From f613dbd2dc94d66d9e42b1b8766bbf8b9e9e48ea Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 19 May 2016 18:03:15 +0300 Subject: [PATCH 1/2] add group chat/ messages in group chat Former-commit-id: a5f153bb664838e50fb13fd80534e0a8e660fe4b --- run-osx.sh | 6 +- src/syng_im/chat/handlers.cljs | 38 ++--- src/syng_im/chat/views/plain_input.cljs | 6 +- src/syng_im/db.cljs | 2 +- src/syng_im/group_settings/handlers.cljs | 2 +- src/syng_im/group_settings/screen.cljs | 13 +- src/syng_im/handlers.cljs | 165 +++++++++------------ src/syng_im/models/chats.cljs | 6 +- src/syng_im/models/messages.cljs | 19 ++- src/syng_im/new_group/handlers.cljs | 73 +++++++++ src/syng_im/new_group/screen.cljs | 74 +++++---- src/syng_im/new_group/subs.cljs | 9 ++ src/syng_im/new_group/views/contact.cljs | 27 ++-- src/syng_im/protocol/protocol_handler.cljs | 1 + src/syng_im/subs.cljs | 3 +- 15 files changed, 240 insertions(+), 204 deletions(-) create mode 100644 src/syng_im/new_group/handlers.cljs create mode 100644 src/syng_im/new_group/subs.cljs diff --git a/run-osx.sh b/run-osx.sh index 9f89a05857..4c66056ae4 100755 --- a/run-osx.sh +++ b/run-osx.sh @@ -38,10 +38,10 @@ fi if [ "$device_type" = "genymotion" ] then # Find Device based on Android version 6.0.0 -device=$(/Applications/Genymotion\ Shell.app/Contents/MacOS/genyshell -c "devices list" | grep "6.0.0") +device=$(genyshell -c "devices list" | grep "6.0.0") #echo ${device##*| } # Launch device in Genymotion -open -a /Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" +open -a ~/Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" fi # Install deps, prepare for genymotion and figwheel @@ -56,6 +56,6 @@ tab "react-native start" # echo "Press any key when emulator, figwheel and packager are ready" && read -n 1 sleep 10s -adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 +adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 && adb forward tcp:8082 tcp:8082 react-native run-android diff --git a/src/syng_im/chat/handlers.cljs b/src/syng_im/chat/handlers.cljs index 1691319b39..67acc9a6fa 100644 --- a/src/syng_im/chat/handlers.cljs +++ b/src/syng_im/chat/handlers.cljs @@ -11,7 +11,6 @@ [syng-im.chat.sign-up :as sign-up-service] [syng-im.models.chats :as chats] [syng-im.navigation.handlers :as nav] - [syng-im.models.chats :as c] [syng-im.utils.handlers :as u])) (register-handler :set-show-actions @@ -70,20 +69,6 @@ (register-handler :set-chat-input-text ((enrich update-command) update-text)) -(register-handler :send-group-chat-msg - (u/side-effect! - (fn [_ [_ chat-id text]] - (let [{msg-id :msg-id - {from :from} :msg} (api/send-group-user-msg {:group-id chat-id - :content text}) - msg {:msg-id msg-id - :from from - :to nil - :content text - :content-type text-content-type - :outgoing true}] - (messages/save-message chat-id msg))))) - (defn console? [s] (= "console" s)) @@ -168,10 +153,15 @@ (assoc-in db [:chats current-chat-id :staged-commands] [])) (defn send-message! - [{:keys [new-message current-chat-id]} _] + [{:keys [new-message current-chat-id] :as db} _] (when (and new-message (not-console? current-chat-id)) - (api/send-user-msg {:to current-chat-id - :content (:content new-message)}))) + (let [{:keys [group-chat]} (get-in db [:chats current-chat-id]) + content (:content new-message)] + (if group-chat + (api/send-group-user-msg {:group-id current-chat-id + :content content}) + (api/send-user-msg {:to current-chat-id + :content content}))))) (defn save-message-to-realm! [{:keys [new-message current-chat-id]} _] @@ -204,8 +194,7 @@ (register-handler :unstage-command (fn [db [_ staged-command]] - (let [] - (commands/unstage-command db staged-command)))) + (commands/unstage-command db staged-command))) (register-handler :set-chat-command (fn [db [_ command-key]] @@ -307,11 +296,7 @@ :group-chat false :is-active true :timestamp (.getTime (js/Date.)) - ;; todo how to choose color? - ;; todo do we need to have some color for not group chat? - :contacts [{:identity contcat-id - :text-color :#FFFFFF - :background-color :#AB7967}]}] + :contacts [{:identity contcat-id}]}] (assoc db :new-chat chat))) (defn add-chat [{:keys [new-chat] :as db} [_ chat-id]] @@ -331,8 +316,7 @@ (-> prepare-chat ((enrich add-chat)) ((after save-chat!)) - ((after open-chat!)) - debug)) + ((after open-chat!)))) (register-handler :switch-command-suggestions (fn [db [_]] diff --git a/src/syng_im/chat/views/plain_input.cljs b/src/syng_im/chat/views/plain_input.cljs index 0feee3d72c..61fb8ed09b 100644 --- a/src/syng_im/chat/views/plain_input.cljs +++ b/src/syng_im/chat/views/plain_input.cljs @@ -12,11 +12,7 @@ (defn send [chat input-message] (let [{:keys [group-chat chat-id]} chat] - (if group-chat - ;; todo how much are different both events? is there real reason - ;; for differentiation here? - (dispatch [:send-group-chat-msg chat-id input-message]) - (dispatch [:send-chat-msg])))) + (dispatch [:send-chat-msg]))) (defn message-valid? [staged-commands message] (or (and (pos? (count message)) diff --git a/src/syng_im/db.cljs b/src/syng_im/db.cljs index f031922451..92c9c0d645 100644 --- a/src/syng_im/db.cljs +++ b/src/syng_im/db.cljs @@ -11,13 +11,13 @@ :identity "me" :contacts [] :contacts-ids #{} + :selected-contacts #{} :current-chat-id "console" :chat {:command nil :last-message nil} :chats {} :chats-updated-signal 0 :show-actions false - :new-group #{} :new-participants #{} :signed-up true :view-id default-view diff --git a/src/syng_im/group_settings/handlers.cljs b/src/syng_im/group_settings/handlers.cljs index d38e52ab06..0871624cb1 100644 --- a/src/syng_im/group_settings/handlers.cljs +++ b/src/syng_im/group_settings/handlers.cljs @@ -31,7 +31,7 @@ (dispatch [:initialize-chats])) (register-handler :show-group-settings - (fn [db [action]] + (fn [db _] (let [chat-id (:current-chat-id db) chat-name (get-in db [:chats chat-id :name]) chat-color (get-in db [:chats chat-id :color]) diff --git a/src/syng_im/group_settings/screen.cljs b/src/syng_im/group_settings/screen.cljs index 9d3011b5fb..7e06fd98af 100644 --- a/src/syng_im/group_settings/screen.cljs +++ b/src/syng_im/group_settings/screen.cljs @@ -1,7 +1,6 @@ (ns syng-im.group-settings.screen (:require-macros [syng-im.utils.views :refer [defview]]) - (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] - [syng-im.resources :as res] + (:require [re-frame.core :refer [subscribe dispatch]] [syng-im.components.react :refer [view text-input text @@ -13,12 +12,8 @@ scroll-view touchable-highlight]] [syng-im.components.toolbar :refer [toolbar]] - [syng-im.components.realm :refer [list-view]] - [syng-im.components.styles :refer [color-purple - text2-color]] [syng-im.group-settings.styles.group-settings :as st] - [syng-im.group-settings.views.member :refer [member-view]] - [reagent.core :as r])) + [syng-im.group-settings.views.member :refer [member-view]])) (defn remove-member [{:keys [whisper-identity]}] (dispatch [:chat-remove-member whisper-identity])) @@ -70,7 +65,7 @@ (dispatch [:set-chat-color])) (defview chat-color-picker [] - [show-color-picker [:group-settings-show-color-picker] + [show-color-picker [:get :group-settings-show-color-picker] new-color [:get :new-chat-color]] [modal {:animated false :transparent false @@ -128,7 +123,7 @@ [name [:chat :name] color [:chat :color]] [view (st/chat-icon color) - [text {:style st/chat-icon-text} (nth name 0)]]) + [text {:style st/chat-icon-text} (first name)]]) (defn new-group-toolbar [] [toolbar {:title "Chat settings" diff --git a/src/syng_im/handlers.cljs b/src/syng_im/handlers.cljs index 37f1e23311..5ca72c1d61 100644 --- a/src/syng_im/handlers.cljs +++ b/src/syng_im/handlers.cljs @@ -34,11 +34,13 @@ nav-pop]] [syng-im.utils.crypt :refer [gen-random-bytes]] [syng-im.utils.random :as random] + [syng-im.utils.handlers :as u] syng-im.chat.handlers [syng-im.group-settings.handlers :refer [delete-chat]] - [syng-im.navigation.handlers :as nav] + syng-im.navigation.handlers syng-im.discovery.handlers - syng-im.contacts.handlers)) + syng-im.contacts.handlers + syng-im.new-group.handlers)) ;; -- Middleware ------------------------------------------------------------ ;; @@ -61,45 +63,37 @@ (fn [db [_ k v]] (assoc db k v)))) -(defn preload-data! - [{:keys [view-id] :as db} _] - (nav/preload-data! db [nil view-id])) - (register-handler :initialize-db (fn [_ _] (assoc app-db :signed-up (storage/get kv/kv-store :signed-up)))) -(register-handler :set-loading - (fn [db [_ value]] - (assoc db :loading value))) - (register-handler :initialize-crypt - (fn [db _] - (log/debug "initializing crypt") - (gen-random-bytes 1024 (fn [{:keys [error buffer]}] - (if error - (do - (log/error "Failed to generate random bytes to initialize sjcl crypto") - (dispatch [:notify-user {:type :error - :error error}])) - (do - (->> (.toString buffer "hex") - (.toBits (.. js/ecc -sjcl -codec -hex)) - (.addEntropy (.. js/ecc -sjcl -random))) - (dispatch [:crypt-initialized]))))) - db)) + (u/side-effect! + (fn [_ _] + (log/debug "initializing crypt") + (gen-random-bytes 1024 (fn [{:keys [error buffer]}] + (if error + (do + (log/error "Failed to generate random bytes to initialize sjcl crypto") + (dispatch [:notify-user {:type :error + :error error}])) + (do + (->> (.toString buffer "hex") + (.toBits (.. js/ecc -sjcl -codec -hex)) + (.addEntropy (.. js/ecc -sjcl -random))) + (dispatch [:crypt-initialized])))))))) (register-handler :crypt-initialized - (fn [db _] - (log/debug "crypt initialized") - db)) + (u/side-effect! + (fn [_ _] + (log/debug "crypt initialized")))) (register-handler :load-commands - (fn [db [action]] - (log/debug action) - (load-commands) - db)) + (u/side-effect! + (fn [_ [action]] + (log/debug action) + (load-commands)))) (register-handler :set-commands (fn [db [action commands]] @@ -109,9 +103,9 @@ ;; -- Protocol -------------------------------------------------------------- (register-handler :initialize-protocol - (fn [db [_]] - (init-protocol (make-handler db)) - db)) + (u/side-effect! + (fn [db [_]] + (init-protocol (make-handler db))))) (register-handler :protocol-initialized (fn [db [_ identity]] @@ -174,55 +168,62 @@ :content-type text-content-type})) (register-handler :group-chat-invite-acked - (fn [db [action from group-id ack-msg-id]] - (log/debug action from group-id ack-msg-id) - (joined-chat-msg group-id from ack-msg-id))) + (u/side-effect! + (fn [_ [action from group-id ack-msg-id]] + (log/debug action from group-id ack-msg-id) + (joined-chat-msg group-id from ack-msg-id)))) (register-handler :participant-removed-from-group - (fn [db [action from group-id identity msg-id]] - (log/debug action msg-id from group-id identity) - (chat-remove-participants group-id [identity]) - (participant-removed-from-group-msg group-id identity from msg-id))) + (u/side-effect! + (fn [_ [action from group-id identity msg-id]] + (log/debug action msg-id from group-id identity) + (chat-remove-participants group-id [identity]) + (participant-removed-from-group-msg group-id identity from msg-id)))) (register-handler :you-removed-from-group - (fn [db [action from group-id msg-id]] - (log/debug action msg-id from group-id) - (you-removed-from-group-msg group-id from msg-id) - (set-chat-active group-id false))) + (u/side-effect! + (fn [_ [action from group-id msg-id]] + (log/debug action msg-id from group-id) + (you-removed-from-group-msg group-id from msg-id) + (set-chat-active group-id false)))) (register-handler :participant-left-group - (fn [db [action from group-id msg-id]] - (log/debug action msg-id from group-id) - (if (= (api/my-identity) from) - db - (participant-left-group-msg group-id from msg-id)))) + (u/side-effect! + (fn [_ [action from group-id msg-id]] + (log/debug action msg-id from group-id) + (when-not (= (api/my-identity) from) + (participant-left-group-msg group-id from msg-id))))) (register-handler :participant-invited-to-group - (fn [db [action from group-id identity msg-id]] - (log/debug action msg-id from group-id identity) - (participant-invited-to-group-msg group-id identity from msg-id))) + (u/side-effect! + (fn [_ [action from group-id identity msg-id]] + (log/debug action msg-id from group-id identity) + (participant-invited-to-group-msg group-id identity from msg-id)))) (register-handler :acked-msg - (fn [db [action from msg-id]] - (log/debug action from msg-id) - (update-message! {:msg-id msg-id - :delivery-status :delivered}))) + (u/side-effect! + (fn [_ [action from msg-id]] + (log/debug action from msg-id) + (update-message! {:msg-id msg-id + :delivery-status :delivered})))) (register-handler :msg-delivery-failed - (fn [db [action msg-id]] - (log/debug action msg-id) - (update-message! {:msg-id msg-id - :delivery-status :failed}))) + (u/side-effect! + (fn [_ [action msg-id]] + (log/debug action msg-id) + (update-message! {:msg-id msg-id + :delivery-status :failed})))) (register-handler :leave-group-chat - (fn [db [action]] - (log/debug action) - (let [chat-id (:current-chat-id db)] - (api/leave-group-chat chat-id) - (set-chat-active chat-id false) - (left-chat-msg chat-id) - (delete-chat chat-id) - (dispatch [:navigate-back])))) + (u/side-effect! + (fn [db [action]] + (log/debug action) + (let [chat-id (:current-chat-id db)] + (api/leave-group-chat chat-id) + (set-chat-active chat-id false) + (left-chat-msg chat-id) + (delete-chat chat-id) + (dispatch [:navigate-back]))))) ;; -- User data -------------------------------------------------------------- (register-handler :load-user-phone-number @@ -288,29 +289,3 @@ (api/group-remove-participant chat-id identity) (removed-participant-msg chat-id identity) db))) - -(defn update-new-group-selection [db identity add?] - (update-in db :new-group (fn [new-group] - (if add? - (conj new-group identity) - (disj new-group identity))))) - -(register-handler :select-for-new-group - (fn [db [_ identity add?]] - (update-new-group-selection db identity add?))) - -(register-handler :create-new-group - (fn [db [action group-name]] - (log/debug action) - (let [identities (vec (:new-group db)) - group-id (api/start-group-chat identities group-name) - db (create-chat db group-id identities true group-name)] - (dispatch [:show-chat group-id :replace]) - db))) - -(register-handler :group-chat-invite-received - (fn [db [action from group-id identities group-name]] - (log/debug action from group-id identities) - (if (chat-exists? group-id) - (re-join-group-chat db group-id identities group-name) - (create-chat db group-id identities true group-name)))) diff --git a/src/syng_im/models/chats.cljs b/src/syng_im/models/chats.cljs index de9ea76963..ce2d982ef6 100644 --- a/src/syng_im/models/chats.cljs +++ b/src/syng_im/models/chats.cljs @@ -44,8 +44,7 @@ (let [chat (assoc chat :last-msg-id (or last-msg-id ""))] (r/write #(r/create :chats chat)))) ([db chat-id identities group-chat? chat-name] - (if (chat-exists? chat-id) - db + (when-not (chat-exists? chat-id) (let [chat-name (or chat-name (get-chat-name chat-id identities)) _ (log/debug "creating chat" chat-name)] @@ -60,8 +59,7 @@ :timestamp (timestamp) :contacts contacts :last-msg-id ""})))) - (add-status-message chat-id) - db)))) + (add-status-message chat-id))))) (defn chat-contacts [chat-id] (-> (r/get-by-field :chats :chat-id chat-id) diff --git a/src/syng_im/models/messages.cljs b/src/syng_im/models/messages.cljs index 7f476de7f4..2706cad94a 100644 --- a/src/syng_im/models/messages.cljs +++ b/src/syng_im/models/messages.cljs @@ -17,19 +17,24 @@ [s] (keywordize-keys (apply hash-map (split s #"[;=]")))) +(def default-values + {:outgoing false + :to nil + :same-author false + :same-direction false}) + (defn save-message ;; todo remove chat-id parameter - [chat-id {:keys [to msg-id content outgoing] - ;; outgoing should be explicitely defined in handlers - :or {outgoing false - to nil} :as message}] + [chat-id {:keys [msg-id content] + :as message}] (when-not (r/exists? :msgs :msg-id msg-id) (r/write (fn [] (let [content' (if (string? content) content (map-to-str content)) - message' (merge message + message' (merge default-values + message {:chat-id chat-id :content content' :timestamp (timestamp) @@ -60,7 +65,7 @@ (defn clear-history [chat-id] (r/write - (fn [] - (r/delete (r/get-by-field :msgs :chat-id chat-id)))) + (fn [] + (r/delete (r/get-by-field :msgs :chat-id chat-id)))) ;; TODO temp. Update chat in db atom (dispatch [:initialize-chats])) diff --git a/src/syng_im/new_group/handlers.cljs b/src/syng_im/new_group/handlers.cljs new file mode 100644 index 0000000000..bbd07a1f60 --- /dev/null +++ b/src/syng_im/new_group/handlers.cljs @@ -0,0 +1,73 @@ +(ns syng-im.new-group.handlers + (:require [syng-im.protocol.api :as api] + [re-frame.core :refer [register-handler after dispatch debug enrich]] + [syng-im.models.chats :as chats] + [clojure.string :as s])) + +(defn deselect-contact + [db [_ id]] + (update db :selected-contacts disj id)) + +(register-handler :deselect-contact deselect-contact) + +(defn select-contact + [db [_ id]] + (update db :selected-contacts conj id)) + +(register-handler :select-contact select-contact) + +(defn start-group-chat! + [{:keys [selected-contacts] :as db} [_ group-name]] + (let [group-id (api/start-group-chat selected-contacts group-name)] + (assoc db :new-group-id group-id))) + +(defn group-name-from-contacts + [{:keys [contacts selected-contacts username]}] + (->> (select-keys contacts selected-contacts) + vals + (map :name) + (cons username) + (s/join ", "))) + +(defn prepare-chat + [{:keys [selected-contacts new-group-id] :as db} [_ group-name]] + (let [contacts (mapv #(hash-map :identity %) selected-contacts) + chat-name (if-not (s/blank? group-name) + group-name + (group-name-from-contacts db))] + (assoc db :new-chat {:chat-id new-group-id + :name chat-name + :group-chat true + :is-active true + :timestamp (.getTime (js/Date.)) + :contacts contacts + :same-author false + :same-direction false}))) + +(defn add-chat + [{:keys [new-chat] :as db} _] + (-> db + (assoc-in [:chats (:chat-id new-chat)] new-chat) + (assoc :selected-contacts #{}))) + +(defn create-chat! + [{:keys [new-chat]} _] + (chats/create-chat new-chat)) + +(defn show-chat! + [{:keys [new-group-id]} _] + (dispatch [:show-chat new-group-id :replace])) + +(register-handler :create-new-group + (-> start-group-chat! + ((enrich prepare-chat)) + ((enrich add-chat)) + ((after create-chat!)) + ((after show-chat!)))) + +; todo rewrite +(register-handler :group-chat-invite-received + (fn [db [action from group-id identities group-name]] + (if (chats/chat-exists? group-id) + (chats/re-join-group-chat db group-id identities group-name) + (chats/create-chat db group-id identities true group-name)))) diff --git a/src/syng_im/new_group/screen.cljs b/src/syng_im/new_group/screen.cljs index 5e7843c86b..85a344022b 100644 --- a/src/syng_im/new_group/screen.cljs +++ b/src/syng_im/new_group/screen.cljs @@ -1,5 +1,6 @@ (ns syng-im.new-group.screen - (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] + (:require-macros [syng-im.utils.views :refer [defview]]) + (:require [re-frame.core :refer [subscribe dispatch]] [syng-im.resources :as res] [syng-im.components.react :refer [view text-input @@ -16,43 +17,38 @@ [syng-im.new-group.styles :as st])) -(defn new-group-toolbar [] - (let [group-name (subscribe [:get ::group-name])] - (fn [] - [toolbar - {:title "New group chat" - :action {:image {:source res/v ;; {:uri "icon_search"} - :style st/toolbar-icon} - :handler #(dispatch [:create-new-group @group-name])}}]))) +(defview new-group-toolbar [] + [group-name [:get ::group-name]] + [toolbar + {:title "New group chat" + :action {:image {:source res/v ;; {:uri "icon_search"} + :style st/toolbar-icon} + :handler #(dispatch [:create-new-group group-name])}}]) -(defn group-name-input [] - (let [group-name (subscribe [:get ::group-name])] - (fn [] - [text-input - {:underlineColorAndroid color-purple - :style st/group-name-input - :autoFocus true - :placeholder "Group Name" - :onChangeText #(dispatch [:set ::group-name %]) - :onSubmitEditing #(dispatch [:set ::group-name nil])} - @group-name]))) +(defview group-name-input [] + [group-name [:get ::group-name]] + [text-input + {:underlineColorAndroid color-purple + :style st/group-name-input + :autoFocus true + :placeholder "Group Name" + :onChangeText #(dispatch [:set ::group-name %])} + group-name]) -(defn new-group [] - (let [contacts (subscribe [:all-contacts])] - (fn [] - (let [contacts-ds (to-datasource @contacts)] - [view st/new-group-container - [new-group-toolbar] - [view st/chat-name-container - [text {:style st/chat-name-text} "Chat name"] - [group-name-input] - [text {:style st/members-text} "Members"] - [touchable-highlight {:on-press (fn [])} - [view st/add-container - [icon :add_gray st/add-icon] - [text {:style st/add-text} "Add members"]]] - [list-view - {:dataSource contacts-ds - :renderRow (fn [row _ _] - (list-item [new-group-contact row])) - :style st/contacts-list}]]])))) +(defview new-group [] + [contacts [:all-contacts]] + [view st/new-group-container + [new-group-toolbar] + [view st/chat-name-container + [text {:style st/chat-name-text} "Chat name"] + [group-name-input] + [text {:style st/members-text} "Members"] + [touchable-highlight {:on-press (fn [])} + [view st/add-container + [icon :add_gray st/add-icon] + [text {:style st/add-text} "Add members"]]] + [list-view + {:dataSource (to-datasource contacts) + :renderRow (fn [row _ _] + (list-item [new-group-contact row])) + :style st/contacts-list}]]]) diff --git a/src/syng_im/new_group/subs.cljs b/src/syng_im/new_group/subs.cljs new file mode 100644 index 0000000000..62fc941747 --- /dev/null +++ b/src/syng_im/new_group/subs.cljs @@ -0,0 +1,9 @@ +(ns syng-im.new-group.subs + (:require-macros [reagent.ratom :refer [reaction]]) + (:require [re-frame.core :refer [register-sub]])) + +(register-sub :is-contact-selected? + (fn [db [_ id]] + (-> (:selected-contacts @db) + (contains? id) + (reaction)))) diff --git a/src/syng_im/new_group/views/contact.cljs b/src/syng_im/new_group/views/contact.cljs index 2a12eb2bc5..6701e9fafc 100644 --- a/src/syng_im/new_group/views/contact.cljs +++ b/src/syng_im/new_group/views/contact.cljs @@ -1,19 +1,22 @@ (ns syng-im.new-group.views.contact + (:require-macros [syng-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] [syng-im.components.react :refer [view]] [syng-im.contacts.views.contact-inner :refer [contact-inner-view]] [syng-im.components.item-checkbox :refer [item-checkbox]] - [reagent.core :as r] [syng-im.new-group.styles :as st])) -(defn new-group-contact [{:keys [whisper-identity] :as contact}] - (let [checked (r/atom false)] - (fn [] - [view st/contact-container - [item-checkbox - {:onToggle (fn [checked?] - (reset! checked checked?) - (dispatch [:select-for-new-group whisper-identity checked?])) - :checked @checked - :size 30}] - [contact-inner-view contact]]))) +(defn on-toggle [whisper-identity] + (fn [checked?] + (println checked?) + (let [action (if checked? :select-contact :deselect-contact)] + (dispatch [action whisper-identity])))) + +(defview new-group-contact [{:keys [whisper-identity] :as contact}] + [checked [:is-contact-selected? whisper-identity]] + [view st/contact-container + [item-checkbox + {:onToggle (on-toggle whisper-identity) + :checked checked + :size 30}] + [contact-inner-view contact]]) diff --git a/src/syng_im/protocol/protocol_handler.cljs b/src/syng_im/protocol/protocol_handler.cljs index dadeee0b5f..4e6f1f94cf 100644 --- a/src/syng_im/protocol/protocol_handler.cljs +++ b/src/syng_im/protocol/protocol_handler.cljs @@ -10,6 +10,7 @@ (defn make-handler [db] {:ethereum-rpc-url ethereum-rpc-url :identity (stored-identity db) + ;; :active-group-ids is never used in protocol :active-group-ids (active-group-chats) :storage kv/kv-store :handler (fn [{:keys [event-type] :as event}] diff --git a/src/syng_im/subs.cljs b/src/syng_im/subs.cljs index b2d895730c..055e3e8760 100644 --- a/src/syng_im/subs.cljs +++ b/src/syng_im/subs.cljs @@ -4,7 +4,8 @@ syng-im.chat.subs syng-im.group-settings.subs syng-im.discovery.subs - syng-im.contacts.subs)) + syng-im.contacts.subs + syng-im.new-group.subs)) (register-sub :get (fn [db [_ k]] From 2312cd7a14c97b8903baeaafc6ec01d6f28128c2 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 19 May 2016 18:09:32 +0300 Subject: [PATCH 2/2] revert run-osx.sh Former-commit-id: 9f5c3df150f36d9ba8c8994c03d4a0e2a1addbf7 --- run-osx.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run-osx.sh b/run-osx.sh index 4c66056ae4..9f89a05857 100755 --- a/run-osx.sh +++ b/run-osx.sh @@ -38,10 +38,10 @@ fi if [ "$device_type" = "genymotion" ] then # Find Device based on Android version 6.0.0 -device=$(genyshell -c "devices list" | grep "6.0.0") +device=$(/Applications/Genymotion\ Shell.app/Contents/MacOS/genyshell -c "devices list" | grep "6.0.0") #echo ${device##*| } # Launch device in Genymotion -open -a ~/Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" +open -a /Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }" fi # Install deps, prepare for genymotion and figwheel @@ -56,6 +56,6 @@ tab "react-native start" # echo "Press any key when emulator, figwheel and packager are ready" && read -n 1 sleep 10s -adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 && adb forward tcp:8082 tcp:8082 +adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 react-native run-android