Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Check whether to enable or disable Tor at each connectivity change.

Browse Source
This commit is contained in:
akwizgran
2014-03-06 15:42:21 +00:00
parent bd7fcb16a3
commit 304ba53807
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
View File

@@ -40,6 +40,7 @@ import org.briarproject.api.lifecycle.ShutdownManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.system.LocationUtils;
import org.briarproject.util.StringUtils;
import socks.Socks5Proxy;
@@ -66,6 +67,7 @@ class TorPlugin implements DuplexPlugin, EventHandler {
private final Executor pluginExecutor;
private final Context appContext;
private final LocationUtils locationUtils;
private final ShutdownManager shutdownManager;
private final DuplexPluginCallback callback;
private final int maxFrameLength;
@@ -82,10 +84,12 @@ class TorPlugin implements DuplexPlugin, EventHandler {
private volatile BroadcastReceiver networkStateReceiver = null;
TorPlugin(Executor pluginExecutor, Context appContext,
ShutdownManager shutdownManager, DuplexPluginCallback callback,
int maxFrameLength, long maxLatency, long pollingInterval) {
LocationUtils locationUtils, ShutdownManager shutdownManager,
DuplexPluginCallback callback, int maxFrameLength, long maxLatency,
long pollingInterval) {
this.pluginExecutor = pluginExecutor;
this.appContext = appContext;
this.locationUtils = locationUtils;
this.shutdownManager = shutdownManager;
this.callback = callback;
this.maxFrameLength = maxFrameLength;
@@ -637,8 +641,15 @@ class TorPlugin implements DuplexPlugin, EventHandler {
public void onReceive(Context ctx, Intent i) {
// Note: Some devices fail to set this extra
boolean online = !i.getBooleanExtra(EXTRA_NO_CONNECTIVITY, false);
String country = locationUtils.getCurrentCountry();
if(LOG.isLoggable(INFO)){
LOG.info("Online: " + online);
if("".equals(country)) LOG.info("Country code unknown");
else LOG.info("Country code: " + country);
}
boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(country);
try {
enableNetwork(online);
enableNetwork(online && !blocked);
} catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}

11
briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
View File

@@ -45,13 +45,8 @@ public class TorPluginFactory implements DuplexPluginFactory {
LOG.info("Tor is not supported on this architecture");
return null;
}
// Check whether we know that Tor is blocked in this country
String countryCode = locationUtils.getCurrentCountry();
if(TorNetworkMetadata.isTorProbablyBlocked(countryCode)) {
LOG.info("Tor has been disabled since it is probably blocked");
return null;
}
return new TorPlugin(pluginExecutor,appContext, shutdownManager,
callback, MAX_FRAME_LENGTH, MAX_LATENCY, POLLING_INTERVAL);
return new TorPlugin(pluginExecutor,appContext, locationUtils,
shutdownManager, callback, MAX_FRAME_LENGTH, MAX_LATENCY,
POLLING_INTERVAL);
}
}