Replaced old custom NetCipher fork with upstream.

6 files changed, 9 insertions, 12 deletions

diff --git a/.gitmodules b/.gitmodules
index 7a45ce9..1d4e095 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "libraries/Jumble"]
 	path = libraries/Jumble
 	url = https://www.github.com/Morlunk/Jumble.git
-[submodule "libraries/NetCipher"]
-	path = libraries/NetCipher
-	url = https://github.com/Morlunk/OnionKit.git
 [submodule "libraries/Leeroy-Gradle"]
 	path = libraries/Leeroy-Gradle
 	url = https://github.com/Morlunk/Leeroy-Gradle.git
diff --git a/app/build.gradle b/app/build.gradle
index b21a62f..33b8253 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,17 +36,18 @@ apply from: '../libraries/Leeroy-Gradle/leeroy.gradle'
 
 repositories {
     mavenCentral()
+    jcenter()
 }
 
 dependencies {
     compile project(":libraries:Jumble")
-    compile project(":libraries:NetCipher:libnetcipher")
     compile 'com.android.support:support-v4:21.+'
     compile 'com.android.support:appcompat-v7:21.+'
     compile 'com.android.support:cardview-v7:21.+'
     compile 'com.android.support:palette-v7:21.+'
     compile 'com.android.support:recyclerview-v7:21.+'
     compile 'org.jsoup:jsoup:1.7.2'
+    compile 'info.guardianproject.netcipher:netcipher:1.2'
 }
 
 
diff --git a/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java b/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java
index acab493..4007822 100644
--- a/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java
+++ b/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java
@@ -92,7 +92,7 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.guardianproject.onionkit.ui.OrbotHelper;
+import info.guardianproject.netcipher.proxy.OrbotHelper;
 
 public class PlumbleActivity extends ActionBarActivity implements ListView.OnItemClickListener,
         FavouriteServerListFragment.ServerConnectHandler, JumbleServiceProvider, DatabaseProvider,
@@ -546,10 +546,10 @@ public class PlumbleActivity extends ActionBarActivity implements ListView.OnIte
         }
 
         // Prompt to start Orbot if enabled but not running
+        // TODO(acomminos): possibly detect onion address before connecting?
         if (mSettings.isTorEnabled()) {
-            OrbotHelper orbotHelper = new OrbotHelper(this);
-            if (!orbotHelper.isOrbotRunning()) {
-                orbotHelper.requestOrbotStart(this);
+            if (!OrbotHelper.isOrbotRunning(this)) {
+                OrbotHelper.requestShowOrbotStart(this);
                 return;
             }
         }
diff --git a/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java b/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java
index 4137406..23389c2 100644
--- a/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java
+++ b/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java
@@ -50,7 +50,7 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
-import info.guardianproject.onionkit.ui.OrbotHelper;
+import info.guardianproject.netcipher.proxy.OrbotHelper;
 
 /**
  * This entire class is a mess.
@@ -106,9 +106,8 @@ public class Preferences extends PreferenceActivity {
     }
 
     private static void configureOrbotPreferences(PreferenceScreen screen) {
-        OrbotHelper orbotHelper = new OrbotHelper(screen.getContext());
         Preference useOrbotPreference = screen.findPreference(USE_TOR_KEY);
-        useOrbotPreference.setEnabled(orbotHelper.isOrbotInstalled());
+        useOrbotPreference.setEnabled(OrbotHelper.isOrbotInstalled(screen.getContext()));
     }
 
     private static void configureAudioPreferences(final PreferenceScreen screen) {
diff --git a/libraries/NetCipher b/libraries/NetCipher
deleted file mode 160000
-Subproject 6b40330de7c2820546e039236ef1b729da435a3
diff --git a/settings.gradle b/settings.gradle
index 358adf9..c16dcdd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,4 +21,4 @@
 
 
 
-include ':libraries:NetCipher:libnetcipher', ':libraries:Jumble', ':app'
\ No newline at end of file
+include ':libraries:Jumble', ':app'
\ No newline at end of file