clean up native files

status-im · Jan 25, 2019 · 59485ee · 59485ee
1 parent 72b6ce5
commit 59485ee
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 74 deletions.
diff --git a/android/app/src/main/java/im/status/ethereum/MainApplication.java b/android/app/src/main/java/im/status/ethereum/MainApplication.java
@@ -1,36 +1,39 @@
 package im.status.ethereum;
 
 import android.support.multidex.MultiDexApplication;
+
+import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
 import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
-import org.devio.rn.splashscreen.SplashScreenReactPackage;
 import com.facebook.react.ReactApplication;
-import io.invertase.firebase.RNFirebasePackage;
-import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
-import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
-import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
-import com.ocetnik.timer.BackgroundTimerPackage;
-import com.horcrux.svg.SvgPackage;
-import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;
-import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
-import org.reactnative.camera.RNCameraPackage;
+import com.horcrux.svg.SvgPackage;
+import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
+import com.oblador.keychain.KeychainPackage;
+import com.ocetnik.timer.BackgroundTimerPackage;
 import com.reactnative.ivpusic.imagepicker.PickerPackage;
 import com.rnfs.RNFSPackage;
-import fr.bamlab.rnimageresizer.ImageResizerPackage;
-import im.status.ethereum.module.StatusPackage;
-import im.status.ethereum.keycard.RNStatusKeycardPackage;
-import io.realm.react.RealmReactPackage;
-import me.alwx.HttpServer.HttpServerReactPackage;
-import com.oblador.keychain.KeychainPackage;
 
-import java.util.ArrayList;
+import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
+
+import org.devio.rn.splashscreen.SplashScreenReactPackage;
+import org.reactnative.camera.RNCameraPackage;
+
 import java.util.Arrays;
 import java.util.List;
+
+import fr.bamlab.rnimageresizer.ImageResizerPackage;
 import im.status.ethereum.function.Function;
+import im.status.ethereum.keycard.RNStatusKeycardPackage;
+import im.status.ethereum.module.StatusPackage;
+import io.invertase.firebase.RNFirebasePackage;
+import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
+import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
+import io.realm.react.RealmReactPackage;
+import me.alwx.HttpServer.HttpServerReactPackage;
 
 public class MainApplication extends MultiDexApplication implements ReactApplication {
 
@@ -42,19 +45,9 @@ public boolean getUseDeveloperSupport() {
 
         @Override
         protected List<ReactPackage> getPackages() {
-            boolean devCluster = false;
-            if (BuildConfig.ETHEREUM_DEV_CLUSTER == "1") {
-                devCluster = true;
-            }
-
-            boolean webViewDebugEnabled = false;
-            if (BuildConfig.DEBUG_WEBVIEW == "1") {
-                webViewDebugEnabled = true;
-            }
-
-            StatusPackage statusPackage = new StatusPackage(BuildConfig.DEBUG, devCluster, RootUtil.isDeviceRooted());
+            StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());
             Function<String, String> callRPC = statusPackage.getCallRPC();
-            List<ReactPackage> packages = new ArrayList<ReactPackage>(Arrays.asList(
+            return Arrays.asList(
                     new MainReactPackage(),
                     new RNFirebasePackage(),
                     new RNFirebaseMessagingPackage(),
@@ -73,11 +66,9 @@ protected List<ReactPackage> getPackages() {
                     new ReactNativeDialogsPackage(),
                     new ImageResizerPackage(),
                     new PickerPackage(),
-                    new WebViewBridgePackage(webViewDebugEnabled, callRPC),
+                    new WebViewBridgePackage(BuildConfig.DEBUG_WEBVIEW == "1", callRPC),
                     new ReactNativeConfigPackage(),
-                    new KeychainPackage()));
-
-            return packages;
+                    new KeychainPackage());
         }
 
         @Override

diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle
@@ -18,7 +18,6 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+' // from node_modules
-    compile 'android.arch.lifecycle:extensions:1.1.1'
     compile 'com.github.status-im:function:0.0.1'
 
     // WARNING: If you change this, make sure the GitHub release of the .aar exists.

diff --git a/...les/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/...les/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
@@ -2,52 +2,50 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleObserver;
-import android.arch.lifecycle.OnLifecycleEvent;
-import android.arch.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.*;
-import android.support.v4.content.FileProvider ;
-import android.text.TextUtils;
-import android.view.WindowManager;
+import android.os.Build;
+import android.os.Environment;
+import android.support.v4.content.FileProvider;
 import android.util.Log;
+import android.view.WindowManager;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebStorage;
 
-import com.facebook.react.bridge.*;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.github.status_im.status_go.Statusgo;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
-import java.util.Stack;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Stack;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.json.JSONObject;
-import org.json.JSONException;
-
 import javax.annotation.Nullable;
 
 class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventListener, StatusNodeEventHandler {
@@ -57,22 +55,12 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     private static final String gethLogFileName = "geth.log";
     private static final String statusLogFileName = "Status.log";
 
-    private final static int TESTNET_NETWORK_ID = 3;
-
     private static StatusModule module;
-    private ExecutorService executor = null;
-    private boolean debug;
-    private boolean devCluster;
     private ReactApplicationContext reactContext;
     private boolean rootedDevice;
 
-    StatusModule(ReactApplicationContext reactContext, boolean debug, boolean devCluster, boolean rootedDevice) {
+    StatusModule(ReactApplicationContext reactContext, boolean rootedDevice) {
         super(reactContext);
-        if (executor == null) {
-            executor = Executors.newCachedThreadPool();
-        }
-        this.debug = debug;
-        this.devCluster = devCluster;
         this.reactContext = reactContext;
         this.rootedDevice = rootedDevice;
         reactContext.addLifecycleEventListener(this);

diff --git a/...es/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java b/...es/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java
@@ -14,13 +14,9 @@
 
 public class StatusPackage implements ReactPackage {
 
-    private boolean debug;
-    private boolean devCluster;
     private boolean rootedDevice;
 
-    public StatusPackage (boolean debug, boolean devCluster, boolean rootedDevice) {
-        this.debug = debug;
-        this.devCluster = devCluster;
+    public StatusPackage(boolean rootedDevice) {
         this.rootedDevice = rootedDevice;
     }
 
@@ -29,15 +25,11 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         List<NativeModule> modules = new ArrayList<>();
         System.loadLibrary("statusgoraw");
         System.loadLibrary("statusgo");
-        modules.add(new StatusModule(reactContext, this.debug, this.devCluster, this.rootedDevice ));
+        modules.add(new StatusModule(reactContext, this.rootedDevice));
 
         return modules;
     }
 
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Collections.emptyList();