From 3c62b9224834e10ba2c21aaa6bca56cab91e3231 Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <rasom@ukr.net>
Date: Wed, 22 Jun 2016 12:56:43 +0300
Subject: [PATCH] move statusgo to artifactory

Former-commit-id: c1e5a64836df78eed48a9f51fc5e2c15990cb8bb
---
 android/app/build.gradle                        |  4 +---
 .../app/libs/geth-android-16.aar.REMOVED.git-id |  1 -
 .../src/main/java/com/statusim/GethService.java | 17 +++--------------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 android/app/libs/geth-android-16.aar.REMOVED.git-id

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4182c69686..2a8bf6a0c8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -132,9 +132,7 @@ dependencies {
     compile project(':ReactNativeAndroidSmsListener')
     compile project(':react-native-camera')
     compile project(':react-native-status')
-    // todo replace this when jail will be integrated into geth
-    compile (name: "geth-android-16", ext:"aar")
-    //compile(group: 'status-im', name: 'android-geth', version: '1.4.0-201604110816-a97a114', ext: 'aar')
+    compile(group: 'status-im', name: 'status-go', version: '0.1.0-201606220917-ec4b9a', ext: 'aar')
 
     compile fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
 }
diff --git a/android/app/libs/geth-android-16.aar.REMOVED.git-id b/android/app/libs/geth-android-16.aar.REMOVED.git-id
deleted file mode 100644
index ae91163656..0000000000
--- a/android/app/libs/geth-android-16.aar.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-030bd1fbceae92a86d43251c4306e9113b8e51f4
\ No newline at end of file
diff --git a/android/app/src/main/java/com/statusim/GethService.java b/android/app/src/main/java/com/statusim/GethService.java
index 7967807cbd..54defce661 100644
--- a/android/app/src/main/java/com/statusim/GethService.java
+++ b/android/app/src/main/java/com/statusim/GethService.java
@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Handler;
 import android.os.AsyncTask;
 import android.os.IBinder;
-import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
 import android.support.annotation.Nullable;
@@ -14,7 +13,7 @@ import android.os.Environment;
 
 import java.lang.ref.WeakReference;
 
-import com.github.ethereum.go_ethereum.cmd.Geth;
+import com.github.status_im.status_go.Statusgo;
 
 import java.io.File;
 
@@ -78,20 +77,11 @@ public class GethService extends Service {
                 extStore.getAbsolutePath() :
                 getApplicationInfo().dataDir;
 
-        final Runnable addPeer = new Runnable() {
-            public void run() {
-                Log.w("Geth", "adding peer");
-                Geth.run("--exec admin.addPeer(\"enode://e2f28126720452aa82f7d3083e49e6b3945502cb94d9750a15e27ee310eed6991618199f878e5fbc7dfa0e20f0af9554b41f491dc8f1dbae8f0f2d37a3a613aa@139.162.13.89:55555\") attach http://localhost:8545");
-            }
-        };
-
         new Thread(new Runnable() {
             public void run() {
-                Geth.run("--shh --ipcdisable --nodiscover --rpc --rpcapi db,eth,net,web3,shh,admin --fast --datadir=" + dataFolder);
+                Statusgo.doStartNode(dataFolder);
             }
         }).start();
-
-        handler.postDelayed(addPeer, 5000);
     }
 
     @Nullable
@@ -103,8 +93,7 @@ public class GethService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-        System.loadLibrary("gethraw");
-        System.loadLibrary("geth");
+        System.loadLibrary("statusgo");
 
         if (!isGethInitialized) {
             isGethInitialized = true;