diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java index 1d54c37174..b23bcc8706 100644 --- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java @@ -19,7 +19,7 @@ public class StatusService extends Service { private static final String TAG = "StatusService"; - private static boolean isNodeInitialized = false; + private boolean isNodeInitialized = false; private final Handler handler = new Handler(); private ExecutorService executor = null; @@ -341,7 +341,7 @@ public class StatusService extends Service { } - public static boolean isNodeInitialized() { + public boolean isNodeInitialized() { return isNodeInitialized; } diff --git a/src/status_im/protocol/handlers.cljs b/src/status_im/protocol/handlers.cljs index 706998a39a..3cc3ec143b 100644 --- a/src/status_im/protocol/handlers.cljs +++ b/src/status_im/protocol/handlers.cljs @@ -408,8 +408,10 @@ (u/side-effect! (fn [_ [_ error]] (.log js/console error) - (let [message (.-message error)] - (when (or (re-find (re-pattern "Could not connect to the server.") message) - (re-find (re-pattern "Failed to connect") message)) + (let [message (.-message error) + ios-error? (re-find (re-pattern "Could not connect to the server.") message) + android-error? (re-find (re-pattern "Failed to connect") message)] + (when (or ios-error? android-error?) + (when android-error? (status/init-jail)) (status/restart-rpc) (dispatch [:load-commands!]))))))