Skip to content

Commit

Permalink
disable signals
Browse files Browse the repository at this point in the history
  • Loading branch information
cammellos committed Oct 18, 2019
1 parent 1314c6e commit 66b7a37
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 14 deletions.
2 changes: 2 additions & 0 deletions src/status_im/events.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[status-im.multiaccounts.recover.core :as multiaccounts.recover]
[status-im.multiaccounts.update.core :as multiaccounts.update]
status-im.multiaccounts.biometric.core
[status-im.native-module.core :as native-module]
[status-im.bootnodes.core :as bootnodes]
[status-im.browser.core :as browser]
[status-im.browser.permissions :as browser.permissions]
Expand Down Expand Up @@ -309,6 +310,7 @@
(handlers/register-handler-fx
:bootnodes.ui/custom-bootnodes-switch-toggled
(fn [cofx [_ value]]
(native-module/stop-signals!)
(bootnodes/toggle-custom-bootnodes cofx value)))

(handlers/register-handler-fx
Expand Down
5 changes: 5 additions & 0 deletions src/status_im/native_module/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
(clear-web-data)
(.logout (status)))

(def receive-signals (atom true))

(defn stop-signals! []
(reset! receive-signals (not @receive-signals)))

(defonce listener
(.addListener react/device-event-emitter "gethEvent"
#(re-frame/dispatch [:signals/signal-received (.-jsonEvent %)])))
Expand Down
1 change: 1 addition & 0 deletions src/status_im/pairing/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
(fx/defn init [cofx]
{:pairing/get-our-installations nil})

; installationID and identity
(defn handle-bundles-added [{:keys [db] :as cofx} bundle]
(let [installation-id (:installationID bundle)]
(when
Expand Down
31 changes: 17 additions & 14 deletions src/status_im/signals/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
(:require [status-im.ethereum.subscriptions :as ethereum.subscriptions]
[status-im.i18n :as i18n]
[status-im.mailserver.core :as mailserver]
[clojure.string :as string]

[status-im.multiaccounts.login.core :as login]
[status-im.multiaccounts.model :as multiaccounts.model]
[status-im.pairing.core :as pairing]
Expand Down Expand Up @@ -42,19 +44,20 @@

(fx/defn process
[cofx event-str]
(let [{:keys [type event]} (types/json->clj event-str)]
(let [data (.parse js/JSON event-str)
event-js (.-event data)
type (.-type data)]
(case type
"node.login" (status-node-started cofx event)
"envelope.sent" (transport.message/update-envelopes-status cofx (:ids event) :sent)
"envelope.expired" (transport.message/update-envelopes-status cofx (:ids event) :not-sent)
"bundles.added" (pairing/handle-bundles-added cofx event)
"mailserver.request.completed" (mailserver/handle-request-completed cofx event)
"node.login" (status-node-started cofx (js->clj event-js :keywordize-keys true))
"envelope.sent" (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :sent)
"envelope.expired" (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :not-sent)
"mailserver.request.completed" (mailserver/handle-request-completed cofx (js->clj event-js :keywordize-keys true))
"mailserver.request.expired" (when (multiaccounts.model/logged-in? cofx)
(mailserver/resend-request cofx {:request-id (:hash event)}))
"discovery.summary" (summary cofx event)
"subscriptions.data" (ethereum.subscriptions/handle-signal cofx event)
"subscriptions.error" (ethereum.subscriptions/handle-error cofx event)
"whisper.filter.added" (transport.filters/handle-negotiated-filter cofx event)
"messages.new" (transport.message/receive-messages cofx event)
"wallet" (ethereum.subscriptions/new-wallet-event cofx event)
(log/debug "Event " type " not handled" event))))
(mailserver/resend-request cofx {:request-id (.-hash event-js)}))
"discovery.summary" (summary cofx (js->clj event-js :keywordize-keys true))
"subscriptions.data" (ethereum.subscriptions/handle-signal cofx (js->clj event-js :keywordize-keys true))
"subscriptions.error" (ethereum.subscriptions/handle-error cofx (js->clj event-js :keywordize-keys true))
"whisper.filter.added" (transport.filters/handle-negotiated-filter cofx (js->clj event-js :keywordize-keys true))
;"messages.new" (transport.message/receive-messages cofx (js->clj event-js :keywordize-keys true))
"wallet" (ethereum.subscriptions/new-wallet-event cofx (js->clj event-js :keywordize-keys true))
(log/debug "Event " type " not handled"))))

0 comments on commit 66b7a37

Please sign in to comment.