From 4b43096ba8eab77be3186fb808b6adfe7d97c19b Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Wed, 8 Jun 2016 15:29:48 +0200 Subject: [PATCH] System.loadLibrary voodoo magic Former-commit-id: 97ff59f95bcdd80a57833263c5a8191223683be6 --- .re-natal | 2 +- android/app/src/main/java/com/statusim/MainActivity.java | 9 +++++---- env/dev/env/android/main.cljs | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.re-natal b/.re-natal index 1455b14c43..b4f25ba62a 100644 --- a/.re-natal +++ b/.re-natal @@ -1,7 +1,7 @@ { "name": "StatusIm", "interface": "reagent", - "androidHost": "localhost", + "androidHost": "10.0.3.2", "modules": [ "react-native-contacts", "react-native-invertible-scroll-view", diff --git a/android/app/src/main/java/com/statusim/MainActivity.java b/android/app/src/main/java/com/statusim/MainActivity.java index 1a7986b3c0..7d14e08627 100644 --- a/android/app/src/main/java/com/statusim/MainActivity.java +++ b/android/app/src/main/java/com/statusim/MainActivity.java @@ -35,10 +35,6 @@ public class MainActivity extends ReactActivity { final Handler handler = new Handler(); protected void startStatus() { - // Required for android-16 (???) - System.loadLibrary("gethraw"); - System.loadLibrary("geth"); - // Required because of crazy APN settings redirecting localhost (found in GB) Properties properties = System.getProperties(); properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1"); @@ -70,6 +66,11 @@ public class MainActivity extends ReactActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + // Required for android-16 (???) + // Crash if put in startStatus() ? + System.loadLibrary("gethraw"); + System.loadLibrary("geth"); + if(!RootUtil.isDeviceRooted()) { startStatus(); } else { diff --git a/env/dev/env/android/main.cljs b/env/dev/env/android/main.cljs index 1bf474e505..f0c3d96fca 100644 --- a/env/dev/env/android/main.cljs +++ b/env/dev/env/android/main.cljs @@ -10,7 +10,7 @@ (def root-el (r/as-element [reloader])) (figwheel/watch-and-reload - :websocket-url "ws://localhost:3449/figwheel-ws" + :websocket-url "ws://10.0.3.2:3449/figwheel-ws" :heads-up-display false :jsload-callback #(swap! cnt inc))