status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix contacts sync 

Former-commit-id: fcba2679f4
This commit is contained in:
virvar 2016-03-18 12:53:13 +03:00
parent d2aabc81c9
commit 17065e0f9a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/messenger/models/contacts.cljs
View File

@ -5,7 +5,7 @@
[messenger.utils.utils :refer [log toast http-post]] [messenger.utils.utils :refer [log toast http-post]]
[messenger.utils.database :as db])) [messenger.utils.database :as db]))
(def fake-contacts? true) (def fake-contacts? false)
(def react-native-contacts (js/require "react-native-contacts")) (def react-native-contacts (js/require "react-native-contacts"))
@ -32,7 +32,8 @@
:contacts :contacts
(when (not error) (when (not error)
(map (fn [contact] (map (fn [contact]
(merge (generate-contact 1) (merge contact
(generate-contact 1)
{:name (:givenName contact) {:name (:givenName contact)
:photo-path (:thumbnailPath contact) :photo-path (:thumbnailPath contact)
:phone-numbers (:phoneNumbers contact)})) :phone-numbers (:phoneNumbers contact)}))

14
src/messenger/services/contacts.cljs
View File

@ -2,12 +2,18 @@
(:require-macros [cljs.core.async.macros :refer [go]]) (:require-macros [cljs.core.async.macros :refer [go]])
(:require [clojure.string :as cstr] (:require [clojure.string :as cstr]
[cljs.core.async :as async :refer [chan put! <!]] [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.utils.crypt :refer [encrypt]]
[messenger.comm.intercom :as intercom :refer [save-user-phone-number]] [messenger.comm.intercom :as intercom :refer [save-user-phone-number]]
[messenger.models.contacts :as contacts-model] [messenger.models.contacts :as contacts-model]
[syng-im.utils.logging :as log])) [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] (defn- get-contact-name [phone-contact]
(cstr/join " " (cstr/join " "
(filter #(not (cstr/blank? %)) (filter #(not (cstr/blank? %))
@ -30,7 +36,7 @@
(let [numbers-info (reduce (fn [numbers contact] (let [numbers-info (reduce (fn [numbers contact]
(into numbers (into numbers
(map (fn [c] (map (fn [c]
{:number (:number c) {:number (format-phone-number (:number c))
:contact contact}) :contact contact})
(:phone-numbers contact)))) (:phone-numbers contact))))
'() '()
@ -62,9 +68,7 @@
(handler)))))) (handler))))))
(defn- load-syng-contacts [] (defn- load-syng-contacts []
(contacts-model/load-syng-contacts) (contacts-model/load-syng-contacts))
;; TODO handle contacts
)
(defmulti contacts (fn [state id args] (defmulti contacts (fn [state id args]