From 17065e0f9a9fbb58359f24348c2467ff7b030188 Mon Sep 17 00:00:00 2001
From: virvar <revalka@gmail.com>
Date: Fri, 18 Mar 2016 12:53:13 +0300
Subject: [PATCH] Fix contacts sync

Former-commit-id: fcba2679f47377f1511c76e5090a58fb9392f44e
---
 src/messenger/models/contacts.cljs   |  5 +++--
 src/messenger/services/contacts.cljs | 14 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/messenger/models/contacts.cljs b/src/messenger/models/contacts.cljs
index 2cc6d4a750..21b03a5401 100644
--- a/src/messenger/models/contacts.cljs
+++ b/src/messenger/models/contacts.cljs
@@ -5,7 +5,7 @@
             [messenger.utils.utils :refer [log toast http-post]]
             [messenger.utils.database :as db]))
 
-(def fake-contacts? true)
+(def fake-contacts? false)
 
 (def react-native-contacts (js/require "react-native-contacts"))
 
@@ -32,7 +32,8 @@
                         :contacts
                         (when (not error)
                           (map (fn [contact]
-                                 (merge (generate-contact 1)
+                                 (merge contact
+                                        (generate-contact 1)
                                         {:name (:givenName contact)
                                          :photo-path (:thumbnailPath contact)
                                          :phone-numbers (:phoneNumbers contact)}))
diff --git a/src/messenger/services/contacts.cljs b/src/messenger/services/contacts.cljs
index c66b978538..4cfa08d784 100644
--- a/src/messenger/services/contacts.cljs
+++ b/src/messenger/services/contacts.cljs
@@ -2,12 +2,18 @@
   (:require-macros [cljs.core.async.macros :refer [go]])
   (:require [clojure.string :as cstr]
             [cljs.core.async :as async :refer [chan put! <!]]
-            [messenger.utils.utils :refer [log on-error http-post]]
+            [messenger.utils.utils :refer [log on-error http-post toast]]
             [messenger.utils.crypt :refer [encrypt]]
             [messenger.comm.intercom :as intercom :refer [save-user-phone-number]]
             [messenger.models.contacts :as contacts-model]
             [syng-im.utils.logging :as log]))
 
+(set! js/PhoneNumber (js/require "awesome-phonenumber"))
+(def country-code "US")
+
+(defn- format-phone-number [number]
+  (str (.getNumber (js/PhoneNumber. number country-code "international"))))
+
 (defn- get-contact-name [phone-contact]
   (cstr/join " "
              (filter #(not (cstr/blank? %))
@@ -30,7 +36,7 @@
   (let [numbers-info (reduce (fn [numbers contact]
                                (into numbers
                                      (map (fn [c]
-                                            {:number (:number c)
+                                            {:number (format-phone-number (:number c))
                                              :contact contact})
                                           (:phone-numbers contact))))
                              '()
@@ -62,9 +68,7 @@
           (handler))))))
 
 (defn- load-syng-contacts []
-  (contacts-model/load-syng-contacts)
-  ;; TODO handle contacts
-  )
+  (contacts-model/load-syng-contacts))
 
 
 (defmulti contacts (fn [state id args]