Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-23 16:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Code style: squashed.

Browse Source
This commit is contained in:
akwizgran
2015-12-15 17:24:16 +00:00
parent d710841728
commit 81c9992075
2 changed files with 45 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,9 @@ import org.briarproject.api.TransportConfig;
import org.briarproject.api.TransportId; import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties; import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.PseudoRandom; import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.SettingsUpdatedEvent;
import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback; import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection; import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
@@ -51,22 +54,17 @@ import static android.content.Context.MODE_PRIVATE;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.EXTRA_NO_CONNECTIVITY; import static android.net.ConnectivityManager.EXTRA_NO_CONNECTIVITY;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.SettingsUpdatedEvent;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
class TorPlugin implements DuplexPlugin, EventHandler, class TorPlugin implements DuplexPlugin, EventHandler,
EventListener { EventListener {
static final TransportId ID = new TransportId("tor"); static final TransportId ID = new TransportId("tor");
private static final String[] EVENTS = { private static final String[] EVENTS = {
"CIRC", "ORCONN", "NOTICE", "WARN", "ERR" "CIRC", "ORCONN", "NOTICE", "WARN", "ERR"
}; };
private static final String OWNER = "__OwningControllerProcess"; private static final String OWNER = "__OwningControllerProcess";
private static final int SOCKS_PORT = 59050, CONTROL_PORT = 59051; private static final int SOCKS_PORT = 59050, CONTROL_PORT = 59051;
@@ -591,46 +589,17 @@ class TorPlugin implements DuplexPlugin, EventHandler,
} }
} }
private class NetworkStateReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context ctx, Intent i) {
if (!running) return;
Object o = ctx.getSystemService(CONNECTIVITY_SERVICE);
ConnectivityManager cm = (ConnectivityManager) o;
NetworkInfo net = cm.getActiveNetworkInfo();
/* Some devices fail to set EXTRA_NO_CONNECTIVITY, double check */
online = !i.getBooleanExtra(EXTRA_NO_CONNECTIVITY, false);
if (online) {
if (net == null || !net.isConnected()) online = false;
}
connectedToWifi = (net != null && net.getType() == TYPE_WIFI
&& net.isConnected());
updateConnectionStatus();
}
}
public void eventOccurred(Event e) { public void eventOccurred(Event e) {
if (e instanceof SettingsUpdatedEvent) { if (e instanceof SettingsUpdatedEvent) {
if (!running) return; // Wifi setting may have been updated
updateConnectionStatus(); updateConnectionStatus();
} }
} }
private void updateConnectionStatus() { private void updateConnectionStatus() {
ioExecutor.execute(new Runnable() { ioExecutor.execute(new Runnable() {
public void run() { public void run() {
if (!running) return;
boolean wifiOnly = false;
boolean blocked = false;
String country = locationUtils.getCurrentCountry(); String country = locationUtils.getCurrentCountry();
if (LOG.isLoggable(INFO)) { if (LOG.isLoggable(INFO)) {
@@ -638,51 +607,46 @@ class TorPlugin implements DuplexPlugin, EventHandler,
if ("".equals(country)) LOG.info("Country code unknown"); if ("".equals(country)) LOG.info("Country code unknown");
else LOG.info("Country code: " + country); else LOG.info("Country code: " + country);
} }
blocked = TorNetworkMetadata.isTorProbablyBlocked(country); boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
country);
TransportConfig c = callback.getConfig(); TransportConfig c = callback.getConfig();
wifiOnly = c.getBoolean("torOverWifi", false); boolean wifiOnly = c.getBoolean("torOverWifi", false);
try { try {
/*
1) Disable network if offline
*/
if (!online) { if (!online) {
LOG.log(WARNING, "Disabling network, network is offline"); LOG.info("Disabling network, device is offline");
enableNetwork(false); enableNetwork(false);
return; } else if (blocked) {
} LOG.info("Disabling network, country is blocked");
/*
2) Disable network if blocked
*/
if (blocked) {
LOG.log(WARNING, "Disabling network, country is blocked");
enableNetwork(false); enableNetwork(false);
return; } else if (wifiOnly & !connectedToWifi){
} LOG.info("Disabling network due to wifi setting");
/*
3) Disable network if wifiOnly and not connected to
wifi
*/
if (wifiOnly & !connectedToWifi){
LOG.log(WARNING, "Disabling network due to wifi only setting");
enableNetwork(false); enableNetwork(false);
return; } else {
enableNetwork(true);
} }
/*
4) Otherwise enable network
*/
enableNetwork(true);
} catch (IOException e) { } catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e); if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
} }
} }
}); });
} }
private class NetworkStateReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context ctx, Intent i) {
if (!running) return;
online = !i.getBooleanExtra(EXTRA_NO_CONNECTIVITY, false);
// Some devices fail to set EXTRA_NO_CONNECTIVITY, double check
Object o = ctx.getSystemService(CONNECTIVITY_SERVICE);
ConnectivityManager cm = (ConnectivityManager) o;
NetworkInfo net = cm.getActiveNetworkInfo();
if (net == null || !net.isConnected()) online = false;
connectedToWifi = (net != null && net.getType() == TYPE_WIFI
&& net.isConnected());
updateConnectionStatus();
}
}
} }

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

@@ -1,19 +1,18 @@
package org.briarproject.plugins.tor; package org.briarproject.plugins.tor;
import java.util.concurrent.Executor; import android.content.Context;
import java.util.logging.Logger; import android.os.Build;
import org.briarproject.api.event.EventBus;
import org.briarproject.android.util.AndroidUtils; import org.briarproject.android.util.AndroidUtils;
import org.briarproject.api.TransportId; import org.briarproject.api.TransportId;
import org.briarproject.api.event.EventBus;
import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback; import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory; import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.system.LocationUtils; import org.briarproject.api.system.LocationUtils;
import android.content.Context; import java.util.concurrent.Executor;
import android.os.Build; import java.util.logging.Logger;
public class TorPluginFactory implements DuplexPluginFactory { public class TorPluginFactory implements DuplexPluginFactory {
@@ -43,8 +42,6 @@ public class TorPluginFactory implements DuplexPluginFactory {
public DuplexPlugin createPlugin(DuplexPluginCallback callback) { public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
TorPlugin thisPlugin = null;
// Check that we have a Tor binary for this architecture // Check that we have a Tor binary for this architecture
String architecture = null; String architecture = null;
for (String abi : AndroidUtils.getSupportedArchitectures()) { for (String abi : AndroidUtils.getSupportedArchitectures()) {
@@ -63,12 +60,10 @@ public class TorPluginFactory implements DuplexPluginFactory {
// Use position-independent executable for SDK >= 16 // Use position-independent executable for SDK >= 16
if (Build.VERSION.SDK_INT >= 16) architecture += "-pie"; if (Build.VERSION.SDK_INT >= 16) architecture += "-pie";
thisPlugin = new TorPlugin(ioExecutor,appContext, locationUtils, TorPlugin plugin = new TorPlugin(ioExecutor, appContext, locationUtils,
callback, architecture, MAX_LATENCY, MAX_IDLE_TIME, callback, architecture, MAX_LATENCY, MAX_IDLE_TIME,
POLLING_INTERVAL); POLLING_INTERVAL);
this.eventBus.addListener(thisPlugin); eventBus.addListener(plugin);
return plugin;
return thisPlugin;
} }
} }