Pull-Merge of latest changes from main repo

briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java

@@ -46,8 +46,7 @@ class BluetoothPlugin implements DuplexPlugin {
 	private final Clock clock;
 	private final SecureRandom secureRandom;
 	private final DuplexPluginCallback callback;
-	private final int maxFrameLength;
-	private final long maxLatency, pollingInterval;
+	private final int maxLatency, pollingInterval;
 	private final Semaphore discoverySemaphore = new Semaphore(1);
 
 	private volatile boolean running = false;
@@ -55,13 +54,12 @@ class BluetoothPlugin implements DuplexPlugin {
 	private volatile LocalDevice localDevice = null;
 
 	BluetoothPlugin(Executor ioExecutor, Clock clock, SecureRandom secureRandom,
-			DuplexPluginCallback callback, int maxFrameLength, long maxLatency,
-			long pollingInterval) {
+			DuplexPluginCallback callback, int maxLatency,
+			int pollingInterval) {
 		this.ioExecutor = ioExecutor;
 		this.clock = clock;
 		this.secureRandom = secureRandom;
 		this.callback = callback;
-		this.maxFrameLength = maxFrameLength;
 		this.maxLatency = maxLatency;
 		this.pollingInterval = pollingInterval;
 	}
@@ -70,12 +68,13 @@ class BluetoothPlugin implements DuplexPlugin {
 		return ID;
 	}
 
-	public int getMaxFrameLength() {
-		return maxFrameLength;
+	public int getMaxLatency() {
+		return maxLatency;
 	}
 
-	public long getMaxLatency() {
-		return maxLatency;
+	public int getMaxIdleTime() {
+		// Bluetooth detects dead connections so we don't need keepalives
+		return Integer.MAX_VALUE;
 	}
 
 	public boolean start() throws IOException {
@@ -181,7 +180,7 @@ class BluetoothPlugin implements DuplexPlugin {
 		return true;
 	}
 
-	public long getPollingInterval() {
+	public int getPollingInterval() {
 		return pollingInterval;
 	}
 

briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPluginFactory.java

@@ -12,9 +12,8 @@ import org.briarproject.system.SystemClock;
 
 public class BluetoothPluginFactory 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 = 3 * 60 * 1000; // 3 minutes
+	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
+	private static final int POLLING_INTERVAL = 3 * 60 * 1000; // 3 minutes
 
 	private final Executor ioExecutor;
 	private final SecureRandom secureRandom;
@@ -33,6 +32,6 @@ public class BluetoothPluginFactory implements DuplexPluginFactory {
 
 	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		return new BluetoothPlugin(ioExecutor, clock, secureRandom, callback,
-				MAX_FRAME_LENGTH, MAX_LATENCY, POLLING_INTERVAL);
+				MAX_LATENCY, POLLING_INTERVAL);
 	}
 }

briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothTransportConnection.java

@@ -39,10 +39,6 @@ class BluetoothTransportConnection implements DuplexTransportConnection {
 
 	private class Reader implements TransportConnectionReader {
 
-		public int getMaxFrameLength() {
-			return plugin.getMaxFrameLength();
-		}
-
 		public long getMaxLatency() {
 			return plugin.getMaxLatency();
 		}
@@ -60,12 +56,12 @@ class BluetoothTransportConnection implements DuplexTransportConnection {
 
 	private class Writer implements TransportConnectionWriter {
 
-		public int getMaxFrameLength() {
-			return plugin.getMaxFrameLength();
+		public int getMaxLatency() {
+			return plugin.getMaxLatency();
 		}
 
-		public long getMaxLatency() {
-			return plugin.getMaxLatency();
+		public int getMaxIdleTime() {
+			return plugin.getMaxIdleTime();
 		}
 
 		public long getCapacity() {

briar-desktop/src/org/briarproject/plugins/file/PollingRemovableDriveMonitor.java

@@ -17,7 +17,7 @@ class PollingRemovableDriveMonitor implements RemovableDriveMonitor, Runnable {
 
 	private final Executor ioExecutor;
 	private final RemovableDriveFinder finder;
-	private final long pollingInterval;
+	private final int pollingInterval;
 
 	private volatile boolean running = false;
 	private volatile Callback callback = null;
@@ -27,7 +27,7 @@ class PollingRemovableDriveMonitor implements RemovableDriveMonitor, Runnable {
 
 
 	public PollingRemovableDriveMonitor(Executor ioExecutor,
-			RemovableDriveFinder finder, long pollingInterval) {
+			RemovableDriveFinder finder, int pollingInterval) {
 		this.ioExecutor = ioExecutor;
 		this.finder = finder;
 		this.pollingInterval = pollingInterval;

briar-desktop/src/org/briarproject/plugins/file/PollingRemovableDriveMonitor.java.orig

@@ -0,0 +1,83 @@
+package org.briarproject.plugins.file;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Logger;
+
+class PollingRemovableDriveMonitor implements RemovableDriveMonitor, Runnable {
+
+	private static final Logger LOG =
+			Logger.getLogger(PollingRemovableDriveMonitor.class.getName());
+
+	private final Executor ioExecutor;
+	private final RemovableDriveFinder finder;
+<<<<<<< HEAD
+	private final long pollingInterval;
+=======
+	private final int pollingInterval;
+	private final Object pollingLock = new Object();
+>>>>>>> theSource
+
+	private volatile boolean running = false;
+	private volatile Callback callback = null;
+
+	private final Lock pollingLock = new ReentrantLock();
+	private final Condition stopPolling = pollingLock.newCondition();
+
+
+	public PollingRemovableDriveMonitor(Executor ioExecutor,
+			RemovableDriveFinder finder, int pollingInterval) {
+		this.ioExecutor = ioExecutor;
+		this.finder = finder;
+		this.pollingInterval = pollingInterval;
+	}
+
+	public void start(Callback callback) throws IOException {
+		this.callback = callback;
+		running = true;
+		ioExecutor.execute(this);
+	}
+
+	public void stop() throws IOException {
+		running = false;
+		pollingLock.lock();
+		try {
+			stopPolling.signalAll();
+		} 
+		finally {
+			pollingLock.unlock();
+		}
+	}
+
+	public void run() {
+		try {
+			Collection<File> drives = finder.findRemovableDrives();
+			while(running) {
+				pollingLock.lock();
+				try {
+					stopPolling.await(pollingInterval, TimeUnit.MILLISECONDS);
+				} 
+				finally{
+					pollingLock.unlock();
+				}
+				if(!running) return;
+				Collection<File> newDrives = finder.findRemovableDrives();
+				for(File f : newDrives) {
+					if(!drives.contains(f)) callback.driveInserted(f);
+				}
+				drives = newDrives;
+			}
+		} catch(InterruptedException e) {
+			LOG.warning("Interrupted while waiting to poll");
+			Thread.currentThread().interrupt();
+		} catch(IOException e) {
+			callback.exceptionThrown(e);
+		}
+	}
+}

briar-desktop/src/org/briarproject/plugins/file/RemovableDrivePlugin.java

@@ -29,9 +29,8 @@ implements RemovableDriveMonitor.Callback {
 
 	RemovableDrivePlugin(Executor ioExecutor, FileUtils fileUtils,
 			SimplexPluginCallback callback, RemovableDriveFinder finder,
-			RemovableDriveMonitor monitor, int maxFrameLength,
-			long maxLatency) {
-		super(ioExecutor, fileUtils, callback, maxFrameLength, maxLatency);
+			RemovableDriveMonitor monitor, int maxLatency) {
+		super(ioExecutor, fileUtils, callback, maxLatency);
 		this.finder = finder;
 		this.monitor = monitor;
 	}
@@ -55,7 +54,7 @@ implements RemovableDriveMonitor.Callback {
 		return false;
 	}
 
-	public long getPollingInterval() {
+	public int getPollingInterval() {
 		throw new UnsupportedOperationException();
 	}
 

briar-desktop/src/org/briarproject/plugins/file/RemovableDrivePluginFactory.java

@@ -1,7 +1,5 @@
 package org.briarproject.plugins.file;
 
-import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
-
 import java.util.concurrent.Executor;
 
 import org.briarproject.api.TransportId;
@@ -14,8 +12,8 @@ import org.briarproject.util.OsUtils;
 public class RemovableDrivePluginFactory implements SimplexPluginFactory {
 
 	// Maximum latency 14 days (Royal Mail or lackadaisical carrier pigeon)
-	private static final long MAX_LATENCY = 14 * 24 * 60 * 60 * 1000;
-	private static final long POLLING_INTERVAL = 10 * 1000; // 10 seconds
+	private static final int MAX_LATENCY = 14 * 24 * 60 * 60 * 1000;
+	private static final int POLLING_INTERVAL = 10 * 1000; // 10 seconds
 
 	private final Executor ioExecutor;
 	private final FileUtils fileUtils;
@@ -52,6 +50,6 @@ public class RemovableDrivePluginFactory implements SimplexPluginFactory {
 			return null;
 		}
 		return new RemovableDrivePlugin(ioExecutor, fileUtils, callback,
-				finder, monitor, MAX_FRAME_LENGTH, MAX_LATENCY);
+				finder, monitor, MAX_LATENCY);
 	}
 }

briar-desktop/src/org/briarproject/plugins/modem/ModemPlugin.java

@@ -32,33 +32,30 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 	private final ModemFactory modemFactory;
 	private final SerialPortList serialPortList;
 	private final DuplexPluginCallback callback;
-	private final int maxFrameLength;
-	private final long maxLatency, pollingInterval;
+	private final int maxLatency;
 
 	private volatile boolean running = false;
 	private volatile Modem modem = null;
 
 	ModemPlugin(ModemFactory modemFactory, SerialPortList serialPortList,
-			DuplexPluginCallback callback, int maxFrameLength, long maxLatency,
-			long pollingInterval) {
+			DuplexPluginCallback callback, int maxLatency) {
 		this.modemFactory = modemFactory;
 		this.serialPortList = serialPortList;
 		this.callback = callback;
-		this.maxFrameLength = maxFrameLength;
 		this.maxLatency = maxLatency;
-		this.pollingInterval = pollingInterval;
 	}
 
 	public TransportId getId() {
 		return ID;
 	}
 
-	public int getMaxFrameLength() {
-		return maxFrameLength;
+	public int getMaxLatency() {
+		return maxLatency;
 	}
 
-	public long getMaxLatency() {
-		return maxLatency;
+	public int getMaxIdleTime() {
+		// FIXME: Do we need keepalives for this transport?
+		return Integer.MAX_VALUE;
 	}
 
 	public boolean start() {
@@ -98,8 +95,8 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 		return false;
 	}
 
-	public long getPollingInterval() {
-		return pollingInterval;
+	public int getPollingInterval() {
+		throw new UnsupportedOperationException();
 	}
 
 	public void poll(Collection<ContactId> connected) {
@@ -197,10 +194,6 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 
 		private class Reader implements TransportConnectionReader {
 
-			public int getMaxFrameLength() {
-				return maxFrameLength;
-			}
-
 			public long getMaxLatency() {
 				return maxLatency;
 			}
@@ -217,12 +210,12 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 
 		private class Writer implements TransportConnectionWriter {
 
-			public int getMaxFrameLength() {
-				return maxFrameLength;
+			public int getMaxLatency() {
+				return getMaxLatency();
 			}
 
-			public long getMaxLatency() {
-				return maxLatency;
+			public int getMaxIdleTime() {
+				return getMaxIdleTime();
 			}
 
 			public long getCapacity() {

briar-desktop/src/org/briarproject/plugins/modem/ModemPluginFactory.java

@@ -11,9 +11,7 @@ import org.briarproject.util.StringUtils;
 
 public class ModemPluginFactory 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 * 60 * 1000; // 1 hour
+	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
 
 	private final ModemFactory modemFactory;
 	private final SerialPortList serialPortList;
@@ -33,6 +31,6 @@ public class ModemPluginFactory implements DuplexPluginFactory {
 		String enabled = callback.getConfig().get("enabled");
 		if(StringUtils.isNullOrEmpty(enabled)) return null;
 		return new ModemPlugin(modemFactory, serialPortList, callback,
-				MAX_FRAME_LENGTH, MAX_LATENCY, POLLING_INTERVAL);
+				MAX_LATENCY);
 	}
 }