Poll Tor plugin infrequently once our HS is reachable.

.idea/codeStyles/Project.xml

@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
       <option name="IMPORT_LAYOUT_TABLE">
@@ -28,20 +31,6 @@
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <XML>

.idea/runConfigurations/All_tests.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.briar-android" />
+    <module name="briar-android" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />

.idea/runConfigurations/All_tests_in_bramble_android.xml

@@ -1,14 +1,20 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in bramble-android" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.bramble-android" />
+    <module name="bramble-android" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-android" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_api.xml

@@ -1,14 +1,20 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in bramble-api" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.bramble-api" />
+    <module name="bramble-api" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-api" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_core.xml

@@ -1,14 +1,20 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in bramble-core" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.bramble-core" />
+    <module name="bramble-core" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-core" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_java.xml

@@ -1,6 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in bramble-java" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.bramble-java" />
+    <module name="bramble-java" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
@@ -8,8 +10,11 @@
     <option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-java" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_android.xml

@@ -1,14 +1,20 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in briar-android" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.briar-android" />
+    <module name="briar-android" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_core.xml

@@ -1,14 +1,20 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in briar-core" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.briar-core" />
+    <module name="briar-core" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-core" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_headless.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in briar-headless" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.briar-headless" />
+    <module name="briar-headless" />
     <option name="PACKAGE_NAME" value="org.briarproject.briar.headless" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />

.idea/runConfigurations/H2_Performance_Test.xml

@@ -1,14 +1,20 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="H2 Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.bramble-core" />
+    <module name="bramble-core" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
     <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.H2DatabasePerformanceTest" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="class" />
+    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/HyperSQL_Performance_Test.xml

@@ -1,14 +1,20 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="HyperSQL Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="briar.bramble-core" />
+    <module name="bramble-core" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
     <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.HyperSqlDatabasePerformanceTest" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="class" />
+    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="" />
-    <method v="2">
+    <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="TEST_SEARCH_SCOPE">
-    </method>
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
   </configuration>
 </component>

.idea/runConfigurations/briar_headless.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" singleton="true">
+  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" factoryName="Kotlin" singleton="true">
-    <module name="briar.briar-headless" />
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="-v" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -8,8 +8,9 @@
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.briarproject.briar.headless.MainKt" />
     <option name="WORKING_DIRECTORY" value="" />
-    <method v="2">
+    <module name="briar-headless" />
-      <option name="Make" enabled="true" />
+    <envs />
+    <method>
       <option name="Gradle.BeforeRunTask" enabled="true" tasks="jar" externalProjectPath="$PROJECT_DIR$/briar-headless" vmOptions="" scriptParameters="" />
     </method>
   </configuration>

TRANSLATION.md

@@ -1,9 +0,0 @@
-Translations for this project are managed through Transifex:
-
-https://transifex.com/otf/briar
-
-If you'd like to volunteer as a translator, please create a Transifex account and request to be
-added to the project's translation team. The Localization Lab has some instructions and advice for
-translators here:
-
-https://wiki.localizationlab.org/index.php/Briar

bramble-android/.gitignore

@@ -3,4 +3,3 @@ gen
 build
 .settings
 src/main/res/raw/*.zip
-src/main/jniLibs

bramble-android/build.gradle

@@ -5,14 +5,14 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion rootProject.ext.compileSdkVersion
+	compileSdkVersion 29
-	buildToolsVersion rootProject.ext.buildToolsVersion
+	buildToolsVersion '29.0.2'
 
 	defaultConfig {
-		minSdkVersion rootProject.ext.minSdkVersion
+		minSdkVersion 16
-		targetSdkVersion rootProject.ext.targetSdkVersion
+		targetSdkVersion 28
-		versionCode rootProject.ext.versionCode
+		versionCode 10207
-		versionName rootProject.ext.versionName
+		versionName "1.2.7"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -38,7 +38,7 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.12@zip'
+	tor 'org.briarproject:tor-android:0.3.5.10@zip'
 	tor 'org.briarproject:obfs4proxy-android:0.0.11-2@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
@@ -53,12 +53,10 @@ dependencies {
 }
 
 def torBinariesDir = 'src/main/res/raw'
-def torLibsDir = 'src/main/jniLibs'
 
 task cleanTorBinaries {
 	doLast {
 		delete fileTree(torBinariesDir) { include '*.zip' }
-		delete fileTree(torLibsDir) { include '**/*.so' }
 	}
 }
 
@@ -69,36 +67,8 @@ task unpackTorBinaries {
 		copy {
 			from configurations.tor.collect { zipTree(it) }
 			into torBinariesDir
-			include 'geoip.zip'
+			// TODO: Remove after next Tor upgrade, which won't include non-PIE binaries
-		}
+			include 'geoip.zip', '*_pie.zip'
-		configurations.tor.each { outer ->
-			zipTree(outer).each { inner ->
-				if (inner.name.endsWith('_arm_pie.zip')) {
-					copy {
-						from zipTree(inner)
-						into torLibsDir
-						rename '(.*)', 'armeabi-v7a/lib$1.so'
-					}
-				} else if (inner.name.endsWith('_arm64_pie.zip')) {
-					copy {
-						from zipTree(inner)
-						into torLibsDir
-						rename '(.*)', 'arm64-v8a/lib$1.so'
-					}
-				} else if (inner.name.endsWith('_x86_pie.zip')) {
-					copy {
-						from zipTree(inner)
-						into torLibsDir
-						rename '(.*)', 'x86/lib$1.so'
-					}
-				} else if (inner.name.endsWith('_x86_64_pie.zip')) {
-					copy {
-						from zipTree(inner)
-						into torLibsDir
-						rename '(.*)', 'x86_64/lib$1.so'
-					}
-				}
-			}
 		}
 	}
 	dependsOn cleanTorBinaries
@@ -106,6 +76,5 @@ task unpackTorBinaries {
 
 tasks.withType(MergeResources) {
 	inputs.dir torBinariesDir
-	inputs.dir torLibsDir
 	dependsOn unpackTorBinaries
 }

bramble-android/src/main/AndroidManifest.xml

@@ -16,8 +16,6 @@
 		android:label="@string/app_name"
 		android:supportsRtl="true">
 
-		<receiver android:name=".system.AlarmReceiver" />
-
 	</application>
 
 </manifest>

bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java

@@ -6,8 +6,6 @@ import org.briarproject.bramble.plugin.tor.CircumventionModule;
 import org.briarproject.bramble.reporting.ReportingModule;
 import org.briarproject.bramble.socks.SocksModule;
 import org.briarproject.bramble.system.AndroidSystemModule;
-import org.briarproject.bramble.system.AndroidTaskSchedulerModule;
-import org.briarproject.bramble.system.AndroidWakefulIoExecutorModule;
 
 import dagger.Module;
 
@@ -15,8 +13,6 @@ import dagger.Module;
 		AndroidBatteryModule.class,
 		AndroidNetworkModule.class,
 		AndroidSystemModule.class,
-		AndroidTaskSchedulerModule.class,
-		AndroidWakefulIoExecutorModule.class,
 		CircumventionModule.class,
 		ReportingModule.class,
 		SocksModule.class

bramble-android/src/main/java/org/briarproject/bramble/BrambleAppComponent.java

@@ -1,8 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.api.system.AlarmListener;
-
-public interface BrambleAppComponent {
-
-	AlarmListener alarmListener();
-}

bramble-android/src/main/java/org/briarproject/bramble/BrambleApplication.java

@@ -1,6 +0,0 @@
-package org.briarproject.bramble;
-
-public interface BrambleApplication {
-
-	BrambleAppComponent getBrambleAppComponent();
-}

bramble-android/src/main/java/org/briarproject/bramble/api/system/AlarmListener.java

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.system;
-
-import android.content.Intent;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface AlarmListener {
-
-	void onAlarm(Intent intent);
-}

bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLock.java

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface AndroidWakeLock {
-
-	/**
-	 * Acquires the wake lock. This has no effect if the wake lock has already
-	 * been acquired.
-	 */
-	void acquire();
-
-	/**
-	 * Releases the wake lock. This has no effect if the wake lock has already
-	 * been released.
-	 */
-	void release();
-}

bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLockManager.java

@@ -1,38 +0,0 @@
-package org.briarproject.bramble.api.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.concurrent.Executor;
-
-@NotNullByDefault
-public interface AndroidWakeLockManager {
-
-	/**
-	 * Creates a wake lock with the given tag. The tag is only used for
-	 * logging; the underlying OS wake lock will use its own tag.
-	 */
-	AndroidWakeLock createWakeLock(String tag);
-
-	/**
-	 * Runs the given task while holding a wake lock.
-	 */
-	void runWakefully(Runnable r, String tag);
-
-	/**
-	 * Submits the given task to the given executor while holding a wake lock.
-	 * The lock is released when the task completes, or if an exception is
-	 * thrown while submitting or running the task.
-	 */
-	void executeWakefully(Runnable r, Executor executor, String tag);
-
-	/**
-	 * Starts a dedicated thread to run the given task asynchronously. A wake
-	 * lock is acquired before starting the thread and released when the task
-	 * completes, or if an exception is thrown while starting the thread or
-	 * running the task.
-	 * <p>
-	 * This method should only be used for lifecycle management tasks that
-	 * can't be run on an executor.
-	 */
-	void executeWakefully(Runnable r, String tag);
-}

bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java

@@ -9,17 +9,16 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventExecutor;
 import org.briarproject.bramble.api.lifecycle.Service;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.network.NetworkStatus;
 import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Scheduler;
-import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 
-import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -51,22 +50,20 @@ class AndroidNetworkManager implements NetworkManager, Service {
 	private static final String WIFI_AP_STATE_CHANGED_ACTION =
 			"android.net.wifi.WIFI_AP_STATE_CHANGED";
 
-	private final TaskScheduler scheduler;
+	private final ScheduledExecutorService scheduler;
 	private final EventBus eventBus;
-	private final Executor eventExecutor;
 	private final Context appContext;
-	private final AtomicReference<Cancellable> connectivityCheck =
+	private final AtomicReference<Future<?>> connectivityCheck =
 			new AtomicReference<>();
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
 	private volatile BroadcastReceiver networkStateReceiver = null;
 
 	@Inject
-	AndroidNetworkManager(TaskScheduler scheduler, EventBus eventBus,
+	AndroidNetworkManager(@Scheduler ScheduledExecutorService scheduler,
-			@EventExecutor Executor eventExecutor, Application app) {
+			EventBus eventBus, Application app) {
 		this.scheduler = scheduler;
 		this.eventBus = eventBus;
-		this.eventExecutor = eventExecutor;
 		this.appContext = app.getApplicationContext();
 	}
 
@@ -107,12 +104,11 @@ class AndroidNetworkManager implements NetworkManager, Service {
 	}
 
 	private void scheduleConnectionStatusUpdate(int delay, TimeUnit unit) {
-		Cancellable newConnectivityCheck =
+		Future<?> newConnectivityCheck =
-				scheduler.schedule(this::updateConnectionStatus, eventExecutor,
+				scheduler.schedule(this::updateConnectionStatus, delay, unit);
-						delay, unit);
+		Future<?> oldConnectivityCheck =
-		Cancellable oldConnectivityCheck =
 				connectivityCheck.getAndSet(newConnectivityCheck);
-		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel();
+		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
 	}
 
 	private class NetworkStateReceiver extends BroadcastReceiver {

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothConnectionFactory.java

@@ -1,36 +0,0 @@
-package org.briarproject.bramble.plugin.bluetooth;
-
-import android.bluetooth.BluetoothSocket;
-
-import org.briarproject.bramble.api.io.TimeoutMonitor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
-
-import java.io.IOException;
-
-@NotNullByDefault
-class AndroidBluetoothConnectionFactory
-		implements BluetoothConnectionFactory<BluetoothSocket> {
-
-	private final BluetoothConnectionLimiter connectionLimiter;
-	private final AndroidWakeLockManager wakeLockManager;
-	private final TimeoutMonitor timeoutMonitor;
-
-	AndroidBluetoothConnectionFactory(
-			BluetoothConnectionLimiter connectionLimiter,
-			AndroidWakeLockManager wakeLockManager,
-			TimeoutMonitor timeoutMonitor) {
-		this.connectionLimiter = connectionLimiter;
-		this.wakeLockManager = wakeLockManager;
-		this.timeoutMonitor = timeoutMonitor;
-	}
-
-	@Override
-	public DuplexTransportConnection wrapSocket(DuplexPlugin plugin,
-			BluetoothSocket s) throws IOException {
-		return new AndroidBluetoothTransportConnection(plugin,
-				connectionLimiter, wakeLockManager, timeoutMonitor, s);
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
-import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothServerSocket;
@@ -10,9 +9,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
+import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
@@ -31,6 +30,7 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
@@ -59,40 +59,35 @@ import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class AndroidBluetoothPlugin
+class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
-		extends BluetoothPlugin<BluetoothSocket, BluetoothServerSocket> {
 
 	private static final Logger LOG =
 			getLogger(AndroidBluetoothPlugin.class.getName());
 
 	private static final int MAX_DISCOVERY_MS = 10_000;
 
+	private final ScheduledExecutorService scheduler;
 	private final AndroidExecutor androidExecutor;
-	private final Application app;
+	private final Context appContext;
 	private final Clock clock;
 
+	private volatile boolean wasEnabledByUs = false;
 	private volatile BluetoothStateReceiver receiver = null;
 
 	// Non-null if the plugin started successfully
 	private volatile BluetoothAdapter adapter = null;
 
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
-			BluetoothConnectionFactory<BluetoothSocket> connectionFactory,
+			TimeoutMonitor timeoutMonitor, Executor ioExecutor,
-			Executor ioExecutor,
+			SecureRandom secureRandom, ScheduledExecutorService scheduler,
-			Executor wakefulIoExecutor,
+			AndroidExecutor androidExecutor, Context appContext, Clock clock,
-			SecureRandom secureRandom,
+			PluginCallback callback, int maxLatency, int maxIdleTime,
-			AndroidExecutor androidExecutor,
+			int pollingInterval) {
-			Application app,
+		super(connectionLimiter, timeoutMonitor, ioExecutor, secureRandom,
-			Clock clock,
+				callback, maxLatency, maxIdleTime, pollingInterval);
-			Backoff backoff,
+		this.scheduler = scheduler;
-			PluginCallback callback,
-			int maxLatency,
-			int maxIdleTime) {
-		super(connectionLimiter, connectionFactory, ioExecutor,
-				wakefulIoExecutor, secureRandom, backoff, callback,
-				maxLatency, maxIdleTime);
 		this.androidExecutor = androidExecutor;
-		this.app = app;
+		this.appContext = appContext;
 		this.clock = clock;
 	}
 
@@ -104,13 +99,13 @@ class AndroidBluetoothPlugin
 		filter.addAction(ACTION_STATE_CHANGED);
 		filter.addAction(ACTION_SCAN_MODE_CHANGED);
 		receiver = new BluetoothStateReceiver();
-		app.registerReceiver(receiver, filter);
+		appContext.registerReceiver(receiver, filter);
 	}
 
 	@Override
 	public void stop() {
 		super.stop();
-		if (receiver != null) app.unregisterReceiver(receiver);
+		if (receiver != null) appContext.unregisterReceiver(receiver);
 	}
 
 	@Override
@@ -132,11 +127,42 @@ class AndroidBluetoothPlugin
 		return adapter != null && adapter.isEnabled();
 	}
 
+	@Override
+	void enableAdapter() {
+		if (adapter != null && !adapter.isEnabled()) {
+			if (adapter.enable()) {
+				LOG.info("Enabling Bluetooth");
+				wasEnabledByUs = true;
+			} else {
+				LOG.info("Could not enable Bluetooth");
+			}
+		}
+	}
+
+	@Override
+	void disableAdapterIfEnabledByUs() {
+		if (isAdapterEnabled() && wasEnabledByUs) {
+			if (adapter.disable()) LOG.info("Disabling Bluetooth");
+			else LOG.info("Could not disable Bluetooth");
+			wasEnabledByUs = false;
+		}
+	}
+
+	@Override
+	void setEnabledByUs() {
+		wasEnabledByUs = true;
+	}
+
+	@Override
+	void onAdapterDisabled() {
+		super.onAdapterDisabled();
+		wasEnabledByUs = false;
+	}
+
 	@Override
 	@Nullable
 	String getBluetoothAddress() {
-		if (adapter == null) return null;
+		String address = AndroidUtils.getBluetoothAddress(appContext, adapter);
-		String address = AndroidUtils.getBluetoothAddress(app, adapter);
 		return address.isEmpty() ? null : address;
 	}
 
@@ -154,7 +180,13 @@ class AndroidBluetoothPlugin
 	@Override
 	DuplexTransportConnection acceptConnection(BluetoothServerSocket ss)
 			throws IOException {
-		return connectionFactory.wrapSocket(this, ss.accept());
+		return wrapSocket(ss.accept());
+	}
+
+	private DuplexTransportConnection wrapSocket(BluetoothSocket s)
+			throws IOException {
+		return new AndroidBluetoothTransportConnection(this, connectionLimiter,
+				timeoutMonitor, appContext, scheduler, s);
 	}
 
 	@Override
@@ -171,7 +203,7 @@ class AndroidBluetoothPlugin
 		try {
 			s = d.createInsecureRfcommSocketToServiceRecord(u);
 			s.connect();
-			return connectionFactory.wrapSocket(this, s);
+			return wrapSocket(s);
 		} catch (IOException e) {
 			IoUtils.tryToClose(s, LOG, WARNING);
 			throw e;
@@ -206,7 +238,7 @@ class AndroidBluetoothPlugin
 		filter.addAction(ACTION_DISCOVERY_STARTED);
 		filter.addAction(ACTION_DISCOVERY_FINISHED);
 		filter.addAction(ACTION_FOUND);
-		app.registerReceiver(receiver, filter);
+		appContext.registerReceiver(receiver, filter);
 		try {
 			if (adapter.startDiscovery()) {
 				long now = clock.currentTimeMillis();
@@ -243,7 +275,7 @@ class AndroidBluetoothPlugin
 		} finally {
 			LOG.info("Cancelling discovery");
 			adapter.cancelDiscovery();
-			app.unregisterReceiver(receiver);
+			appContext.unregisterReceiver(receiver);
 		}
 		// Shuffle the addresses so we don't always try the same one first
 		shuffle(addresses);

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java

@@ -1,72 +1,57 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
-import android.app.Application;
+import android.content.Context;
-import android.bluetooth.BluetoothSocket;
 
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.io.TimeoutMonitor;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
 
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 
 import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
 
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
 
 @Immutable
 @NotNullByDefault
 public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 
-	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
+	private static final int MAX_LATENCY = (int) SECONDS.toMillis(30);
-	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
+	private static final int MAX_IDLE_TIME = (int) SECONDS.toMillis(30);
-	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
+	private static final int POLLING_INTERVAL = (int) MINUTES.toMillis(2);
-	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
-	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
+	private final ScheduledExecutorService scheduler;
 	private final AndroidExecutor androidExecutor;
-	private final AndroidWakeLockManager wakeLockManager;
+	private final Context appContext;
-	private final Application app;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
 	private final Clock clock;
 	private final TimeoutMonitor timeoutMonitor;
-	private final BackoffFactory backoffFactory;
 
-	@Inject
+	public AndroidBluetoothPluginFactory(Executor ioExecutor,
-	public AndroidBluetoothPluginFactory(@IoExecutor Executor ioExecutor,
+			ScheduledExecutorService scheduler,
-			@WakefulIoExecutor Executor wakefulIoExecutor,
+			AndroidExecutor androidExecutor, Context appContext,
-			AndroidExecutor androidExecutor,
+			SecureRandom secureRandom, EventBus eventBus, Clock clock,
-			AndroidWakeLockManager wakeLockManager,
+			TimeoutMonitor timeoutMonitor) {
-			Application app,
-			SecureRandom secureRandom,
-			EventBus eventBus,
-			Clock clock,
-			TimeoutMonitor timeoutMonitor,
-			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
+		this.scheduler = scheduler;
 		this.androidExecutor = androidExecutor;
-		this.wakeLockManager = wakeLockManager;
+		this.appContext = appContext;
-		this.app = app;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
 		this.clock = clock;
 		this.timeoutMonitor = timeoutMonitor;
-		this.backoffFactory = backoffFactory;
 	}
 
 	@Override
@@ -83,15 +68,10 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	public DuplexPlugin createPlugin(PluginCallback callback) {
 		BluetoothConnectionLimiter connectionLimiter =
 				new BluetoothConnectionLimiterImpl(eventBus);
-		BluetoothConnectionFactory<BluetoothSocket> connectionFactory =
-				new AndroidBluetoothConnectionFactory(connectionLimiter,
-						wakeLockManager, timeoutMonitor);
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
-				connectionLimiter, connectionFactory, ioExecutor,
+				connectionLimiter, timeoutMonitor, ioExecutor, secureRandom,
-				wakefulIoExecutor, secureRandom, androidExecutor, app,
+				scheduler, androidExecutor, appContext, clock, callback,
-				clock, backoff, callback, MAX_LATENCY, MAX_IDLE_TIME);
+				MAX_LATENCY, MAX_IDLE_TIME, POLLING_INTERVAL);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java

@@ -1,19 +1,26 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
 import android.bluetooth.BluetoothSocket;
+import android.content.Context;
+import android.os.PowerManager;
 
 import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
-import org.briarproject.bramble.api.system.AndroidWakeLock;
+import org.briarproject.bramble.util.RenewableWakeLock;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.concurrent.ScheduledExecutorService;
 
+import static android.content.Context.POWER_SERVICE;
+import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_ADDRESS;
+import static org.briarproject.bramble.util.AndroidUtils.getWakeLockTag;
 import static org.briarproject.bramble.util.AndroidUtils.isValidBluetoothAddress;
 
 @NotNullByDefault
@@ -21,21 +28,25 @@ class AndroidBluetoothTransportConnection
 		extends AbstractDuplexTransportConnection {
 
 	private final BluetoothConnectionLimiter connectionLimiter;
+	private final RenewableWakeLock wakeLock;
 	private final BluetoothSocket socket;
 	private final InputStream in;
-	private final AndroidWakeLock wakeLock;
 
 	AndroidBluetoothTransportConnection(Plugin plugin,
 			BluetoothConnectionLimiter connectionLimiter,
-			AndroidWakeLockManager wakeLockManager,
+			TimeoutMonitor timeoutMonitor, Context appContext,
-			TimeoutMonitor timeoutMonitor,
+			ScheduledExecutorService scheduler, BluetoothSocket socket)
-			BluetoothSocket socket) throws IOException {
+			throws IOException {
 		super(plugin);
 		this.connectionLimiter = connectionLimiter;
 		this.socket = socket;
 		in = timeoutMonitor.createTimeoutInputStream(
 				socket.getInputStream(), plugin.getMaxIdleTime() * 2);
-		wakeLock = wakeLockManager.createWakeLock("BluetoothConnection");
+		PowerManager powerManager = (PowerManager)
+				requireNonNull(appContext.getSystemService(POWER_SERVICE));
+		String tag = getWakeLockTag(appContext);
+		wakeLock = new RenewableWakeLock(powerManager, scheduler,
+				PARTIAL_WAKE_LOCK, tag, 1, MINUTES);
 		wakeLock.acquire();
 		String address = socket.getRemoteDevice().getAddress();
 		if (isValidBluetoothAddress(address)) remote.put(PROP_ADDRESS, address);
@@ -55,7 +66,6 @@ class AndroidBluetoothTransportConnection
 	protected void closeConnection(boolean exception) throws IOException {
 		try {
 			socket.close();
-			in.close();
 		} finally {
 			wakeLock.release();
 			connectionLimiter.connectionClosed(this);

bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java

@@ -1,7 +1,7 @@
 package org.briarproject.bramble.plugin.tcp;
 
 import android.annotation.TargetApi;
-import android.app.Application;
+import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
@@ -15,7 +15,6 @@ import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.settings.Settings;
 
@@ -42,7 +41,6 @@ import static java.util.Collections.list;
 import static java.util.Collections.singletonList;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.DEFAULT_PREF_PLUGIN_ENABLE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE;
@@ -62,22 +60,20 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 
 	private volatile SocketFactory socketFactory;
 
-	AndroidLanTcpPlugin(Executor ioExecutor,
+	AndroidLanTcpPlugin(Executor ioExecutor, Context appContext,
-			Executor wakefulIoExecutor,
+			PluginCallback callback, int maxLatency, int maxIdleTime,
-			Application app,
+			int pollingInterval, int connectionTimeout) {
-			Backoff backoff,
+		super(ioExecutor, callback, maxLatency, maxIdleTime, pollingInterval,
-			PluginCallback callback,
+				connectionTimeout);
-			int maxLatency,
-			int maxIdleTime,
-			int connectionTimeout) {
-		super(ioExecutor, wakefulIoExecutor, backoff, callback, maxLatency,
-				maxIdleTime, connectionTimeout);
 		// Don't execute more than one connection status check at a time
 		connectionStatusExecutor =
 				new PoliteExecutor("AndroidLanTcpPlugin", ioExecutor, 1);
-		connectivityManager = (ConnectivityManager)
+		ConnectivityManager connectivityManager = (ConnectivityManager)
-				requireNonNull(app.getSystemService(CONNECTIVITY_SERVICE));
+				appContext.getSystemService(CONNECTIVITY_SERVICE);
-		wifiManager = (WifiManager) app.getSystemService(WIFI_SERVICE);
+		if (connectivityManager == null) throw new AssertionError();
+		this.connectivityManager = connectivityManager;
+		wifiManager = (WifiManager) appContext.getApplicationContext()
+				.getSystemService(WIFI_SERVICE);
 		socketFactory = SocketFactory.getDefault();
 	}
 
@@ -277,11 +273,11 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 				// make outgoing connections on API 21+ if another network
 				// has internet access
 				socketFactory = SocketFactory.getDefault();
-				bind();
+				if (s == INACTIVE) bind();
 			} else {
 				LOG.info("Connected to wifi");
 				socketFactory = getSocketFactory();
-				bind();
+				if (s == INACTIVE) bind();
 			}
 		});
 	}

bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java

@@ -1,52 +1,40 @@
 package org.briarproject.bramble.plugin.tcp;
 
-import android.app.Application;
+import android.content.Context;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
 
 import java.util.concurrent.Executor;
 
 import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
 
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 
 @Immutable
 @NotNullByDefault
 public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 
-	private static final int MAX_LATENCY = 30_000; // 30 seconds
+	private static final int MAX_LATENCY = (int) SECONDS.toMillis(30);
-	private static final int MAX_IDLE_TIME = 30_000; // 30 seconds
+	private static final int MAX_IDLE_TIME = (int) SECONDS.toMillis(30);
-	private static final int CONNECTION_TIMEOUT = 3_000; // 3 seconds
+	private static final int POLLING_INTERVAL = (int) MINUTES.toMillis(1);
-	private static final int MIN_POLLING_INTERVAL = 60_000; // 1 minute
+	private static final int CONNECTION_TIMEOUT = (int) SECONDS.toMillis(3);
-	private static final int MAX_POLLING_INTERVAL = 600_000; // 10 mins
-	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
 	private final EventBus eventBus;
-	private final BackoffFactory backoffFactory;
+	private final Context appContext;
-	private final Application app;
 
-	@Inject
+	public AndroidLanTcpPluginFactory(Executor ioExecutor, EventBus eventBus,
-	public AndroidLanTcpPluginFactory(@IoExecutor Executor ioExecutor,
+			Context appContext) {
-			@WakefulIoExecutor Executor wakefulIoExecutor,
-			EventBus eventBus,
-			BackoffFactory backoffFactory,
-			Application app) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.eventBus = eventBus;
-		this.backoffFactory = backoffFactory;
+		this.appContext = appContext;
-		this.app = app;
 	}
 
 	@Override
@@ -61,11 +49,9 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 
 	@Override
 	public DuplexPlugin createPlugin(PluginCallback callback) {
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidLanTcpPlugin plugin = new AndroidLanTcpPlugin(ioExecutor,
-				wakefulIoExecutor, app, backoff, callback,
+				appContext, callback, MAX_LATENCY, MAX_IDLE_TIME,
-				MAX_LATENCY, MAX_IDLE_TIME, CONNECTION_TIMEOUT);
+				POLLING_INTERVAL, CONNECTION_TIMEOUT);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java

@@ -1,86 +1,61 @@
 package org.briarproject.bramble.plugin.tor;
 
-import android.app.Application;
+import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.PowerManager;
 
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
-import org.briarproject.bramble.api.system.AndroidWakeLock;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 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.util.AndroidUtils;
+import org.briarproject.bramble.util.RenewableWakeLock;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.Executor;
-import java.util.logging.Logger;
+import java.util.concurrent.ScheduledExecutorService;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 import javax.net.SocketFactory;
 
-import static android.os.Build.VERSION.SDK_INT;
+import static android.content.Context.MODE_PRIVATE;
-import static java.util.Arrays.asList;
+import static android.content.Context.POWER_SERVICE;
-import static java.util.logging.Level.INFO;
+import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
-import static java.util.logging.Logger.getLogger;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.briarproject.bramble.util.AndroidUtils.getWakeLockTag;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 class AndroidTorPlugin extends TorPlugin {
 
-	private static final List<String> LIBRARY_ARCHITECTURES =
+	private final Context appContext;
-			asList("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
+	private final RenewableWakeLock wakeLock;
 
-	private static final String TOR_LIB_NAME = "libtor.so";
+	AndroidTorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
-	private static final String OBFS4_LIB_NAME = "libobfs4proxy.so";
+			Context appContext, NetworkManager networkManager,
-
+			LocationUtils locationUtils, SocketFactory torSocketFactory,
-	private static final Logger LOG =
+			Clock clock, ResourceProvider resourceProvider,
-			getLogger(AndroidTorPlugin.class.getName());
-
-	private final Application app;
-	private final AndroidWakeLock wakeLock;
-	private final File torLib, obfs4Lib;
-
-	AndroidTorPlugin(Executor ioExecutor,
-			Executor wakefulIoExecutor,
-			Application app,
-			NetworkManager networkManager,
-			LocationUtils locationUtils,
-			SocketFactory torSocketFactory,
-			Clock clock,
-			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager,
-			AndroidWakeLockManager wakeLockManager,
-			Backoff backoff,
 			TorRendezvousCrypto torRendezvousCrypto,
-			PluginCallback callback,
+			PluginCallback callback, String architecture, int maxLatency,
-			String architecture,
+			int maxIdleTime, int initialPollingInterval,
-			int maxLatency,
+			int stablePollingInterval) {
-			int maxIdleTime,
+		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
-			File torDirectory) {
+				clock, resourceProvider, circumventionProvider, batteryManager,
-		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
-				torSocketFactory, clock, resourceProvider,
-				circumventionProvider, batteryManager, backoff,
 				torRendezvousCrypto, callback, architecture, maxLatency,
-				maxIdleTime, torDirectory);
+				maxIdleTime, initialPollingInterval, stablePollingInterval,
-		this.app = app;
+				appContext.getDir("tor", MODE_PRIVATE));
-		wakeLock = wakeLockManager.createWakeLock("TorPlugin");
+		this.appContext = appContext;
-		String nativeLibDir = app.getApplicationInfo().nativeLibraryDir;
+		PowerManager pm = (PowerManager)
-		torLib = new File(nativeLibDir, TOR_LIB_NAME);
+				appContext.getSystemService(POWER_SERVICE);
-		obfs4Lib = new File(nativeLibDir, OBFS4_LIB_NAME);
+		if (pm == null) throw new AssertionError();
+		wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
+				getWakeLockTag(appContext), 1, MINUTES);
 	}
 
 	@Override
@@ -91,8 +66,8 @@ class AndroidTorPlugin extends TorPlugin {
 	@Override
 	protected long getLastUpdateTime() {
 		try {
-			PackageManager pm = app.getPackageManager();
+			PackageManager pm = appContext.getPackageManager();
-			PackageInfo pi = pm.getPackageInfo(app.getPackageName(), 0);
+			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
 			return pi.lastUpdateTime;
 		} catch (NameNotFoundException e) {
 			throw new AssertionError(e);
@@ -111,112 +86,4 @@ class AndroidTorPlugin extends TorPlugin {
 		super.stop();
 		wakeLock.release();
 	}
-
-	@Override
-	protected File getTorExecutableFile() {
-		return torLib.exists() ? torLib : super.getTorExecutableFile();
-	}
-
-	@Override
-	protected File getObfs4ExecutableFile() {
-		return obfs4Lib.exists() ? obfs4Lib : super.getObfs4ExecutableFile();
-	}
-
-	@Override
-	protected void installTorExecutable() throws IOException {
-		File extracted = super.getTorExecutableFile();
-		if (torLib.exists()) {
-			// If an older version left behind a Tor binary, delete it
-			if (extracted.exists()) {
-				if (extracted.delete()) LOG.info("Deleted Tor binary");
-				else LOG.info("Failed to delete Tor binary");
-			}
-		} else if (SDK_INT < 29) {
-			// The binary wasn't extracted at install time. Try to extract it
-			extractLibraryFromApk(TOR_LIB_NAME, extracted);
-		} else {
-			// No point extracting the binary, we won't be allowed to execute it
-			throw new FileNotFoundException(torLib.getAbsolutePath());
-		}
-	}
-
-	@Override
-	protected void installObfs4Executable() throws IOException {
-		File extracted = super.getObfs4ExecutableFile();
-		if (obfs4Lib.exists()) {
-			// If an older version left behind an obfs4 binary, delete it
-			if (extracted.exists()) {
-				if (extracted.delete()) LOG.info("Deleted obfs4 binary");
-				else LOG.info("Failed to delete obfs4 binary");
-			}
-		} else if (SDK_INT < 29) {
-			// The binary wasn't extracted at install time. Try to extract it
-			extractLibraryFromApk(OBFS4_LIB_NAME, extracted);
-		} else {
-			// No point extracting the binary, we won't be allowed to execute it
-			throw new FileNotFoundException(obfs4Lib.getAbsolutePath());
-		}
-	}
-
-	private void extractLibraryFromApk(String libName, File dest)
-			throws IOException {
-		File sourceDir = new File(app.getApplicationInfo().sourceDir);
-		if (sourceDir.isFile()) {
-			// Look for other APK files in the same directory, if we're allowed
-			File parent = sourceDir.getParentFile();
-			if (parent != null) sourceDir = parent;
-		}
-		List<String> libPaths = getSupportedLibraryPaths(libName);
-		for (File apk : findApkFiles(sourceDir)) {
-			ZipInputStream zin = new ZipInputStream(new FileInputStream(apk));
-			for (ZipEntry e = zin.getNextEntry(); e != null;
-					e = zin.getNextEntry()) {
-				if (libPaths.contains(e.getName())) {
-					if (LOG.isLoggable(INFO)) {
-						LOG.info("Extracting " + e.getName()
-								+ " from " + apk.getAbsolutePath());
-					}
-					extract(zin, dest); // Zip input stream will be closed
-					return;
-				}
-			}
-			zin.close();
-		}
-		throw new FileNotFoundException(libName);
-	}
-
-	/**
-	 * Returns all files with the extension .apk or .APK under the given root.
-	 */
-	private List<File> findApkFiles(File root) {
-		List<File> files = new ArrayList<>();
-		findApkFiles(root, files);
-		return files;
-	}
-
-	private void findApkFiles(File f, List<File> files) {
-		if (f.isFile() && f.getName().toLowerCase().endsWith(".apk")) {
-			files.add(f);
-		} else if (f.isDirectory()) {
-			File[] children = f.listFiles();
-			if (children != null) {
-				for (File child : children) findApkFiles(child, files);
-			}
-		}
-	}
-
-	/**
-	 * Returns the paths at which libraries with the given name would be found
-	 * inside an APK file, for all architectures supported by the device, in
-	 * order of preference.
-	 */
-	private List<String> getSupportedLibraryPaths(String libName) {
-		List<String> architectures = new ArrayList<>();
-		for (String abi : AndroidUtils.getSupportedArchitectures()) {
-			if (LIBRARY_ARCHITECTURES.contains(abi)) {
-				architectures.add("lib/" + abi + "/" + libName);
-			}
-		}
-		return architectures;
-	}
 }

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java

@@ -1,91 +1,86 @@
 package org.briarproject.bramble.plugin.tor;
 
-import android.app.Application;
+import android.content.Context;
 
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TorConstants;
-import org.briarproject.bramble.api.plugin.TorDirectory;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 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.util.AndroidUtils;
 
-import java.io.File;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
 import javax.net.SocketFactory;
 
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.logging.Logger.getLogger;
+
 @Immutable
 @NotNullByDefault
 public class AndroidTorPluginFactory implements DuplexPluginFactory {
 
 	private static final Logger LOG =
-			Logger.getLogger(AndroidTorPluginFactory.class.getName());
+			getLogger(AndroidTorPluginFactory.class.getName());
 
-	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
+	private static final int MAX_LATENCY = (int) SECONDS.toMillis(30);
-	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
+	private static final int MAX_IDLE_TIME = (int) SECONDS.toMillis(30);
-	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
-	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
-	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	/**
-	private final Application app;
+	 * How often to poll before our hidden service becomes reachable.
+	 */
+	private static final int INITIAL_POLLING_INTERVAL =
+			(int) MINUTES.toMillis(1);
+
+	/**
+	 * How often to poll when our hidden service is reachable. Our contacts
+	 * will poll when they come online, so our polling is just a fallback in
+	 * case of repeated connection failures.
+	 */
+	private static final int STABLE_POLLING_INTERVAL =
+			(int) MINUTES.toMillis(15);
+
+	private final Executor ioExecutor;
+	private final ScheduledExecutorService scheduler;
+	private final Context appContext;
 	private final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
 	private final EventBus eventBus;
 	private final SocketFactory torSocketFactory;
-	private final BackoffFactory backoffFactory;
 	private final ResourceProvider resourceProvider;
 	private final CircumventionProvider circumventionProvider;
 	private final BatteryManager batteryManager;
-	private final AndroidWakeLockManager wakeLockManager;
 	private final Clock clock;
-	private final File torDirectory;
 
-	@Inject
+	public AndroidTorPluginFactory(Executor ioExecutor,
-	public AndroidTorPluginFactory(@IoExecutor Executor ioExecutor,
+			ScheduledExecutorService scheduler, Context appContext,
-			@WakefulIoExecutor Executor wakefulIoExecutor,
+			NetworkManager networkManager, LocationUtils locationUtils,
-			Application app,
+			EventBus eventBus, SocketFactory torSocketFactory,
-			NetworkManager networkManager,
-			LocationUtils locationUtils,
-			EventBus eventBus,
-			SocketFactory torSocketFactory,
-			BackoffFactory backoffFactory,
 			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager,
+			BatteryManager batteryManager, Clock clock) {
-			AndroidWakeLockManager wakeLockManager,
-			Clock clock,
-			@TorDirectory File torDirectory) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
+		this.scheduler = scheduler;
-		this.app = app;
+		this.appContext = appContext;
 		this.networkManager = networkManager;
 		this.locationUtils = locationUtils;
 		this.eventBus = eventBus;
 		this.torSocketFactory = torSocketFactory;
-		this.backoffFactory = backoffFactory;
 		this.resourceProvider = resourceProvider;
 		this.circumventionProvider = circumventionProvider;
 		this.batteryManager = batteryManager;
-		this.wakeLockManager = wakeLockManager;
 		this.clock = clock;
-		this.torDirectory = torDirectory;
 	}
 
 	@Override
@@ -125,15 +120,13 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 		// Use position-independent executable
 		architecture += "_pie";
 
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		TorRendezvousCrypto torRendezvousCrypto = new TorRendezvousCryptoImpl();
-		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor,
+		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor, scheduler,
-				wakefulIoExecutor, app, networkManager, locationUtils,
+				appContext, networkManager, locationUtils, torSocketFactory,
-				torSocketFactory, clock, resourceProvider,
+				clock, resourceProvider, circumventionProvider, batteryManager,
-				circumventionProvider, batteryManager, wakeLockManager,
+				torRendezvousCrypto, callback, architecture, MAX_LATENCY,
-				backoff, torRendezvousCrypto, callback, architecture,
+				MAX_IDLE_TIME, INITIAL_POLLING_INTERVAL,
-				MAX_LATENCY, MAX_IDLE_TIME, torDirectory);
+				STABLE_POLLING_INTERVAL);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-android/src/main/java/org/briarproject/bramble/system/AlarmConstants.java

@@ -1,18 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-interface AlarmConstants {
-
-	/**
-	 * Request code for the broadcast intent attached to the periodic alarm.
-	 */
-	int REQUEST_ALARM = 1;
-
-	/**
-	 * Key for storing the process ID in the extras of the periodic alarm's
-	 * intent. This allows us to ignore alarms scheduled by dead processes.
-	 */
-	String EXTRA_PID = "org.briarproject.bramble.EXTRA_PID";
-}

bramble-android/src/main/java/org/briarproject/bramble/system/AlarmReceiver.java

@@ -1,17 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import org.briarproject.bramble.BrambleApplication;
-
-public class AlarmReceiver extends BroadcastReceiver {
-
-	@Override
-	public void onReceive(Context ctx, Intent intent) {
-		BrambleApplication app =
-				(BrambleApplication) ctx.getApplicationContext();
-		app.getBrambleAppComponent().alarmListener().onAlarm(intent);
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java

@@ -1,17 +1,12 @@
 package org.briarproject.bramble.system;
 
 import org.briarproject.bramble.api.event.EventExecutor;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 
 import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
 
 import javax.inject.Singleton;
 
@@ -21,23 +16,6 @@ import dagger.Provides;
 @Module
 public class AndroidSystemModule {
 
-	private final ScheduledExecutorService scheduledExecutorService;
-
-	public AndroidSystemModule() {
-		// Discard tasks that are submitted during shutdown
-		RejectedExecutionHandler policy =
-				new ScheduledThreadPoolExecutor.DiscardPolicy();
-		scheduledExecutorService = new ScheduledThreadPoolExecutor(1, policy);
-	}
-
-	@Provides
-	@Singleton
-	ScheduledExecutorService provideScheduledExecutorService(
-			LifecycleManager lifecycleManager) {
-		lifecycleManager.registerForShutdown(scheduledExecutorService);
-		return scheduledExecutorService;
-	}
-
 	@Provides
 	@Singleton
 	SecureRandomProvider provideSecureRandomProvider(
@@ -69,11 +47,4 @@ public class AndroidSystemModule {
 	ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {
 		return provider;
 	}
-
-	@Provides
-	@Singleton
-	AndroidWakeLockManager provideWakeLockManager(
-			AndroidWakeLockManagerImpl wakeLockManager) {
-		return wakeLockManager;
-	}
 }

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java

@@ -1,242 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.annotation.TargetApi;
-import android.app.AlarmManager;
-import android.app.Application;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.os.Process;
-import android.os.SystemClock;
-
-import org.briarproject.bramble.api.lifecycle.Service;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.AlarmListener;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.api.system.Wakeful;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.PriorityQueue;
-import java.util.Queue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static android.app.AlarmManager.ELAPSED_REALTIME_WAKEUP;
-import static android.app.AlarmManager.INTERVAL_FIFTEEN_MINUTES;
-import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
-import static android.content.Context.ALARM_SERVICE;
-import static android.os.Build.VERSION.SDK_INT;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.system.AlarmConstants.EXTRA_PID;
-import static org.briarproject.bramble.system.AlarmConstants.REQUEST_ALARM;
-
-@ThreadSafe
-@NotNullByDefault
-class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
-
-	private static final Logger LOG =
-			getLogger(AndroidTaskScheduler.class.getName());
-
-	private static final long ALARM_MS = INTERVAL_FIFTEEN_MINUTES;
-
-	private final Application app;
-	private final AndroidWakeLockManager wakeLockManager;
-	private final ScheduledExecutorService scheduledExecutorService;
-	private final AlarmManager alarmManager;
-
-	private final Object lock = new Object();
-	@GuardedBy("lock")
-	private final Queue<ScheduledTask> tasks = new PriorityQueue<>();
-
-	AndroidTaskScheduler(Application app,
-			AndroidWakeLockManager wakeLockManager,
-			ScheduledExecutorService scheduledExecutorService) {
-		this.app = app;
-		this.wakeLockManager = wakeLockManager;
-		this.scheduledExecutorService = scheduledExecutorService;
-		alarmManager = (AlarmManager)
-				requireNonNull(app.getSystemService(ALARM_SERVICE));
-	}
-
-	@Override
-	public void startService() {
-		scheduleAlarm();
-	}
-
-	@Override
-	public void stopService() {
-		cancelAlarm();
-	}
-
-	@Override
-	public Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit) {
-		AtomicBoolean cancelled = new AtomicBoolean(false);
-		return schedule(task, executor, delay, unit, cancelled);
-	}
-
-	@Override
-	public Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit) {
-		AtomicBoolean cancelled = new AtomicBoolean(false);
-		return scheduleWithFixedDelay(task, executor, delay, interval, unit,
-				cancelled);
-	}
-
-	@Override
-	public void onAlarm(Intent intent) {
-		wakeLockManager.runWakefully(() -> {
-			int extraPid = intent.getIntExtra(EXTRA_PID, -1);
-			int currentPid = Process.myPid();
-			if (extraPid == currentPid) {
-				LOG.info("Alarm");
-				rescheduleAlarm();
-				runDueTasks();
-			} else if (LOG.isLoggable(INFO)) {
-				LOG.info("Ignoring alarm with PID " + extraPid
-						+ ", current PID is " + currentPid);
-			}
-		}, "TaskAlarm");
-	}
-
-	private Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit, AtomicBoolean cancelled) {
-		long now = SystemClock.elapsedRealtime();
-		long dueMillis = now + MILLISECONDS.convert(delay, unit);
-		Runnable wakeful = () ->
-				wakeLockManager.executeWakefully(task, executor, "TaskHandoff");
-		Future<?> check = scheduleCheckForDueTasks(delay, unit);
-		ScheduledTask s = new ScheduledTask(wakeful, dueMillis, check,
-				cancelled);
-		synchronized (lock) {
-			tasks.add(s);
-		}
-		return s;
-	}
-
-	private Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit, AtomicBoolean cancelled) {
-		// All executions of this periodic task share a cancelled flag
-		Runnable wrapped = () -> {
-			task.run();
-			scheduleWithFixedDelay(task, executor, interval, interval, unit,
-					cancelled);
-		};
-		return schedule(wrapped, executor, delay, unit, cancelled);
-	}
-
-	private Future<?> scheduleCheckForDueTasks(long delay, TimeUnit unit) {
-		Runnable wakeful = () -> wakeLockManager.runWakefully(
-				this::runDueTasks, "TaskScheduler");
-		return scheduledExecutorService.schedule(wakeful, delay, unit);
-	}
-
-	@Wakeful
-	private void runDueTasks() {
-		long now = SystemClock.elapsedRealtime();
-		List<ScheduledTask> due = new ArrayList<>();
-		synchronized (lock) {
-			while (true) {
-				ScheduledTask s = tasks.peek();
-				if (s == null || s.dueMillis > now) break;
-				due.add(tasks.remove());
-			}
-		}
-		if (LOG.isLoggable(INFO)) {
-			LOG.info("Running " + due.size() + " due tasks");
-		}
-		for (ScheduledTask s : due) {
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Task is " + (now - s.dueMillis) + " ms overdue");
-			}
-			s.run();
-		}
-	}
-
-	private void scheduleAlarm() {
-		if (SDK_INT >= 23) scheduleIdleAlarm();
-		else scheduleInexactRepeatingAlarm();
-	}
-
-	private void rescheduleAlarm() {
-		// If SDK_INT < 23 the alarm repeats automatically
-		if (SDK_INT >= 23) scheduleIdleAlarm();
-	}
-
-	private void cancelAlarm() {
-		alarmManager.cancel(getAlarmPendingIntent());
-	}
-
-	private void scheduleInexactRepeatingAlarm() {
-		alarmManager.setInexactRepeating(ELAPSED_REALTIME_WAKEUP,
-				SystemClock.elapsedRealtime() + ALARM_MS, ALARM_MS,
-				getAlarmPendingIntent());
-	}
-
-	@TargetApi(23)
-	private void scheduleIdleAlarm() {
-		alarmManager.setAndAllowWhileIdle(ELAPSED_REALTIME_WAKEUP,
-				SystemClock.elapsedRealtime() + ALARM_MS,
-				getAlarmPendingIntent());
-	}
-
-	private PendingIntent getAlarmPendingIntent() {
-		Intent i = new Intent(app, AlarmReceiver.class);
-		i.putExtra(EXTRA_PID, android.os.Process.myPid());
-		return PendingIntent.getBroadcast(app, REQUEST_ALARM, i,
-				FLAG_CANCEL_CURRENT);
-	}
-
-	private class ScheduledTask
-			implements Runnable, Cancellable, Comparable<ScheduledTask> {
-
-		private final Runnable task;
-		private final long dueMillis;
-		private final Future<?> check;
-		private final AtomicBoolean cancelled;
-
-		public ScheduledTask(Runnable task, long dueMillis,
-				Future<?> check, AtomicBoolean cancelled) {
-			this.task = task;
-			this.dueMillis = dueMillis;
-			this.check = check;
-			this.cancelled = cancelled;
-		}
-
-		@Override
-		public void run() {
-			if (!cancelled.get()) task.run();
-		}
-
-		@Override
-		public void cancel() {
-			// Cancel any future executions of this task
-			cancelled.set(true);
-			// Cancel the scheduled check for due tasks
-			check.cancel(false);
-			// Remove the task from the queue
-			synchronized (lock) {
-				tasks.remove(this);
-			}
-		}
-
-		@Override
-		public int compareTo(ScheduledTask s) {
-			//noinspection UseCompareMethod
-			if (dueMillis < s.dueMillis) return -1;
-			if (dueMillis > s.dueMillis) return 1;
-			return 0;
-		}
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskSchedulerModule.java

@@ -1,49 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.system.AlarmListener;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
-import org.briarproject.bramble.api.system.TaskScheduler;
-
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidTaskSchedulerModule {
-
-	public static class EagerSingletons {
-		@Inject
-		AndroidTaskScheduler scheduler;
-	}
-
-	@Provides
-	@Singleton
-	AndroidTaskScheduler provideAndroidTaskScheduler(
-			LifecycleManager lifecycleManager, Application app,
-			AndroidWakeLockManager wakeLockManager,
-			ScheduledExecutorService scheduledExecutorService) {
-		AndroidTaskScheduler scheduler = new AndroidTaskScheduler(app,
-				wakeLockManager, scheduledExecutorService);
-		lifecycleManager.registerService(scheduler);
-		return scheduler;
-	}
-
-	@Provides
-	@Singleton
-	AlarmListener provideAlarmListener(AndroidTaskScheduler scheduler) {
-		return scheduler;
-	}
-
-	@Provides
-	@Singleton
-	TaskScheduler provideTaskScheduler(AndroidTaskScheduler scheduler) {
-		return scheduler;
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockImpl.java

@@ -1,74 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.AndroidWakeLock;
-
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.logging.Level.FINE;
-import static java.util.logging.Logger.getLogger;
-
-/**
- * A wrapper around a {@link SharedWakeLock} that provides the more convenient
- * semantics of {@link AndroidWakeLock} (i.e. calls to acquire() and release()
- * don't need to be balanced).
- */
-@ThreadSafe
-@NotNullByDefault
-class AndroidWakeLockImpl implements AndroidWakeLock {
-
-	private static final Logger LOG =
-			getLogger(AndroidWakeLockImpl.class.getName());
-
-	private static final AtomicInteger INSTANCE_ID = new AtomicInteger(0);
-
-	private final SharedWakeLock sharedWakeLock;
-	private final String tag;
-
-	private final Object lock = new Object();
-	@GuardedBy("lock")
-	private boolean held = false;
-
-	AndroidWakeLockImpl(SharedWakeLock sharedWakeLock, String tag) {
-		this.sharedWakeLock = sharedWakeLock;
-		this.tag = tag + "_" + INSTANCE_ID.getAndIncrement();
-	}
-
-	@Override
-	public void acquire() {
-		synchronized (lock) {
-			if (held) {
-				if (LOG.isLoggable(FINE)) {
-					LOG.fine(tag + " already acquired");
-				}
-			} else {
-				if (LOG.isLoggable(FINE)) {
-					LOG.fine(tag + " acquiring shared wake lock");
-				}
-				held = true;
-				sharedWakeLock.acquire();
-			}
-		}
-	}
-
-	@Override
-	public void release() {
-		synchronized (lock) {
-			if (held) {
-				if (LOG.isLoggable(FINE)) {
-					LOG.fine(tag + " releasing shared wake lock");
-				}
-				held = false;
-				sharedWakeLock.release();
-			} else {
-				if (LOG.isLoggable(FINE)) {
-					LOG.fine(tag + " already released");
-				}
-			}
-		}
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java

@@ -1,119 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.PowerManager;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.AndroidWakeLock;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.inject.Inject;
-
-import static android.content.Context.POWER_SERVICE;
-import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-
-@NotNullByDefault
-class AndroidWakeLockManagerImpl implements AndroidWakeLockManager {
-
-	/**
-	 * How often to replace the wake lock.
-	 */
-	private static final long LOCK_DURATION_MS = MINUTES.toMillis(1);
-
-	/**
-	 * Automatically release the lock this many milliseconds after it's due
-	 * to have been replaced and released.
-	 */
-	private static final long SAFETY_MARGIN_MS = SECONDS.toMillis(30);
-
-	private final SharedWakeLock sharedWakeLock;
-
-	@Inject
-	AndroidWakeLockManagerImpl(Application app,
-			ScheduledExecutorService scheduledExecutorService) {
-		PowerManager powerManager = (PowerManager)
-				requireNonNull(app.getSystemService(POWER_SERVICE));
-		String tag = getWakeLockTag(app);
-		sharedWakeLock = new RenewableWakeLock(powerManager,
-				scheduledExecutorService, PARTIAL_WAKE_LOCK, tag,
-				LOCK_DURATION_MS, SAFETY_MARGIN_MS);
-	}
-
-	@Override
-	public AndroidWakeLock createWakeLock(String tag) {
-		return new AndroidWakeLockImpl(sharedWakeLock, tag);
-	}
-
-	@Override
-	public void runWakefully(Runnable r, String tag) {
-		AndroidWakeLock wakeLock = createWakeLock(tag);
-		wakeLock.acquire();
-		try {
-			r.run();
-		} finally {
-			wakeLock.release();
-		}
-	}
-
-	@Override
-	public void executeWakefully(Runnable r, Executor executor, String tag) {
-		AndroidWakeLock wakeLock = createWakeLock(tag);
-		wakeLock.acquire();
-		try {
-			executor.execute(() -> {
-				try {
-					r.run();
-				} finally {
-					// Release the wake lock if the task throws an exception
-					wakeLock.release();
-				}
-			});
-		} catch (Exception e) {
-			// Release the wake lock if the executor throws an exception when
-			// we submit the task (in which case the release() call above won't
-			// happen)
-			wakeLock.release();
-			throw e;
-		}
-	}
-
-	@Override
-	public void executeWakefully(Runnable r, String tag) {
-		AndroidWakeLock wakeLock = createWakeLock(tag);
-		wakeLock.acquire();
-		try {
-			new Thread(() -> {
-				try {
-					r.run();
-				} finally {
-					wakeLock.release();
-				}
-			}).start();
-		} catch (Exception e) {
-			wakeLock.release();
-			throw e;
-		}
-	}
-
-	private String getWakeLockTag(Context ctx) {
-		PackageManager pm = ctx.getPackageManager();
-		for (PackageInfo info : pm.getInstalledPackages(0)) {
-			String name = info.packageName.toLowerCase();
-			if (name.startsWith("com.huawei.powergenie")) {
-				return "LocationManagerService";
-			} else if (name.startsWith("com.evenwell.powermonitor")) {
-				return "AudioIn";
-			}
-		}
-		return ctx.getPackageName();
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakefulIoExecutorModule.java

@@ -1,23 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.system.AndroidWakeLockManager;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
-
-import java.util.concurrent.Executor;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public
-class AndroidWakefulIoExecutorModule {
-
-	@Provides
-	@WakefulIoExecutor
-	Executor provideWakefulIoExecutor(@IoExecutor Executor ioExecutor,
-			AndroidWakeLockManager wakeLockManager) {
-		return r -> wakeLockManager.executeWakefully(r, ioExecutor,
-				"WakefulIoExecutor");
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/system/RenewableWakeLock.java

@@ -1,130 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.logging.Level.FINE;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-
-@ThreadSafe
-@NotNullByDefault
-class RenewableWakeLock implements SharedWakeLock {
-
-	private static final Logger LOG =
-			getLogger(RenewableWakeLock.class.getName());
-
-	private final PowerManager powerManager;
-	private final ScheduledExecutorService scheduledExecutorService;
-	private final int levelAndFlags;
-	private final String tag;
-	private final long durationMs, safetyMarginMs;
-
-	private final Object lock = new Object();
-	@GuardedBy("lock")
-	@Nullable
-	private WakeLock wakeLock;
-	@GuardedBy("lock")
-	@Nullable
-	private Future<?> future;
-	@GuardedBy("lock")
-	private int refCount = 0;
-	@GuardedBy("lock")
-	private long acquired = 0;
-
-	RenewableWakeLock(PowerManager powerManager,
-			ScheduledExecutorService scheduledExecutorService,
-			int levelAndFlags,
-			String tag,
-			long durationMs,
-			long safetyMarginMs) {
-		this.powerManager = powerManager;
-		this.scheduledExecutorService = scheduledExecutorService;
-		this.levelAndFlags = levelAndFlags;
-		this.tag = tag;
-		this.durationMs = durationMs;
-		this.safetyMarginMs = safetyMarginMs;
-	}
-
-	@Override
-	public void acquire() {
-		synchronized (lock) {
-			refCount++;
-			if (refCount == 1) {
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Acquiring wake lock " + tag);
-				}
-				wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
-				// We do our own reference counting so we can replace the lock
-				// TODO: Check whether using a ref-counted wake lock affects
-				//  power management apps
-				wakeLock.setReferenceCounted(false);
-				wakeLock.acquire(durationMs + safetyMarginMs);
-				future = scheduledExecutorService.schedule(this::renew,
-						durationMs, MILLISECONDS);
-				acquired = android.os.SystemClock.elapsedRealtime();
-			} else if (LOG.isLoggable(FINE)) {
-				LOG.fine("Wake lock " + tag + " has " + refCount + " holders");
-			}
-		}
-	}
-
-	private void renew() {
-		if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag);
-		synchronized (lock) {
-			if (wakeLock == null) {
-				LOG.info("Already released");
-				return;
-			}
-			if (LOG.isLoggable(FINE)) {
-				LOG.fine("Wake lock " + tag + " has " + refCount + " holders");
-			}
-			long now = android.os.SystemClock.elapsedRealtime();
-			long expiry = acquired + durationMs + safetyMarginMs;
-			if (now > expiry && LOG.isLoggable(WARNING)) {
-				LOG.warning("Wake lock expired " + (now - expiry) + " ms ago");
-			}
-			WakeLock oldWakeLock = wakeLock;
-			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
-			wakeLock.setReferenceCounted(false);
-			wakeLock.acquire(durationMs + safetyMarginMs);
-			oldWakeLock.release();
-			future = scheduledExecutorService.schedule(this::renew, durationMs,
-					MILLISECONDS);
-			acquired = now;
-		}
-	}
-
-	@Override
-	public void release() {
-		synchronized (lock) {
-			refCount--;
-			if (refCount == 0) {
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Releasing wake lock " + tag);
-				}
-				requireNonNull(future).cancel(false);
-				future = null;
-				requireNonNull(wakeLock).release();
-				wakeLock = null;
-				acquired = 0;
-			} else if (LOG.isLoggable(FINE)) {
-				LOG.fine("Wake lock " + tag + " has " + refCount + " holders");
-			}
-		}
-	}
-}
-

bramble-android/src/main/java/org/briarproject/bramble/system/SharedWakeLock.java

@@ -1,22 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.AndroidWakeLock;
-
-@NotNullByDefault
-interface SharedWakeLock {
-
-	/**
-	 * Acquires the wake lock. This increments the wake lock's reference count,
-	 * so unlike {@link AndroidWakeLock#acquire()} every call to this method
-	 * must be followed by a balancing call to {@link #release()}.
-	 */
-	void acquire();
-
-	/**
-	 * Releases the wake lock. This decrements the wake lock's reference count,
-	 * so unlike {@link AndroidWakeLock#release()} every call to this method
-	 * must follow a balancing call to {@link #acquire()}.
-	 */
-	void release();
-}

bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java

@@ -3,6 +3,8 @@ package org.briarproject.bramble.util;
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.provider.Settings;
 
@@ -117,4 +119,17 @@ public class AndroidUtils {
 		if (SDK_INT < 24) return new String[] {"image/jpeg", "image/png"};
 		else return new String[] {"image/jpeg", "image/png", "image/gif"};
 	}
+
+	public static String getWakeLockTag(Context ctx) {
+		PackageManager pm = ctx.getPackageManager();
+		for (PackageInfo info : pm.getInstalledPackages(0)) {
+			String name = info.packageName.toLowerCase();
+			if (name.startsWith("com.huawei.powergenie")) {
+				return "LocationManagerService";
+			} else if (name.startsWith("com.evenwell.powermonitor")) {
+				return "AudioIn";
+			}
+		}
+		return ctx.getPackageName();
+	}
 }

bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java

@@ -0,0 +1,100 @@
+package org.briarproject.bramble.util;
+
+import android.os.PowerManager;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.logging.Level.INFO;
+
+@ThreadSafe
+@NotNullByDefault
+public class RenewableWakeLock {
+
+	private static final Logger LOG =
+			Logger.getLogger(RenewableWakeLock.class.getName());
+
+	/**
+	 * Automatically release the lock this many milliseconds after it's due
+	 * to have been replaced and released.
+	 */
+	private static final int SAFETY_MARGIN_MS = 10_000;
+
+	private final PowerManager powerManager;
+	private final ScheduledExecutorService scheduler;
+	private final int levelAndFlags;
+	private final String tag;
+	private final long durationMs;
+	private final Runnable renewTask;
+
+	private final Object lock = new Object();
+	@Nullable
+	private PowerManager.WakeLock wakeLock; // Locking: lock
+	@Nullable
+	private ScheduledFuture future; // Locking: lock
+
+	public RenewableWakeLock(PowerManager powerManager,
+			ScheduledExecutorService scheduler, int levelAndFlags, String tag,
+			long duration, TimeUnit timeUnit) {
+		this.powerManager = powerManager;
+		this.scheduler = scheduler;
+		this.levelAndFlags = levelAndFlags;
+		this.tag = tag;
+		durationMs = MILLISECONDS.convert(duration, timeUnit);
+		renewTask = this::renew;
+	}
+
+	public void acquire() {
+		if (LOG.isLoggable(INFO)) LOG.info("Acquiring wake lock " + tag);
+		synchronized (lock) {
+			if (wakeLock != null) {
+				LOG.info("Already acquired");
+				return;
+			}
+			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
+			wakeLock.setReferenceCounted(false);
+			wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
+			future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
+		}
+	}
+
+	private void renew() {
+		if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag);
+		synchronized (lock) {
+			if (wakeLock == null) {
+				LOG.info("Already released");
+				return;
+			}
+			PowerManager.WakeLock oldWakeLock = wakeLock;
+			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
+			wakeLock.setReferenceCounted(false);
+			wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
+			oldWakeLock.release();
+			future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
+		}
+	}
+
+	public void release() {
+		if (LOG.isLoggable(INFO)) LOG.info("Releasing wake lock " + tag);
+		synchronized (lock) {
+			if (wakeLock == null) {
+				LOG.info("Already released");
+				return;
+			}
+			if (future == null) throw new AssertionError();
+			future.cancel(false);
+			future = null;
+			wakeLock.release();
+			wakeLock = null;
+		}
+	}
+}
+

bramble-android/witness.gradle

@@ -1,36 +1,33 @@
 dependencyVerification {
     verify = [
         'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-        'com.android.tools.analytics-library:protos:27.1.1:protos-27.1.1.jar:13f77e73762e58ab372d140b3a6be6903aea9775b62dd14fbc62d4cc7069c9a4',
+        'com.android.tools.analytics-library:protos:26.5.1:protos-26.5.1.jar:8dde1130725461fe827f2a343d353f2b51e8870661fc860d7d5ebddb097ead4e',
-        'com.android.tools.analytics-library:shared:27.1.1:shared-27.1.1.jar:82930a52001410e97d809930b670f4de3002286975f046b9de5f6b777b06d366',
+        'com.android.tools.analytics-library:shared:26.5.1:shared-26.5.1.jar:ccc2f3b00ec17b11401610ba68553544fc8fc517120e84439ac6eb86b875e18d',
-        'com.android.tools.analytics-library:tracker:27.1.1:tracker-27.1.1.jar:31bc5a00be0055bac89c9b2f34751883e987cd89e3ac1783720645c164f591d9',
+        'com.android.tools.analytics-library:tracker:26.5.1:tracker-26.5.1.jar:3a76984c0fe2e847ca7a8b35b4780ef0447a9d1666946cb8e60466318e0ab5ae',
-        'com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524:aapt2-proto-4.1.0-alpha01-6193524.jar:17e75523e1e92dd4f222c7368ee41df9e964a508232f591e265d0c499baf9dca',
+        'com.android.tools.build:aapt2-proto:0.4.0:aapt2-proto-0.4.0.jar:fac0435e08898f89eeeb9ca236bea707155ff816c12205ced285ad53604133ca',
-        'com.android.tools.build:apksig:4.1.1:apksig-4.1.1.jar:e0a69da9e5a03986d608b45bbf954ef0e6a0b3f58c1b8315bd169ec08b279e72',
+        'com.android.tools.build:apksig:3.5.1:apksig-3.5.1.jar:1fd33e7f009a2a0da766cfeec4211a09f548034b015c289a66d75dd8a9302f4a',
-        'com.android.tools.build:apkzlib:4.1.1:apkzlib-4.1.1.jar:ba4b5e419b6be0130eae7f8301c3a551ad3976f487d2e0c6852ebb175ac41127',
+        'com.android.tools.build:apkzlib:3.5.1:apkzlib-3.5.1.jar:9f330167cbe973b7db407692f74f4f6453b7ffa5f2048934b06280c2ceee60fa',
-        'com.android.tools.build:builder-model:4.1.1:builder-model-4.1.1.jar:e95c99cc298ad67b8deb6ced99c51abc8f59afebedad044b1a10dde14646a4dd',
+        'com.android.tools.build:builder-model:3.5.1:builder-model-3.5.1.jar:39ea3c82b76b6e0c9f9fa88d93e0edc1dd4a0f1dfae0ef6fbf2d451da47e5450',
-        'com.android.tools.build:builder-test-api:4.1.1:builder-test-api-4.1.1.jar:464f596ab261c051c3847406748e843770dea123f6fa5fee8a9390644e709b7a',
+        'com.android.tools.build:builder-test-api:3.5.1:builder-test-api-3.5.1.jar:a1b59305584cbcaa078fdc9cfb80871012755b822dd32e8da19add6f7bbcb762',
-        'com.android.tools.build:builder:4.1.1:builder-4.1.1.jar:0f78d4759d2f7b57b95865522ec34596ba419b9982f3b25e3449213f9c98b80d',
+        'com.android.tools.build:builder:3.5.1:builder-3.5.1.jar:e3a8d382434c5f60990730c4719fc814e85a898a33a1e96c1df8d627d3c6eea6',
-        'com.android.tools.build:gradle-api:4.1.1:gradle-api-4.1.1.jar:d42e6b539e4c1353ad3546e75ec8ce11a017b97481023e8ea18577eefe374358',
+        'com.android.tools.build:gradle-api:3.5.1:gradle-api-3.5.1.jar:be9b41859bace11998f66b04ed944f87e413f3ad6da3c4665587699da125addc',
-        'com.android.tools.build:manifest-merger:27.1.1:manifest-merger-27.1.1.jar:7a45fa143687859bb2e5a961dcf6ee88094d3853de0cb543dc03dbcb0f4b554b',
+        'com.android.tools.build:manifest-merger:26.5.1:manifest-merger-26.5.1.jar:dcad9ecb967251f4d750f55a4204a2b400e8fbfe5cb930a1d0d5dbe10ae8bdfc',
-        'com.android.tools.ddms:ddmlib:27.1.1:ddmlib-27.1.1.jar:da6e4bd834b6a85dae8019039849d8bd96933347dfbf460df74913ddade6e40a',
+        'com.android.tools.ddms:ddmlib:26.5.1:ddmlib-26.5.1.jar:b081aef2a4ed3f4d47cae4cdb128469735f25a114e026d37123bf9ffdec742a8',
-        'com.android.tools.external.com-intellij:intellij-core:27.1.1:intellij-core-27.1.1.jar:2591a7363c4443c59bf9f793730acafce9d6ec3076e2f46716edaf53a41b6fb6',
+        'com.android.tools.external.com-intellij:intellij-core:26.5.1:intellij-core-26.5.1.jar:20eced30adc124805bd93488d9cd9d3e33e6bf7b48e9fe5a703d4983f894d450',
-        'com.android.tools.external.com-intellij:kotlin-compiler:27.1.1:kotlin-compiler-27.1.1.jar:5054ae770ba788f110303c65abd6b1fa28eccf52dee1274510e201b2b81885c8',
+        'com.android.tools.external.com-intellij:kotlin-compiler:26.5.1:kotlin-compiler-26.5.1.jar:5aed762dd54875b77ae7018d97c05756ff0c5b9fd02ec595dd396ccd14cc22cb',
-        'com.android.tools.external.org-jetbrains:uast:27.1.1:uast-27.1.1.jar:54cd8f6886a9d2f5641659dd5c91f626629672cd48301f7f0bd6aad9bd448714',
+        'com.android.tools.external.org-jetbrains:uast:26.5.1:uast-26.5.1.jar:4bc8653d6c0943f40fee963a149e36c6baa45683d2530968a13f5007e3c40740',
-        'com.android.tools.layoutlib:layoutlib-api:27.1.1:layoutlib-api-27.1.1.jar:8a9a22e3b309521ea83b724e5a89cfdac6076f52d675c0e17d77b05527bc0f8c',
+        'com.android.tools.layoutlib:layoutlib-api:26.5.1:layoutlib-api-26.5.1.jar:88732f11396c427273e515d23042e35633f4fe4295528a99b866aa2adf0efd9c',
-        'com.android.tools.lint:lint-api:27.1.1:lint-api-27.1.1.jar:c1d8176094cb0478786070d40533efb578ebc53529a82f6ef5bee879bdca418b',
+        'com.android.tools.lint:lint-api:26.5.1:lint-api-26.5.1.jar:ec33fcd72bfaf70dd841e03fbfd93f109c2e575aec146067c606689c3972f0de',
-        'com.android.tools.lint:lint-checks:27.1.1:lint-checks-27.1.1.jar:3899c91e00bd059b40c31a9ca00cd0f8303191947608735ae1b657323693fb61',
+        'com.android.tools.lint:lint-checks:26.5.1:lint-checks-26.5.1.jar:a1b9607d484aaae7a71dcecdc76f8003d8239af226c776894a2cf63f9e6c60d7',
-        'com.android.tools.lint:lint-gradle-api:27.1.1:lint-gradle-api-27.1.1.jar:26aa89d38b9825cc73229daa82a68875801c8b8491f30497ce62aff1f206eb0d',
+        'com.android.tools.lint:lint-gradle-api:26.5.1:lint-gradle-api-26.5.1.jar:82453fd98a8394cc84ed995c04d2cd744abd1d6589403427ba7eef53115406f3',
-        'com.android.tools.lint:lint-gradle:27.1.1:lint-gradle-27.1.1.jar:f7355823ead869f4d28184ba28b7a0c693b507519a2d3705bb9848a0f35b3756',
+        'com.android.tools.lint:lint-gradle:26.5.1:lint-gradle-26.5.1.jar:59465b56cf7db77c656d5f8195d721c3d48b6bdd0502d774de335bfe4baff00b',
-        'com.android.tools.lint:lint-model:27.1.1:lint-model-27.1.1.jar:bc23c0c413bdfca59dac2cd56b870d8360d009e9ec0d365e71f774bcf127971d',
+        'com.android.tools.lint:lint:26.5.1:lint-26.5.1.jar:336e4b04ec6f8b0f25879131b7a7862d77df83a1879ee5b71be26128755f8e2e',
-        'com.android.tools.lint:lint:27.1.1:lint-27.1.1.jar:2f6038a5398a42bd591883c3f5e5894f4ec52ca1c3683bf94fa8553c1700af81',
+        'com.android.tools:annotations:26.5.1:annotations-26.5.1.jar:2c43c82f8c59d8f7a61e3239e1a2dc9f69dc342ec09af9b7c9f69b25337c0b6e',
-        'com.android.tools:annotations:27.1.1:annotations-27.1.1.jar:ff28c504d2acb9fd1a5ffbd97ae85cf59ee18c76927525aad250509bccf2cab1',
+        'com.android.tools:common:26.5.1:common-26.5.1.jar:eccfa54486ed54c4e3123cc42195d023bd0dd21bcd2f0e4868e8c6fc70f8ef6b',
-        'com.android.tools:common:27.1.1:common-27.1.1.jar:63d9a2a9ad6d278db319f3749b9f50bdf5457ef7020074a1bebe124e714b535c',
+        'com.android.tools:dvlib:26.5.1:dvlib-26.5.1.jar:46f93ad498b4756e7d867d2fe38c38890a80e7407a4ae459e4a8c8d5c5aeacfe',
-        'com.android.tools:dvlib:27.1.1:dvlib-27.1.1.jar:998a54201fc1cefee5f2399215e95c42b1f64f9e1d8f4452eb8255c68ba5440f',
+        'com.android.tools:repository:26.5.1:repository-26.5.1.jar:2b3ee791aa4c3e8ce60498c161a27ca7228816fc630eed4d9f25f2f36a106dce',
-        'com.android.tools:repository:27.1.1:repository-27.1.1.jar:d25b74ccabf4d876903efb375e9af6fb380d8ae0445bb74bbdcc225c1e37fa1d',
+        'com.android.tools:sdk-common:26.5.1:sdk-common-26.5.1.jar:365f749676c3574676fd465177c8a492f340816db2b520d6ed114d3b6e77bea7',
-        'com.android.tools:sdk-common:27.1.1:sdk-common-27.1.1.jar:4473ae97d0ef7061ee1de61041d5aa97405ae08e44c09cf7bb278b42e4b97c7c',
+        'com.android.tools:sdklib:26.5.1:sdklib-26.5.1.jar:007da104afb27c8c682a1628023fe9ec438249c8d15ef0fd6624c5bb8e23b696',
-        'com.android.tools:sdklib:27.1.1:sdklib-27.1.1.jar:08e6b83961ac9724b3c1e3d0eff971f13be6701292c77914b8794480f3391250',
-        'com.android:signflinger:4.1.1:signflinger-4.1.1.jar:0c66825988873ec2d51057fa463f54a8f18fc7326ff4530b9da363b71e97ce60',
-        'com.android:zipflinger:4.1.1:zipflinger-4.1.1.jar:0a8c3e52ac13dd031236f9fb5ba4408b1d5dcd12325a05440b36da09d8881446',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
         'com.google.code.gson:gson:2.8.5:gson-2.8.5.jar:233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81',
         'com.google.dagger:dagger-compiler:2.24:dagger-compiler-2.24.jar:3c5afb955fb188da485cb2c048eff37dce0e1530b9780a0f2f7187d16d1ccc1f',
@@ -38,30 +35,27 @@ dependencyVerification {
         'com.google.dagger:dagger-spi:2.24:dagger-spi-2.24.jar:c038445d14dbcb4054e61bf49e05009edf26fce4fdc7ec1a9db544784f68e718',
         'com.google.dagger:dagger:2.24:dagger-2.24.jar:550a6e46a6dfcdf1d764887b6090cea94f783327e50e5c73754f18facfc70b64',
         'com.google.errorprone:error_prone_annotations:2.2.0:error_prone_annotations-2.2.0.jar:6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a',
-        'com.google.errorprone:error_prone_annotations:2.3.2:error_prone_annotations-2.3.2.jar:357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d',
         'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
         'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
         'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
+        'com.google.guava:guava:27.0.1-jre:guava-27.0.1-jre.jar:e1c814fd04492a27c38e0317eabeaa1b3e950ec8010239e400fe90ad6c9107b4',
         'com.google.guava:guava:27.1-jre:guava-27.1-jre.jar:4a5aa70cc968a4d137e599ad37553e5cfeed2265e8c193476d7119036c536fe7',
-        'com.google.guava:guava:28.1-jre:guava-28.1-jre.jar:30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4',
         'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
         'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
-        'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
         'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
-        'com.google.protobuf:protobuf-java:3.10.0:protobuf-java-3.10.0.jar:161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9',
+        'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
         'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
         'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90',
         'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
         'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
-        'com.sun.istack:istack-commons-runtime:3.0.7:istack-commons-runtime-3.0.7.jar:6443e10ba2e259fb821d9b6becf10db5316285fc30c53cec9d7b19a3877e7fdf',
+        'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
-        'com.sun.xml.fastinfoset:FastInfoset:1.2.15:FastInfoset-1.2.15.jar:785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec',
+        'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
         'commons-codec:commons-codec:1.10:commons-codec-1.10.jar:4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569',
         'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
         'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
-        'javax.activation:javax.activation-api:1.2.0:javax.activation-api-1.2.0.jar:43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393',
         'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-        'javax.xml.bind:jaxb-api:2.3.1:jaxb-api-2.3.1.jar:88b955a0df57880a26a74708bc34f74dcaf8ebf4e78843a28b50eae945732b06',
+        'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
         'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
         'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
         'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
@@ -76,35 +70,34 @@ dependencyVerification {
         'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
         'org.briarproject:obfs4proxy-android:0.0.11-2:obfs4proxy-android-0.0.11-2.zip:57e55cbe87aa2aac210fdbb6cd8cdeafe15f825406a08ebf77a8b787aa2c6a8a',
-        'org.briarproject:tor-android:0.3.5.12:tor-android-0.3.5.12.zip:db71fb3290acff79d572af0752570eaf6aad7c4d88c9b9aa0b4d5afe2b9ead9c',
+        'org.briarproject:tor-android:0.3.5.10:tor-android-0.3.5.10.zip:edd83bf557fcff2105eaa0bdb3f607a6852ebe7360920929ae3039dd5f4774c5',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
-        'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df',
         'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',
         'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
-        'org.codehaus.mojo:animal-sniffer-annotations:1.18:animal-sniffer-annotations-1.18.jar:47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d',
+        'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
-        'org.glassfish.jaxb:jaxb-runtime:2.3.1:jaxb-runtime-2.3.1.jar:45fecfa5c8217ce1f3652ab95179790ec8cc0dec0384bca51cbeb94a293d9f2f',
+        'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
-        'org.glassfish.jaxb:txw2:2.3.1:txw2-2.3.1.jar:34975dde1c6920f1a39791142235689bc3cd357e24d05edd8ff93b885bd68d60',
+        'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
         'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
         'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
-        'org.jetbrains.kotlin:kotlin-reflect:1.3.72:kotlin-reflect-1.3.72.jar:a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40',
+        'org.jetbrains.kotlin:kotlin-reflect:1.3.50:kotlin-reflect-1.3.50.jar:64583199ea5a54aefd1bd1595288925f784226ee562d1dd279011c6075b3d7a4',
-        'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72:kotlin-stdlib-common-1.3.72.jar:5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a',
+        'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50:kotlin-stdlib-common-1.3.50.jar:8ce678e88e4ba018b66dacecf952471e4d7dfee156a8a819760a5a5ff29d323c',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72:kotlin-stdlib-jdk7-1.3.72.jar:40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50:kotlin-stdlib-jdk7-1.3.50.jar:9a026639e76212f8d57b86d55b075394c2e009f1979110751d34c05c5f75d57b',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72:kotlin-stdlib-jdk8-1.3.72.jar:133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50:kotlin-stdlib-jdk8-1.3.50.jar:1b351fb6e09c14b55525c74c1f4cf48942eae43c348b7bc764a5e6e423d4da0c',
-        'org.jetbrains.kotlin:kotlin-stdlib:1.3.72:kotlin-stdlib-1.3.72.jar:3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b',
+        'org.jetbrains.kotlin:kotlin-stdlib:1.3.50:kotlin-stdlib-1.3.50.jar:e6f05746ee0366d0b52825a090fac474dcf44082c9083bbb205bd16976488d6c',
         'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
         'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
         'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
         'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
         'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
         'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-        'org.jvnet.staxex:stax-ex:1.8:stax-ex-1.8.jar:95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77',
+        'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
         'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
-        'org.ow2.asm:asm-analysis:7.0:asm-analysis-7.0.jar:e981f8f650c4d900bb033650b18e122fa6b161eadd5f88978d08751f72ee8474',
+        'org.ow2.asm:asm-analysis:6.0:asm-analysis-6.0.jar:2f1a6387219c3a6cc4856481f221b03bd9f2408a326d416af09af5d6f608c1f4',
-        'org.ow2.asm:asm-commons:7.0:asm-commons-7.0.jar:fed348ef05958e3e846a3ac074a12af5f7936ef3d21ce44a62c4fa08a771927d',
+        'org.ow2.asm:asm-commons:6.0:asm-commons-6.0.jar:f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf',
-        'org.ow2.asm:asm-tree:7.0:asm-tree-7.0.jar:cfd7a0874f9de36a999c127feeadfbfe6e04d4a71ee954d7af3d853f0be48a6c',
+        'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215',
-        'org.ow2.asm:asm-util:7.0:asm-util-7.0.jar:75fbbca440ef463f41c2b0ab1a80abe67e910ac486da60a7863cbcb5bae7e145',
+        'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6',
         'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
-        'org.ow2.asm:asm:7.0:asm-7.0.jar:b88ef66468b3c978ad0c97fd6e90979e56155b4ac69089ba7a44e9aa7ffe9acf',
+        'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461',
     ]
 }

bramble-api/src/main/java/org/briarproject/bramble/api/io/TimeoutMonitor.java

@@ -7,10 +7,6 @@ public interface TimeoutMonitor {
 	/**
 	 * Returns an {@link InputStream} that wraps the given stream and allows
 	 * read timeouts to be detected.
-	 * <p>
-	 * The returned stream must be {@link InputStream#close() closed} when it's
-	 * no longer needed to ensure that resources held by the timeout monitor
-	 * are released.
 	 *
 	 * @param timeoutMs The read timeout in milliseconds. Timeouts will be
 	 * detected eventually but are not guaranteed to be detected immediately.

bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java

@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Wakeful;
 
 import java.util.concurrent.ExecutorService;
 
@@ -66,7 +65,6 @@ public interface LifecycleManager {
 	 * Opens the {@link DatabaseComponent} using the given key and starts any
 	 * registered {@link Service Services}.
 	 */
-	@Wakeful
 	StartResult startServices(SecretKey dbKey);
 
 	/**
@@ -74,7 +72,6 @@ public interface LifecycleManager {
 	 * registered {@link ExecutorService ExecutorServices}, and closes the
 	 * {@link DatabaseComponent}.
 	 */
-	@Wakeful
 	void stopServices();
 
 	/**
@@ -107,7 +104,6 @@ public interface LifecycleManager {
 		 *
 		 * @param txn A read-write transaction
 		 */
-		@Wakeful
 		void onDatabaseOpened(Transaction txn) throws DbException;
 	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/Service.java

@@ -1,20 +1,16 @@
 package org.briarproject.bramble.api.lifecycle;
 
-import org.briarproject.bramble.api.system.Wakeful;
-
 public interface Service {
 
 	/**
-	 * Starts the service. This method must not be called concurrently with
+	 * Starts the service.This method must not be called concurrently with
 	 * {@link #stopService()}.
 	 */
-	@Wakeful
 	void startService() throws ServiceException;
 
 	/**
 	 * Stops the service. This method must not be called concurrently with
 	 * {@link #startService()}.
 	 */
-	@Wakeful
 	void stopService() throws ServiceException;
 }

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Backoff.java

@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-/**
- * Calculates polling intervals for transport plugins that use backoff.
- */
-public interface Backoff {
-
-	/**
-	 * Returns the current polling interval.
-	 */
-	int getPollingInterval();
-
-	/**
-	 * Increments the backoff counter.
-	 */
-	void increment();
-
-	/**
-	 * Resets the backoff counter.
-	 */
-	void reset();
-}

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BackoffFactory.java

@@ -1,7 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-public interface BackoffFactory {
-
-	Backoff createBackoff(int minInterval, int maxInterval,
-			double base);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BluetoothConstants.java

@@ -10,12 +10,6 @@ public interface BluetoothConstants {
 	String PROP_ADDRESS = "address";
 	String PROP_UUID = "uuid";
 
-	// Local settings (not shared with contacts)
+	// Default value for PREF_PLUGIN_ENABLE
-	String PREF_ADDRESS_IS_REFLECTED = "addressIsReflected";
-	String PREF_EVER_CONNECTED = "everConnected";
-
-	// Default values for local settings
 	boolean DEFAULT_PREF_PLUGIN_ENABLE = false;
-	boolean DEFAULT_PREF_ADDRESS_IS_REFLECTED = false;
-	boolean DEFAULT_PREF_EVER_CONNECTED = false;
 }

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java

@@ -4,7 +4,6 @@ import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.settings.SettingsManager;
-import org.briarproject.bramble.api.system.Wakeful;
 
 import java.util.Collection;
 
@@ -71,13 +70,11 @@ public interface Plugin {
 	/**
 	 * Starts the plugin.
 	 */
-	@Wakeful
 	void start() throws PluginException;
 
 	/**
 	 * Stops the plugin.
 	 */
-	@Wakeful
 	void stop() throws PluginException;
 
 	/**
@@ -109,7 +106,6 @@ public interface Plugin {
 	 * Attempts to create connections using the given transport properties,
 	 * passing any created connections to the corresponding handlers.
 	 */
-	@Wakeful
 	void poll(Collection<Pair<TransportProperties, ConnectionHandler>>
 			properties);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginCallback.java

@@ -8,8 +8,6 @@ import org.briarproject.bramble.api.plugin.event.TransportStateEvent;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.settings.Settings;
 
-import java.util.Collection;
-
 /**
  * An interface through which a transport plugin interacts with the rest of
  * the application.
@@ -27,11 +25,6 @@ public interface PluginCallback extends ConnectionHandler {
 	 */
 	TransportProperties getLocalProperties();
 
-	/**
-	 * Returns the plugin's remote transport properties.
-	 */
-	Collection<TransportProperties> getRemoteProperties();
-
 	/**
 	 * Merges the given settings with the plugin's settings
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java

@@ -8,7 +8,6 @@ import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
 import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
-import org.briarproject.bramble.api.system.Wakeful;
 
 import javax.annotation.Nullable;
 
@@ -22,7 +21,6 @@ public interface DuplexPlugin extends Plugin {
 	 * Attempts to create and return a connection using the given transport
 	 * properties. Returns null if a connection cannot be created.
 	 */
-	@Wakeful
 	@Nullable
 	DuplexTransportConnection createConnection(TransportProperties p);
 

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/BluetoothEnabledEvent.java

@@ -0,0 +1,15 @@
+package org.briarproject.bramble.api.plugin.event;
+
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An event that informs the Bluetooth plugin that we have enabled the
+ * Bluetooth adapter.
+ */
+@Immutable
+@NotNullByDefault
+public class BluetoothEnabledEvent extends Event {
+}

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java

@@ -0,0 +1,15 @@
+package org.briarproject.bramble.api.plugin.event;
+
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An event that asks the Bluetooth plugin to disable the Bluetooth adapter if
+ * we previously enabled it.
+ */
+@Immutable
+@NotNullByDefault
+public class DisableBluetoothEvent extends Event {
+}

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/EnableBluetoothEvent.java

@@ -0,0 +1,14 @@
+package org.briarproject.bramble.api.plugin.event;
+
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An event that asks the Bluetooth plugin to enable the Bluetooth adapter.
+ */
+@Immutable
+@NotNullByDefault
+public class EnableBluetoothEvent extends Event {
+}

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPlugin.java

@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.TransportConnectionReader;
 import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
 import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.system.Wakeful;
 
 import javax.annotation.Nullable;
 
@@ -19,7 +18,6 @@ public interface SimplexPlugin extends Plugin {
 	 * Attempts to create and return a reader for the given transport
 	 * properties. Returns null if a reader cannot be created.
 	 */
-	@Wakeful
 	@Nullable
 	TransportConnectionReader createReader(TransportProperties p);
 
@@ -27,7 +25,6 @@ public interface SimplexPlugin extends Plugin {
 	 * Attempts to create and return a writer for the given transport
 	 * properties. Returns null if a writer cannot be created.
 	 */
-	@Wakeful
 	@Nullable
 	TransportConnectionWriter createWriter(TransportProperties p);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyConstants.java

@@ -12,11 +12,6 @@ public interface TransportPropertyConstants {
 	 */
 	int MAX_PROPERTY_LENGTH = 100;
 
-	/**
-	 * Prefix for keys that represent reflected properties.
-	 */
-	String REFLECTED_PROPERTY_PREFIX = "u:";
-
 	/**
 	 * Message metadata key for the transport ID of a local or remote update,
 	 * as a BDF string.

bramble-api/src/main/java/org/briarproject/bramble/api/properties/event/RemoteTransportPropertiesUpdatedEvent.java

@@ -1,27 +0,0 @@
-package org.briarproject.bramble.api.properties.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.properties.TransportProperties;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when {@link TransportProperties} are received
- * from a contact.
- */
-@Immutable
-@NotNullByDefault
-public class RemoteTransportPropertiesUpdatedEvent extends Event {
-
-	private final TransportId transportId;
-
-	public RemoteTransportPropertiesUpdatedEvent(TransportId transportId) {
-		this.transportId = transportId;
-	}
-
-	public TransportId getTransportId() {
-		return transportId;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/system/Scheduler.java

@@ -1,6 +1,5 @@
-package org.briarproject.bramble.api.plugin;
+package org.briarproject.bramble.api.system;
 
-import java.io.File;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -12,11 +11,15 @@ import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * Annotation for injecting the {@link File directory} where the Tor plugin
+ * Annotation for injecting a scheduled executor service
- * should store its state.
+ * that can be used to schedule the execution of tasks.
+ * <p>
+ * The service should <b>only</b> be used for running tasks on other executors
+ * at scheduled times.
+ * No significant work should be run by the service itself!
  */
 @Qualifier
 @Target({FIELD, METHOD, PARAMETER})
 @Retention(RUNTIME)
-public @interface TorDirectory {
+public @interface Scheduler {
-}
+}

bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java

@@ -1,43 +0,0 @@
-package org.briarproject.bramble.api.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A service that can be used to schedule the execution of tasks.
- */
-@NotNullByDefault
-public interface TaskScheduler {
-
-	/**
-	 * Submits the given task to the given executor after the given delay.
-	 * <p>
-	 * If the platform supports wake locks, a wake lock will be held while
-	 * submitting and running the task.
-	 */
-	Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit);
-
-	/**
-	 * Submits the given task to the given executor after the given delay,
-	 * and then repeatedly with the given interval between executions
-	 * (measured from the end of one execution to the beginning of the next).
-	 * <p>
-	 * If the platform supports wake locks, a wake lock will be held while
-	 * submitting and running the task.
-	 */
-	Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit);
-
-	interface Cancellable {
-
-		/**
-		 * Cancels the task if it has not already started running. If the task
-		 * is {@link #scheduleWithFixedDelay(Runnable, Executor, long, long, TimeUnit) periodic},
-		 * all future executions of the task are cancelled.
-		 */
-		void cancel();
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/system/Wakeful.java

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.system;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Annotation for methods that must be called while holding a wake lock, if
- * the platform supports wake locks.
- */
-@Qualifier
-@Target(METHOD)
-@Retention(RUNTIME)
-public @interface Wakeful {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/system/WakefulIoExecutor.java

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.system;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Annotation for injecting the executor for long-running IO tasks that should
- * run without sleeping. Also used for annotating methods that should run on
- * this executor.
- * <p>
- * The contract of this executor is that tasks may be run concurrently, and
- * submitting a task will never block. Tasks must not run indefinitely. Tasks
- * submitted during shutdown are discarded.
- */
-@Qualifier
-@Target({FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-public @interface WakefulIoExecutor {
-}

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java

@@ -9,6 +9,7 @@ import org.briarproject.bramble.plugin.PluginModule;
 import org.briarproject.bramble.properties.PropertiesModule;
 import org.briarproject.bramble.rendezvous.RendezvousModule;
 import org.briarproject.bramble.sync.validation.ValidationModule;
+import org.briarproject.bramble.system.SystemModule;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 
@@ -30,6 +31,8 @@ public interface BrambleCoreEagerSingletons {
 
 	void inject(RendezvousModule.EagerSingletons init);
 
+	void inject(SystemModule.EagerSingletons init);
+
 	void inject(TransportModule.EagerSingletons init);
 
 	void inject(ValidationModule.EagerSingletons init);
@@ -47,6 +50,7 @@ public interface BrambleCoreEagerSingletons {
 			c.inject(new RendezvousModule.EagerSingletons());
 			c.inject(new PluginModule.EagerSingletons());
 			c.inject(new PropertiesModule.EagerSingletons());
+			c.inject(new SystemModule.EagerSingletons());
 			c.inject(new TransportModule.EagerSingletons());
 			c.inject(new ValidationModule.EagerSingletons());
 			c.inject(new VersioningModule.EagerSingletons());

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java

@@ -21,7 +21,7 @@ import org.briarproject.bramble.rendezvous.RendezvousModule;
 import org.briarproject.bramble.settings.SettingsModule;
 import org.briarproject.bramble.sync.SyncModule;
 import org.briarproject.bramble.sync.validation.ValidationModule;
-import org.briarproject.bramble.system.ClockModule;
+import org.briarproject.bramble.system.SystemModule;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 
@@ -29,7 +29,6 @@ import dagger.Module;
 
 @Module(includes = {
 		ClientModule.class,
-		ClockModule.class,
 		ConnectionModule.class,
 		ContactModule.class,
 		CryptoModule.class,
@@ -49,6 +48,7 @@ import dagger.Module;
 		RendezvousModule.class,
 		SettingsModule.class,
 		SyncModule.class,
+		SystemModule.class,
 		TransportModule.class,
 		ValidationModule.class,
 		VersioningModule.class

bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java

@@ -3,15 +3,15 @@ package org.briarproject.bramble.io;
 import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Scheduler;
-import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
-import org.briarproject.bramble.api.system.Wakeful;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.GuardedBy;
@@ -30,7 +30,7 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 
 	private static final long CHECK_INTERVAL_MS = SECONDS.toMillis(10);
 
-	private final TaskScheduler scheduler;
+	private final ScheduledExecutorService scheduler;
 	private final Executor ioExecutor;
 	private final Clock clock;
 	private final Object lock = new Object();
@@ -38,10 +38,10 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 	private final List<TimeoutInputStream> streams = new ArrayList<>();
 
 	@GuardedBy("lock")
-	private Cancellable cancellable = null;
+	private Future<?> task = null;
 
 	@Inject
-	TimeoutMonitorImpl(TaskScheduler scheduler,
+	TimeoutMonitorImpl(@Scheduler ScheduledExecutorService scheduler,
 			@IoExecutor Executor ioExecutor, Clock clock) {
 		this.scheduler = scheduler;
 		this.ioExecutor = ioExecutor;
@@ -55,9 +55,8 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 				timeoutMs, this::removeStream);
 		synchronized (lock) {
 			if (streams.isEmpty()) {
-				cancellable = scheduler.scheduleWithFixedDelay(
+				task = scheduler.scheduleWithFixedDelay(this::checkTimeouts,
-						this::checkTimeouts, ioExecutor, CHECK_INTERVAL_MS,
+						CHECK_INTERVAL_MS, CHECK_INTERVAL_MS, MILLISECONDS);
-						CHECK_INTERVAL_MS, MILLISECONDS);
 			}
 			streams.add(stream);
 		}
@@ -65,35 +64,33 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 	}
 
 	private void removeStream(TimeoutInputStream stream) {
-		Cancellable toCancel = null;
+		Future<?> toCancel = null;
 		synchronized (lock) {
 			if (streams.remove(stream) && streams.isEmpty()) {
-				toCancel = cancellable;
+				toCancel = task;
-				cancellable = null;
+				task = null;
 			}
 		}
-		if (toCancel != null) {
+		if (toCancel != null) toCancel.cancel(false);
-			LOG.info("Cancelling timeout monitor task");
-			toCancel.cancel();
-		}
 	}
 
-	@IoExecutor
+	@Scheduler
-	@Wakeful
 	private void checkTimeouts() {
-		List<TimeoutInputStream> snapshot;
+		ioExecutor.execute(() -> {
-		synchronized (lock) {
+			List<TimeoutInputStream> snapshot;
-			snapshot = new ArrayList<>(streams);
+			synchronized (lock) {
-		}
+				snapshot = new ArrayList<>(streams);
-		for (TimeoutInputStream stream : snapshot) {
+			}
-			if (stream.hasTimedOut()) {
+			for (TimeoutInputStream stream : snapshot) {
-				LOG.info("Input stream has timed out");
+				if (stream.hasTimedOut()) {
-				try {
+					LOG.info("Input stream has timed out");
-					stream.close();
+					try {
-				} catch (IOException e) {
+						stream.close();
-					logException(LOG, INFO, e);
+					} catch (IOException e) {
+						logException(LOG, INFO, e);
+					}
 				}
 			}
-		}
+		});
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.keyagreement;
 
-import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.crypto.KeyAgreementCrypto;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.data.BdfList;
@@ -9,8 +8,6 @@ import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 import org.briarproject.bramble.api.keyagreement.Payload;
 import org.briarproject.bramble.api.keyagreement.TransportDescriptor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.BluetoothConstants;
-import org.briarproject.bramble.api.plugin.LanTcpConstants;
 import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.PluginManager;
 import org.briarproject.bramble.api.plugin.TransportId;
@@ -22,9 +19,7 @@ import org.briarproject.bramble.api.record.RecordWriterFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
@@ -33,10 +28,8 @@ import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 
-import static java.util.Arrays.asList;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.CONNECTION_TIMEOUT;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
@@ -48,10 +41,7 @@ class KeyAgreementConnector {
 	}
 
 	private static final Logger LOG =
-			getLogger(KeyAgreementConnector.class.getName());
+			Logger.getLogger(KeyAgreementConnector.class.getName());
-
-	private static final List<TransportId> PREFERRED_TRANSPORTS =
-			asList(BluetoothConstants.ID, LanTcpConstants.ID);
 
 	private final Callbacks callbacks;
 	private final KeyAgreementCrypto keyAgreementCrypto;
@@ -115,35 +105,24 @@ class KeyAgreementConnector {
 		this.alice = alice;
 		aliceLatch.countDown();
 
-		// Start connecting over supported transports in order of preference
+		// Start connecting over supported transports
 		if (LOG.isLoggable(INFO)) {
 			LOG.info("Starting outgoing BQP connections as "
 					+ (alice ? "Alice" : "Bob"));
 		}
-		Map<TransportId, TransportDescriptor> descriptors = new HashMap<>();
 		for (TransportDescriptor d : remotePayload.getTransportDescriptors()) {
-			descriptors.put(d.getId(), d);
+			Plugin p = pluginManager.getPlugin(d.getId());
-		}
+			if (p instanceof DuplexPlugin) {
-		List<Pair<DuplexPlugin, BdfList>> transports = new ArrayList<>();
-		for (TransportId id : PREFERRED_TRANSPORTS) {
-			TransportDescriptor d = descriptors.get(id);
-			Plugin p = pluginManager.getPlugin(id);
-			if (d != null && p instanceof DuplexPlugin) {
 				if (LOG.isLoggable(INFO))
-					LOG.info("Connecting via " + id);
+					LOG.info("Connecting via " + d.getId());
-				transports.add(new Pair<>((DuplexPlugin) p, d.getDescriptor()));
+				DuplexPlugin plugin = (DuplexPlugin) p;
+				byte[] commitment = remotePayload.getCommitment();
+				BdfList descriptor = d.getDescriptor();
+				connectionChooser.submit(new ReadableTask(
+						new ConnectorTask(plugin, commitment, descriptor)));
 			}
 		}
 
-		// TODO: If we don't have any transports in common with the peer,
-		//  warn the user and give up (#1224)
-
-		if (!transports.isEmpty()) {
-			byte[] commitment = remotePayload.getCommitment();
-			connectionChooser.submit(new ReadableTask(new ConnectorTask(
-					transports, commitment)));
-		}
-
 		// Get chosen connection
 		try {
 			KeyAgreementConnection chosen =
@@ -169,13 +148,15 @@ class KeyAgreementConnector {
 
 	private class ConnectorTask implements Callable<KeyAgreementConnection> {
 
-		private final List<Pair<DuplexPlugin, BdfList>> transports;
 		private final byte[] commitment;
+		private final BdfList descriptor;
+		private final DuplexPlugin plugin;
 
-		private ConnectorTask(List<Pair<DuplexPlugin, BdfList>> transports,
+		private ConnectorTask(DuplexPlugin plugin, byte[] commitment,
-				byte[] commitment) {
+				BdfList descriptor) {
-			this.transports = transports;
+			this.plugin = plugin;
 			this.commitment = commitment;
+			this.descriptor = descriptor;
 		}
 
 		@Nullable
@@ -183,18 +164,13 @@ class KeyAgreementConnector {
 		public KeyAgreementConnection call() throws Exception {
 			// Repeat attempts until we connect, get stopped, or get interrupted
 			while (!stopped) {
-				for (Pair<DuplexPlugin, BdfList> pair : transports) {
+				DuplexTransportConnection conn =
-					if (stopped) return null;
+						plugin.createKeyAgreementConnection(commitment,
-					DuplexPlugin plugin = pair.getFirst();
+								descriptor);
-					BdfList descriptor = pair.getSecond();
+				if (conn != null) {
-					DuplexTransportConnection conn =
+					if (LOG.isLoggable(INFO))
-							plugin.createKeyAgreementConnection(commitment,
+						LOG.info(plugin.getId() + ": Outgoing connection");
-									descriptor);
+					return new KeyAgreementConnection(conn, plugin.getId());
-					if (conn != null) {
-						if (LOG.isLoggable(INFO))
-							LOG.info(plugin.getId() + ": Outgoing connection");
-						return new KeyAgreementConnection(conn, plugin.getId());
-					}
 				}
 				// Wait 2s before retry (to circumvent transient failures)
 				Thread.sleep(2000);

bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffFactoryImpl.java

@@ -1,18 +0,0 @@
-package org.briarproject.bramble.plugin;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-class BackoffFactoryImpl implements BackoffFactory {
-
-	@Override
-	public Backoff createBackoff(int minInterval, int maxInterval,
-			double base) {
-		return new BackoffImpl(minInterval, maxInterval, base);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/plugin/BackoffImpl.java

@@ -1,42 +0,0 @@
-package org.briarproject.bramble.plugin;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-class BackoffImpl implements Backoff {
-
-	private final int minInterval, maxInterval;
-	private final double base;
-	private final AtomicInteger backoff;
-
-	BackoffImpl(int minInterval, int maxInterval, double base) {
-		this.minInterval = minInterval;
-		this.maxInterval = maxInterval;
-		this.base = base;
-		backoff = new AtomicInteger(0);
-	}
-
-	@Override
-	public int getPollingInterval() {
-		double multiplier = Math.pow(base, backoff.get());
-		// Large or infinite values will be rounded to Integer.MAX_VALUE
-		int interval = (int) (minInterval * multiplier);
-		return Math.min(interval, maxInterval);
-	}
-
-	@Override
-	public void increment() {
-		backoff.incrementAndGet();
-	}
-
-	@Override
-	public void reset() {
-		backoff.set(0);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.plugin;
 
 import org.briarproject.bramble.api.connection.ConnectionManager;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
@@ -29,7 +28,6 @@ import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.SettingsManager;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,14 +44,12 @@ import java.util.logging.Logger;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
-import static java.util.Collections.emptyList;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.plugin.Plugin.PREF_PLUGIN_ENABLE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
-import static org.briarproject.bramble.api.plugin.Plugin.State.DISABLED;
 import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
@@ -66,7 +62,7 @@ class PluginManagerImpl implements PluginManager, Service {
 	private static final Logger LOG =
 			getLogger(PluginManagerImpl.class.getName());
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
 	private final EventBus eventBus;
 	private final PluginConfig pluginConfig;
 	private final ConnectionManager connectionManager;
@@ -79,15 +75,11 @@ class PluginManagerImpl implements PluginManager, Service {
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
 	@Inject
-	PluginManagerImpl(@IoExecutor Executor ioExecutor,
+	PluginManagerImpl(@IoExecutor Executor ioExecutor, EventBus eventBus,
-			@WakefulIoExecutor Executor wakefulIoExecutor,
+			PluginConfig pluginConfig, ConnectionManager connectionManager,
-			EventBus eventBus,
-			PluginConfig pluginConfig,
-			ConnectionManager connectionManager,
 			SettingsManager settingsManager,
 			TransportPropertyManager transportPropertyManager) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.eventBus = eventBus;
 		this.pluginConfig = pluginConfig;
 		this.connectionManager = connectionManager;
@@ -115,7 +107,7 @@ class PluginManagerImpl implements PluginManager, Service {
 				simplexPlugins.add(s);
 				CountDownLatch startLatch = new CountDownLatch(1);
 				startLatches.put(t, startLatch);
-				wakefulIoExecutor.execute(new PluginStarter(s, startLatch));
+				ioExecutor.execute(new PluginStarter(s, startLatch));
 			}
 		}
 		// Instantiate the duplex plugins and start them asynchronously
@@ -131,7 +123,7 @@ class PluginManagerImpl implements PluginManager, Service {
 				duplexPlugins.add(d);
 				CountDownLatch startLatch = new CountDownLatch(1);
 				startLatches.put(t, startLatch);
-				wakefulIoExecutor.execute(new PluginStarter(d, startLatch));
+				ioExecutor.execute(new PluginStarter(d, startLatch));
 			}
 		}
 	}
@@ -143,16 +135,12 @@ class PluginManagerImpl implements PluginManager, Service {
 		LOG.info("Stopping simplex plugins");
 		for (SimplexPlugin s : simplexPlugins) {
 			CountDownLatch startLatch = startLatches.get(s.getId());
-			// Don't need the wakeful executor here as we wait for the plugin
-			// to stop before returning
 			ioExecutor.execute(new PluginStopper(s, startLatch, stopLatch));
 		}
 		// Stop the duplex plugins
 		LOG.info("Stopping duplex plugins");
 		for (DuplexPlugin d : duplexPlugins) {
 			CountDownLatch startLatch = startLatches.get(d.getId());
-			// Don't need the wakeful executor here as we wait for the plugin
-			// to stop before returning
 			ioExecutor.execute(new PluginStopper(d, startLatch, stopLatch));
 		}
 		// Wait for all the plugins to stop
@@ -215,7 +203,7 @@ class PluginManagerImpl implements PluginManager, Service {
 		}
 	}
 
-	private static class PluginStarter implements Runnable {
+	private class PluginStarter implements Runnable {
 
 		private final Plugin plugin;
 		private final CountDownLatch startLatch;
@@ -245,7 +233,7 @@ class PluginManagerImpl implements PluginManager, Service {
 		}
 	}
 
-	private static class PluginStopper implements Runnable {
+	private class PluginStopper implements Runnable {
 
 		private final Plugin plugin;
 		private final CountDownLatch startLatch, stopLatch;
@@ -315,18 +303,6 @@ class PluginManagerImpl implements PluginManager, Service {
 			}
 		}
 
-		@Override
-		public Collection<TransportProperties> getRemoteProperties() {
-			try {
-				Map<ContactId, TransportProperties> remote =
-						transportPropertyManager.getRemoteProperties(id);
-				return remote.values();
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				return emptyList();
-			}
-		}
-
 		@Override
 		public void mergeSettings(Settings s) {
 			PluginManagerImpl.this.mergeSettings(s, id.getString());
@@ -355,10 +331,6 @@ class PluginManagerImpl implements PluginManager, Service {
 				} else if (oldState == ACTIVE) {
 					eventBus.broadcast(new TransportInactiveEvent(id));
 				}
-			} else if (newState == DISABLED) {
-				// Broadcast an event even though the state hasn't changed, as
-				// the reasons for the plugin being disabled may have changed
-				eventBus.broadcast(new TransportStateEvent(id, newState));
 			}
 		}
 

bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginModule.java

@@ -2,7 +2,6 @@ package org.briarproject.bramble.plugin;
 
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginConfig;
 import org.briarproject.bramble.api.plugin.PluginManager;
 
@@ -22,11 +21,6 @@ public class PluginModule {
 		Poller poller;
 	}
 
-	@Provides
-	BackoffFactory provideBackoffFactory() {
-		return new BackoffFactoryImpl();
-	}
-
 	@Provides
 	@Singleton
 	PluginManager providePluginManager(LifecycleManager lifecycleManager,

bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java

@@ -19,17 +19,13 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent;
-import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent;
 import org.briarproject.bramble.api.plugin.event.TransportActiveEvent;
 import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Scheduler;
-import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
-import org.briarproject.bramble.api.system.Wakeful;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -38,6 +34,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
@@ -58,8 +56,8 @@ class PollerImpl implements Poller, EventListener {
 
 	private static final Logger LOG = getLogger(PollerImpl.class.getName());
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
-	private final TaskScheduler scheduler;
+	private final ScheduledExecutorService scheduler;
 	private final ConnectionManager connectionManager;
 	private final ConnectionRegistry connectionRegistry;
 	private final PluginManager pluginManager;
@@ -72,16 +70,12 @@ class PollerImpl implements Poller, EventListener {
 
 	@Inject
 	PollerImpl(@IoExecutor Executor ioExecutor,
-			@WakefulIoExecutor Executor wakefulIoExecutor,
+			@Scheduler ScheduledExecutorService scheduler,
-			TaskScheduler scheduler,
 			ConnectionManager connectionManager,
-			ConnectionRegistry connectionRegistry,
+			ConnectionRegistry connectionRegistry, PluginManager pluginManager,
-			PluginManager pluginManager,
 			TransportPropertyManager transportPropertyManager,
-			SecureRandom random,
+			SecureRandom random, Clock clock) {
-			Clock clock) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.scheduler = scheduler;
 		this.connectionManager = connectionManager;
 		this.connectionRegistry = connectionRegistry;
@@ -101,16 +95,10 @@ class PollerImpl implements Poller, EventListener {
 			connectToContact(c.getContactId());
 		} else if (e instanceof ConnectionClosedEvent) {
 			ConnectionClosedEvent c = (ConnectionClosedEvent) e;
-			// Reschedule polling, the polling interval may have decreased
-			reschedule(c.getTransportId());
 			// If an outgoing connection failed, try to reconnect
 			if (!c.isIncoming() && c.isException()) {
 				connectToContact(c.getContactId(), c.getTransportId());
 			}
-		} else if (e instanceof ConnectionOpenedEvent) {
-			ConnectionOpenedEvent c = (ConnectionOpenedEvent) e;
-			// Reschedule polling, the polling interval may have decreased
-			reschedule(c.getTransportId());
 		} else if (e instanceof TransportActiveEvent) {
 			TransportActiveEvent t = (TransportActiveEvent) e;
 			// Poll the newly activated transport
@@ -138,7 +126,7 @@ class PollerImpl implements Poller, EventListener {
 	}
 
 	private void connectToContact(ContactId c, SimplexPlugin p) {
-		wakefulIoExecutor.execute(() -> {
+		ioExecutor.execute(() -> {
 			TransportId t = p.getId();
 			if (connectionRegistry.isConnected(c, t)) return;
 			try {
@@ -154,7 +142,7 @@ class PollerImpl implements Poller, EventListener {
 	}
 
 	private void connectToContact(ContactId c, DuplexPlugin p) {
-		wakefulIoExecutor.execute(() -> {
+		ioExecutor.execute(() -> {
 			TransportId t = p.getId();
 			if (connectionRegistry.isConnected(c, t)) return;
 			try {
@@ -169,12 +157,6 @@ class PollerImpl implements Poller, EventListener {
 		});
 	}
 
-	private void reschedule(TransportId t) {
-		Plugin p = pluginManager.getPlugin(t);
-		if (p != null && p.shouldPoll())
-			schedule(p, p.getPollingInterval(), false);
-	}
-
 	private void pollNow(TransportId t) {
 		Plugin p = pluginManager.getPlugin(t);
 		// Randomise next polling interval
@@ -191,11 +173,11 @@ class PollerImpl implements Poller, EventListener {
 			if (scheduled == null || due < scheduled.task.due) {
 				// If a later task exists, cancel it. If it's already started
 				// it will abort safely when it finds it's been replaced
-				if (scheduled != null) scheduled.cancellable.cancel();
+				if (scheduled != null) scheduled.future.cancel(false);
 				PollTask task = new PollTask(p, due, randomiseNext);
-				Cancellable cancellable = scheduler.schedule(task, ioExecutor,
+				Future future = scheduler.schedule(() ->
-						delay, MILLISECONDS);
+						ioExecutor.execute(task), delay, MILLISECONDS);
-				tasks.put(t, new ScheduledPollTask(task, cancellable));
+				tasks.put(t, new ScheduledPollTask(task, future));
 			}
 		} finally {
 			lock.unlock();
@@ -206,7 +188,7 @@ class PollerImpl implements Poller, EventListener {
 		lock.lock();
 		try {
 			ScheduledPollTask scheduled = tasks.remove(t);
-			if (scheduled != null) scheduled.cancellable.cancel();
+			if (scheduled != null) scheduled.future.cancel(false);
 		} finally {
 			lock.unlock();
 		}
@@ -237,11 +219,11 @@ class PollerImpl implements Poller, EventListener {
 	private class ScheduledPollTask {
 
 		private final PollTask task;
-		private final Cancellable cancellable;
+		private final Future future;
 
-		private ScheduledPollTask(PollTask task, Cancellable cancellable) {
+		private ScheduledPollTask(PollTask task, Future future) {
 			this.task = task;
-			this.cancellable = cancellable;
+			this.future = future;
 		}
 	}
 
@@ -259,7 +241,6 @@ class PollerImpl implements Poller, EventListener {
 
 		@Override
 		@IoExecutor
-		@Wakeful
 		public void run() {
 			lock.lock();
 			try {

bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionFactory.java

@@ -1,14 +0,0 @@
-package org.briarproject.bramble.plugin.bluetooth;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-
-import java.io.IOException;
-
-@NotNullByDefault
-interface BluetoothConnectionFactory<S> {
-
-	DuplexTransportConnection wrapSocket(DuplexPlugin plugin, S socket)
-			throws IOException;
-}

bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java

@@ -1,11 +1,11 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.Multiset;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent;
@@ -14,15 +14,16 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.ConnectionHandler;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+import org.briarproject.bramble.api.plugin.event.BluetoothEnabledEvent;
+import org.briarproject.bramble.api.plugin.event.DisableBluetoothEvent;
+import org.briarproject.bramble.api.plugin.event.EnableBluetoothEvent;
 import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.properties.event.RemoteTransportPropertiesUpdatedEvent;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
 import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
 import org.briarproject.bramble.api.settings.Settings;
@@ -44,12 +45,8 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.TRANSPORT_ID_BLUETOOTH;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_ADDRESS_IS_REFLECTED;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_EVER_CONNECTED;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_PLUGIN_ENABLE;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_ADDRESS_IS_REFLECTED;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_EVER_CONNECTED;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_ADDRESS;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
@@ -57,7 +54,6 @@ import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.DISABLED;
 import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
-import static org.briarproject.bramble.api.properties.TransportPropertyConstants.REFLECTED_PROPERTY_PREFIX;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
@@ -66,21 +62,19 @@ import static org.briarproject.bramble.util.StringUtils.macToString;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
+abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 
 	private static final Logger LOG =
 			getLogger(BluetoothPlugin.class.getName());
 
 	final BluetoothConnectionLimiter connectionLimiter;
-	final BluetoothConnectionFactory<S> connectionFactory;
+	final TimeoutMonitor timeoutMonitor;
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
 	private final SecureRandom secureRandom;
-	private final Backoff backoff;
 	private final PluginCallback callback;
-	private final int maxLatency, maxIdleTime;
+	private final int maxLatency, maxIdleTime, pollingInterval;
 	private final AtomicBoolean used = new AtomicBoolean(false);
-	private final AtomicBoolean everConnected = new AtomicBoolean(false);
 
 	protected final PluginState state = new PluginState();
 
@@ -90,6 +84,12 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 
 	abstract boolean isAdapterEnabled();
 
+	abstract void enableAdapter();
+
+	abstract void disableAdapterIfEnabledByUs();
+
+	abstract void setEnabledByUs();
+
 	/**
 	 * Returns the local Bluetooth address, or null if no valid address can
 	 * be found.
@@ -113,23 +113,17 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 	abstract DuplexTransportConnection discoverAndConnect(String uuid);
 
 	BluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
-			BluetoothConnectionFactory<S> connectionFactory,
+			TimeoutMonitor timeoutMonitor, Executor ioExecutor,
-			Executor ioExecutor,
+			SecureRandom secureRandom, PluginCallback callback, int maxLatency, int maxIdleTime,
-			Executor wakefulIoExecutor,
+			int pollingInterval) {
-			SecureRandom secureRandom,
-			Backoff backoff,
-			PluginCallback callback,
-			int maxLatency,
-			int maxIdleTime) {
 		this.connectionLimiter = connectionLimiter;
-		this.connectionFactory = connectionFactory;
+		this.timeoutMonitor = timeoutMonitor;
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.secureRandom = secureRandom;
-		this.backoff = backoff;
 		this.callback = callback;
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
+		this.pollingInterval = pollingInterval;
 	}
 
 	void onAdapterEnabled() {
@@ -171,8 +165,6 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 		Settings settings = callback.getSettings();
 		boolean enabledByUser = settings.getBoolean(PREF_PLUGIN_ENABLE,
 				DEFAULT_PREF_PLUGIN_ENABLE);
-		everConnected.set(settings.getBoolean(PREF_EVER_CONNECTED,
-				DEFAULT_PREF_EVER_CONNECTED));
 		state.setStarted(enabledByUser);
 		try {
 			initialiseAdapter();
@@ -180,7 +172,10 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 			throw new PluginException(e);
 		}
 		updateProperties();
-		if (enabledByUser && isAdapterEnabled()) bind();
+		if (enabledByUser) {
+			if (isAdapterEnabled()) bind();
+			else enableAdapter();
+		}
 	}
 
 	private void bind() {
@@ -199,7 +194,6 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 				tryToClose(ss);
 				return;
 			}
-			backoff.reset();
 			acceptContactConnections(ss);
 		});
 	}
@@ -208,68 +202,25 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 		TransportProperties p = callback.getLocalProperties();
 		String address = p.get(PROP_ADDRESS);
 		String uuid = p.get(PROP_UUID);
-		Settings s = callback.getSettings();
-		boolean isReflected = s.getBoolean(PREF_ADDRESS_IS_REFLECTED,
-				DEFAULT_PREF_ADDRESS_IS_REFLECTED);
 		boolean changed = false;
-		if (address == null || isReflected) {
+		if (address == null) {
 			address = getBluetoothAddress();
-			if (LOG.isLoggable(INFO)) {
+			if (LOG.isLoggable(INFO))
 				LOG.info("Local address " + scrubMacAddress(address));
-			}
+			if (!isNullOrEmpty(address)) {
-			if (address == null) {
+				p.put(PROP_ADDRESS, address);
-				if (everConnected.get()) {
-					address = getReflectedAddress();
-					if (LOG.isLoggable(INFO)) {
-						LOG.info("Reflected address " +
-								scrubMacAddress(address));
-					}
-					if (address != null) {
-						changed = true;
-						isReflected = true;
-					}
-				}
-			} else {
 				changed = true;
-				isReflected = false;
 			}
 		}
 		if (uuid == null) {
 			byte[] random = new byte[UUID_BYTES];
 			secureRandom.nextBytes(random);
 			uuid = UUID.nameUUIDFromBytes(random).toString();
+			p.put(PROP_UUID, uuid);
 			changed = true;
 		}
 		contactConnectionsUuid = uuid;
-		if (changed) {
+		if (changed) callback.mergeLocalProperties(p);
-			p = new TransportProperties();
-			// If we previously used a reflected address and there's no longer
-			// a reflected address with enough votes to be used, we'll continue
-			// to use the old reflected address until there's a new winner
-			if (address != null) p.put(PROP_ADDRESS, address);
-			p.put(PROP_UUID, uuid);
-			callback.mergeLocalProperties(p);
-			s = new Settings();
-			s.putBoolean(PREF_ADDRESS_IS_REFLECTED, isReflected);
-			callback.mergeSettings(s);
-		}
-	}
-
-	@Nullable
-	private String getReflectedAddress() {
-		// Count the number of votes for each reflected address
-		String key = REFLECTED_PROPERTY_PREFIX + PROP_ADDRESS;
-		Multiset<String> votes = new Multiset<>();
-		for (TransportProperties p : callback.getRemoteProperties()) {
-			String address = p.get(key);
-			if (address != null && isValidAddress(address)) votes.add(address);
-		}
-		// If an address gets more than half of the votes, accept it
-		int total = votes.getTotal();
-		for (String address : votes.keySet()) {
-			if (votes.getCount(address) * 2 > total) return address;
-		}
-		return null;
 	}
 
 	private void acceptContactConnections(SS ss) {
@@ -285,28 +236,15 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 			}
 			LOG.info("Connection received");
 			connectionLimiter.connectionOpened(conn);
-			backoff.reset();
-			setEverConnected();
 			callback.handleConnection(conn);
 		}
 	}
 
-	private void setEverConnected() {
-		if (!everConnected.getAndSet(true)) {
-			ioExecutor.execute(() -> {
-				Settings s = new Settings();
-				s.putBoolean(PREF_EVER_CONNECTED, true);
-				callback.mergeSettings(s);
-				// Contacts may already have sent a reflected address
-				updateProperties();
-			});
-		}
-	}
-
 	@Override
 	public void stop() {
 		SS ss = state.setStopped();
 		tryToClose(ss);
+		disableAdapterIfEnabledByUs();
 	}
 
 	@Override
@@ -326,14 +264,13 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 
 	@Override
 	public int getPollingInterval() {
-		return backoff.getPollingInterval();
+		return pollingInterval;
 	}
 
 	@Override
 	public void poll(Collection<Pair<TransportProperties, ConnectionHandler>>
 			properties) {
 		if (getState() != ACTIVE) return;
-		backoff.increment();
 		for (Pair<TransportProperties, ConnectionHandler> p : properties) {
 			connect(p.getFirst(), p.getSecond());
 		}
@@ -344,13 +281,9 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 		if (isNullOrEmpty(address)) return;
 		String uuid = p.get(PROP_UUID);
 		if (isNullOrEmpty(uuid)) return;
-		wakefulIoExecutor.execute(() -> {
+		ioExecutor.execute(() -> {
 			DuplexTransportConnection d = createConnection(p);
-			if (d != null) {
+			if (d != null) h.handleConnection(d);
-				backoff.reset();
-				setEverConnected();
-				h.handleConnection(d);
-			}
 		});
 	}
 
@@ -436,10 +369,8 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
 		DuplexTransportConnection conn;
 		if (descriptor.size() == 1) {
-			if (LOG.isLoggable(INFO)) {
+			if (LOG.isLoggable(INFO))
-				LOG.info("Discovering address for key agreement UUID " +
+				LOG.info("Discovering address for key agreement UUID " + uuid);
-						uuid);
-			}
 			conn = discoverAndConnect(uuid);
 		} else {
 			String address;
@@ -453,10 +384,7 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 				LOG.info("Connecting to key agreement UUID " + uuid);
 			conn = connect(address, uuid);
 		}
-		if (conn != null) {
+		if (conn != null) connectionLimiter.connectionOpened(conn);
-			connectionLimiter.connectionOpened(conn);
-			setEverConnected();
-		}
 		return conn;
 	}
 
@@ -479,7 +407,13 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 
 	@Override
 	public void eventOccurred(Event e) {
-		if (e instanceof SettingsUpdatedEvent) {
+		if (e instanceof EnableBluetoothEvent) {
+			ioExecutor.execute(this::enableAdapter);
+		} else if (e instanceof DisableBluetoothEvent) {
+			ioExecutor.execute(this::disableAdapterIfEnabledByUs);
+		} else if (e instanceof BluetoothEnabledEvent) {
+			setEnabledByUs();
+		} else if (e instanceof SettingsUpdatedEvent) {
 			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
 			if (s.getNamespace().equals(ID.getString()))
 				ioExecutor.execute(() -> onSettingsUpdated(s.getSettings()));
@@ -487,12 +421,6 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 			ioExecutor.execute(connectionLimiter::keyAgreementStarted);
 		} else if (e instanceof KeyAgreementStoppedListeningEvent) {
 			ioExecutor.execute(connectionLimiter::keyAgreementEnded);
-		} else if (e instanceof RemoteTransportPropertiesUpdatedEvent) {
-			RemoteTransportPropertiesUpdatedEvent r =
-					(RemoteTransportPropertiesUpdatedEvent) e;
-			if (r.getTransportId().equals(ID)) {
-				ioExecutor.execute(this::updateProperties);
-			}
 		}
 	}
 
@@ -505,13 +433,11 @@ abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 		if (ss != null) {
 			LOG.info("Disabled by user, closing server socket");
 			tryToClose(ss);
+			disableAdapterIfEnabledByUs();
 		} else if (s == INACTIVE) {
-			if (isAdapterEnabled()) {
+			LOG.info("Enabled by user, opening server socket");
-				LOG.info("Enabled by user, opening server socket");
+			if (isAdapterEnabled()) bind();
-				bind();
+			else enableAdapter();
-			} else {
-				LOG.info("Enabled by user but adapter is disabled");
-			}
 		}
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java

@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
@@ -88,15 +87,10 @@ class LanTcpPlugin extends TcpPlugin {
 		}
 	}
 
-	LanTcpPlugin(Executor ioExecutor,
+	LanTcpPlugin(Executor ioExecutor, PluginCallback callback, int maxLatency,
-			Executor wakefulIoExecutor,
+			int maxIdleTime, int pollingInterval, int connectionTimeout) {
-			Backoff backoff,
+		super(ioExecutor, callback, maxLatency, maxIdleTime, pollingInterval,
-			PluginCallback callback,
+				connectionTimeout);
-			int maxLatency,
-			int maxIdleTime,
-			int connectionTimeout) {
-		super(ioExecutor, wakefulIoExecutor, backoff, callback, maxLatency,
-				maxIdleTime, connectionTimeout);
 	}
 
 	@Override
@@ -354,7 +348,7 @@ class LanTcpPlugin extends TcpPlugin {
 				tryToClose(ss, LOG, WARNING);
 			}
 		}
-		if (ss == null || !ss.isBound()) {
+		if (ss == null) {
 			LOG.info("Could not bind server socket for key agreement");
 			return null;
 		}

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginFactory.java

@@ -1,47 +1,35 @@
 package org.briarproject.bramble.plugin.tcp;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
 
 import java.util.concurrent.Executor;
 
 import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
 
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 
 @Immutable
 @NotNullByDefault
 public class LanTcpPluginFactory implements DuplexPluginFactory {
 
-	private static final int MAX_LATENCY = 30_000; // 30 seconds
+	private static final int MAX_LATENCY = (int) SECONDS.toMillis(30);
-	private static final int MAX_IDLE_TIME = 30_000; // 30 seconds
+	private static final int MAX_IDLE_TIME = (int) SECONDS.toMillis(30);
-	private static final int CONNECTION_TIMEOUT = 3_000; // 3 seconds
+	private static final int POLLING_INTERVAL = (int) MINUTES.toMillis(1);
-	private static final int MIN_POLLING_INTERVAL = 60_000; // 1 minute
+	private static final int CONNECTION_TIMEOUT = (int) SECONDS.toMillis(3);
-	private static final int MAX_POLLING_INTERVAL = 600_000; // 10 mins
-	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
 	private final EventBus eventBus;
-	private final BackoffFactory backoffFactory;
 
-	@Inject
+	public LanTcpPluginFactory(Executor ioExecutor, EventBus eventBus) {
-	public LanTcpPluginFactory(@IoExecutor Executor ioExecutor,
-			@WakefulIoExecutor Executor wakefulIoExecutor,
-			EventBus eventBus,
-			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.eventBus = eventBus;
-		this.backoffFactory = backoffFactory;
 	}
 
 	@Override
@@ -56,10 +44,8 @@ public class LanTcpPluginFactory implements DuplexPluginFactory {
 
 	@Override
 	public DuplexPlugin createPlugin(PluginCallback callback) {
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
+		LanTcpPlugin plugin = new LanTcpPlugin(ioExecutor, callback,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
+				MAX_LATENCY, MAX_IDLE_TIME, POLLING_INTERVAL,
-		LanTcpPlugin plugin = new LanTcpPlugin(ioExecutor, wakefulIoExecutor,
-				backoff, callback, MAX_LATENCY, MAX_IDLE_TIME,
 				CONNECTION_TIMEOUT);
 		eventBus.addListener(plugin);
 		return plugin;

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java

@@ -10,7 +10,6 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.ConnectionHandler;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
@@ -66,10 +65,9 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 	private static final Pattern DOTTED_QUAD =
 			Pattern.compile("^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$");
 
-	protected final Executor ioExecutor, wakefulIoExecutor, bindExecutor;
+	protected final Executor ioExecutor, bindExecutor;
-	protected final Backoff backoff;
 	protected final PluginCallback callback;
-	protected final int maxLatency, maxIdleTime;
+	protected final int maxLatency, maxIdleTime, pollingInterval;
 	protected final int connectionTimeout, socketTimeout;
 	protected final AtomicBoolean used = new AtomicBoolean(false);
 	protected final PluginState state = new PluginState();
@@ -107,19 +105,13 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 	 */
 	protected abstract boolean isEnabledByDefault();
 
-	TcpPlugin(Executor ioExecutor,
+	TcpPlugin(Executor ioExecutor, PluginCallback callback, int maxLatency,
-			Executor wakefulIoExecutor,
+			int maxIdleTime, int pollingInterval, int connectionTimeout) {
-			Backoff backoff,
-			PluginCallback callback,
-			int maxLatency,
-			int maxIdleTime,
-			int connectionTimeout) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
-		this.backoff = backoff;
 		this.callback = callback;
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
+		this.pollingInterval = pollingInterval;
 		this.connectionTimeout = connectionTimeout;
 		if (maxIdleTime > Integer.MAX_VALUE / 2)
 			socketTimeout = Integer.MAX_VALUE;
@@ -149,21 +141,15 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 
 	protected void bind() {
 		bindExecutor.execute(() -> {
-			State s = getState();
+			if (getState() != INACTIVE) return;
-			if (s != ACTIVE && s != INACTIVE) return;
 			bind(true);
 			bind(false);
 		});
 	}
 
 	private void bind(boolean ipv4) {
-		ServerSocket old = state.getServerSocket(ipv4);
 		ServerSocket ss = null;
 		for (InetSocketAddress addr : getLocalSocketAddresses(ipv4)) {
-			if (old != null && addr.equals(old.getLocalSocketAddress())) {
-				LOG.info("Server socket already bound");
-				return;
-			}
 			try {
 				ss = new ServerSocket();
 				ss.bind(addr);
@@ -174,7 +160,7 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 				tryToClose(ss, LOG, WARNING);
 			}
 		}
-		if (ss == null || !ss.isBound()) {
+		if (ss == null) {
 			LOG.info("Could not bind server socket");
 			return;
 		}
@@ -183,7 +169,6 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 			tryToClose(ss, LOG, WARNING);
 			return;
 		}
-		backoff.reset();
 		InetSocketAddress local =
 				(InetSocketAddress) ss.getLocalSocketAddress();
 		setLocalSocketAddress(local, ipv4);
@@ -216,7 +201,6 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 				LOG.info("Connection from " +
 						scrubSocketAddress(s.getRemoteSocketAddress()));
 			}
-			backoff.reset();
 			callback.handleConnection(new TcpTransportConnection(this, s));
 		}
 	}
@@ -243,26 +227,22 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 
 	@Override
 	public int getPollingInterval() {
-		return backoff.getPollingInterval();
+		return pollingInterval;
 	}
 
 	@Override
 	public void poll(Collection<Pair<TransportProperties, ConnectionHandler>>
 			properties) {
 		if (getState() != ACTIVE) return;
-		backoff.increment();
 		for (Pair<TransportProperties, ConnectionHandler> p : properties) {
 			connect(p.getFirst(), p.getSecond());
 		}
 	}
 
 	private void connect(TransportProperties p, ConnectionHandler h) {
-		wakefulIoExecutor.execute(() -> {
+		ioExecutor.execute(() -> {
 			DuplexTransportConnection d = createConnection(p);
-			if (d != null) {
+			if (d != null) h.handleConnection(d);
-				backoff.reset();
-				h.handleConnection(d);
-			}
 		});
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPlugin.java

@@ -2,7 +2,6 @@ package org.briarproject.bramble.plugin.tcp;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
@@ -30,16 +29,11 @@ class WanTcpPlugin extends TcpPlugin {
 
 	private volatile MappingResult mappingResult;
 
-	WanTcpPlugin(Executor ioExecutor,
+	WanTcpPlugin(Executor ioExecutor, PortMapper portMapper,
-			Executor wakefulIoExecutor,
+			PluginCallback callback, int maxLatency, int maxIdleTime,
-			Backoff backoff,
+			int pollingInterval, int connectionTimeout) {
-			PortMapper portMapper,
+		super(ioExecutor, callback, maxLatency, maxIdleTime, pollingInterval,
-			PluginCallback callback,
+				connectionTimeout);
-			int maxLatency,
-			int maxIdleTime,
-			int connectionTimeout) {
-		super(ioExecutor, wakefulIoExecutor, backoff, callback, maxLatency,
-				maxIdleTime, connectionTimeout);
 		this.portMapper = portMapper;
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPluginFactory.java

@@ -1,50 +1,38 @@
 package org.briarproject.bramble.plugin.tcp;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.lifecycle.ShutdownManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
 
 import java.util.concurrent.Executor;
 
 import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
 
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.briarproject.bramble.api.plugin.WanTcpConstants.ID;
 
 @Immutable
 @NotNullByDefault
 public class WanTcpPluginFactory implements DuplexPluginFactory {
 
-	private static final int MAX_LATENCY = 30_000; // 30 seconds
+	private static final int MAX_LATENCY = (int) SECONDS.toMillis(30);
-	private static final int MAX_IDLE_TIME = 30_000; // 30 seconds
+	private static final int MAX_IDLE_TIME = (int) SECONDS.toMillis(30);
-	private static final int CONNECTION_TIMEOUT = 30_000; // 30 seconds
+	private static final int POLLING_INTERVAL = (int) MINUTES.toMillis(1);
-	private static final int MIN_POLLING_INTERVAL = 60_000; // 1 minute
+	private static final int CONNECTION_TIMEOUT = (int) SECONDS.toMillis(30);
-	private static final int MAX_POLLING_INTERVAL = 600_000; // 10 mins
-	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
 	private final EventBus eventBus;
-	private final BackoffFactory backoffFactory;
 	private final ShutdownManager shutdownManager;
 
-	@Inject
+	public WanTcpPluginFactory(Executor ioExecutor, EventBus eventBus,
-	public WanTcpPluginFactory(@IoExecutor Executor ioExecutor,
-			@WakefulIoExecutor Executor wakefulIoExecutor,
-			EventBus eventBus,
-			BackoffFactory backoffFactory,
 			ShutdownManager shutdownManager) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.eventBus = eventBus;
-		this.backoffFactory = backoffFactory;
 		this.shutdownManager = shutdownManager;
 	}
 
@@ -60,12 +48,9 @@ public class WanTcpPluginFactory implements DuplexPluginFactory {
 
 	@Override
 	public DuplexPlugin createPlugin(PluginCallback callback) {
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
+		WanTcpPlugin plugin = new WanTcpPlugin(ioExecutor,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
+				new PortMapperImpl(shutdownManager), callback, MAX_LATENCY,
-		PortMapper portMapper = new PortMapperImpl(shutdownManager);
+				MAX_IDLE_TIME, POLLING_INTERVAL, CONNECTION_TIMEOUT);
-		WanTcpPlugin plugin = new WanTcpPlugin(ioExecutor, wakefulIoExecutor,
-				backoff, portMapper, callback, MAX_LATENCY, MAX_IDLE_TIME,
-				CONNECTION_TIMEOUT);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -17,7 +17,6 @@ import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.ConnectionHandler;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.PluginException;
@@ -46,9 +45,11 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
@@ -109,30 +110,60 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	private static final Logger LOG = getLogger(TorPlugin.class.getName());
 
+	/**
+	 * Controller events we want to receive.
+	 */
 	private static final String[] EVENTS = {
 			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
 	};
+
+	/**
+	 * Command-line argument to set our process as Tor's owning controller
+	 * so Tor exits when our process dies.
+	 */
 	private static final String OWNER = "__OwningControllerProcess";
+
+	/**
+	 * How long to wait for the authentication cookie file to be created.
+	 */
 	private static final int COOKIE_TIMEOUT_MS = 3000;
+
+	/**
+	 * How often to check whether the authentication cookie file has been
+	 * created.
+	 */
 	private static final int COOKIE_POLLING_INTERVAL_MS = 200;
+
+	/**
+	 * Regex for matching v2 hidden service names.
+	 */
 	private static final Pattern ONION_V2 = Pattern.compile("[a-z2-7]{16}");
+
+	/**
+	 * Regex for matching v3 hidden service names.
+	 */
 	private static final Pattern ONION_V3 = Pattern.compile("[a-z2-7]{56}");
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	/**
-	private final Executor connectionStatusExecutor;
+	 * How many copies of our descriptor must be uploaded before we consider
+	 * our hidden service to be reachable and switch to less frequent polling.
+	 */
+	private static final int MIN_DESCRIPTORS_UPLOADED = 5;
+
+	private final Executor ioExecutor, connectionStatusExecutor;
 	private final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
 	private final SocketFactory torSocketFactory;
 	private final Clock clock;
 	private final BatteryManager batteryManager;
-	private final Backoff backoff;
 	private final TorRendezvousCrypto torRendezvousCrypto;
 	private final PluginCallback callback;
 	private final String architecture;
 	private final CircumventionProvider circumventionProvider;
 	private final ResourceProvider resourceProvider;
 	private final int maxLatency, maxIdleTime, socketTimeout;
-	private final File torDirectory, geoIpFile, configFile;
+	private final int initialPollingInterval, stablePollingInterval;
+	private final File torDirectory, torFile, geoIpFile, obfs4File, configFile;
 	private final File doneFile, cookieFile;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
@@ -146,24 +177,16 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	protected abstract long getLastUpdateTime();
 
-	TorPlugin(Executor ioExecutor,
+	TorPlugin(Executor ioExecutor, NetworkManager networkManager,
-			Executor wakefulIoExecutor,
+			LocationUtils locationUtils, SocketFactory torSocketFactory,
-			NetworkManager networkManager,
+			Clock clock, ResourceProvider resourceProvider,
-			LocationUtils locationUtils,
-			SocketFactory torSocketFactory,
-			Clock clock,
-			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager,
-			Backoff backoff,
 			TorRendezvousCrypto torRendezvousCrypto,
-			PluginCallback callback,
+			PluginCallback callback, String architecture, int maxLatency,
-			String architecture,
+			int maxIdleTime, int initialPollingInterval,
-			int maxLatency,
+			int stablePollingInterval, File torDirectory) {
-			int maxIdleTime,
-			File torDirectory) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.networkManager = networkManager;
 		this.locationUtils = locationUtils;
 		this.torSocketFactory = torSocketFactory;
@@ -171,7 +194,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		this.resourceProvider = resourceProvider;
 		this.circumventionProvider = circumventionProvider;
 		this.batteryManager = batteryManager;
-		this.backoff = backoff;
 		this.torRendezvousCrypto = torRendezvousCrypto;
 		this.callback = callback;
 		this.architecture = architecture;
@@ -180,8 +202,12 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (maxIdleTime > Integer.MAX_VALUE / 2)
 			socketTimeout = Integer.MAX_VALUE;
 		else socketTimeout = maxIdleTime * 2;
+		this.initialPollingInterval = initialPollingInterval;
+		this.stablePollingInterval = stablePollingInterval;
 		this.torDirectory = torDirectory;
+		torFile = new File(torDirectory, "tor");
 		geoIpFile = new File(torDirectory, "geoip");
+		obfs4File = new File(torDirectory, "obfs4proxy");
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
@@ -190,14 +216,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				new PoliteExecutor("TorPlugin", ioExecutor, 1);
 	}
 
-	protected File getTorExecutableFile() {
-		return new File(torDirectory, "tor");
-	}
-
-	protected File getObfs4ExecutableFile() {
-		return new File(torDirectory, "obfs4proxy");
-	}
-
 	@Override
 	public TransportId getId() {
 		return TorConstants.ID;
@@ -230,7 +248,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			LOG.warning("Old auth cookie not deleted");
 		// Start a new Tor process
 		LOG.info("Starting Tor");
-		File torFile = getTorExecutableFile();
 		String torPath = torFile.getAbsolutePath();
 		String configPath = configFile.getAbsolutePath();
 		String pid = String.valueOf(getProcessId());
@@ -329,43 +346,44 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void installAssets() throws PluginException {
+		InputStream in = null;
+		OutputStream out = null;
 		try {
 			// The done file may already exist from a previous installation
 			//noinspection ResultOfMethodCallIgnored
 			doneFile.delete();
-			installTorExecutable();
+			// Unzip the Tor binary to the filesystem
-			installObfs4Executable();
+			in = getTorInputStream();
-			extract(getGeoIpInputStream(), geoIpFile);
+			out = new FileOutputStream(torFile);
-			extract(getConfigInputStream(), configFile);
+			copyAndClose(in, out);
+			// Make the Tor binary executable
+			if (!torFile.setExecutable(true, true)) throw new IOException();
+			// Unzip the GeoIP database to the filesystem
+			in = getGeoIpInputStream();
+			out = new FileOutputStream(geoIpFile);
+			copyAndClose(in, out);
+			// Unzip the Obfs4 proxy to the filesystem
+			in = getObfs4InputStream();
+			out = new FileOutputStream(obfs4File);
+			copyAndClose(in, out);
+			// Make the Obfs4 proxy executable
+			if (!obfs4File.setExecutable(true, true)) throw new IOException();
+			// Copy the config file to the filesystem
+			in = getConfigInputStream();
+			out = new FileOutputStream(configFile);
+			copyAndClose(in, out);
 			if (!doneFile.createNewFile())
 				LOG.warning("Failed to create done file");
 		} catch (IOException e) {
+			tryToClose(in, LOG, WARNING);
+			tryToClose(out, LOG, WARNING);
 			throw new PluginException(e);
 		}
 	}
 
-	protected void extract(InputStream in, File dest) throws IOException {
+	private InputStream getTorInputStream() throws IOException {
-		OutputStream out = new FileOutputStream(dest);
-		copyAndClose(in, out);
-	}
-
-	protected void installTorExecutable() throws IOException {
 		if (LOG.isLoggable(INFO))
 			LOG.info("Installing Tor binary for " + architecture);
-		File torFile = getTorExecutableFile();
-		extract(getTorInputStream(), torFile);
-		if (!torFile.setExecutable(true, true)) throw new IOException();
-	}
-
-	protected void installObfs4Executable() throws IOException {
-		if (LOG.isLoggable(INFO))
-			LOG.info("Installing obfs4proxy binary for " + architecture);
-		File obfs4File = getObfs4ExecutableFile();
-		extract(getObfs4InputStream(), obfs4File);
-		if (!obfs4File.setExecutable(true, true)) throw new IOException();
-	}
-
-	private InputStream getTorInputStream() throws IOException {
 		InputStream in = resourceProvider
 				.getResourceInputStream("tor_" + architecture, ".zip");
 		ZipInputStream zin = new ZipInputStream(in);
@@ -382,6 +400,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private InputStream getObfs4InputStream() throws IOException {
+		if (LOG.isLoggable(INFO))
+			LOG.info("Installing obfs4proxy binary for " + architecture);
 		InputStream in = resourceProvider
 				.getResourceInputStream("obfs4proxy_" + architecture, ".zip");
 		ZipInputStream zin = new ZipInputStream(in);
@@ -448,7 +468,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			callback.mergeSettings(s);
 			// Create a hidden service if necessary
 			ioExecutor.execute(() -> publishHiddenService(localPort));
-			backoff.reset();
 			// Accept incoming hidden service connections from Tor
 			acceptContactConnections(ss);
 		});
@@ -466,7 +485,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		// in the migration period since first publishing it
 		if (!isNullOrEmpty(privKey2)) {
 			long now = clock.currentTimeMillis();
-			long then = v3Created == null ? now : Long.parseLong(v3Created);
+			long then = v3Created == null ? now : Long.valueOf(v3Created);
 			if (now - then >= V3_MIGRATION_PERIOD_MS) retireV2HiddenService();
 			else publishV2HiddenService(port, privKey2);
 		}
@@ -528,15 +547,15 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			LOG.warning("Tor did not return a private key");
 			return;
 		}
+		// Publish the hidden service's onion hostname in transport properties
 		String onion3 = response.get(HS_ADDRESS);
 		if (LOG.isLoggable(INFO)) {
 			LOG.info("V3 hidden service " + scrubOnion(onion3));
 		}
+		TransportProperties p = new TransportProperties();
+		p.put(PROP_ONION_V3, onion3);
+		callback.mergeLocalProperties(p);
 		if (privKey == null) {
-			// Publish the hidden service's onion hostname in transport props
-			TransportProperties p = new TransportProperties();
-			p.put(PROP_ONION_V3, onion3);
-			callback.mergeLocalProperties(p);
 			// Save the hidden service's private key for next time
 			Settings s = new Settings();
 			s.put(HS_PRIVATE_KEY_V3, response.get(HS_PRIVKEY));
@@ -558,7 +577,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				return;
 			}
 			LOG.info("Connection received");
-			backoff.reset();
 			callback.handleConnection(new TorTransportConnection(this, s));
 		}
 	}
@@ -573,7 +591,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (enable) {
 			Collection<String> conf = new ArrayList<>();
 			conf.add("UseBridges 1");
-			File obfs4File = getObfs4ExecutableFile();
 			if (needsMeek) {
 				conf.add("ClientTransportPlugin meek_lite exec " +
 						obfs4File.getAbsolutePath());
@@ -621,26 +638,28 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public int getPollingInterval() {
-		return backoff.getPollingInterval();
+		if (state.isDescriptorPublished()) {
+			LOG.info("Using stable polling interval");
+			return stablePollingInterval;
+		} else {
+			LOG.info("Using initial polling interval");
+			return initialPollingInterval;
+		}
 	}
 
 	@Override
 	public void poll(Collection<Pair<TransportProperties, ConnectionHandler>>
 			properties) {
 		if (getState() != ACTIVE) return;
-		backoff.increment();
 		for (Pair<TransportProperties, ConnectionHandler> p : properties) {
 			connect(p.getFirst(), p.getSecond());
 		}
 	}
 
 	private void connect(TransportProperties p, ConnectionHandler h) {
-		wakefulIoExecutor.execute(() -> {
+		ioExecutor.execute(() -> {
 			DuplexTransportConnection d = createConnection(p);
-			if (d != null) {
+			if (d != null) h.handleConnection(d);
-				backoff.reset();
-				h.handleConnection(d);
-			}
 		});
 	}
 
@@ -770,10 +789,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public void circuitStatus(String status, String id, String path) {
-		if (status.equals("BUILT") &&
+		if (status.equals("BUILT") && state.getAndSetCircuitBuilt()) {
-				state.getAndSetCircuitBuilt()) {
 			LOG.info("First circuit built");
-			backoff.reset();
 		}
 	}
 
@@ -783,8 +800,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public void orConnStatus(String status, String orName) {
-		if (LOG.isLoggable(INFO))
+		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
-			LOG.info("OR connection " + status + " " + orName);
+		state.setOrConnectionStatus(orName, status);
 		if (status.equals("CLOSED") || status.equals("FAILED")) {
 			// Check whether we've lost connectivity
 			updateConnectionStatus(networkManager.getNetworkStatus(),
@@ -805,20 +822,18 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
 		if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
 			state.setBootstrapped();
-			backoff.reset();
 		}
 	}
 
 	@Override
 	public void unrecognized(String type, String msg) {
 		if (type.equals("HS_DESC") && msg.startsWith("UPLOADED")) {
-			if (LOG.isLoggable(INFO)) {
+			String[] words = msg.split(" ");
-				String[] words = msg.split(" ");
+			if (words.length > 1 && ONION_V3.matcher(words[1]).matches()) {
-				if (words.length > 1 && ONION_V3.matcher(words[1]).matches()) {
+				LOG.info("V3 descriptor uploaded");
-					LOG.info("V3 descriptor uploaded");
+				state.descriptorUploaded();
-				} else {
+			} else {
-					LOG.info("V2 descriptor uploaded");
+				LOG.info("V2 descriptor uploaded");
-				}
 			}
 		}
 	}
@@ -974,6 +989,12 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		@Nullable
 		private ServerSocket serverSocket = null;
 
+		@GuardedBy("this")
+		private final Set<String> orConnections = new HashSet<>();
+
+		@GuardedBy("this")
+		private int descriptorsUploaded = 0;
+
 		synchronized void setStarted() {
 			started = true;
 			callback.pluginStateChanged(getState());
@@ -1007,7 +1028,10 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		synchronized void enableNetwork(boolean enable) {
 			networkInitialised = true;
 			networkEnabled = enable;
-			if (!enable) circuitBuilt = false;
+			if (!enable) {
+				circuitBuilt = false;
+				descriptorsUploaded = 0;
+			}
 			callback.pluginStateChanged(getState());
 		}
 
@@ -1017,6 +1041,34 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			callback.pluginStateChanged(getState());
 		}
 
+		synchronized void setOrConnectionStatus(String orName, String status) {
+			if (status.equals("CONNECTED")) {
+				if (!orConnections.add(orName)) {
+					LOG.warning("Duplicate OR connection");
+				}
+			} else {
+				orConnections.remove(orName);
+				if (orConnections.isEmpty()) descriptorsUploaded = 0;
+			}
+			if (LOG.isLoggable(INFO)) {
+				LOG.info(orConnections.size() + " OR connections");
+			}
+			callback.pluginStateChanged(getState());
+		}
+
+		// Doesn't affect getState()
+		synchronized void descriptorUploaded() {
+			if (networkEnabled && !orConnections.isEmpty()) {
+				descriptorsUploaded++;
+			} else {
+				LOG.warning("Descriptor was uploaded with no OR connection");
+			}
+		}
+
+		synchronized boolean isDescriptorPublished() {
+			return descriptorsUploaded >= MIN_DESCRIPTORS_UPLOADED;
+		}
+
 		// Doesn't affect getState()
 		synchronized boolean setServerSocket(ServerSocket ss) {
 			if (stopped || serverSocket != null) return false;
@@ -1036,7 +1088,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (reasonsDisabled != 0) return DISABLED;
 			if (!networkInitialised) return ENABLING;
 			if (!networkEnabled) return INACTIVE;
-			return bootstrapped && circuitBuilt ? ACTIVE : ENABLING;
+			return bootstrapped && circuitBuilt && !orConnections.isEmpty()
+					? ACTIVE : ENABLING;
 		}
 
 		synchronized int getReasonsDisabled() {

bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java

@@ -18,7 +18,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
-import org.briarproject.bramble.api.properties.event.RemoteTransportPropertiesUpdatedEvent;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.Group.Visibility;
 import org.briarproject.bramble.api.sync.GroupId;
@@ -43,7 +42,6 @@ import static org.briarproject.bramble.api.properties.TransportPropertyConstants
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_LOCAL;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_TRANSPORT_ID;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_VERSION;
-import static org.briarproject.bramble.api.properties.TransportPropertyConstants.REFLECTED_PROPERTY_PREFIX;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @Immutable
@@ -131,10 +129,8 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 					// We've already received a newer update - delete this one
 					db.deleteMessage(txn, m.getId());
 					db.deleteMessageMetadata(txn, m.getId());
-					return false;
 				}
 			}
-			txn.attach(new RemoteTransportPropertiesUpdatedEvent(t));
 		} catch (FormatException e) {
 			throw new InvalidMessageException(e);
 		}
@@ -157,27 +153,15 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 		if (props.isEmpty()) return;
 		try {
 			db.transaction(false, txn -> {
-				Contact contact = db.getContact(txn, c);
+				Group g = getContactGroup(db.getContact(txn, c));
-				Group g = getContactGroup(contact);
 				BdfDictionary meta = clientHelper.getGroupMetadataAsDictionary(
 						txn, g.getId());
 				BdfDictionary discovered =
 						meta.getOptionalDictionary(GROUP_KEY_DISCOVERED);
-				BdfDictionary merged;
+				if (discovered == null) discovered = new BdfDictionary();
-				boolean changed;
+				discovered.putAll(props);
-				if (discovered == null) {
+				meta.put(GROUP_KEY_DISCOVERED, discovered);
-					merged = new BdfDictionary(props);
+				clientHelper.mergeGroupMetadata(txn, g.getId(), meta);
-					changed = true;
-				} else {
-					merged = new BdfDictionary(discovered);
-					merged.putAll(props);
-					changed = !merged.equals(discovered);
-				}
-				if (changed) {
-					meta.put(GROUP_KEY_DISCOVERED, merged);
-					clientHelper.mergeGroupMetadata(txn, g.getId(), meta);
-					updateLocalProperties(txn, contact, t);
-				}
 			});
 		} catch (FormatException e) {
 			throw new DbException(e);
@@ -242,24 +226,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 		});
 	}
 
-	private void updateLocalProperties(Transaction txn, Contact c,
-			TransportId t) throws DbException {
-		try {
-			TransportProperties local;
-			LatestUpdate latest = findLatest(txn, localGroup.getId(), t, true);
-			if (latest == null) {
-				local = new TransportProperties();
-			} else {
-				BdfList message = clientHelper.getMessageAsList(txn,
-						latest.messageId);
-				local = parseProperties(message);
-			}
-			storeLocalProperties(txn, c, t, local);
-		} catch (FormatException e) {
-			throw new DbException(e);
-		}
-	}
-
 	private TransportProperties getRemoteProperties(Transaction txn, Contact c,
 			TransportId t) throws DbException {
 		Group g = getContactGroup(c);
@@ -332,10 +298,18 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 					storeMessage(txn, localGroup.getId(), t, merged, version,
 							true, false);
 					// Delete the previous update, if any
-					if (latest != null) db.removeMessage(txn, latest.messageId);
+					if (latest != null)
+						db.removeMessage(txn, latest.messageId);
 					// Store the merged properties in each contact's group
 					for (Contact c : db.getContacts(txn)) {
-						storeLocalProperties(txn, c, t, merged);
+						Group g = getContactGroup(c);
+						latest = findLatest(txn, g.getId(), t, true);
+						version = latest == null ? 1 : latest.version + 1;
+						storeMessage(txn, g.getId(), t, merged, version,
+								true, true);
+						// Delete the previous update, if any
+						if (latest != null)
+							db.removeMessage(txn, latest.messageId);
 					}
 				}
 			});
@@ -344,34 +318,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 		}
 	}
 
-	private void storeLocalProperties(Transaction txn, Contact c,
-			TransportId t, TransportProperties p)
-			throws DbException, FormatException {
-		Group g = getContactGroup(c);
-		LatestUpdate latest = findLatest(txn, g.getId(), t, true);
-		long version = latest == null ? 1 : latest.version + 1;
-		// Reflect any remote properties we've discovered
-		BdfDictionary meta = clientHelper.getGroupMetadataAsDictionary(txn,
-				g.getId());
-		BdfDictionary discovered =
-				meta.getOptionalDictionary(GROUP_KEY_DISCOVERED);
-		TransportProperties combined;
-		if (discovered == null) {
-			combined = p;
-		} else {
-			combined = new TransportProperties(p);
-			TransportProperties d = clientHelper
-					.parseAndValidateTransportProperties(discovered);
-			for (Entry<String, String> e : d.entrySet()) {
-				String key = REFLECTED_PROPERTY_PREFIX + e.getKey();
-				combined.put(key, e.getValue());
-			}
-		}
-		storeMessage(txn, g.getId(), t, combined, version, true, true);
-		// Delete the previous update, if any
-		if (latest != null) db.removeMessage(txn, latest.messageId);
-	}
-
 	private Group getContactGroup(Contact c) {
 		return contactGroupFactory.createContactGroup(CLIENT_ID,
 				MAJOR_VERSION, c);

bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java

@@ -41,9 +41,7 @@ import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedE
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousPollEvent;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Scheduler;
-import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
-import org.briarproject.bramble.api.system.Wakeful;
 
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
@@ -54,6 +52,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
@@ -69,7 +68,6 @@ import static org.briarproject.bramble.api.contact.PendingContactState.ADDING_CO
 import static org.briarproject.bramble.api.contact.PendingContactState.FAILED;
 import static org.briarproject.bramble.api.contact.PendingContactState.OFFLINE;
 import static org.briarproject.bramble.api.contact.PendingContactState.WAITING_FOR_CONNECTION;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNull;
 import static org.briarproject.bramble.rendezvous.RendezvousConstants.POLLING_INTERVAL_MS;
 import static org.briarproject.bramble.rendezvous.RendezvousConstants.RENDEZVOUS_TIMEOUT_MS;
@@ -82,7 +80,7 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 	private static final Logger LOG =
 			getLogger(RendezvousPollerImpl.class.getName());
 
-	private final TaskScheduler scheduler;
+	private final ScheduledExecutorService scheduler;
 	private final DatabaseComponent db;
 	private final IdentityManager identityManager;
 	private final TransportCrypto transportCrypto;
@@ -104,12 +102,10 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 			new HashMap<>();
 	@Nullable
 	private KeyPair handshakeKeyPair = null;
-	@Nullable
-	private Cancellable pollTask = null;
 
 	@Inject
 	RendezvousPollerImpl(@IoExecutor Executor ioExecutor,
-			TaskScheduler scheduler,
+			@Scheduler ScheduledExecutorService scheduler,
 			DatabaseComponent db,
 			IdentityManager identityManager,
 			TransportCrypto transportCrypto,
@@ -148,6 +144,8 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 		} catch (DbException e) {
 			throw new ServiceException(e);
 		}
+		scheduler.scheduleAtFixedRate(this::poll, POLLING_INTERVAL_MS,
+				POLLING_INTERVAL_MS, MILLISECONDS);
 	}
 
 	@EventExecutor
@@ -188,12 +186,6 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 			}
 			if (cs.numEndpoints == 0) broadcastState(p.getId(), OFFLINE);
 			else broadcastState(p.getId(), WAITING_FOR_CONNECTION);
-			if (cryptoStates.size() == 1) {
-				LOG.info("Starting poller");
-				requireNull(pollTask);
-				pollTask = scheduler.scheduleWithFixedDelay(this::poll, worker,
-						POLLING_INTERVAL_MS, POLLING_INTERVAL_MS, MILLISECONDS);
-			}
 		} catch (DbException | GeneralSecurityException e) {
 			logException(LOG, WARNING, e);
 		}
@@ -213,12 +205,12 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 		return plugin.createRendezvousEndpoint(k, cs.alice, h);
 	}
 
-	// Worker
+	@Scheduler
-	@Wakeful
 	private void poll() {
-		LOG.info("Polling");
+		worker.execute(() -> {
-		removeExpiredPendingContacts();
+			removeExpiredPendingContacts();
-		for (PluginState ps : pluginStates.values()) poll(ps);
+			for (PluginState ps : pluginStates.values()) poll(ps);
+		});
 	}
 
 	// Worker
@@ -243,15 +235,9 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 			RendezvousEndpoint endpoint = ps.endpoints.remove(p);
 			if (endpoint != null) tryToClose(endpoint, LOG, INFO);
 		}
-		if (cryptoStates.isEmpty()) {
-			LOG.info("Stopping poller");
-			requireNonNull(pollTask).cancel();
-			pollTask = null;
-		}
 	}
 
 	// Worker
-	@Wakeful
 	private void poll(PluginState ps) {
 		if (ps.endpoints.isEmpty()) return;
 		TransportId t = ps.plugin.getId();

bramble-core/src/main/java/org/briarproject/bramble/system/ClockModule.java

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.system.Clock;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class ClockModule {
-
-	@Provides
-	Clock provideClock() {
-		return new SystemClock();
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/system/DefaultWakefulIoExecutorModule.java

@@ -1,23 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
-
-import java.util.concurrent.Executor;
-
-import dagger.Module;
-import dagger.Provides;
-
-/**
- * Provides a default implementation of {@link WakefulIoExecutor} for systems
- * without wake locks.
- */
-@Module
-public class DefaultWakefulIoExecutorModule {
-
-	@Provides
-	@WakefulIoExecutor
-	Executor provideWakefulIoExecutor(@IoExecutor Executor ioExecutor) {
-		return ioExecutor;
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/system/SystemModule.java

@@ -1,7 +1,8 @@
 package org.briarproject.bramble.system;
 
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.Scheduler;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledExecutorService;
@@ -14,26 +15,34 @@ import dagger.Module;
 import dagger.Provides;
 
 @Module
-public class DefaultTaskSchedulerModule {
+public class SystemModule {
 
 	public static class EagerSingletons {
 		@Inject
-		TaskScheduler scheduler;
+		@Scheduler
+		ScheduledExecutorService scheduledExecutorService;
 	}
 
-	private final ScheduledExecutorService scheduledExecutorService;
+	private final ScheduledExecutorService scheduler;
 
-	public DefaultTaskSchedulerModule() {
+	public SystemModule() {
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ScheduledThreadPoolExecutor.DiscardPolicy();
-		scheduledExecutorService = new ScheduledThreadPoolExecutor(1, policy);
+		scheduler = new ScheduledThreadPoolExecutor(1, policy);
+	}
+
+	@Provides
+	Clock provideClock() {
+		return new SystemClock();
 	}
 
 	@Provides
 	@Singleton
-	TaskScheduler provideTaskScheduler(LifecycleManager lifecycleManager) {
+	@Scheduler
-		lifecycleManager.registerForShutdown(scheduledExecutorService);
+	ScheduledExecutorService provideScheduledExecutorService(
-		return new TaskSchedulerImpl(scheduledExecutorService);
+			LifecycleManager lifecycleManager) {
+		lifecycleManager.registerForShutdown(scheduler);
+		return scheduler;
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java

@@ -1,43 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.TaskScheduler;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-/**
- * A {@link TaskScheduler} that uses a {@link ScheduledExecutorService}.
- */
-@ThreadSafe
-@NotNullByDefault
-class TaskSchedulerImpl implements TaskScheduler {
-
-	private final ScheduledExecutorService scheduledExecutorService;
-
-	TaskSchedulerImpl(ScheduledExecutorService scheduledExecutorService) {
-		this.scheduledExecutorService = scheduledExecutorService;
-	}
-
-	@Override
-	public Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit) {
-		Runnable execute = () -> executor.execute(task);
-		ScheduledFuture<?> future =
-				scheduledExecutorService.schedule(execute, delay, unit);
-		return () -> future.cancel(false);
-	}
-
-	@Override
-	public Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit) {
-		Runnable execute = () -> executor.execute(task);
-		ScheduledFuture<?> future = scheduledExecutorService.
-				scheduleWithFixedDelay(execute, delay, interval, unit);
-		return () -> future.cancel(false);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactoryImpl.java

@@ -6,9 +6,10 @@ import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Scheduler;
 
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
@@ -21,15 +22,14 @@ class TransportKeyManagerFactoryImpl implements
 	private final DatabaseComponent db;
 	private final TransportCrypto transportCrypto;
 	private final Executor dbExecutor;
-	private final TaskScheduler scheduler;
+	private final ScheduledExecutorService scheduler;
 	private final Clock clock;
 
 	@Inject
 	TransportKeyManagerFactoryImpl(DatabaseComponent db,
 			TransportCrypto transportCrypto,
 			@DatabaseExecutor Executor dbExecutor,
-			TaskScheduler scheduler,
+			@Scheduler ScheduledExecutorService scheduler, Clock clock) {
-			Clock clock) {
 		this.db = db;
 		this.transportCrypto = transportCrypto;
 		this.dbExecutor = dbExecutor;

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java

@@ -6,14 +6,12 @@ import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.TransportCrypto;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Scheduler;
-import org.briarproject.bramble.api.system.Wakeful;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.StreamContext;
 import org.briarproject.bramble.api.transport.TransportKeySet;
@@ -26,6 +24,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
@@ -54,7 +53,7 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 	private final DatabaseComponent db;
 	private final TransportCrypto transportCrypto;
 	private final Executor dbExecutor;
-	private final TaskScheduler scheduler;
+	private final ScheduledExecutorService scheduler;
 	private final Clock clock;
 	private final TransportId transportId;
 	private final long timePeriodLength;
@@ -73,12 +72,9 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 			pendingContactOutContexts = new HashMap<>();
 
 	TransportKeyManagerImpl(DatabaseComponent db,
-			TransportCrypto transportCrypto,
+			TransportCrypto transportCrypto, Executor dbExecutor,
-			Executor dbExecutor,
+			@Scheduler ScheduledExecutorService scheduler, Clock clock,
-			TaskScheduler scheduler,
+			TransportId transportId, long maxLatency) {
-			Clock clock,
-			TransportId transportId,
-			long maxLatency) {
 		this.db = db;
 		this.transportCrypto = transportCrypto;
 		this.dbExecutor = dbExecutor;
@@ -200,17 +196,17 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 
 	private void scheduleKeyUpdate(long now) {
 		long delay = timePeriodLength - now % timePeriodLength;
-		scheduler.schedule(this::updateKeys, dbExecutor, delay, MILLISECONDS);
+		scheduler.schedule((Runnable) this::updateKeys, delay, MILLISECONDS);
 	}
 
-	@DatabaseExecutor
-	@Wakeful
 	private void updateKeys() {
-		try {
+		dbExecutor.execute(() -> {
-			db.transaction(false, this::updateKeys);
+			try {
-		} catch (DbException e) {
+				db.transaction(false, this::updateKeys);
-			logException(LOG, WARNING, e);
+			} catch (DbException e) {
-		}
+				logException(LOG, WARNING, e);
+			}
+		});
 	}
 
 	@Override
@@ -443,8 +439,6 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		}
 	}
 
-	@DatabaseExecutor
-	@Wakeful
 	private void updateKeys(Transaction txn) throws DbException {
 		long now = clock.currentTimeMillis();
 		lock.lock();

bramble-core/src/test/java/org/briarproject/bramble/BrambleCoreIntegrationTestEagerSingletons.java

@@ -1,18 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.system.DefaultTaskSchedulerModule;
-
-public interface BrambleCoreIntegrationTestEagerSingletons
-		extends BrambleCoreEagerSingletons {
-
-	void inject(DefaultTaskSchedulerModule.EagerSingletons init);
-
-	class Helper {
-
-		public static void injectEagerSingletons(
-				BrambleCoreIntegrationTestEagerSingletons c) {
-			BrambleCoreEagerSingletons.Helper.injectEagerSingletons(c);
-			c.inject(new DefaultTaskSchedulerModule.EagerSingletons());
-		}
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTest.java

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.contact;
 
-import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons;
+import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -62,13 +62,11 @@ public class ContactExchangeIntegrationTest extends BrambleTestCase {
 		alice = DaggerContactExchangeIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(
 						new TestDatabaseConfigModule(aliceDir)).build();
-		BrambleCoreIntegrationTestEagerSingletons.Helper
+		BrambleCoreEagerSingletons.Helper.injectEagerSingletons(alice);
-				.injectEagerSingletons(alice);
 		bob = DaggerContactExchangeIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(bobDir))
 				.build();
-		BrambleCoreIntegrationTestEagerSingletons.Helper
+		BrambleCoreEagerSingletons.Helper.injectEagerSingletons(bob);
-				.injectEagerSingletons(bob);
 		// Set up the devices and get the identities
 		aliceIdentity = setUp(alice, "Alice");
 		bobIdentity = setUp(bob, "Bob");

bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTestComponent.java

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.contact;
 
-import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons;
+import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.connection.ConnectionManager;
 import org.briarproject.bramble.api.contact.ContactExchangeManager;
@@ -23,7 +23,7 @@ import dagger.Component;
 		BrambleCoreModule.class
 })
 interface ContactExchangeIntegrationTestComponent
-		extends BrambleCoreIntegrationTestEagerSingletons {
+		extends BrambleCoreEagerSingletons {
 
 	ConnectionManager getConnectionManager();
 

bramble-core/src/test/java/org/briarproject/bramble/plugin/BackoffImplTest.java

@@ -1,63 +0,0 @@
-package org.briarproject.bramble.plugin;
-
-import org.briarproject.bramble.test.BrambleTestCase;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class BackoffImplTest extends BrambleTestCase {
-
-	private static final int MIN_INTERVAL = 60 * 1000;
-	private static final int MAX_INTERVAL = 60 * 60 * 1000;
-	private static final double BASE = 1.2;
-
-	@Test
-	public void testPollingIntervalStartsAtMinimum() {
-		BackoffImpl b = new BackoffImpl(MIN_INTERVAL, MAX_INTERVAL, BASE);
-		assertEquals(MIN_INTERVAL, b.getPollingInterval());
-	}
-
-	@Test
-	public void testIncrementIncreasesPollingInterval() {
-		BackoffImpl b = new BackoffImpl(MIN_INTERVAL, MAX_INTERVAL, BASE);
-		b.increment();
-		assertTrue(b.getPollingInterval() > MIN_INTERVAL);
-	}
-
-	@Test
-	public void testResetResetsPollingInterval() {
-		BackoffImpl b = new BackoffImpl(MIN_INTERVAL, MAX_INTERVAL, BASE);
-		b.increment();
-		b.increment();
-		b.reset();
-		assertEquals(MIN_INTERVAL, b.getPollingInterval());
-	}
-
-	@Test
-	public void testBaseAffectsBackoffSpeed() {
-		BackoffImpl b = new BackoffImpl(MIN_INTERVAL, MAX_INTERVAL, BASE);
-		b.increment();
-		int interval = b.getPollingInterval();
-		BackoffImpl b1 = new BackoffImpl(MIN_INTERVAL, MAX_INTERVAL, BASE * 2);
-		b1.increment();
-		int interval1 = b1.getPollingInterval();
-		assertTrue(interval < interval1);
-	}
-
-	@Test
-	public void testIntervalDoesNotExceedMaxInterval() {
-		BackoffImpl b = new BackoffImpl(MIN_INTERVAL, MAX_INTERVAL, BASE);
-		for (int i = 0; i < 100; i++) b.increment();
-		assertEquals(MAX_INTERVAL, b.getPollingInterval());
-	}
-
-	@Test
-	public void testIntervalDoesNotExceedMaxIntervalWithInfiniteMultiplier() {
-		BackoffImpl b = new BackoffImpl(MIN_INTERVAL, MAX_INTERVAL,
-				Double.POSITIVE_INFINITY);
-		b.increment();
-		assertEquals(MAX_INTERVAL, b.getPollingInterval());
-	}
-}
-

bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java

@@ -109,8 +109,8 @@ public class PluginManagerImplTest extends BrambleTestCase {
 			oneOf(duplexPlugin).stop();
 		}});
 
-		PluginManagerImpl p = new PluginManagerImpl(ioExecutor, ioExecutor,
+		PluginManagerImpl p = new PluginManagerImpl(ioExecutor, eventBus,
-				eventBus, pluginConfig, connectionManager, settingsManager,
+				pluginConfig, connectionManager, settingsManager,
 				transportPropertyManager);
 
 		// Two plugins should be started and stopped

bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java

@@ -12,15 +12,12 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent;
-import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent;
 import org.briarproject.bramble.api.plugin.event.TransportActiveEvent;
 import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.bramble.test.RunAction;
@@ -32,6 +29,8 @@ import org.junit.Test;
 import java.security.SecureRandom;
 import java.util.List;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
@@ -45,7 +44,8 @@ import static org.briarproject.bramble.test.TestUtils.getTransportId;
 
 public class PollerImplTest extends BrambleMockTestCase {
 
-	private final TaskScheduler scheduler = context.mock(TaskScheduler.class);
+	private final ScheduledExecutorService scheduler =
+			context.mock(ScheduledExecutorService.class);
 	private final ConnectionManager connectionManager =
 			context.mock(ConnectionManager.class);
 	private final ConnectionRegistry connectionRegistry =
@@ -55,11 +55,10 @@ public class PollerImplTest extends BrambleMockTestCase {
 	private final TransportPropertyManager transportPropertyManager =
 			context.mock(TransportPropertyManager.class);
 	private final Clock clock = context.mock(Clock.class);
-	private final Cancellable cancellable = context.mock(Cancellable.class);
+	private final ScheduledFuture future = context.mock(ScheduledFuture.class);
 	private final SecureRandom random;
 
 	private final Executor ioExecutor = new ImmediateExecutor();
-	private final Executor wakefulIoExecutor = new ImmediateExecutor();
 	private final TransportId transportId = getTransportId();
 	private final ContactId contactId = getContactId();
 	private final TransportProperties properties = new TransportProperties();
@@ -75,9 +74,9 @@ public class PollerImplTest extends BrambleMockTestCase {
 
 	@Before
 	public void setUp() {
-		poller = new PollerImpl(ioExecutor, wakefulIoExecutor, scheduler,
+		poller = new PollerImpl(ioExecutor, scheduler, connectionManager,
-				connectionManager, connectionRegistry, pluginManager,
+				connectionRegistry, pluginManager, transportPropertyManager,
-				transportPropertyManager, random, clock);
+				random, clock);
 	}
 
 	@Test
@@ -157,22 +156,20 @@ public class PollerImplTest extends BrambleMockTestCase {
 	}
 
 	@Test
-	public void testRescheduleOnOutgoingConnectionClosed() {
+	public void testDoesNotReconnectOnOutgoingConnectionClosed() {
 		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();
 			will(returnValue(transportId));
 		}});
-		expectReschedule(plugin);
 
 		poller.eventOccurred(new ConnectionClosedEvent(contactId, transportId,
 				false, false));
 	}
 
 	@Test
-	public void testRescheduleAndReconnectOnOutgoingConnectionFailed()
+	public void testReconnectsOnOutgoingConnectionFailed() throws Exception {
-			throws Exception {
 		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
 		DuplexTransportConnection duplexConnection =
 				context.mock(DuplexTransportConnection.class);
@@ -181,7 +178,6 @@ public class PollerImplTest extends BrambleMockTestCase {
 			allowing(plugin).getId();
 			will(returnValue(transportId));
 		}});
-		expectReschedule(plugin);
 		expectReconnect(plugin, duplexConnection);
 
 		poller.eventOccurred(new ConnectionClosedEvent(contactId, transportId,
@@ -189,151 +185,31 @@ public class PollerImplTest extends BrambleMockTestCase {
 	}
 
 	@Test
-	public void testRescheduleOnIncomingConnectionClosed() {
+	public void testDoesNotReconnectOnIncomingConnectionClosed() {
 		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();
 			will(returnValue(transportId));
 		}});
-		expectReschedule(plugin);
 
 		poller.eventOccurred(new ConnectionClosedEvent(contactId, transportId,
 				true, false));
 	}
 
 	@Test
-	public void testRescheduleOnIncomingConnectionFailed() {
+	public void testDoesNotReconnectOnIncomingConnectionFailed() {
 		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();
 			will(returnValue(transportId));
 		}});
-		expectReschedule(plugin);
 
 		poller.eventOccurred(new ConnectionClosedEvent(contactId, transportId,
 				true, false));
 	}
 
-	@Test
-	public void testRescheduleOnConnectionOpened() {
-		Plugin plugin = context.mock(Plugin.class);
-
-		context.checking(new Expectations() {{
-			allowing(plugin).getId();
-			will(returnValue(transportId));
-			// Get the plugin
-			oneOf(pluginManager).getPlugin(transportId);
-			will(returnValue(plugin));
-			// The plugin supports polling
-			oneOf(plugin).shouldPoll();
-			will(returnValue(true));
-			// Schedule the next poll
-			oneOf(plugin).getPollingInterval();
-			will(returnValue(pollingInterval));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with((long) pollingInterval),
-					with(MILLISECONDS));
-			will(returnValue(cancellable));
-		}});
-
-		poller.eventOccurred(new ConnectionOpenedEvent(contactId, transportId,
-				false));
-	}
-
-	@Test
-	public void testRescheduleDoesNotReplaceEarlierTask() {
-		Plugin plugin = context.mock(Plugin.class);
-
-		context.checking(new Expectations() {{
-			allowing(plugin).getId();
-			will(returnValue(transportId));
-			// First event
-			// Get the plugin
-			oneOf(pluginManager).getPlugin(transportId);
-			will(returnValue(plugin));
-			// The plugin supports polling
-			oneOf(plugin).shouldPoll();
-			will(returnValue(true));
-			// Schedule the next poll
-			oneOf(plugin).getPollingInterval();
-			will(returnValue(pollingInterval));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with((long) pollingInterval),
-					with(MILLISECONDS));
-			will(returnValue(cancellable));
-			// Second event
-			// Get the plugin
-			oneOf(pluginManager).getPlugin(transportId);
-			will(returnValue(plugin));
-			// The plugin supports polling
-			oneOf(plugin).shouldPoll();
-			will(returnValue(true));
-			// Don't replace the previously scheduled task, due earlier
-			oneOf(plugin).getPollingInterval();
-			will(returnValue(pollingInterval));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now + 1));
-		}});
-
-		poller.eventOccurred(new ConnectionOpenedEvent(contactId, transportId,
-				false));
-		poller.eventOccurred(new ConnectionOpenedEvent(contactId, transportId,
-				false));
-	}
-
-	@Test
-	public void testRescheduleReplacesLaterTask() {
-		Plugin plugin = context.mock(Plugin.class);
-
-		context.checking(new Expectations() {{
-			allowing(plugin).getId();
-			will(returnValue(transportId));
-			// First event
-			// Get the plugin
-			oneOf(pluginManager).getPlugin(transportId);
-			will(returnValue(plugin));
-			// The plugin supports polling
-			oneOf(plugin).shouldPoll();
-			will(returnValue(true));
-			// Schedule the next poll
-			oneOf(plugin).getPollingInterval();
-			will(returnValue(pollingInterval));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with((long) pollingInterval),
-					with(MILLISECONDS));
-			will(returnValue(cancellable));
-			// Second event
-			// Get the plugin
-			oneOf(pluginManager).getPlugin(transportId);
-			will(returnValue(plugin));
-			// The plugin supports polling
-			oneOf(plugin).shouldPoll();
-			will(returnValue(true));
-			// Replace the previously scheduled task, due later
-			oneOf(plugin).getPollingInterval();
-			will(returnValue(pollingInterval - 2));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now + 1));
-			oneOf(cancellable).cancel();
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with((long) pollingInterval - 2),
-					with(MILLISECONDS));
-		}});
-
-		poller.eventOccurred(new ConnectionOpenedEvent(contactId, transportId,
-				false));
-		poller.eventOccurred(new ConnectionOpenedEvent(contactId, transportId,
-				false));
-	}
-
 	@Test
 	public void testPollsOnTransportActivated() throws Exception {
 		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
@@ -350,9 +226,9 @@ public class PollerImplTest extends BrambleMockTestCase {
 			// Schedule a polling task immediately
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
+			oneOf(scheduler).schedule(with(any(Runnable.class)), with(0L),
-					with(ioExecutor), with(0L), with(MILLISECONDS));
+					with(MILLISECONDS));
-			will(returnValue(cancellable));
+			will(returnValue(future));
 			will(new RunAction());
 			// Running the polling task schedules the next polling task
 			oneOf(plugin).getPollingInterval();
@@ -362,9 +238,8 @@ public class PollerImplTest extends BrambleMockTestCase {
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
 			oneOf(scheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with((long) (pollingInterval * 0.5)),
+					with((long) (pollingInterval * 0.5)), with(MILLISECONDS));
-					with(MILLISECONDS));
+			will(returnValue(future));
-			will(returnValue(cancellable));
 			// Get the transport properties and connected contacts
 			oneOf(transportPropertyManager).getRemoteProperties(transportId);
 			will(returnValue(singletonMap(contactId, properties)));
@@ -394,9 +269,9 @@ public class PollerImplTest extends BrambleMockTestCase {
 			// Schedule a polling task immediately
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
+			oneOf(scheduler).schedule(with(any(Runnable.class)), with(0L),
-					with(ioExecutor), with(0L), with(MILLISECONDS));
+					with(MILLISECONDS));
-			will(returnValue(cancellable));
+			will(returnValue(future));
 			will(new RunAction());
 			// Running the polling task schedules the next polling task
 			oneOf(plugin).getPollingInterval();
@@ -406,9 +281,8 @@ public class PollerImplTest extends BrambleMockTestCase {
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
 			oneOf(scheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with((long) (pollingInterval * 0.5)),
+					with((long) (pollingInterval * 0.5)), with(MILLISECONDS));
-					with(MILLISECONDS));
+			will(returnValue(future));
-			will(returnValue(cancellable));
 			// Get the transport properties and connected contacts
 			oneOf(transportPropertyManager).getRemoteProperties(transportId);
 			will(returnValue(singletonMap(contactId, properties)));
@@ -436,37 +310,17 @@ public class PollerImplTest extends BrambleMockTestCase {
 			// Schedule a polling task immediately
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
+			oneOf(scheduler).schedule(with(any(Runnable.class)), with(0L),
-					with(ioExecutor), with(0L), with(MILLISECONDS));
+					with(MILLISECONDS));
-			will(returnValue(cancellable));
+			will(returnValue(future));
 			// The plugin is deactivated before the task runs - cancel the task
-			oneOf(cancellable).cancel();
+			oneOf(future).cancel(false);
 		}});
 
 		poller.eventOccurred(new TransportActiveEvent(transportId));
 		poller.eventOccurred(new TransportInactiveEvent(transportId));
 	}
 
-	private void expectReschedule(Plugin plugin) {
-		context.checking(new Expectations() {{
-			// Get the plugin
-			oneOf(pluginManager).getPlugin(transportId);
-			will(returnValue(plugin));
-			// The plugin supports polling
-			oneOf(plugin).shouldPoll();
-			will(returnValue(true));
-			// Schedule the next poll
-			oneOf(plugin).getPollingInterval();
-			will(returnValue(pollingInterval));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(scheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with((long) pollingInterval),
-					with(MILLISECONDS));
-			will(returnValue(cancellable));
-		}});
-	}
-
 	private void expectReconnect(DuplexPlugin plugin,
 			DuplexTransportConnection duplexConnection) throws Exception {
 		context.checking(new Expectations() {{

bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java

@@ -3,7 +3,6 @@ package org.briarproject.bramble.plugin.tcp;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.Plugin.State;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportConnectionReader;
@@ -22,13 +21,11 @@ import java.net.InetSocketAddress;
 import java.net.NetworkInterface;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.Collection;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static java.net.NetworkInterface.getNetworkInterfaces;
-import static java.util.Collections.emptyList;
 import static java.util.Collections.list;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -44,7 +41,6 @@ import static org.junit.Assume.assumeTrue;
 
 public class LanTcpPluginTest extends BrambleTestCase {
 
-	private final Backoff backoff = new TestBackoff();
 	private final ExecutorService ioExecutor = newCachedThreadPool();
 
 	private Callback callback = null;
@@ -53,8 +49,7 @@ public class LanTcpPluginTest extends BrambleTestCase {
 	@Before
 	public void setUp() {
 		callback = new Callback();
-		plugin = new LanTcpPlugin(ioExecutor, ioExecutor, backoff, callback,
+		plugin = new LanTcpPlugin(ioExecutor, callback, 0, 0, 0, 1000) {
-				0, 0, 1000) {
 			@Override
 			protected boolean canConnectToOwnAddress() {
 				return true;
@@ -323,11 +318,6 @@ public class LanTcpPluginTest extends BrambleTestCase {
 			return local;
 		}
 
-		@Override
-		public Collection<TransportProperties> getRemoteProperties() {
-			return emptyList();
-		}
-
 		@Override
 		public void mergeSettings(Settings s) {
 		}
@@ -355,20 +345,4 @@ public class LanTcpPluginTest extends BrambleTestCase {
 		public void handleWriter(TransportConnectionWriter w) {
 		}
 	}
-
-	private static class TestBackoff implements Backoff {
-
-		@Override
-		public int getPollingInterval() {
-			return 60 * 1000;
-		}
-
-		@Override
-		public void increment() {
-		}
-
-		@Override
-		public void reset() {
-		}
-	}
 }

bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java

@@ -8,15 +8,11 @@ import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfEntry;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.data.MetadataParser;
-import org.briarproject.bramble.api.db.CommitAction;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.EventAction;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.properties.event.RemoteTransportPropertiesUpdatedEvent;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
@@ -49,7 +45,6 @@ import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
@@ -64,28 +59,23 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	private final Clock clock = context.mock(Clock.class);
 
 	private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
-	private final BdfDictionary fooPropertiesDict, barPropertiesDict;
+	private final BdfDictionary fooPropertiesDict = BdfDictionary.of(
-	private final BdfDictionary discoveredPropertiesDict, mergedPropertiesDict;
+			new BdfEntry("fooKey1", "fooValue1"),
+			new BdfEntry("fooKey2", "fooValue2")
+	);
+	private final BdfDictionary barPropertiesDict = BdfDictionary.of(
+			new BdfEntry("barKey1", "barValue1"),
+			new BdfEntry("barKey2", "barValue2")
+	);
 	private final TransportProperties fooProperties, barProperties;
-	private final TransportProperties discoveredProperties;
 
-	public TransportPropertyManagerImplTest() {
+	public TransportPropertyManagerImplTest() throws Exception {
 		fooProperties = new TransportProperties();
-		fooProperties.put("fooKey1", "fooValue1");
+		for (String key : fooPropertiesDict.keySet())
-		fooProperties.put("fooKey2", "fooValue2");
+			fooProperties.put(key, fooPropertiesDict.getString(key));
-		fooPropertiesDict = new BdfDictionary(fooProperties);
-
 		barProperties = new TransportProperties();
-		barProperties.put("barKey1", "barValue1");
+		for (String key : barPropertiesDict.keySet())
-		barProperties.put("barKey2", "barValue2");
+			barProperties.put(key, barPropertiesDict.getString(key));
-		barPropertiesDict = new BdfDictionary(barProperties);
-
-		discoveredProperties = new TransportProperties();
-		discoveredProperties.put("fooKey3", "fooValue3");
-		discoveredPropertiesDict = new BdfDictionary(discoveredProperties);
-
-		mergedPropertiesDict = new BdfDictionary(fooProperties);
-		mergedPropertiesDict.put("u:fooKey3", "fooValue3");
 	}
 
 	private TransportPropertyManagerImpl createInstance() {
@@ -231,7 +221,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 		TransportPropertyManagerImpl t = createInstance();
 		assertFalse(t.incomingMessage(txn, message, meta));
-		assertTrue(hasEvent(txn, RemoteTransportPropertiesUpdatedEvent.class));
 	}
 
 	@Test
@@ -270,7 +259,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 		TransportPropertyManagerImpl t = createInstance();
 		assertFalse(t.incomingMessage(txn, message, meta));
-		assertTrue(hasEvent(txn, RemoteTransportPropertiesUpdatedEvent.class));
 	}
 
 	@Test
@@ -304,12 +292,10 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 			// The update being delivered (version 3) should be deleted
 			oneOf(db).deleteMessage(txn, message.getId());
 			oneOf(db).deleteMessageMetadata(txn, message.getId());
-			// No event should be broadcast
 		}});
 
 		TransportPropertyManagerImpl t = createInstance();
 		assertFalse(t.incomingMessage(txn, message, meta));
-		assertFalse(hasEvent(txn, RemoteTransportPropertiesUpdatedEvent.class));
 	}
 
 	@Test
@@ -602,9 +588,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
 					contactGroup.getId());
 			will(returnValue(emptyMap()));
-			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(new BdfDictionary()));
 			expectStoreMessage(txn, contactGroup.getId(), "foo",
 					fooPropertiesDict, 1, true, true);
 		}});
@@ -613,49 +596,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 		t.mergeLocalProperties(new TransportId("foo"), properties);
 	}
 
-	@Test
-	public void testMergingNewPropertiesCreatesUpdateWithReflectedProperties()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact = getContact();
-		Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
-		BdfDictionary contactGroupMeta = BdfDictionary.of(
-				new BdfEntry(GROUP_KEY_DISCOVERED, discoveredPropertiesDict)
-		);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(false), withDbRunnable(txn));
-			// There are no existing properties to merge with
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(emptyMap()));
-			// Store the new properties in the local group, version 1
-			expectStoreMessage(txn, localGroup.getId(), "foo",
-					fooPropertiesDict, 1, true, false);
-			// Store the new properties in each contact's group, version 1
-			oneOf(db).getContacts(txn);
-			will(returnValue(singletonList(contact)));
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
-					MAJOR_VERSION, contact);
-			will(returnValue(contactGroup));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(emptyMap()));
-			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(contactGroupMeta));
-			// Reflect discovered properties
-			oneOf(clientHelper).parseAndValidateTransportProperties(
-					discoveredPropertiesDict);
-			will(returnValue(discoveredProperties));
-			expectStoreMessage(txn, contactGroup.getId(), "foo",
-					mergedPropertiesDict, 1, true, true);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.mergeLocalProperties(new TransportId("foo"), fooProperties);
-	}
-
 	@Test
 	public void testMergingUpdatedPropertiesCreatesUpdate() throws Exception {
 		Transaction txn = new Transaction(null, false);
@@ -712,9 +652,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
 					contactGroup.getId());
 			will(returnValue(contactGroupMessageMetadata));
-			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(new BdfDictionary()));
 			expectStoreMessage(txn, contactGroup.getId(), "foo",
 					fooPropertiesDict, 2, true, true);
 			// Delete the previous update
@@ -725,75 +662,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 		t.mergeLocalProperties(new TransportId("foo"), properties);
 	}
 
-	@Test
-	public void testMergingUpdatedPropertiesCreatesUpdateWithReflectedProperties()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact = getContact();
-		Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
-		BdfDictionary contactGroupMeta = BdfDictionary.of(
-				new BdfEntry(GROUP_KEY_DISCOVERED, discoveredPropertiesDict)
-		);
-		BdfDictionary oldMetadata = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_TRANSPORT_ID, "foo"),
-				new BdfEntry(MSG_KEY_VERSION, 1),
-				new BdfEntry(MSG_KEY_LOCAL, true)
-		);
-		MessageId localGroupUpdateId = new MessageId(getRandomId());
-		Map<MessageId, BdfDictionary> localGroupMessageMetadata =
-				singletonMap(localGroupUpdateId, oldMetadata);
-		MessageId contactGroupUpdateId = new MessageId(getRandomId());
-		Map<MessageId, BdfDictionary> contactGroupMessageMetadata =
-				singletonMap(contactGroupUpdateId, oldMetadata);
-		TransportProperties oldProperties = new TransportProperties();
-		oldProperties.put("fooKey1", "oldFooValue1");
-		BdfDictionary oldPropertiesDict = BdfDictionary.of(
-				new BdfEntry("fooKey1", "oldFooValue1")
-		);
-		BdfList oldUpdate = BdfList.of("foo", 1, oldPropertiesDict);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(false), withDbRunnable(txn));
-			// Merge the new properties with the existing properties
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(localGroupMessageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, localGroupUpdateId);
-			will(returnValue(oldUpdate));
-			oneOf(clientHelper).parseAndValidateTransportProperties(
-					oldPropertiesDict);
-			will(returnValue(oldProperties));
-			// Store the merged properties in the local group, version 2
-			expectStoreMessage(txn, localGroup.getId(), "foo",
-					fooPropertiesDict, 2, true, false);
-			// Delete the previous update
-			oneOf(db).removeMessage(txn, localGroupUpdateId);
-			// Store the merged properties in each contact's group, version 2
-			oneOf(db).getContacts(txn);
-			will(returnValue(singletonList(contact)));
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
-					MAJOR_VERSION, contact);
-			will(returnValue(contactGroup));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(contactGroupMessageMetadata));
-			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(contactGroupMeta));
-			// Reflect discovered properties
-			oneOf(clientHelper).parseAndValidateTransportProperties(
-					discoveredPropertiesDict);
-			will(returnValue(discoveredProperties));
-			expectStoreMessage(txn, contactGroup.getId(), "foo",
-					mergedPropertiesDict, 2, true, true);
-			// Delete the previous update
-			oneOf(db).removeMessage(txn, contactGroupUpdateId);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.mergeLocalProperties(new TransportId("foo"), fooProperties);
-	}
-
 	private void expectGetLocalProperties(Transaction txn) throws Exception {
 		Map<MessageId, BdfDictionary> messageMetadata = new LinkedHashMap<>();
 		// The latest update for transport "foo" should be returned
@@ -851,15 +719,4 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 					false);
 		}});
 	}
-
-	private boolean hasEvent(Transaction txn,
-			Class<? extends Event> eventClass) {
-		for (CommitAction action : txn.getActions()) {
-			if (action instanceof EventAction) {
-				Event event = ((EventAction) action).getEvent();
-				if (eventClass.isInstance(event)) return true;
-			}
-		}
-		return false;
-	}
 }

bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java

@@ -26,8 +26,6 @@ import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedE
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousPollEvent;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.CaptureArgumentAction;
 import org.briarproject.bramble.test.DbExpectations;
@@ -39,6 +37,7 @@ import org.junit.Test;
 
 import java.util.Random;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static java.util.Collections.emptyList;
@@ -61,7 +60,8 @@ import static org.briarproject.bramble.test.TestUtils.getTransportProperties;
 
 public class RendezvousPollerImplTest extends BrambleMockTestCase {
 
-	private final TaskScheduler scheduler = context.mock(TaskScheduler.class);
+	private final ScheduledExecutorService scheduler =
+			context.mock(ScheduledExecutorService.class);
 	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
 	private final IdentityManager identityManager =
 			context.mock(IdentityManager.class);
@@ -80,7 +80,6 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 			context.mock(KeyMaterialSource.class);
 	private final RendezvousEndpoint rendezvousEndpoint =
 			context.mock(RendezvousEndpoint.class);
-	private final Cancellable cancellable = context.mock(Cancellable.class);
 
 	private final Executor ioExecutor = new ImmediateExecutor();
 	private final PendingContact pendingContact = getPendingContact();
@@ -109,7 +108,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		long beforeExpiry = pendingContact.getTimestamp()
 				+ RENDEZVOUS_TIMEOUT_MS - 1000;
 		long afterExpiry = beforeExpiry + POLLING_INTERVAL_MS;
-		AtomicReference<Runnable> capturePollTask;
+		AtomicReference<Runnable> capturePollTask = new AtomicReference<>();
 
 		// Start the service
 		context.checking(new DbExpectations() {{
@@ -123,17 +122,21 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 			oneOf(eventBus).broadcast(with(new PredicateMatcher<>(
 					PendingContactStateChangedEvent.class, e ->
 					e.getPendingContactState() == OFFLINE)));
+			// Capture the poll task
+			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
+					with(MILLISECONDS));
+			will(new CaptureArgumentAction<>(capturePollTask, Runnable.class,
+					0));
 		}});
 
 		expectDeriveRendezvousKey();
-		capturePollTask = expectSchedulePolling();
 
 		rendezvousPoller.startService();
 		context.assertIsSatisfied();
 
-		// Run the poll task - pending contact expires, polling is cancelled
+		// Run the poll task - pending contact expires
 		expectPendingContactExpires(afterExpiry);
-		expectCancelPolling();
 
 		capturePollTask.get().run();
 	}
@@ -155,6 +158,10 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 			oneOf(eventBus).broadcast(with(new PredicateMatcher<>(
 					PendingContactStateChangedEvent.class, e ->
 					e.getPendingContactState() == FAILED)));
+			// Schedule the poll task
+			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
+					with(MILLISECONDS));
 		}});
 
 		rendezvousPoller.startService();
@@ -177,8 +184,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		rendezvousPoller.eventOccurred(new TransportActiveEvent(transportId));
 		context.assertIsSatisfied();
 
-		// Add the pending contact - endpoint should be created and polled,
+		// Add the pending contact - endpoint should be created and polled
-		// polling should be scheduled
 		expectAddPendingContact(beforeExpiry, WAITING_FOR_CONNECTION);
 		expectDeriveRendezvousKey();
 		expectCreateEndpoint();
@@ -195,16 +201,12 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 					any(ConnectionHandler.class)))));
 		}});
 
-		expectSchedulePolling();
-
 		rendezvousPoller.eventOccurred(
 				new PendingContactAddedEvent(pendingContact));
 		context.assertIsSatisfied();
 
-		// Remove the pending contact - endpoint should be closed,
+		// Remove the pending contact - endpoint should be closed
-		// polling should be cancelled
 		expectCloseEndpoint();
-		expectCancelPolling();
 
 		rendezvousPoller.eventOccurred(
 				new PendingContactRemovedEvent(pendingContact.getId()));
@@ -220,10 +222,10 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		long beforeExpiry = pendingContact.getTimestamp()
 				+ RENDEZVOUS_TIMEOUT_MS - 1000;
 		long afterExpiry = beforeExpiry + POLLING_INTERVAL_MS;
-		AtomicReference<Runnable> capturePollTask;
 
-		// Start the service
+		// Start the service, capturing the poll task
-		expectStartupWithNoPendingContacts();
+		AtomicReference<Runnable> capturePollTask =
+				expectStartupWithNoPendingContacts();
 
 		rendezvousPoller.startService();
 		context.assertIsSatisfied();
@@ -234,8 +236,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		rendezvousPoller.eventOccurred(new TransportActiveEvent(transportId));
 		context.assertIsSatisfied();
 
-		// Add the pending contact - endpoint should be created and polled,
+		// Add the pending contact - endpoint should be created and polled
-		// polling should be scheduled
 		expectAddPendingContact(beforeExpiry, WAITING_FOR_CONNECTION);
 		expectDeriveRendezvousKey();
 		expectCreateEndpoint();
@@ -252,17 +253,13 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 					any(ConnectionHandler.class)))));
 		}});
 
-		capturePollTask = expectSchedulePolling();
-
 		rendezvousPoller.eventOccurred(
 				new PendingContactAddedEvent(pendingContact));
 		context.assertIsSatisfied();
 
-		// Run the poll task - pending contact expires, endpoint is closed,
+		// Run the poll task - pending contact expires, endpoint is closed
-		// polling is cancelled
 		expectPendingContactExpires(afterExpiry);
 		expectCloseEndpoint();
-		expectCancelPolling();
 
 		capturePollTask.get().run();
 		context.assertIsSatisfied();
@@ -290,7 +287,6 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		// Add the pending contact - no endpoints should be created yet
 		expectAddPendingContact(beforeExpiry, OFFLINE);
 		expectDeriveRendezvousKey();
-		expectSchedulePolling();
 
 		rendezvousPoller.eventOccurred(
 				new PendingContactAddedEvent(pendingContact));
@@ -312,8 +308,6 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		context.assertIsSatisfied();
 
 		// Remove the pending contact - endpoint is already closed
-		expectCancelPolling();
-
 		rendezvousPoller.eventOccurred(
 				new PendingContactRemovedEvent(pendingContact.getId()));
 	}
@@ -355,9 +349,8 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		rendezvousPoller.startService();
 		context.assertIsSatisfied();
 
-		// Run the poll task - pending contact expires, polling is cancelled
+		// Run the poll task - pending contact expires
 		expectPendingContactExpires(afterExpiry);
-		expectCancelPolling();
 
 		capturePollTask.get().run();
 		context.assertIsSatisfied();
@@ -393,9 +386,8 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 				new RendezvousConnectionOpenedEvent(pendingContact.getId()));
 		context.assertIsSatisfied();
 
-		// Run the poll task - pending contact expires, polling is cancelled
+		// Run the poll task - pending contact expires
 		expectPendingContactExpires(afterExpiry);
-		expectCancelPolling();
 
 		capturePollTask.get().run();
 		context.assertIsSatisfied();
@@ -426,9 +418,8 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 				new RendezvousConnectionOpenedEvent(pendingContact.getId()));
 		context.assertIsSatisfied();
 
-		// Run the poll task - pending contact expires, polling is cancelled
+		// Run the poll task - pending contact expires
 		expectPendingContactExpires(afterExpiry);
-		expectCancelPolling();
 
 		capturePollTask.get().run();
 		context.assertIsSatisfied();
@@ -457,8 +448,6 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 		context.assertIsSatisfied();
 
 		// Pending contact is removed - no event should be broadcast
-		expectCancelPolling();
-
 		rendezvousPoller.eventOccurred(
 				new PendingContactRemovedEvent(pendingContact.getId()));
 		context.assertIsSatisfied();
@@ -468,35 +457,25 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 				pendingContact.getId(), false));
 	}
 
-	private AtomicReference<Runnable> expectSchedulePolling() {
+	private AtomicReference<Runnable> expectStartupWithNoPendingContacts()
-		AtomicReference<Runnable> capturePollTask = new AtomicReference<>();
+			throws Exception {
-
-		context.checking(new Expectations() {{
-			oneOf(scheduler).scheduleWithFixedDelay(with(any(Runnable.class)),
-					with(any(Executor.class)), with(POLLING_INTERVAL_MS),
-					with(POLLING_INTERVAL_MS), with(MILLISECONDS));
-			will(doAll(new CaptureArgumentAction<>(capturePollTask,
-					Runnable.class, 0), returnValue(cancellable)));
-		}});
-
-		return capturePollTask;
-	}
-
-	private void expectCancelPolling() {
-		context.checking(new Expectations() {{
-			oneOf(cancellable).cancel();
-		}});
-	}
-
-	private void expectStartupWithNoPendingContacts() throws Exception {
 		Transaction txn = new Transaction(null, true);
+		AtomicReference<Runnable> capturePollTask = new AtomicReference<>();
 
 		context.checking(new DbExpectations() {{
 			// Load the pending contacts
 			oneOf(db).transaction(with(true), withDbRunnable(txn));
 			oneOf(db).getPendingContacts(txn);
 			will(returnValue(emptyList()));
+			// Capture the poll task
+			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
+					with(MILLISECONDS));
+			will(new CaptureArgumentAction<>(capturePollTask, Runnable.class,
+					0));
 		}});
+
+		return capturePollTask;
 	}
 
 	private void expectAddPendingContact(long now,
@@ -552,6 +531,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 	private AtomicReference<Runnable> expectStartupWithPendingContact(long now)
 			throws Exception {
 		Transaction txn = new Transaction(null, true);
+		AtomicReference<Runnable> capturePollTask = new AtomicReference<>();
 
 		context.checking(new DbExpectations() {{
 			// Load the pending contacts
@@ -564,10 +544,17 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 			oneOf(eventBus).broadcast(with(new PredicateMatcher<>(
 					PendingContactStateChangedEvent.class, e ->
 					e.getPendingContactState() == OFFLINE)));
+			// Capture the poll task
+			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
+					with(MILLISECONDS));
+			will(new CaptureArgumentAction<>(capturePollTask, Runnable.class,
+					0));
 		}});
 
 		expectDeriveRendezvousKey();
-		return expectSchedulePolling();
+
+		return capturePollTask;
 	}
 
 	private void expectPendingContactExpires(long now) {

bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.sync;
 
-import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons;
+import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.TransportCrypto;
@@ -73,8 +73,7 @@ public class SyncIntegrationTest extends BrambleTestCase {
 
 		SyncIntegrationTestComponent component =
 				DaggerSyncIntegrationTestComponent.builder().build();
-		BrambleCoreIntegrationTestEagerSingletons.Helper
+		BrambleCoreEagerSingletons.Helper.injectEagerSingletons(component);
-				.injectEagerSingletons(component);
 		component.inject(this);
 
 		contactId = getContactId();

bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.sync;
 
-import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons;
+import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
 
@@ -13,8 +13,7 @@ import dagger.Component;
 		BrambleCoreIntegrationTestModule.class,
 		BrambleCoreModule.class
 })
-interface SyncIntegrationTestComponent extends
+interface SyncIntegrationTestComponent extends BrambleCoreEagerSingletons {
-		BrambleCoreIntegrationTestEagerSingletons {
 
 	void inject(SyncIntegrationTest testCase);
 }

bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java

@@ -3,8 +3,6 @@ package org.briarproject.bramble.test;
 import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.bramble.battery.DefaultBatteryManagerModule;
 import org.briarproject.bramble.event.DefaultEventExecutorModule;
-import org.briarproject.bramble.system.DefaultTaskSchedulerModule;
-import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule;
 
 import dagger.Module;
 import dagger.Provides;
@@ -12,8 +10,6 @@ import dagger.Provides;
 @Module(includes = {
 		DefaultBatteryManagerModule.class,
 		DefaultEventExecutorModule.class,
-		DefaultTaskSchedulerModule.class,
-		DefaultWakefulIoExecutorModule.class,
 		TestDatabaseConfigModule.class,
 		TestPluginConfigModule.class,
 		TestSecureRandomModule.class