Browse Source

Replaced old custom NetCipher fork with upstream.

tags/3.3.0-rc1
Andrew Comminos 4 years ago
parent
commit
50e8da8bf5
6 changed files with 9 additions and 13 deletions
  1. +0
    -3
      .gitmodules
  2. +2
    -1
      app/build.gradle
  3. +4
    -4
      app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java
  4. +2
    -3
      app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java
  5. +0
    -1
      libraries/NetCipher
  6. +1
    -1
      settings.gradle

+ 0
- 3
.gitmodules View File

@@ -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

+ 2
- 1
app/build.gradle View File

@@ -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'
}




+ 4
- 4
app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java View File

@@ -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;
}
}


+ 2
- 3
app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java View File

@@ -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) {


+ 0
- 1
libraries/NetCipher

@@ -1 +0,0 @@
Subproject commit 6b40330de7c2820546e039236ef1b729da435a3f

+ 1
- 1
settings.gradle View File

@@ -21,4 +21,4 @@



include ':libraries:NetCipher:libnetcipher', ':libraries:Jumble', ':app'
include ':libraries:Jumble', ':app'

Loading…
Cancel
Save