cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better logs and explanation for orbot

Browse Source
This commit is contained in:
Dominik Schürmann
2017-07-25 15:02:46 +02:00
parent 1ad0bf1988
commit 0e6ec82823
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
View File

@@ -157,7 +157,8 @@ public final class Constants {
} }
/** /**
* information to connect to Orbot's localhost HTTP proxy * Orbot's default localhost HTTP proxy
* Orbot's SOCKS proxy is not fully supported by OkHttp
*/ */
public static final class Orbot { public static final class Orbot {
public static final String PROXY_HOST = "127.0.0.1"; public static final String PROXY_HOST = "127.0.0.1";

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/orbot/OrbotHelper.java
View File

@@ -79,6 +79,7 @@ import java.util.List;
/** /**
* This class is taken from the NetCipher library: https://github.com/guardianproject/NetCipher/ * This class is taken from the NetCipher library: https://github.com/guardianproject/NetCipher/
* All calls that use a shell have been removed.
*/ */
public class OrbotHelper { public class OrbotHelper {

29
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/orbot/OrbotStatusReceiver.java
View File

@@ -1,4 +1,6 @@
/* /*
* Copyright (C) 2017 Dominik Schürmann <dominik@dominikschuermann.de>
*
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@@ -28,15 +30,14 @@ import org.sufficientlysecure.keychain.util.Log;
*/ */
public class OrbotStatusReceiver extends BroadcastReceiver { public class OrbotStatusReceiver extends BroadcastReceiver {
//TODO: These two Strings are missing in older versions of NetCipher. // TODO: These two Strings are missing in older versions of NetCipher.
//TODO: Once they are present in OrbotHelper (not ProxyHelper) point to OrbotHelpers Strings instead. // TODO: Once they are present in OrbotHelper (not ProxyHelper) point to OrbotHelpers Strings instead.
public final static String EXTRA_PROXY_PORT_HTTP = "org.torproject.android.intent.extra.HTTP_PROXY_PORT"; public final static String EXTRA_PROXY_PORT_HTTP = "org.torproject.android.intent.extra.HTTP_PROXY_PORT";
public final static String EXTRA_PROXY_PORT_SOCKS = "org.torproject.android.intent.extra.SOCKS_PROXY_PORT"; public final static String EXTRA_PROXY_PORT_SOCKS = "org.torproject.android.intent.extra.SOCKS_PROXY_PORT";
//Variables representing Orbots status
private boolean torRunning; private boolean torRunning;
private int proxy_port_http; private int proxyPortHttp;
private int proxy_port_socks; private int proxyPortSocks;
private static OrbotStatusReceiver instance; private static OrbotStatusReceiver instance;
@@ -51,26 +52,24 @@ public class OrbotStatusReceiver extends BroadcastReceiver {
return instance; return instance;
} }
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (OrbotHelper.ACTION_STATUS.equals(intent.getAction())) { if (OrbotHelper.ACTION_STATUS.equals(intent.getAction())) {
Log.i(Constants.TAG, context.getPackageName() + " received intent : " + intent.getAction() + " " + intent.getPackage()); String status = intent.getStringExtra(OrbotHelper.EXTRA_STATUS);
String status = intent.getStringExtra(OrbotHelper.EXTRA_STATUS) + " (" + intent.getStringExtra(OrbotHelper.EXTRA_PACKAGE_NAME) + ")";
this.torRunning = (intent.getStringExtra(OrbotHelper.EXTRA_STATUS).equals(OrbotHelper.STATUS_ON)); this.torRunning = (intent.getStringExtra(OrbotHelper.EXTRA_STATUS).equals(OrbotHelper.STATUS_ON));
Log.d(Constants.TAG, "Orbot status: " + status); Log.d(Constants.TAG, "Receiver: Orbot status: " + status);
if (torRunning) { if (torRunning) {
Bundle extras = intent.getExtras(); Bundle extras = intent.getExtras();
if (extras.containsKey(EXTRA_PROXY_PORT_HTTP)) { if (extras.containsKey(EXTRA_PROXY_PORT_HTTP)) {
this.proxy_port_http = extras.getInt(EXTRA_PROXY_PORT_HTTP, -1); this.proxyPortHttp = extras.getInt(EXTRA_PROXY_PORT_HTTP, -1);
Log.i(Constants.TAG, "Http proxy set to " + proxy_port_http); Log.i(Constants.TAG, "Receiver: Orbot Http proxy at " + proxyPortHttp);
} }
if (extras.containsKey(EXTRA_PROXY_PORT_SOCKS)) { if (extras.containsKey(EXTRA_PROXY_PORT_SOCKS)) {
this.proxy_port_socks = extras.getInt(EXTRA_PROXY_PORT_SOCKS, -1); this.proxyPortSocks = extras.getInt(EXTRA_PROXY_PORT_SOCKS, -1);
Log.i(Constants.TAG, "Socks proxy set to " + proxy_port_socks); Log.i(Constants.TAG, "Receiver: Orbot Socks proxy at " + proxyPortSocks);
} }
} }
} }
@@ -83,11 +82,11 @@ public class OrbotStatusReceiver extends BroadcastReceiver {
public int getProxyPortHttp(Context context) { public int getProxyPortHttp(Context context) {
OrbotHelper.requestStartTor(context); OrbotHelper.requestStartTor(context);
return this.proxy_port_http; return this.proxyPortHttp;
} }
public int getProxyPortSocks(Context context) { public int getProxyPortSocks(Context context) {
OrbotHelper.requestStartTor(context); OrbotHelper.requestStartTor(context);
return this.proxy_port_socks; return this.proxyPortSocks;
} }
} }