LAN plugin should re-bind each time wifi becomes available. Bug #51.

briar-android/src/org/briarproject/plugins/AndroidPluginsModule.java

@@ -15,7 +15,7 @@ import org.briarproject.api.plugins.simplex.SimplexPluginConfig;
 import org.briarproject.api.plugins.simplex.SimplexPluginFactory;
 import org.briarproject.api.system.LocationUtils;
 import org.briarproject.plugins.droidtooth.DroidtoothPluginFactory;
-import org.briarproject.plugins.tcp.LanTcpPluginFactory;
+import org.briarproject.plugins.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.plugins.tor.TorPluginFactory;
 
 import android.app.Application;
@@ -44,14 +44,15 @@ public class AndroidPluginsModule extends AbstractModule {
 			CryptoComponent crypto, LocationUtils locationUtils,
 			ShutdownManager shutdownManager) {
 		Context appContext = app.getApplicationContext();
-		DuplexPluginFactory droidtooth = new DroidtoothPluginFactory(
+		DuplexPluginFactory bluetooth = new DroidtoothPluginFactory(
 				pluginExecutor, androidExecutor, appContext,
 				crypto.getSecureRandom());
 		DuplexPluginFactory tor = new TorPluginFactory(pluginExecutor,
 				appContext, locationUtils, shutdownManager);
-		DuplexPluginFactory lan = new LanTcpPluginFactory(pluginExecutor);
+		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(
+				pluginExecutor, appContext);
 		final Collection<DuplexPluginFactory> factories =
-				Arrays.asList(droidtooth, tor, lan);
+				Arrays.asList(bluetooth, tor, lan);
 		return new DuplexPluginConfig() {
 			public Collection<DuplexPluginFactory> getFactories() {
 				return factories;

briar-android/src/org/briarproject/plugins/tcp/AndroidLanTcpPlugin.java

@@ -0,0 +1,71 @@
+package org.briarproject.plugins.tcp;
+
+import static android.content.Context.CONNECTIVITY_SERVICE;
+import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
+import static android.net.ConnectivityManager.TYPE_WIFI;
+
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+class AndroidLanTcpPlugin extends LanTcpPlugin {
+
+	private static final Logger LOG =
+			Logger.getLogger(AndroidLanTcpPlugin.class.getName());
+
+	private final Context appContext;
+
+	private volatile BroadcastReceiver networkStateReceiver = null;
+
+	AndroidLanTcpPlugin(Executor pluginExecutor, Context appContext,
+			DuplexPluginCallback callback, int maxFrameLength, long maxLatency,
+			long pollingInterval) {
+		super(pluginExecutor, callback, maxFrameLength, maxLatency,
+				pollingInterval);
+		this.appContext = appContext;
+	}
+
+	@Override
+	public boolean start() {
+		running = true;
+		// Register to receive network status events
+		networkStateReceiver = new NetworkStateReceiver();
+		IntentFilter filter = new IntentFilter(CONNECTIVITY_ACTION);
+		appContext.registerReceiver(networkStateReceiver, filter);
+		return true;
+	}
+
+	@Override
+	public void stop() {
+		running = false;
+		if(networkStateReceiver != null)
+			appContext.unregisterReceiver(networkStateReceiver);
+		tryToClose(socket);
+	}
+
+	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();
+			if(net != null && net.getType() == TYPE_WIFI && net.isConnected()) {
+				LOG.info("Connected to Wi-Fi");
+				if(socket == null || socket.isClosed()) bind();
+			} else {
+				LOG.info("Not connected to Wi-Fi");
+				tryToClose(socket);
+			}
+		}
+	}
+}

briar-android/src/org/briarproject/plugins/tcp/AndroidLanTcpPluginFactory.java

@@ -0,0 +1,35 @@
+package org.briarproject.plugins.tcp;
+
+import java.util.concurrent.Executor;
+
+import org.briarproject.api.TransportId;
+import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
+
+import android.content.Context;
+
+public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
+
+	private static final int MAX_FRAME_LENGTH = 1024;
+	private static final long MAX_LATENCY = 60 * 1000; // 1 minute
+	private static final long POLLING_INTERVAL = 60 * 1000; // 1 minute
+
+	private final Executor pluginExecutor;
+	private final Context appContext;
+
+	public AndroidLanTcpPluginFactory(Executor pluginExecutor,
+			Context appContext) {
+		this.pluginExecutor = pluginExecutor;
+		this.appContext = appContext;
+	}
+
+	public TransportId getId() {
+		return LanTcpPlugin.ID;
+	}
+
+	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
+		return new AndroidLanTcpPlugin(pluginExecutor, appContext, callback,
+				MAX_FRAME_LENGTH, MAX_LATENCY, POLLING_INTERVAL);
+	}
+}