fixing the result handlers and orientation changes

2026-02-12 10:49:06 +01:00 · 2016-11-24 23:59:26 +01:00
1779 changed files with 45786 additions and 63764 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,18 +9,15 @@ Thumbs.db
 .DS_Store

 # Eclipse project files
-.classpath
-.project
-.settings
+#.classpath
+#.project

 # Local configuration file (sdk path, etc)
 local.properties

 # Android Studio
 .idea/*
-!.idea/runConfigurations/
 !.idea/codeStyleSettings.xml
 .gradle
 build/
 *.iml
-projectFilesBackup/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,29 +0,0 @@
-image: registry.gitlab.com/fdroid/ci-images-base:latest
-
-cache:
-  paths:
-    - .gradle/wrapper
-    - .gradle/caches
-
-before_script:
-  - set -e
-  - export GRADLE_USER_HOME=$PWD/.gradle
-  # Accept the license for the Android build tools
-  - echo y | /opt/android-sdk/tools/bin/sdkmanager "build-tools;26.0.2"
-  # Download OpenJDK 6 so we can compile against its standard library
-  - JDK_FILE=openjdk-6-jre-headless_6b38-1.13.10-1~deb7u1_amd64.deb
-  - if [ ! -d openjdk ]
-  - then
-  - wget -q http://ftp.uk.debian.org/debian/pool/main/o/openjdk-6/$JDK_FILE
-  - dpkg-deb -x $JDK_FILE openjdk
-  - fi
-  - export JAVA_6_HOME=$PWD/openjdk/usr/lib/jvm/java-6-openjdk-amd64
-
-test:
-  script:
-    - ./gradlew test
-
-after_script:
-    # this file changes every time but should not be cached
-    - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
-    - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
--- a/.idea/runConfigurations/All_tests.xml
+++ b/.idea/runConfigurations/All_tests.xml
@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <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" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method>
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-j2se" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
-    </method>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/All_tests_in_bramble_api.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_api.xml
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-api" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <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" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/All_tests_in_bramble_core.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_core.xml
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-core" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <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" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/All_tests_in_bramble_j2se.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_j2se.xml
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-j2se" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="bramble-j2se" />
-    <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 -Djava.library.path=libs" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-j2se" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/All_tests_in_briar_android.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_android.xml
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-android" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <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" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/All_tests_in_briar_core.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_core.xml
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-core" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <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" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -1,95 +0,0 @@
-import de.undercouch.gradle.tasks.download.Download
-import de.undercouch.gradle.tasks.download.Verify
-
-apply plugin: 'com.android.library'
-apply plugin: 'witness'
-apply plugin: 'de.undercouch.download'
-
-android {
-	compileSdkVersion 27
-	buildToolsVersion '26.0.2'
-
-	defaultConfig {
-		minSdkVersion 14
-		targetSdkVersion 26
-		versionCode 1620
-		versionName "0.16.20"
-		consumerProguardFiles 'proguard-rules.txt'
-	}
-
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
-	}
-}
-
-dependencies {
-	implementation project(path: ':bramble-core', configuration: 'default')
-	implementation fileTree(dir: 'libs', include: '*.jar')
-
-	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
-
-	compileOnly 'javax.annotation:jsr250-api:1.0'
-}
-
-dependencyVerification {
-	verify = [
-			'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-			'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
-			'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
-			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
-			'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
-			'com.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
-			'com.madgag.spongycastle:core:1.58.0.0:core-1.58.0.0.jar:199617dd5698c5a9312b898c0a4cec7ce9dd8649d07f65d91629f58229d72728',
-			'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
-			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-			'org.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
-			'org.jacoco:org.jacoco.agent:0.7.4.201502262128:org.jacoco.agent-0.7.4.201502262128-runtime.jar:e357a0f1d573c2f702a273992b1b6cb661734f66311854efb3778a888515c5b5',
-			'org.jacoco:org.jacoco.agent:0.7.4.201502262128:org.jacoco.agent-0.7.4.201502262128.jar:47b4bec6df11a1118da3953da8b9fa1e7079d6fec857faa1a3cf912e53a6fd4e',
-			'org.jacoco:org.jacoco.ant:0.7.4.201502262128:org.jacoco.ant-0.7.4.201502262128.jar:013ce2a68ba57a3c59215ae0dec4df3498c078062a38c3b94c841fc14450f283',
-			'org.jacoco:org.jacoco.core:0.7.4.201502262128:org.jacoco.core-0.7.4.201502262128.jar:ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb',
-			'org.jacoco:org.jacoco.report:0.7.4.201502262128:org.jacoco.report-0.7.4.201502262128.jar:7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09',
-			'org.ow2.asm:asm-debug-all:5.0.1:asm-debug-all-5.0.1.jar:4734de5b515a454b0096db6971fb068e5f70e6f10bbee2b3bd2fdfe5d978ed57',
-	]
-}
-
-ext.torBinaryDir = 'src/main/res/raw'
-ext.torVersion = '0.2.9.14'
-ext.geoipVersion = '2017-11-06'
-ext.torDownloadUrl = 'https://briarproject.org/build/'
-
-def torBinaries = [
-		"tor_arm"    : '1710ea6c47b7f4c1a88bdf4858c7893837635db10e8866854eed8d61629f50e8',
-		"tor_arm_pie": '974e6949507db8fa2ea45231817c2c3677ed4ccf5488a2252317d744b0be1917',
-		"tor_x86"    : '3a5e45b3f051fcda9353b098b7086e762ffe7ba9242f7d7c8bf6523faaa8b1e9',
-		"tor_x86_pie": 'd1d96d8ce1a4b68accf04850185780d10cd5563d3552f7e1f040f8ca32cb4e51',
-		"geoip"      : '8239b98374493529a29096e45fc5877d4d6fdad0146ad8380b291f90d61484ea'
-]
-
-def downloadBinary(name) {
-	return tasks.create("downloadBinary${name}", Download) {
-		src "${torDownloadUrl}${name}.zip"
-				.replace('tor_', "tor-${torVersion}-")
-				.replace('geoip', "geoip-${geoipVersion}")
-				.replaceAll('_', '-')
-		dest "${torBinaryDir}/${name}.zip"
-		onlyIfNewer true
-	}
-}
-
-def verifyBinary(name, chksum) {
-	return tasks.create([
-			name     : "verifyBinary${name}",
-			type     : Verify,
-			dependsOn: downloadBinary(name)]) {
-		src "${torBinaryDir}/${name}.zip"
-		algorithm 'SHA-256'
-		checksum chksum
-	}
-}
-
-project.afterEvaluate {
-	torBinaries.every { key, value ->
-		preBuild.dependsOn.add(verifyBinary(key, value))
-	}
-}
--- a/bramble-android/libs/jtorctl-briar.jar
+++ b/bramble-android/libs/jtorctl-briar.jar
--- a/bramble-android/proguard-rules.txt
+++ b/bramble-android/proguard-rules.txt
@@ -1,15 +0,0 @@
-keep,includedescriptorclasses class org.briarproject.** { *; }
-
-keep class org.h2.** { *; }
-dontwarn org.h2.**
-dontnote org.h2.**
-
-keep class dagger.** { *; }
-dontwarn dagger.**
-dontnote dagger.**
-
-dontwarn sun.misc.Unsafe
-dontnote com.google.common.**
-
-# UPnP library isn't used
-dontwarn org.bitlet.weupnp.**
--- a/bramble-android/src/main/AndroidManifest.xml
+++ b/bramble-android/src/main/AndroidManifest.xml
@@ -1,22 +0,0 @@
-<manifest
-	package="org.briarproject.bramble"
-	xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<uses-feature android:name="android.hardware.bluetooth"/>
-
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-	<uses-permission android:name="android.permission.BLUETOOTH"/>
-	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.READ_LOGS"/>
-	<uses-permission android:name="android.permission.WAKE_LOCK"/>
-
-	<application
-		android:allowBackup="false"
-		android:label="@string/app_name"
-		android:supportsRtl="true">
-
-	</application>
-
-</manifest>
--- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java
@@ -1,13 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.plugin.AndroidPluginModule;
-import org.briarproject.bramble.system.AndroidSystemModule;
-
-import dagger.Module;
-
-@Module(includes = {
-		AndroidPluginModule.class,
-		AndroidSystemModule.class
-})
-public class BrambleAndroidModule {
-}
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
@@ -1,69 +0,0 @@
-package org.briarproject.bramble.plugin;
-
-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.BackoffFactory;
-import org.briarproject.bramble.api.plugin.PluginConfig;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
-import org.briarproject.bramble.api.reporting.DevReporter;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.Scheduler;
-import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory;
-import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
-import org.briarproject.bramble.plugin.tor.TorPluginFactory;
-
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.net.SocketFactory;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidPluginModule {
-
-	@Provides
-	PluginConfig providePluginConfig(@IoExecutor Executor ioExecutor,
-			@Scheduler ScheduledExecutorService scheduler,
-			AndroidExecutor androidExecutor, SecureRandom random,
-			SocketFactory torSocketFactory, BackoffFactory backoffFactory,
-			Application app, LocationUtils locationUtils, DevReporter reporter,
-			EventBus eventBus) {
-		Context appContext = app.getApplicationContext();
-		DuplexPluginFactory bluetooth =
-				new AndroidBluetoothPluginFactory(ioExecutor, androidExecutor,
-						appContext, random, eventBus, backoffFactory);
-		DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, scheduler,
-				appContext, locationUtils, reporter, eventBus,
-				torSocketFactory, backoffFactory);
-		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
-				scheduler, backoffFactory, appContext);
-		Collection<DuplexPluginFactory> duplex =
-				Arrays.asList(bluetooth, tor, lan);
-		@NotNullByDefault
-		PluginConfig pluginConfig = new PluginConfig() {
-
-			@Override
-			public Collection<DuplexPluginFactory> getDuplexFactories() {
-				return duplex;
-			}
-
-			@Override
-			public Collection<SimplexPluginFactory> getSimplexFactories() {
-				return Collections.emptyList();
-			}
-		};
-		return pluginConfig;
-	}
-}
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
@@ -1,206 +0,0 @@
-package org.briarproject.bramble.plugin.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothServerSocket;
-import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-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.PluginException;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.util.AndroidUtils;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-
-import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
-import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
-import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
-import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
-import static android.bluetooth.BluetoothAdapter.STATE_OFF;
-import static android.bluetooth.BluetoothAdapter.STATE_ON;
-import static java.util.logging.Level.WARNING;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
-
-	private static final Logger LOG =
-			Logger.getLogger(AndroidBluetoothPlugin.class.getName());
-
-	private final AndroidExecutor androidExecutor;
-	private final Context appContext;
-
-	private volatile boolean wasEnabledByUs = false;
-	private volatile BluetoothStateReceiver receiver = null;
-
-	// Non-null if the plugin started successfully
-	private volatile BluetoothAdapter adapter = null;
-
-	AndroidBluetoothPlugin(Executor ioExecutor, AndroidExecutor androidExecutor,
-			Context appContext, SecureRandom secureRandom, Backoff backoff,
-			DuplexPluginCallback callback, int maxLatency) {
-		super(ioExecutor, secureRandom, backoff, callback, maxLatency);
-		this.androidExecutor = androidExecutor;
-		this.appContext = appContext;
-	}
-
-	@Override
-	public void start() throws PluginException {
-		super.start();
-		// Listen for changes to the Bluetooth state
-		IntentFilter filter = new IntentFilter();
-		filter.addAction(ACTION_STATE_CHANGED);
-		filter.addAction(ACTION_SCAN_MODE_CHANGED);
-		receiver = new BluetoothStateReceiver();
-		appContext.registerReceiver(receiver, filter);
-	}
-
-	@Override
-	public void stop() {
-		super.stop();
-		if (receiver != null) appContext.unregisterReceiver(receiver);
-	}
-
-	@Override
-	void initialiseAdapter() throws IOException {
-		// BluetoothAdapter.getDefaultAdapter() must be called on a thread
-		// with a message queue, so submit it to the AndroidExecutor
-		try {
-			adapter = androidExecutor.runOnBackgroundThread(
-					BluetoothAdapter::getDefaultAdapter).get();
-		} catch (InterruptedException | ExecutionException e) {
-			throw new IOException(e);
-		}
-		if (adapter == null)
-			throw new IOException("Bluetooth is not supported");
-	}
-
-	@Override
-	boolean isAdapterEnabled() {
-		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
-	@Nullable
-	String getBluetoothAddress() {
-		String address = AndroidUtils.getBluetoothAddress(appContext, adapter);
-		return address.isEmpty() ? null : address;
-	}
-
-	@Override
-	BluetoothServerSocket openServerSocket(String uuid) throws IOException {
-		return adapter.listenUsingInsecureRfcommWithServiceRecord(
-				"RFCOMM", UUID.fromString(uuid));
-	}
-
-	@Override
-	void tryToClose(@Nullable BluetoothServerSocket ss) {
-		try {
-			if (ss != null) ss.close();
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		}
-	}
-
-	@Override
-	DuplexTransportConnection acceptConnection(BluetoothServerSocket ss)
-			throws IOException {
-		return wrapSocket(ss.accept());
-	}
-
-	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
-		return new AndroidBluetoothTransportConnection(this, s);
-	}
-
-	@Override
-	boolean isValidAddress(String address) {
-		return BluetoothAdapter.checkBluetoothAddress(address);
-	}
-
-	@Override
-	DuplexTransportConnection connectTo(String address, String uuid)
-			throws IOException {
-		BluetoothDevice d = adapter.getRemoteDevice(address);
-		UUID u = UUID.fromString(uuid);
-		BluetoothSocket s = null;
-		try {
-			s = d.createInsecureRfcommSocketToServiceRecord(u);
-			s.connect();
-			return wrapSocket(s);
-		} catch (IOException e) {
-			tryToClose(s);
-			throw e;
-		}
-	}
-
-	private void tryToClose(@Nullable Closeable c) {
-		try {
-			if (c != null) c.close();
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		}
-	}
-
-	private class BluetoothStateReceiver extends BroadcastReceiver {
-
-		@Override
-		public void onReceive(Context ctx, Intent intent) {
-			int state = intent.getIntExtra(EXTRA_STATE, 0);
-			if (state == STATE_ON) onAdapterEnabled();
-			else if (state == STATE_OFF) onAdapterDisabled();
-			int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
-			if (scanMode == SCAN_MODE_NONE) {
-				LOG.info("Scan mode: None");
-			} else if (scanMode == SCAN_MODE_CONNECTABLE) {
-				LOG.info("Scan mode: Connectable");
-			} else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
-				LOG.info("Scan mode: Discoverable");
-			}
-		}
-	}
-}
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java
@@ -1,70 +0,0 @@
-package org.briarproject.bramble.plugin.bluetooth;
-
-import android.content.Context;
-
-import org.briarproject.bramble.api.event.EventBus;
-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.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-
-import java.security.SecureRandom;
-import java.util.concurrent.Executor;
-
-import javax.annotation.concurrent.Immutable;
-
-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 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;
-	private final AndroidExecutor androidExecutor;
-	private final Context appContext;
-	private final SecureRandom secureRandom;
-	private final EventBus eventBus;
-	private final BackoffFactory backoffFactory;
-
-	public AndroidBluetoothPluginFactory(Executor ioExecutor,
-			AndroidExecutor androidExecutor, Context appContext,
-			SecureRandom secureRandom, EventBus eventBus,
-			BackoffFactory backoffFactory) {
-		this.ioExecutor = ioExecutor;
-		this.androidExecutor = androidExecutor;
-		this.appContext = appContext;
-		this.secureRandom = secureRandom;
-		this.eventBus = eventBus;
-		this.backoffFactory = backoffFactory;
-	}
-
-	@Override
-	public TransportId getId() {
-		return ID;
-	}
-
-	@Override
-	public int getMaxLatency() {
-		return MAX_LATENCY;
-	}
-
-	@Override
-	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(ioExecutor,
-				androidExecutor, appContext, secureRandom, backoff, callback,
-				MAX_LATENCY);
-		eventBus.addListener(plugin);
-		return plugin;
-	}
-}
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
@@ -1,196 +0,0 @@
-package org.briarproject.bramble.plugin.tcp;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.net.SocketFactory;
-
-import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.WIFI_SERVICE;
-import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
-import static android.net.ConnectivityManager.TYPE_WIFI;
-import static android.net.wifi.WifiManager.EXTRA_WIFI_STATE;
-import static android.os.Build.VERSION.SDK_INT;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-@NotNullByDefault
-class AndroidLanTcpPlugin extends LanTcpPlugin {
-
-	// See android.net.wifi.WifiManager
-	private static final String WIFI_AP_STATE_CHANGED_ACTION =
-			"android.net.wifi.WIFI_AP_STATE_CHANGED";
-	private static final int WIFI_AP_STATE_ENABLED = 13;
-
-	private static final byte[] WIFI_AP_ADDRESS_BYTES =
-			{(byte) 192, (byte) 168, 43, 1};
-	private static final InetAddress WIFI_AP_ADDRESS;
-
-	private static final Logger LOG =
-			Logger.getLogger(AndroidLanTcpPlugin.class.getName());
-
-	static {
-		try {
-			WIFI_AP_ADDRESS = InetAddress.getByAddress(WIFI_AP_ADDRESS_BYTES);
-		} catch (UnknownHostException e) {
-			// Should only be thrown if the address has an illegal length
-			throw new AssertionError(e);
-		}
-	}
-
-	private final ScheduledExecutorService scheduler;
-	private final Context appContext;
-	private final ConnectivityManager connectivityManager;
-	@Nullable
-	private final WifiManager wifiManager;
-
-	@Nullable
-	private volatile BroadcastReceiver networkStateReceiver = null;
-	private volatile SocketFactory socketFactory;
-
-	AndroidLanTcpPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
-			Backoff backoff, Context appContext, DuplexPluginCallback callback,
-			int maxLatency, int maxIdleTime) {
-		super(ioExecutor, backoff, callback, maxLatency, maxIdleTime);
-		this.scheduler = scheduler;
-		this.appContext = appContext;
-		ConnectivityManager connectivityManager = (ConnectivityManager)
-				appContext.getSystemService(CONNECTIVITY_SERVICE);
-		if (connectivityManager == null) throw new AssertionError();
-		this.connectivityManager = connectivityManager;
-		wifiManager = (WifiManager) appContext.getApplicationContext()
-				.getSystemService(WIFI_SERVICE);
-		socketFactory = SocketFactory.getDefault();
-	}
-
-	@Override
-	public void start() {
-		if (used.getAndSet(true)) throw new IllegalStateException();
-		running = true;
-		// Register to receive network status events
-		networkStateReceiver = new NetworkStateReceiver();
-		IntentFilter filter = new IntentFilter();
-		filter.addAction(CONNECTIVITY_ACTION);
-		filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
-		appContext.registerReceiver(networkStateReceiver, filter);
-	}
-
-	@Override
-	public void stop() {
-		running = false;
-		if (networkStateReceiver != null)
-			appContext.unregisterReceiver(networkStateReceiver);
-		tryToClose(socket);
-	}
-
-	@Override
-	protected Socket createSocket() throws IOException {
-		return socketFactory.createSocket();
-	}
-
-	@Override
-	protected Collection<InetAddress> getLocalIpAddresses() {
-		// If the device doesn't have wifi, don't open any sockets
-		if (wifiManager == null) return emptyList();
-		// If we're connected to a wifi network, use that network
-		WifiInfo info = wifiManager.getConnectionInfo();
-		if (info != null && info.getIpAddress() != 0)
-			return singletonList(intToInetAddress(info.getIpAddress()));
-		// If we're running an access point, return its address
-		if (super.getLocalIpAddresses().contains(WIFI_AP_ADDRESS))
-				return singletonList(WIFI_AP_ADDRESS);
-		// No suitable addresses
-		return emptyList();
-	}
-
-	private InetAddress intToInetAddress(int ip) {
-		byte[] ipBytes = new byte[4];
-		ipBytes[0] = (byte) (ip & 0xFF);
-		ipBytes[1] = (byte) ((ip >> 8) & 0xFF);
-		ipBytes[2] = (byte) ((ip >> 16) & 0xFF);
-		ipBytes[3] = (byte) ((ip >> 24) & 0xFF);
-		try {
-			return InetAddress.getByAddress(ipBytes);
-		} catch (UnknownHostException e) {
-			// Should only be thrown if address has illegal length
-			throw new AssertionError(e);
-		}
-	}
-
-	// On API 21 and later, a socket that is not created with the wifi
-	// network's socket factory may try to connect via another network
-	private SocketFactory getSocketFactory() {
-		if (SDK_INT < 21) return SocketFactory.getDefault();
-		for (Network net : connectivityManager.getAllNetworks()) {
-			NetworkInfo info = connectivityManager.getNetworkInfo(net);
-			if (info != null && info.getType() == TYPE_WIFI)
-				return net.getSocketFactory();
-		}
-		LOG.warning("Could not find suitable socket factory");
-		return SocketFactory.getDefault();
-	}
-
-	private class NetworkStateReceiver extends BroadcastReceiver {
-
-		@Override
-		public void onReceive(Context ctx, Intent i) {
-			if (!running) return;
-			if (isApEnabledEvent(i)) {
-				// The state change may be broadcast before the AP address is
-				// visible, so delay handling the event
-				scheduler.schedule(this::handleConnectivityChange, 1, SECONDS);
-			} else {
-				handleConnectivityChange();
-			}
-		}
-
-		private void handleConnectivityChange() {
-			if (!running) return;
-			Collection<InetAddress> addrs = getLocalIpAddresses();
-			if (addrs.contains(WIFI_AP_ADDRESS)) {
-				LOG.info("Providing wifi hotspot");
-				// There's no corresponding Network object and thus no way
-				// to get a suitable socket factory, so we won't be able to
-				// make outgoing connections on API 21+ if another network
-				// has internet access
-				socketFactory = SocketFactory.getDefault();
-				if (socket == null || socket.isClosed()) bind();
-			} else if (addrs.isEmpty()) {
-				LOG.info("Not connected to wifi");
-				socketFactory = SocketFactory.getDefault();
-				tryToClose(socket);
-			} else {
-				LOG.info("Connected to wifi");
-				socketFactory = getSocketFactory();
-				if (socket == null || socket.isClosed()) bind();
-			}
-		}
-
-		private boolean isApEnabledEvent(Intent i) {
-			return WIFI_AP_STATE_CHANGED_ACTION.equals(i.getAction()) &&
-					i.getIntExtra(EXTRA_WIFI_STATE, 0) == WIFI_AP_STATE_ENABLED;
-		}
-	}
-}
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java
@@ -1,93 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.os.Parcel;
-import android.provider.Settings;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-import static android.content.Context.WIFI_SERVICE;
-import static android.provider.Settings.Secure.ANDROID_ID;
-
-@Immutable
-@NotNullByDefault
-class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
-
-	private static final int SEED_LENGTH = 32;
-
-	private final Context appContext;
-
-	@Inject
-	AndroidSecureRandomProvider(Application app) {
-		appContext = app.getApplicationContext();
-	}
-
-	@Override
-	protected void writeToEntropyPool(DataOutputStream out) throws IOException {
-		super.writeToEntropyPool(out);
-		out.writeInt(android.os.Process.myPid());
-		out.writeInt(android.os.Process.myTid());
-		out.writeInt(android.os.Process.myUid());
-		if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT);
-		if (Build.SERIAL != null) out.writeUTF(Build.SERIAL);
-		ContentResolver contentResolver = appContext.getContentResolver();
-		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
-		if (id != null) out.writeUTF(id);
-		Parcel parcel = Parcel.obtain();
-		WifiManager wm =
-				(WifiManager) appContext.getSystemService(WIFI_SERVICE);
-		List<WifiConfiguration> configs = wm.getConfiguredNetworks();
-		if (configs != null) {
-			for (WifiConfiguration config : configs)
-				parcel.writeParcelable(config, 0);
-		}
-		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
-		if (bt != null) {
-			for (BluetoothDevice device : bt.getBondedDevices())
-				parcel.writeParcelable(device, 0);
-		}
-		out.write(parcel.marshall());
-		parcel.recycle();
-	}
-
-	@Override
-	protected void writeSeed() {
-		super.writeSeed();
-		if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT <= 18)
-			applyOpenSslFix();
-	}
-
-	// Based on https://android-developers.googleblog.com/2013/08/some-securerandom-thoughts.html
-	private void applyOpenSslFix() {
-		byte[] seed = new LinuxSecureRandomSpi().engineGenerateSeed(
-				SEED_LENGTH);
-		try {
-			// Seed the OpenSSL PRNG
-			Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
-					.getMethod("RAND_seed", byte[].class)
-					.invoke(null, seed);
-			// Mix the output of the Linux PRNG into the OpenSSL PRNG
-			int bytesRead = (Integer) Class.forName(
-					"org.apache.harmony.xnet.provider.jsse.NativeCrypto")
-					.getMethod("RAND_load_file", String.class, long.class)
-					.invoke(null, "/dev/urandom", 1024);
-			if (bytesRead != 1024) throw new IOException();
-		} catch (Exception e) {
-			throw new SecurityException(e);
-		}
-	}
-}
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java
@@ -1,33 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.SecureRandomProvider;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidSystemModule {
-
-	@Provides
-	@Singleton
-	SecureRandomProvider provideSecureRandomProvider(Application app) {
-		return new AndroidSecureRandomProvider(app);
-	}
-
-	@Provides
-	LocationUtils provideLocationUtils(Application app) {
-		return new AndroidLocationUtils(app);
-	}
-
-	@Provides
-	@Singleton
-	AndroidExecutor provideAndroidExecutor(Application app) {
-		return new AndroidExecutorImpl(app);
-	}
-}
--- a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
@@ -1,70 +0,0 @@
-package org.briarproject.bramble.util;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.os.Build;
-import android.provider.Settings;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import static android.content.Context.MODE_PRIVATE;
-
-public class AndroidUtils {
-
-	// Fake Bluetooth address returned by BluetoothAdapter on API 23 and later
-	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
-
-	private static final String STORED_REPORTS = "dev-reports";
-
-	@SuppressWarnings("deprecation")
-	public static Collection<String> getSupportedArchitectures() {
-		List<String> abis = new ArrayList<>();
-		if (Build.VERSION.SDK_INT >= 21) {
-			abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS));
-		} else {
-			abis.add(Build.CPU_ABI);
-			if (Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2);
-		}
-		return abis;
-	}
-
-	public static String getBluetoothAddress(Context ctx,
-			BluetoothAdapter adapter) {
-		// Return the adapter's address if it's valid and not fake
-		String address = adapter.getAddress();
-		if (isValidBluetoothAddress(address)) return address;
-		// Return the address from settings if it's valid and not fake
-		address = Settings.Secure.getString(ctx.getContentResolver(),
-				"bluetooth_address");
-		if (isValidBluetoothAddress(address)) return address;
-		// Let the caller know we can't find the address
-		return "";
-	}
-
-	private static boolean isValidBluetoothAddress(String address) {
-		return !StringUtils.isNullOrEmpty(address)
-				&& BluetoothAdapter.checkBluetoothAddress(address)
-				&& !address.equals(FAKE_BLUETOOTH_ADDRESS);
-	}
-
-	public static void deleteAppData(Context ctx) {
-		File dataDir = new File(ctx.getApplicationInfo().dataDir);
-		File[] children = dataDir.listFiles();
-		if (children != null) {
-			for (File child : children) {
-				if (!child.getName().equals("lib"))
-					IoUtils.deleteFileOrDir(child);
-			}
-		}
-		// Recreate the cache dir as some OpenGL drivers expect it to exist
-		new File(dataDir, "cache").mkdir();
-	}
-
-	public static File getReportDir(Context ctx) {
-		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
-	}
-}
--- a/bramble-android/src/main/res/values/strings.xml
+++ b/bramble-android/src/main/res/values/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-	<string name="app_name">Bramble</string>
-</resources>
--- a/bramble-api/build.gradle
+++ b/bramble-api/build.gradle
@@ -1,55 +0,0 @@
-apply plugin: 'java-library'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-apply plugin: 'witness'
-
-dependencies {
-	implementation "com.google.dagger:dagger:2.0.2"
-	implementation 'com.google.code.findbugs:jsr305:3.0.2'
-
-	testImplementation 'junit:junit:4.12'
-	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock-legacy:2.8.2"
-	testImplementation "org.hamcrest:hamcrest-library:1.3"
-	testImplementation "org.hamcrest:hamcrest-core:1.3"
-}
-
-dependencyVerification {
-	verify = [
-			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-			'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
-			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-			'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
-			'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
-			'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
-			'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.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.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
-			'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
-	]
-}
-
-// needed to make test output available to bramble-core and briar-core
-configurations {
-	testOutput.extendsFrom(testCompile)
-}
-task jarTest(type: Jar, dependsOn: testClasses) {
-	from sourceSets.test.output
-	classifier = 'test'
-}
-artifacts {
-	testOutput jarTest
-}
-
-// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
-tasks.withType(JavaCompile) {
-	useJava6StandardLibrary(it)
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/FormatException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FormatException.java
@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api;
-
-import java.io.IOException;
-
-/**
- * An exception that indicates an unrecoverable formatting error.
- */
-public class FormatException extends IOException {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java
@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-public abstract class UniqueId extends Bytes {
-
-	/**
-	 * The length of a unique identifier in bytes.
-	 */
-	public static final int LENGTH = 32;
-
-	protected UniqueId(byte[] id) {
-		super(id);
-		if (id.length != LENGTH) throw new IllegalArgumentException();
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java
@@ -1,66 +0,0 @@
-package org.briarproject.bramble.api.client;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.data.MetadataEncoder;
-import org.briarproject.bramble.api.db.Metadata;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.InvalidMessageException;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.sync.MessageContext;
-import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator;
-import org.briarproject.bramble.api.system.Clock;
-
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
-import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
-
-@Immutable
-@NotNullByDefault
-public abstract class BdfMessageValidator implements MessageValidator {
-
-	protected static final Logger LOG =
-			Logger.getLogger(BdfMessageValidator.class.getName());
-
-	protected final ClientHelper clientHelper;
-	protected final MetadataEncoder metadataEncoder;
-	protected final Clock clock;
-
-	protected BdfMessageValidator(ClientHelper clientHelper,
-			MetadataEncoder metadataEncoder, Clock clock) {
-		this.clientHelper = clientHelper;
-		this.metadataEncoder = metadataEncoder;
-		this.clock = clock;
-	}
-
-	protected abstract BdfMessageContext validateMessage(Message m, Group g,
-			BdfList body) throws InvalidMessageException, FormatException;
-
-	@Override
-	public MessageContext validateMessage(Message m, Group g)
-			throws InvalidMessageException {
-		// Reject the message if it's too far in the future
-		long now = clock.currentTimeMillis();
-		if (m.getTimestamp() - now > MAX_CLOCK_DIFFERENCE) {
-			throw new InvalidMessageException(
-					"Timestamp is too far in the future");
-		}
-		byte[] raw = m.getRaw();
-		if (raw.length <= MESSAGE_HEADER_LENGTH) {
-			throw new InvalidMessageException("Message is too short");
-		}
-		try {
-			BdfList body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
-					raw.length - MESSAGE_HEADER_LENGTH);
-			BdfMessageContext result = validateMessage(m, g, body);
-			Metadata meta = metadataEncoder.encode(result.getDictionary());
-			return new MessageContext(meta, result.getDependencies());
-		} catch (FormatException e) {
-			throw new InvalidMessageException(e);
-		}
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java
@@ -1,29 +0,0 @@
-package org.briarproject.bramble.api.client;
-
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.ClientId;
-import org.briarproject.bramble.api.sync.Group;
-
-@NotNullByDefault
-public interface ContactGroupFactory {
-
-	/**
-	 * Creates a group that is not shared with any contacts.
-	 */
-	Group createLocalGroup(ClientId clientId);
-
-	/**
-	 * Creates a group for the given client to share with the given contact.
-	 */
-	Group createContactGroup(ClientId clientId, Contact contact);
-
-	/**
-	 * Creates a group for the given client to share between the given authors
-	 * identified by their AuthorIds.
-	 */
-	Group createContactGroup(ClientId clientId, AuthorId authorId1,
-			AuthorId authorId2);
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeListener.java
@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface ContactExchangeListener {
-
-	void contactExchangeSucceeded(Author remoteAuthor);
-
-	/**
-	 * The exchange failed because the contact already exists.
-	 */
-	void duplicateContact(Author remoteAuthor);
-
-	/**
-	 * A general failure.
-	 */
-	void contactExchangeFailed();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java
@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-
-/**
- * A task for conducting a contact information exchange with a remote peer.
- */
-@NotNullByDefault
-public interface ContactExchangeTask {
-
-	/**
-	 * Exchanges contact information with a remote peer.
-	 */
-	void startExchange(ContactExchangeListener listener,
-			LocalAuthor localAuthor, SecretKey masterSecret,
-			DuplexTransportConnection conn, TransportId transportId,
-			boolean alice);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
@@ -1,104 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collection;
-
-@NotNullByDefault
-public interface ContactManager {
-
-	/**
-	 * Registers a hook to be called whenever a contact is added.
-	 */
-	void registerAddContactHook(AddContactHook hook);
-
-	/**
-	 * Registers a hook to be called whenever a contact is removed.
-	 */
-	void registerRemoveContactHook(RemoveContactHook hook);
-
-	/**
-	 * Stores a contact within the given transaction associated with the given
-	 * local and remote pseudonyms, and returns an ID for the contact.
-	 */
-	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			SecretKey master, long timestamp, boolean alice, boolean verified,
-			boolean active) throws DbException;
-
-	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
-	 * and returns an ID for the contact.
-	 */
-	ContactId addContact(Author remote, AuthorId local,
-			SecretKey master, long timestamp, boolean alice, boolean verified,
-			boolean active) throws DbException;
-
-	/**
-	 * Returns the contact with the given ID.
-	 */
-	Contact getContact(ContactId c) throws DbException;
-
-	/**
-	 * Returns the contact with the given remoteAuthorId
-	 * that was added by the LocalAuthor with the given localAuthorId
-	 *
-	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
-	 */
-	Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
-			throws DbException;
-
-	/**
-	 * Returns the contact with the given remoteAuthorId
-	 * that was added by the LocalAuthor with the given localAuthorId
-	 *
-	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
-	 */
-	Contact getContact(Transaction txn, AuthorId remoteAuthorId,
-			AuthorId localAuthorId) throws DbException;
-
-	/**
-	 * Returns all active contacts.
-	 */
-	Collection<Contact> getActiveContacts() throws DbException;
-
-	/**
-	 * Removes a contact and all associated state.
-	 */
-	void removeContact(ContactId c) throws DbException;
-
-	/**
-	 * Removes a contact and all associated state.
-	 */
-	void removeContact(Transaction txn, ContactId c) throws DbException;
-
-	/**
-	 * Marks a contact as active or inactive.
-	 */
-	void setContactActive(Transaction txn, ContactId c, boolean active)
-			throws DbException;
-
-	/**
-	 * Return true if a contact with this name and public key already exists
-	 */
-	boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
-			AuthorId localAuthorId) throws DbException;
-
-	/**
-	 * Return true if a contact with this name and public key already exists
-	 */
-	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
-			throws DbException;
-
-	interface AddContactHook {
-		void addingContact(Transaction txn, Contact c) throws DbException;
-	}
-
-	interface RemoveContactHook {
-		void removingContact(Transaction txn, Contact c) throws DbException;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java
@@ -1,31 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is added.
- */
-@Immutable
-@NotNullByDefault
-public class ContactAddedEvent extends Event {
-
-	private final ContactId contactId;
-	private final boolean active;
-
-	public ContactAddedEvent(ContactId contactId, boolean active) {
-		this.contactId = contactId;
-		this.active = active;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is removed.
- */
-@Immutable
-@NotNullByDefault
-public class ContactRemovedEvent extends Event {
-
-	private final ContactId contactId;
-
-	public ContactRemovedEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java
@@ -1,31 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is marked active or inactive.
- */
-@Immutable
-@NotNullByDefault
-public class ContactStatusChangedEvent extends Event {
-
-	private final ContactId contactId;
-	private final boolean active;
-
-	public ContactStatusChangedEvent(ContactId contactId, boolean active) {
-		this.contactId = contactId;
-		this.active = active;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java
@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is verified.
- */
-@Immutable
-@NotNullByDefault
-public class ContactVerifiedEvent extends Event {
-
-	private final ContactId contactId;
-
-	public ContactVerifiedEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java
@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * The private half of a public/private {@link KeyPair}.
- */
-@NotNullByDefault
-public interface PrivateKey {
-
-	/**
-	 * Returns the encoded representation of this key.
-	 */
-	byte[] getEncoded();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java
@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * The public half of a public/private {@link KeyPair}.
- */
-@NotNullByDefault
-public interface PublicKey {
-
-	/**
-	 * Returns the encoded representation of this key.
-	 */
-	byte[] getEncoded();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java
@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.transport.StreamContext;
-
-import java.io.InputStream;
-
-@NotNullByDefault
-public interface StreamDecrypterFactory {
-
-	/**
-	 * Creates a {@link StreamDecrypter} for decrypting a transport stream.
-	 */
-	StreamDecrypter createStreamDecrypter(InputStream in, StreamContext ctx);
-
-	/**
-	 * Creates a {@link StreamDecrypter} for decrypting a contact exchange
-	 * stream.
-	 */
-	StreamDecrypter createContactExchangeStreamDecrypter(InputStream in,
-			SecretKey headerKey);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java
@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface StreamEncrypter {
-
-	/**
-	 * Encrypts the given frame and writes it to the stream.
-	 */
-	void writeFrame(byte[] payload, int payloadLength, int paddingLength,
-			boolean finalFrame) throws IOException;
-
-	/**
-	 * Flushes the stream.
-	 */
-	void flush() throws IOException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java
@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.transport.StreamContext;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-public interface StreamEncrypterFactory {
-
-	/**
-	 * Creates a {@link StreamEncrypter} for encrypting a transport stream.
-	 */
-	StreamEncrypter createStreamEncrypter(OutputStream out, StreamContext ctx);
-
-	/**
-	 * Creates a {@link StreamEncrypter} for encrypting a contact exchange
-	 * stream.
-	 */
-	StreamEncrypter createContactExchangeStreamDecrypter(OutputStream out,
-			SecretKey headerKey);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-public interface BdfWriterFactory {
-
-	BdfWriter createWriter(OutputStream out);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.db.Metadata;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface MetadataEncoder {
-
-	Metadata encode(BdfDictionary d) throws FormatException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.db.Metadata;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface MetadataParser {
-
-	BdfDictionary parse(Metadata m) throws FormatException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/ObjectReader.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/ObjectReader.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface ObjectReader<T> {
-
-	T readObject(BdfReader r) throws IOException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooNewException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooNewException.java
@@ -1,7 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-/**
- * Thrown when the database uses a newer schema than the current code.
- */
-public class DataTooNewException extends DbException {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooOldException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooOldException.java
@@ -1,8 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-/**
- * Thrown when the database uses an older schema than the current code and
- * cannot be migrated.
- */
-public class DataTooOldException extends DbException {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/Metadata.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/Metadata.java
@@ -1,14 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import java.util.TreeMap;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-@NotThreadSafe
-public class Metadata extends TreeMap<String, byte[]> {
-
-	/**
-	 * Special value to indicate that a key is being removed.
-	 */
-	public static final byte[] REMOVE = new byte[0];
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/MigrationListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/MigrationListener.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-public interface MigrationListener {
-
-	/**
-	 * This is called when a migration is started while opening the database.
-	 * It will be called once for each migration being applied.
-	 */
-	void onMigrationRun();
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/event/Event.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/event/Event.java
@@ -1,7 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-/**
- * An abstract superclass for events.
- */
-public abstract class Event {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java
@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface EventBus {
-
-	/**
-	 * Adds a listener to be notified when events occur.
-	 */
-	void addListener(EventListener l);
-
-	/**
-	 * Removes a listener.
-	 */
-	void removeListener(EventListener l);
-
-	/**
-	 * Notifies all listeners of an event.
-	 */
-	void broadcast(Event e);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java
@@ -1,16 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * An interface for receiving notifications when events occur.
- */
-@NotNullByDefault
-public interface EventListener {
-
-	/**
-	 * Called when an event is broadcast. Implementations of this method must
-	 * not block.
-	 */
-	void eventOccurred(Event e);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java
@@ -1,38 +0,0 @@
-package org.briarproject.bramble.api.identity;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.identity.Author.Status;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface IdentityManager {
-
-	/**
-	 * Stores the local pseudonym.
-	 */
-	void registerLocalAuthor(LocalAuthor a) throws DbException;
-
-	/**
-	 * Returns the cached main local identity, non-blocking, or loads it from
-	 * the db, blocking
-	 */
-	LocalAuthor getLocalAuthor() throws DbException;
-
-	/**
-	 * Returns the cached main local identity, non-blocking, or loads it from
-	 * the db, blocking, within the given Transaction.
-	 */
-	LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
-
-	/**
-	 * Returns the trust-level status of the author
-	 */
-	Status getAuthorStatus(AuthorId a) throws DbException;
-
-	/**
-	 * Returns the trust-level status of the author
-	 */
-	Status getAuthorStatus(Transaction txn, AuthorId a) throws DbException;
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.identity.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a local pseudonym is added.
- */
-@Immutable
-@NotNullByDefault
-public class LocalAuthorAddedEvent extends Event {
-
-	private final AuthorId authorId;
-
-	public LocalAuthorAddedEvent(AuthorId authorId) {
-		this.authorId = authorId;
-	}
-
-	public AuthorId getAuthorId() {
-		return authorId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.identity.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a local pseudonym is removed.
- */
-@Immutable
-@NotNullByDefault
-public class LocalAuthorRemovedEvent extends Event {
-
-	private final AuthorId authorId;
-
-	public LocalAuthorRemovedEvent(AuthorId authorId) {
-		this.authorId = authorId;
-	}
-
-	public AuthorId getAuthorId() {
-		return authorId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java
@@ -1,36 +0,0 @@
-package org.briarproject.bramble.api.keyagreement;
-
-public interface KeyAgreementConstants {
-
-	/**
-	 * The current version of the BQP protocol.
-	 */
-	byte PROTOCOL_VERSION = 2;
-
-	/**
-	 * The length of the record header in bytes.
-	 */
-	int RECORD_HEADER_LENGTH = 4;
-
-	/**
-	 * The offset of the payload length in the record header, in bytes.
-	 */
-	int RECORD_HEADER_PAYLOAD_LENGTH_OFFSET = 2;
-
-	/**
-	 * The length of the BQP key commitment in bytes.
-	 */
-	int COMMIT_LENGTH = 16;
-
-	long CONNECTION_TIMEOUT = 20 * 1000; // Milliseconds
-
-	/**
-	 * The transport identifier for Bluetooth.
-	 */
-	int TRANSPORT_ID_BLUETOOTH = 0;
-
-	/**
-	 * The transport identifier for LAN.
-	 */
-	int TRANSPORT_ID_LAN = 1;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTaskFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTaskFactory.java
@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.keyagreement;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * Manages tasks for conducting key agreements with remote peers.
- */
-@NotNullByDefault
-public interface KeyAgreementTaskFactory {
-
-	/**
-	 * Gets the current key agreement task.
-	 */
-	KeyAgreementTask createTask();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadEncoder.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadEncoder.java
@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.keyagreement;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface PayloadEncoder {
-
-	byte[] encode(Payload p);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementAbortedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementAbortedEvent.java
@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a BQP protocol aborts.
- */
-@Immutable
-@NotNullByDefault
-public class KeyAgreementAbortedEvent extends Event {
-
-	private final boolean remoteAborted;
-
-	public KeyAgreementAbortedEvent(boolean remoteAborted) {
-		this.remoteAborted = remoteAborted;
-	}
-
-	public boolean didRemoteAbort() {
-		return remoteAborted;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFailedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFailedEvent.java
@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * An event that is broadcast when a BQP connection cannot be created.
- */
-public class KeyAgreementFailedEvent extends Event {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFinishedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFinishedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a BQP protocol completes.
- */
-@Immutable
-@NotNullByDefault
-public class KeyAgreementFinishedEvent extends Event {
-
-	private final KeyAgreementResult result;
-
-	public KeyAgreementFinishedEvent(KeyAgreementResult result) {
-		this.result = result;
-	}
-
-	public KeyAgreementResult getResult() {
-		return result;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementListeningEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementListeningEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.keyagreement.Payload;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a BQP task is listening.
- */
-@Immutable
-@NotNullByDefault
-public class KeyAgreementListeningEvent extends Event {
-
-	private final Payload localPayload;
-
-	public KeyAgreementListeningEvent(Payload localPayload) {
-		this.localPayload = localPayload;
-	}
-
-	public Payload getLocalPayload() {
-		return localPayload;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementStartedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementStartedEvent.java
@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * An event that is broadcast when a BQP protocol completes.
- */
-public class KeyAgreementStartedEvent extends Event {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java
@@ -1,98 +0,0 @@
-package org.briarproject.bramble.api.lifecycle;
-
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Client;
-
-import java.util.concurrent.ExecutorService;
-
-import javax.annotation.Nullable;
-
-/**
- * Manages the lifecycle of the app, starting {@link Client Clients}, starting
- * and stopping {@link Service Services}, shutting down
- * {@link ExecutorService ExecutorServices}, and opening and closing the
- * {@link DatabaseComponent}.
- */
-@NotNullByDefault
-public interface LifecycleManager {
-
-	/**
-	 * The result of calling {@link #startServices(String)}.
-	 */
-	enum StartResult {
-		ALREADY_RUNNING,
-		DB_ERROR,
-		DATA_TOO_OLD_ERROR,
-		DATA_TOO_NEW_ERROR,
-		SERVICE_ERROR,
-		SUCCESS
-	}
-
-	/**
-	 * The state the lifecycle can be in.
-	 * Returned by {@link #getLifecycleState()}
-	 */
-	enum LifecycleState {
-
-		STARTING, MIGRATING_DATABASE, STARTING_SERVICES, RUNNING, STOPPING;
-
-		public boolean isAfter(LifecycleState state) {
-			return ordinal() > state.ordinal();
-		}
-	}
-
-	/**
-	 * Registers a {@link Service} to be started and stopped.
-	 */
-	void registerService(Service s);
-
-	/**
-	 * Registers a {@link Client} to be started.
-	 */
-	void registerClient(Client c);
-
-	/**
-	 * Registers an {@link ExecutorService} to be shut down.
-	 */
-	void registerForShutdown(ExecutorService e);
-
-	/**
-	 * Opens the {@link DatabaseComponent}, optionally creates a local author
-	 * with the provided nickname, and starts any registered
-	 * {@link Client Clients} and {@link Service Services}.
-	 */
-	StartResult startServices(@Nullable String nickname);
-
-	/**
-	 * Stops any registered {@link Service Services}, shuts down any
-	 * registered {@link ExecutorService ExecutorServices}, and closes the
-	 * {@link DatabaseComponent}.
-	 */
-	void stopServices();
-
-	/**
-	 * Waits for the {@link DatabaseComponent} to be opened before returning.
-	 */
-	void waitForDatabase() throws InterruptedException;
-
-	/**
-	 * Waits for the {@link DatabaseComponent} to be opened and all registered
-	 * {@link Client Clients} and {@link Service Services} to start before
-	 * returning.
-	 */
-	void waitForStartup() throws InterruptedException;
-
-	/**
-	 * Waits for all registered {@link Service Services} to stop, all
-	 * registered {@link ExecutorService ExecutorServices} to shut down, and
-	 * the {@link DatabaseComponent} to be closed before returning.
-	 */
-	void waitForShutdown() throws InterruptedException;
-
-	/**
-	 * Returns the current state of the lifecycle.
-	 */
-	LifecycleState getLifecycleState();
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/event/LifecycleEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/event/LifecycleEvent.java
@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.lifecycle.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState;
-
-/**
- * An event that is broadcast when the app enters a new lifecycle state.
- */
-public class LifecycleEvent extends Event {
-
-	private final LifecycleState state;
-
-	public LifecycleEvent(LifecycleState state) {
-		this.state = state;
-	}
-
-	public LifecycleState getLifecycleState() {
-		return state;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/LanTcpConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/LanTcpConstants.java
@@ -1,13 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-public interface LanTcpConstants {
-
-	TransportId ID = new TransportId("org.briarproject.bramble.lan");
-
-	// a transport property (shared with contacts)
-	String PROP_IP_PORTS = "ipPorts";
-
-	// a local setting
-	String PREF_LAN_IP_PORTS = "ipPorts";
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginConfig.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginConfig.java
@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
-
-import java.util.Collection;
-
-@NotNullByDefault
-public interface PluginConfig {
-
-	Collection<DuplexPluginFactory> getDuplexFactories();
-
-	Collection<SimplexPluginFactory> getSimplexFactories();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginException.java
@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-/**
- * An exception that indicates an error starting or stopping a {@link Plugin}.
- */
-public class PluginException extends Exception {
-
-	public PluginException() {
-		super();
-	}
-
-	public PluginException(Throwable cause) {
-		super(cause);
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java
@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-public interface TorConstants {
-
-	TransportId ID = new TransportId("org.briarproject.bramble.tor");
-
-	String PROP_ONION = "onion";
-
-	int SOCKS_PORT = 59050;
-	int CONTROL_PORT = 59051;
-
-	int CONNECT_TO_PROXY_TIMEOUT = 5000; // Milliseconds
-	int EXTRA_SOCKET_TIMEOUT = 30000; // Milliseconds
-
-	String PREF_TOR_NETWORK = "network";
-	String PREF_TOR_PORT = "port";
-
-	int PREF_TOR_NETWORK_NEVER = 0;
-	int PREF_TOR_NETWORK_WIFI = 1;
-	int PREF_TOR_NETWORK_ALWAYS = 2;
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexTransportConnection.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexTransportConnection.java
@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.plugin.duplex;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportConnectionReader;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
-
-/**
- * An interface for reading and writing data over a duplex transport. The
- * connection is not responsible for encrypting/decrypting or authenticating
- * the data.
- */
-@NotNullByDefault
-public interface DuplexTransportConnection {
-
-	/**
-	 * Returns a {@link TransportConnectionReader TransportConnectionReader}
-	 * for reading from the connection.
-	 */
-	TransportConnectionReader getReader();
-
-	/**
-	 * Returns a {@link TransportConnectionWriter TransportConnectionWriter}
-	 * for writing to the connection.
-	 */
-	TransportConnectionWriter getWriter();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/BluetoothEnabledEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/BluetoothEnabledEvent.java
@@ -1,15 +0,0 @@
-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 {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java
@@ -1,15 +0,0 @@
-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 {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/EnableBluetoothEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/EnableBluetoothEvent.java
@@ -1,14 +0,0 @@
-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 {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportDisabledEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportDisabledEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.plugin.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a transport is disabled.
- */
-@Immutable
-@NotNullByDefault
-public class TransportDisabledEvent extends Event {
-
-	private final TransportId transportId;
-
-	public TransportDisabledEvent(TransportId transportId) {
-		this.transportId = transportId;
-	}
-
-	public TransportId getTransportId() {
-		return transportId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportEnabledEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportEnabledEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.plugin.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a transport is enabled.
- */
-@Immutable
-@NotNullByDefault
-public class TransportEnabledEvent extends Event {
-
-	private final TransportId transportId;
-
-	public TransportEnabledEvent(TransportId transportId) {
-		this.transportId = transportId;
-	}
-
-	public TransportId getTransportId() {
-		return transportId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPluginCallback.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/simplex/SimplexPluginCallback.java
@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.plugin.simplex;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.PluginCallback;
-import org.briarproject.bramble.api.plugin.TransportConnectionReader;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
-
-/**
- * An interface for handling readers and writers created by a simplex transport
- * plugin.
- */
-@NotNullByDefault
-public interface SimplexPluginCallback extends PluginCallback {
-
-	void readerCreated(TransportConnectionReader r);
-
-	void writerCreated(ContactId c, TransportConnectionWriter w);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyConstants.java
@@ -1,14 +0,0 @@
-package org.briarproject.bramble.api.properties;
-
-public interface TransportPropertyConstants {
-
-	/**
-	 * The maximum number of properties per transport.
-	 */
-	int MAX_PROPERTIES_PER_TRANSPORT = 100;
-
-	/**
-	 * The maximum length of a property's key or value in UTF-8 bytes.
-	 */
-	int MAX_PROPERTY_LENGTH = 100;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReadHandler.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReadHandler.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.reliability;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface ReadHandler {
-
-	void handleRead(byte[] b) throws IOException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayerFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayerFactory.java
@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.reliability;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface ReliabilityLayerFactory {
-
-	/**
-	 * Returns a reliability layer that writes to the given lower layer.
-	 */
-	ReliabilityLayer createReliabilityLayer(WriteHandler writeHandler);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/WriteHandler.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reliability/WriteHandler.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.reliability;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface WriteHandler {
-
-	void handleWrite(byte[] b) throws IOException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java
@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.reporting;
-
-import org.briarproject.bramble.api.crypto.PublicKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface DevConfig {
-
-	PublicKey getDevPublicKey();
-
-	String getDevOnionAddress();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevReporter.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevReporter.java
@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.reporting;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-/**
- * A task for reporting back to the developers.
- */
-@NotNullByDefault
-public interface DevReporter {
-
-	/**
-	 * Stores an encrypted report on disk to be sent later.
-	 *
-	 * @param reportDir the directory where reports are stored.
-	 * @param report the report in the form expected by the server.
-	 * @throws FileNotFoundException if the report could not be written.
-	 */
-	void encryptReportToFile(File reportDir, String filename, String report)
-			throws FileNotFoundException;
-
-	/**
-	 * Sends any reports previously stored on disk.
-	 *
-	 * @param reportDir the directory where reports are stored.
-	 */
-	void sendReports(File reportDir);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/settings/Settings.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/settings/Settings.java
@@ -1,6 +0,0 @@
-package org.briarproject.bramble.api.settings;
-
-import org.briarproject.bramble.api.StringMap;
-
-public class Settings extends StringMap {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java
@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.settings;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface SettingsManager {
-
-	/**
-	 * Returns all settings in the given namespace.
-	 */
-	Settings getSettings(String namespace) throws DbException;
-
-	/**
-	 * Merges the given settings with any existing settings in the given
-	 * namespace.
-	 */
-	void mergeSettings(Settings s, String namespace) throws DbException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java
@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.settings.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when one or more settings are updated.
- */
-@Immutable
-@NotNullByDefault
-public class SettingsUpdatedEvent extends Event {
-
-	private final String namespace;
-
-	public SettingsUpdatedEvent(String namespace) {
-		this.namespace = namespace;
-	}
-
-	public String getNamespace() {
-		return namespace;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Client.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Client.java
@@ -1,14 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface Client {
-
-	/**
-	 * Called at startup to create any local state needed by the client.
-	 */
-	void createLocalState(Transaction txn) throws DbException;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java
@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface GroupFactory {
-
-	/**
-	 * Creates a group with the given client ID and descriptor.
-	 */
-	Group createGroup(ClientId c, byte[] descriptor);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordReaderFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordReaderFactory.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.InputStream;
-
-@NotNullByDefault
-public interface RecordReaderFactory {
-
-	RecordReader createRecordReader(InputStream in);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordTypes.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordTypes.java
@@ -1,13 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-/**
- * Record types for the sync protocol.
- */
-public interface RecordTypes {
-
-	byte ACK = 0;
-	byte MESSAGE = 1;
-	byte OFFER = 2;
-	byte REQUEST = 3;
-
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordWriterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordWriterFactory.java
@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-public interface RecordWriterFactory {
-
-	RecordWriter createRecordWriter(OutputStream out);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java
@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import java.util.Collection;
-
-/**
- * A record requesting one or more {@link Message Messages} from the recipient.
- */
-public class Request {
-
-	private final Collection<MessageId> requested;
-
-	public Request(Collection<MessageId> requested) {
-		this.requested = requested;
-	}
-
-	/**
-	 * Returns the identifiers of the requested messages.
-	 */
-	public Collection<MessageId> getMessageIds() {
-		return requested;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java
@@ -1,44 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.UniqueId;
-
-public interface SyncConstants {
-
-	/**
-	 * The current version of the sync protocol.
-	 */
-	byte PROTOCOL_VERSION = 0;
-
-	/**
-	 * The length of the record header in bytes.
-	 */
-	int RECORD_HEADER_LENGTH = 4;
-
-	/**
-	 * The maximum length of the record payload in bytes.
-	 */
-	int MAX_RECORD_PAYLOAD_LENGTH = 48 * 1024; // 48 KiB
-
-	/** The maximum length of a group descriptor in bytes. */
-	int MAX_GROUP_DESCRIPTOR_LENGTH = 16 * 1024; // 16 KiB
-
-	/**
-	 * The length of the message header in bytes.
-	 */
-	int MESSAGE_HEADER_LENGTH = UniqueId.LENGTH + 8;
-
-	/**
-	 * The maximum length of a message body in bytes.
-	 */
-	int MAX_MESSAGE_BODY_LENGTH = 32 * 1024; // 32 KiB
-
-	/**
-	 * The maximum length of a message in bytes.
-	 */
-	int MAX_MESSAGE_LENGTH = MESSAGE_HEADER_LENGTH + MAX_MESSAGE_BODY_LENGTH;
-
-	/**
-	 * The maximum number of message IDs in an ack, offer or request record.
-	 */
-	int MAX_MESSAGE_IDS = MAX_RECORD_PAYLOAD_LENGTH / UniqueId.LENGTH;
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupAddedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupAddedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a group is added to the database.
- */
-@Immutable
-@NotNullByDefault
-public class GroupAddedEvent extends Event {
-
-	private final Group group;
-
-	public GroupAddedEvent(Group group) {
-		this.group = group;
-	}
-
-	public Group getGroup() {
-		return group;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupRemovedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupRemovedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a group is removed from the database.
- */
-@Immutable
-@NotNullByDefault
-public class GroupRemovedEvent extends Event {
-
-	private final Group group;
-
-	public GroupRemovedEvent(Group group) {
-		this.group = group;
-	}
-
-	public Group getGroup() {
-		return group;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupVisibilityUpdatedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupVisibilityUpdatedEvent.java
@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collection;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when the visibility of a group is updated.
- */
-@Immutable
-@NotNullByDefault
-public class GroupVisibilityUpdatedEvent extends Event {
-
-	private final Collection<ContactId> affected;
-
-	public GroupVisibilityUpdatedEvent(Collection<ContactId> affected) {
-		this.affected = affected;
-	}
-
-	/**
-	 * Returns the contacts affected by the update.
-	 */
-	public Collection<ContactId> getAffectedContacts() {
-		return affected;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageAddedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageAddedEvent.java
@@ -1,50 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.Message;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is added to the database.
- */
-@Immutable
-@NotNullByDefault
-public class MessageAddedEvent extends Event {
-
-	private final Message message;
-	@Nullable
-	private final ContactId contactId;
-
-	public MessageAddedEvent(Message message, @Nullable ContactId contactId) {
-		this.message = message;
-		this.contactId = contactId;
-	}
-
-	/**
-	 * Returns the message that was added.
-	 */
-	public Message getMessage() {
-		return message;
-	}
-
-	/**
-	 * Returns the ID of the group to which the message belongs.
-	 */
-	public GroupId getGroupId() {
-		return message.getGroupId();
-	}
-
-	/**
-	 * Returns the ID of the contact from which the message was received, or
-	 * null if the message was locally generated.
-	 */
-	@Nullable
-	public ContactId getContactId() {
-		return contactId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageRequestedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageRequestedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is requested by a contact.
- */
-@Immutable
-@NotNullByDefault
-public class MessageRequestedEvent extends Event {
-
-	private final ContactId contactId;
-
-	public MessageRequestedEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageSharedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageSharedEvent.java
@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is shared.
- */
-@Immutable
-@NotNullByDefault
-public class MessageSharedEvent extends Event {
-
-	private final MessageId messageId;
-
-	public MessageSharedEvent(MessageId message) {
-		this.messageId = message;
-	}
-
-	public MessageId getMessageId() {
-		return messageId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToAckEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessageToAckEvent.java
@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is received from, or offered by, a
- * contact and needs to be acknowledged.
- */
-@Immutable
-@NotNullByDefault
-public class MessageToAckEvent extends Event {
-
-	private final ContactId contactId;
-
-	public MessageToAckEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesAckedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/MessagesAckedEvent.java
@@ -1,35 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-
-import java.util.Collection;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when messages are acked by a contact.
- */
-@Immutable
-@NotNullByDefault
-public class MessagesAckedEvent extends Event {
-
-	private final ContactId contactId;
-	private final Collection<MessageId> acked;
-
-	public MessagesAckedEvent(ContactId contactId,
-			Collection<MessageId> acked) {
-		this.contactId = contactId;
-		this.acked = acked;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-	public Collection<MessageId> getMessageIds() {
-		return acked;
-	}
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/SecureRandomProvider.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/SecureRandomProvider.java
@@ -1,23 +0,0 @@
-package org.briarproject.bramble.api.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.annotation.Nullable;
-
-/**
- * Wrapper for a platform-specific secure random number generator.
- */
-@NotNullByDefault
-public interface SecureRandomProvider {
-
-	/**
-	 * Returns a {@link Provider} that provides a strong {@link SecureRandom}
-	 * implementation, or null if the platform's default implementation should
-	 * be used.
-	 */
-	@Nullable
-	Provider getProvider();
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java
@@ -1,23 +0,0 @@
-package org.briarproject.bramble.api.transport;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.InputStream;
-
-@NotNullByDefault
-public interface StreamReaderFactory {
-
-	/**
-	 * Creates an {@link InputStream InputStream} for reading from a
-	 * transport stream.
-	 */
-	InputStream createStreamReader(InputStream in, StreamContext ctx);
-
-	/**
-	 * Creates an {@link InputStream InputStream} for reading from a contact
-	 * exchangestream.
-	 */
-	InputStream createContactExchangeStreamReader(InputStream in,
-			SecretKey headerKey);
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java
@@ -1,23 +0,0 @@
-package org.briarproject.bramble.api.transport;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-public interface StreamWriterFactory {
-
-	/**
-	 * Creates an {@link OutputStream OutputStream} for writing to a
-	 * transport stream
-	 */
-	OutputStream createStreamWriter(OutputStream out, StreamContext ctx);
-
-	/**
-	 * Creates an {@link OutputStream OutputStream} for writing to a contact
-	 * exchange stream.
-	 */
-	OutputStream createContactExchangeStreamWriter(OutputStream out,
-			SecretKey headerKey);
-}
--- a/Show More
+++ b/Show More