Hold wake lock while polling.

bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java

@@ -13,6 +13,7 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
 import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory;
+import org.briarproject.bramble.api.system.WakefulIoExecutor;
 import org.briarproject.bramble.plugin.bluetooth.JavaBluetoothPluginFactory;
 import org.briarproject.bramble.plugin.modem.ModemPluginFactory;
 import org.briarproject.bramble.plugin.tcp.LanTcpPluginFactory;
@@ -37,18 +38,22 @@ public class DesktopPluginModule extends PluginModule {
 
 	@Provides
 	PluginConfig getPluginConfig(@IoExecutor Executor ioExecutor,
-			SecureRandom random, BackoffFactory backoffFactory,
+			@WakefulIoExecutor Executor wakefulIoExecutor,
+			SecureRandom random,
+			BackoffFactory backoffFactory,
 			ReliabilityLayerFactory reliabilityFactory,
-			ShutdownManager shutdownManager, EventBus eventBus,
+			ShutdownManager shutdownManager,
+			EventBus eventBus,
 			TimeoutMonitor timeoutMonitor) {
 		DuplexPluginFactory bluetooth = new JavaBluetoothPluginFactory(
-				ioExecutor, random, eventBus, timeoutMonitor, backoffFactory);
+				ioExecutor, wakefulIoExecutor, random, eventBus,
+				timeoutMonitor, backoffFactory);
 		DuplexPluginFactory modem = new ModemPluginFactory(ioExecutor,
 				reliabilityFactory);
-		DuplexPluginFactory lan = new LanTcpPluginFactory(ioExecutor, eventBus,
-				backoffFactory);
-		DuplexPluginFactory wan = new WanTcpPluginFactory(ioExecutor, eventBus,
-				backoffFactory, shutdownManager);
+		DuplexPluginFactory lan = new LanTcpPluginFactory(ioExecutor,
+				wakefulIoExecutor, eventBus, backoffFactory);
+		DuplexPluginFactory wan = new WanTcpPluginFactory(ioExecutor,
+				wakefulIoExecutor, eventBus, backoffFactory, shutdownManager);
 		Collection<DuplexPluginFactory> duplex =
 				asList(bluetooth, modem, lan, wan);
 		@NotNullByDefault

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java

@@ -36,10 +36,16 @@ class JavaBluetoothPlugin
 
 	JavaBluetoothPlugin(BluetoothConnectionLimiter connectionManager,
 			BluetoothConnectionFactory<StreamConnection> connectionFactory,
-			Executor ioExecutor, SecureRandom secureRandom, Backoff backoff,
-			PluginCallback callback, int maxLatency, int maxIdleTime) {
-		super(connectionManager, connectionFactory, ioExecutor, secureRandom,
-				backoff, callback, maxLatency, maxIdleTime);
+			Executor ioExecutor,
+			Executor wakefulIoExecutor,
+			SecureRandom secureRandom,
+			Backoff backoff,
+			PluginCallback callback,
+			int maxLatency,
+			int maxIdleTime) {
+		super(connectionManager, connectionFactory, ioExecutor,
+				wakefulIoExecutor, secureRandom, backoff, callback,
+				maxLatency, maxIdleTime);
 	}
 
 	@Override

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java

@@ -28,16 +28,20 @@ public class JavaBluetoothPluginFactory implements DuplexPluginFactory {
 	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
 	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor;
+	private final Executor ioExecutor, wakefulIoExecutor;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
 	private final TimeoutMonitor timeoutMonitor;
 	private final BackoffFactory backoffFactory;
 
 	public JavaBluetoothPluginFactory(Executor ioExecutor,
-			SecureRandom secureRandom, EventBus eventBus,
-			TimeoutMonitor timeoutMonitor, BackoffFactory backoffFactory) {
+			Executor wakefulIoExecutor,
+			SecureRandom secureRandom,
+			EventBus eventBus,
+			TimeoutMonitor timeoutMonitor,
+			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
+		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
 		this.timeoutMonitor = timeoutMonitor;
@@ -64,8 +68,8 @@ public class JavaBluetoothPluginFactory implements DuplexPluginFactory {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		JavaBluetoothPlugin plugin = new JavaBluetoothPlugin(connectionLimiter,
-				connectionFactory, ioExecutor, secureRandom, backoff, callback,
-				MAX_LATENCY, MAX_IDLE_TIME);
+				connectionFactory, ioExecutor, wakefulIoExecutor, secureRandom,
+				backoff, callback, MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java

@@ -20,17 +20,26 @@ import javax.net.SocketFactory;
 @NotNullByDefault
 abstract class JavaTorPlugin extends TorPlugin {
 
-	JavaTorPlugin(Executor ioExecutor, NetworkManager networkManager,
-			LocationUtils locationUtils, SocketFactory torSocketFactory,
-			Clock clock, ResourceProvider resourceProvider,
+	JavaTorPlugin(Executor ioExecutor,
+			Executor wakefulIoExecutor,
+			NetworkManager networkManager,
+			LocationUtils locationUtils,
+			SocketFactory torSocketFactory,
+			Clock clock,
+			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager, Backoff backoff,
+			BatteryManager batteryManager,
+			Backoff backoff,
 			TorRendezvousCrypto torRendezvousCrypto,
-			PluginCallback callback, String architecture, int maxLatency,
-			int maxIdleTime, File torDirectory) {
-		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
-				clock, resourceProvider, circumventionProvider, batteryManager,
-				backoff, torRendezvousCrypto, callback, architecture,
+			PluginCallback callback,
+			String architecture,
+			int maxLatency,
+			int maxIdleTime,
+			File torDirectory) {
+		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
+				torSocketFactory, clock, resourceProvider,
+				circumventionProvider, batteryManager, backoff,
+				torRendezvousCrypto, callback, architecture,
 				maxLatency, maxIdleTime, torDirectory);
 	}
 

bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java

@@ -20,17 +20,26 @@ import javax.net.SocketFactory;
 @NotNullByDefault
 class UnixTorPlugin extends JavaTorPlugin {
 
-	UnixTorPlugin(Executor ioExecutor, NetworkManager networkManager,
-			LocationUtils locationUtils, SocketFactory torSocketFactory,
-			Clock clock, ResourceProvider resourceProvider,
+	UnixTorPlugin(Executor ioExecutor,
+			Executor wakefulIoExecutor,
+			NetworkManager networkManager,
+			LocationUtils locationUtils,
+			SocketFactory torSocketFactory,
+			Clock clock,
+			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager, Backoff backoff,
+			BatteryManager batteryManager,
+			Backoff backoff,
 			TorRendezvousCrypto torRendezvousCrypto,
-			PluginCallback callback, String architecture, int maxLatency,
-			int maxIdleTime, File torDirectory) {
-		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
-				clock, resourceProvider, circumventionProvider, batteryManager,
-				backoff, torRendezvousCrypto, callback, architecture,
+			PluginCallback callback,
+			String architecture,
+			int maxLatency,
+			int maxIdleTime,
+			File torDirectory) {
+		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
+				torSocketFactory, clock, resourceProvider,
+				circumventionProvider, batteryManager, backoff,
+				torRendezvousCrypto, callback, architecture,
 				maxLatency, maxIdleTime, torDirectory);
 	}
 

bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java

@@ -38,7 +38,7 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
 	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor;
+	private final Executor ioExecutor, wakefulIoExecutor;
 	private final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
 	private final EventBus eventBus;
@@ -51,12 +51,19 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 	private final File torDirectory;
 
 	public UnixTorPluginFactory(Executor ioExecutor,
-			NetworkManager networkManager, LocationUtils locationUtils,
-			EventBus eventBus, SocketFactory torSocketFactory,
-			BackoffFactory backoffFactory, ResourceProvider resourceProvider,
+			Executor wakefulIoExecutor,
+			NetworkManager networkManager,
+			LocationUtils locationUtils,
+			EventBus eventBus,
+			SocketFactory torSocketFactory,
+			BackoffFactory backoffFactory,
+			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager, Clock clock, File torDirectory) {
+			BatteryManager batteryManager,
+			Clock clock,
+			File torDirectory) {
 		this.ioExecutor = ioExecutor;
+		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.networkManager = networkManager;
 		this.locationUtils = locationUtils;
 		this.eventBus = eventBus;
@@ -97,11 +104,11 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		TorRendezvousCrypto torRendezvousCrypto = new TorRendezvousCryptoImpl();
-		UnixTorPlugin plugin = new UnixTorPlugin(ioExecutor, networkManager,
-				locationUtils, torSocketFactory, clock, resourceProvider,
-				circumventionProvider, batteryManager, backoff,
-				torRendezvousCrypto, callback, architecture, MAX_LATENCY,
-				MAX_IDLE_TIME, torDirectory);
+		UnixTorPlugin plugin = new UnixTorPlugin(ioExecutor, wakefulIoExecutor,
+				networkManager, locationUtils, torSocketFactory, clock,
+				resourceProvider, circumventionProvider, batteryManager,
+				backoff, torRendezvousCrypto, callback, architecture,
+				MAX_LATENCY, MAX_IDLE_TIME, torDirectory);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java

@@ -10,6 +10,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
+import org.briarproject.bramble.api.system.WakefulIoExecutor;
 import org.briarproject.bramble.test.BrambleJavaIntegrationTestComponent;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.DaggerBrambleJavaIntegrationTestComponent;
@@ -60,6 +61,9 @@ public class BridgeTest extends BrambleTestCase {
 	@IoExecutor
 	Executor ioExecutor;
 	@Inject
+	@WakefulIoExecutor
+	Executor wakefulIoExecutor;
+	@Inject
 	NetworkManager networkManager;
 	@Inject
 	ResourceProvider resourceProvider;
@@ -121,10 +125,10 @@ public class BridgeTest extends BrambleTestCase {
 				return singletonList(bridge);
 			}
 		};
-		factory = new UnixTorPluginFactory(ioExecutor, networkManager,
-				locationUtils, eventBus, torSocketFactory, backoffFactory,
-				resourceProvider, bridgeProvider, batteryManager, clock,
-				torDir);
+		factory = new UnixTorPluginFactory(ioExecutor, wakefulIoExecutor,
+				networkManager, locationUtils, eventBus, torSocketFactory,
+				backoffFactory, resourceProvider, bridgeProvider,
+				batteryManager, clock, torDir);
 	}
 
 	@After