vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-24 13:22:08 +01:00
Code Issues Releases Wiki Activity

Respect custom orbot proxy port/host configuration

Browse source
This commit is contained in:
vanitasvitae 2016-06-06 12:36:05 +02:00
parent 595a0d7794
commit d336152238
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/github/dfa/diaspora_android/util/OrbotStatusReceiver.java
View file

@ -40,8 +40,13 @@ import info.guardianproject.netcipher.web.WebkitProxy;
*/ */
public class OrbotStatusReceiver extends BroadcastReceiver { public class OrbotStatusReceiver extends BroadcastReceiver {
public static final String EXTRA_HTTP_HOST = "org.torproject.android.intent.extra.HTTP_PROXY_HOST";
public static final String EXTRA_HTTP_PORT = "org.torproject.android.intent.extra.HTTP_PROXY_PORT";
public static final String defaultHost = "127.0.0.1"; public static final String defaultHost = "127.0.0.1";
public static final int defaultPort = 8118; public static final int defaultPort = 8118;
private static String host = "";
private static int port = 0;
private Intent lastStatus; private Intent lastStatus;
private Context lastContext; private Context lastContext;
private static MainActivity mainActivity; private static MainActivity mainActivity;
@ -59,7 +64,7 @@ public class OrbotStatusReceiver extends BroadcastReceiver {
if(appSettings == null) appSettings = new AppSettings(context.getApplicationContext()); if(appSettings == null) appSettings = new AppSettings(context.getApplicationContext());
String orbotStatus = intent.getExtras().getString(OrbotHelper.EXTRA_STATUS); String orbotStatus = intent.getExtras().getString(OrbotHelper.EXTRA_STATUS);
if(appSettings.isProxyOrbot()) { if(appSettings.isProxyOrbot()) {
if (orbotStatus.equals(OrbotHelper.STATUS_ON) && !proxySet) { if (orbotStatus.equals(OrbotHelper.STATUS_ON)) {
setProxy(lastContext, lastStatus); setProxy(lastContext, lastStatus);
} else if(orbotStatus.equals(OrbotHelper.STATUS_OFF)) { } else if(orbotStatus.equals(OrbotHelper.STATUS_OFF)) {
Log.d(App.TAG, "Warning: Orbot reports status off."); Log.d(App.TAG, "Warning: Orbot reports status off.");
@ -78,8 +83,17 @@ public class OrbotStatusReceiver extends BroadcastReceiver {
if(intent != null) { if(intent != null) {
String status = intent.getStringExtra(OrbotHelper.EXTRA_STATUS); String status = intent.getStringExtra(OrbotHelper.EXTRA_STATUS);
if(status.equals(OrbotHelper.STATUS_ON)) { if(status.equals(OrbotHelper.STATUS_ON)) {
String nHost = intent.getExtras().getString(EXTRA_HTTP_HOST, null);
int nPort = intent.getIntExtra(EXTRA_HTTP_PORT, -1);
//Got no values from intent
if((nHost == null || nPort == -1)) {
if(host.equals("") || port == 0) {
setProxy(context, defaultHost, defaultPort); setProxy(context, defaultHost, defaultPort);
} }
} else {
setProxy(context, nHost, nPort);
}
}
} else { } else {
Log.e(App.TAG, "OrbotStatusReceiver: lastStatus intent is null. Cannot set Proxy."); Log.e(App.TAG, "OrbotStatusReceiver: lastStatus intent is null. Cannot set Proxy.");
} }
@ -87,6 +101,8 @@ public class OrbotStatusReceiver extends BroadcastReceiver {
public static void setProxy(Context context, String host, int port) { public static void setProxy(Context context, String host, int port) {
try { try {
OrbotStatusReceiver.host = host;
OrbotStatusReceiver.port = port;
NetCipher.setProxy(host, port); NetCipher.setProxy(host, port);
WebkitProxy.setProxy(MainActivity.class.getName(), context.getApplicationContext(), null, host, port); WebkitProxy.setProxy(MainActivity.class.getName(), context.getApplicationContext(), null, host, port);
Log.d(App.TAG, "Proxy successfully set."); Log.d(App.TAG, "Proxy successfully set.");