remove force disable

.gitlab-ci.yml

@@ -6,18 +6,8 @@ cache:
     - .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
+  - echo y | /opt/android-sdk/tools/bin/sdkmanager "build-tools;23.0.3"
 
 test:
   script:

bramble-android/build.gradle

@@ -6,90 +6,99 @@ apply plugin: 'witness'
 apply plugin: 'de.undercouch.download'
 
 android {
-	compileSdkVersion 27
-	buildToolsVersion '26.0.2'
+	compileSdkVersion 23
+	buildToolsVersion '25.0.0'
 
 	defaultConfig {
 		minSdkVersion 14
-		targetSdkVersion 26
-		versionCode 1617
-		versionName "0.16.17"
+		targetSdkVersion 22
+		versionCode 1611
+		versionName "0.16.11"
 		consumerProguardFiles 'proguard-rules.txt'
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_1_7
+		targetCompatibility JavaVersion.VERSION_1_7
 	}
 }
 
 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'
+	compile project(path: ':bramble-core', configuration: 'default')
+	compile fileTree(dir: 'libs', include: '*.jar')
+	provided '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',
-	]
+def torBinaryDir = 'src/main/res/raw'
+
+task downloadTorGeoIp(type: Download) {
+	src 'https://briarproject.org/build/geoip-2017-09-06.zip'
+	dest "$torBinaryDir/geoip.zip"
+	onlyIfNewer true
 }
 
-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
-	}
+task downloadTorBinaryArm(type: Download) {
+	src 'https://briarproject.org/build/tor-0.2.9.12-arm.zip'
+	dest "$torBinaryDir/tor_arm.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
-	}
+task downloadTorBinaryArmPie(type: Download) {
+	src 'https://briarproject.org/build/tor-0.2.9.12-arm-pie.zip'
+	dest "$torBinaryDir/tor_arm_pie.zip"
+	onlyIfNewer true
+}
+
+task downloadTorBinaryX86(type: Download) {
+	src 'https://briarproject.org/build/tor-0.2.9.12-x86.zip'
+	dest "$torBinaryDir/tor_x86.zip"
+	onlyIfNewer true
+}
+
+task downloadTorBinaryX86Pie(type: Download) {
+	src 'https://briarproject.org/build/tor-0.2.9.12-x86-pie.zip'
+	dest "$torBinaryDir/tor_x86_pie.zip"
+	onlyIfNewer true
+}
+
+task verifyTorGeoIp(type: Verify, dependsOn: 'downloadTorGeoIp') {
+	src "$torBinaryDir/geoip.zip"
+	algorithm 'SHA-256'
+	checksum 'fe49d3adb86d3c512373101422a017dbb86c85a570524663f09dd8ce143a24f3'
+}
+
+task verifyTorBinaryArm(type: Verify, dependsOn: 'downloadTorBinaryArm') {
+	src "$torBinaryDir/tor_arm.zip"
+	algorithm 'SHA-256'
+	checksum '8ed0b347ffed1d6a4d2fd14495118eb92be83e9cc06e057e15220dc288b31688'
+}
+
+task verifyTorBinaryArmPie(type: Verify, dependsOn: 'downloadTorBinaryArmPie') {
+	src "$torBinaryDir/tor_arm_pie.zip"
+	algorithm 'SHA-256'
+	checksum '64403262511c29f462ca5e7c7621bfc3c944898364d1d5ad35a016bb8a034283'
+}
+
+task verifyTorBinaryX86(type: Verify, dependsOn: 'downloadTorBinaryX86') {
+	src "$torBinaryDir/tor_x86.zip"
+	algorithm 'SHA-256'
+	checksum '61e014607a2079bcf1646289c67bff6372b1aded6e1d8d83d7791efda9a4d5ab'
+}
+
+task verifyTorBinaryX86Pie(type: Verify, dependsOn: 'downloadTorBinaryX86Pie') {
+	src "$torBinaryDir/tor_x86_pie.zip"
+	algorithm 'SHA-256'
+	checksum '18fbc98356697dd0895836ab46d5c9877d1c539193464f7db1e82a65adaaf288'
 }
 
 project.afterEvaluate {
-	torBinaries.every { key, value ->
-		preBuild.dependsOn.add(verifyBinary(key, value))
+	preBuild.dependsOn {
+		[
+				'verifyTorGeoIp',
+				'verifyTorBinaryArm',
+				'verifyTorBinaryArmPie',
+				'verifyTorBinaryX86',
+				'verifyTorBinaryX86Pie'
+		]
 	}
 }

bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java

@@ -13,7 +13,6 @@ 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.droidtooth.DroidtoothPluginFactory;
 import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.bramble.plugin.tor.TorPluginFactory;
@@ -23,7 +22,6 @@ 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;
 
@@ -35,7 +33,6 @@ 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,
@@ -43,12 +40,12 @@ public class AndroidPluginModule {
 		Context appContext = app.getApplicationContext();
 		DuplexPluginFactory bluetooth = new DroidtoothPluginFactory(ioExecutor,
 				androidExecutor, appContext, random, eventBus, backoffFactory);
-		DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, scheduler,
-				appContext, locationUtils, reporter, eventBus,
-				torSocketFactory, backoffFactory);
+		DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, appContext,
+				locationUtils, reporter, eventBus, torSocketFactory,
+				backoffFactory);
 		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
 				backoffFactory, appContext);
-		Collection<DuplexPluginFactory> duplex =
+		final Collection<DuplexPluginFactory> duplex =
 				Arrays.asList(bluetooth, tor, lan);
 		@NotNullByDefault
 		PluginConfig pluginConfig = new PluginConfig() {

bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java

@@ -8,6 +8,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.widget.ArrayAdapter;
 
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.contact.ContactId;
@@ -19,6 +20,7 @@ import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 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.BluetoothEnableDisableReason;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
@@ -34,6 +36,7 @@ import org.briarproject.bramble.util.StringUtils;
 import java.io.Closeable;
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -83,6 +86,8 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 
 	private volatile boolean running = false;
 	private volatile boolean wasEnabledByUs = false;
+	private volatile ArrayList<BluetoothEnableDisableReason>
+			enableDisableReasons = new ArrayList<>();
 	private volatile BluetoothStateReceiver receiver = null;
 	private volatile BluetoothServerSocket socket = null;
 
@@ -124,7 +129,12 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 		// with a message queue, so submit it to the AndroidExecutor
 		try {
 			adapter = androidExecutor.runOnBackgroundThread(
-					BluetoothAdapter::getDefaultAdapter).get();
+					new Callable<BluetoothAdapter>() {
+						@Override
+						public BluetoothAdapter call() throws Exception {
+							return BluetoothAdapter.getDefaultAdapter();
+						}
+					}).get();
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			LOG.warning("Interrupted while getting BluetoothAdapter");
@@ -148,8 +158,8 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 			bind();
 		} else {
 			// Enable Bluetooth if settings allow
-			if (callback.getSettings().getBoolean(PREF_BT_ENABLE, false)) {
-				enableAdapter();
+			if (callback.getSettings().getBoolean(PREF_BT_ENABLE, true)) {
+				enableAdapter(BluetoothEnableDisableReason.COMMUNICATION);
 			} else {
 				LOG.info("Not enabling Bluetooth");
 			}
@@ -157,36 +167,40 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 	}
 
 	private void bind() {
-		ioExecutor.execute(() -> {
-			if (!isRunning()) return;
-			String address = AndroidUtils.getBluetoothAddress(appContext,
-					adapter);
-			if (LOG.isLoggable(INFO))
-				LOG.info("Local address " + scrubMacAddress(address));
-			if (!StringUtils.isNullOrEmpty(address)) {
-				// Advertise the Bluetooth address to contacts
-				TransportProperties p = new TransportProperties();
-				p.put(PROP_ADDRESS, address);
-				callback.mergeLocalProperties(p);
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				if (!isRunning()) return;
+				String address = AndroidUtils.getBluetoothAddress(appContext,
+						adapter);
+				if (LOG.isLoggable(INFO))
+					LOG.info("Local address " + scrubMacAddress(address));
+				if (!StringUtils.isNullOrEmpty(address)) {
+					// Advertise the Bluetooth address to contacts
+					TransportProperties p = new TransportProperties();
+					p.put(PROP_ADDRESS, address);
+					callback.mergeLocalProperties(p);
+				}
+				// Bind a server socket to accept connections from contacts
+				BluetoothServerSocket ss;
+				try {
+					ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
+							"RFCOMM", getUuid());
+				} catch (IOException e) {
+					if (LOG.isLoggable(WARNING))
+						LOG.log(WARNING, e.toString(), e);
+					return;
+				}
+				if (!isRunning()) {
+					tryToClose(ss);
+					return;
+				}
+				LOG.info("Socket bound");
+				socket = ss;
+				backoff.reset();
+				callback.transportEnabled();
+				acceptContactConnections();
 			}
-			// Bind a server socket to accept connections from contacts
-			BluetoothServerSocket ss;
-			try {
-				ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
-						"RFCOMM", getUuid());
-			} catch (IOException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				return;
-			}
-			if (!isRunning()) {
-				tryToClose(ss);
-				return;
-			}
-			LOG.info("Socket bound");
-			socket = ss;
-			backoff.reset();
-			callback.transportEnabled();
-			acceptContactConnections();
 		});
 	}
 
@@ -236,11 +250,15 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 		return new DroidtoothTransportConnection(this, s);
 	}
 
-	private void enableAdapter() {
+	private void enableAdapter(BluetoothEnableDisableReason reason) {
 		if (adapter != null && !adapter.isEnabled()) {
 			if (adapter.enable()) {
 				LOG.info("Enabling Bluetooth");
 				wasEnabledByUs = true;
+
+				if(!enableDisableReasons.contains(reason)) {
+					enableDisableReasons.add(reason);
+				}
 			} else {
 				LOG.info("Could not enable Bluetooth");
 			}
@@ -252,11 +270,22 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 		running = false;
 		if (receiver != null) appContext.unregisterReceiver(receiver);
 		tryToClose(socket);
-		disableAdapter();
+		disableAdapter(true);
 	}
 
-	private void disableAdapter() {
-		if (adapter != null && adapter.isEnabled() && wasEnabledByUs) {
+	private void disableAdapter(boolean force){
+		disableAdapter(null, force);
+	}
+
+	private void disableAdapter(BluetoothEnableDisableReason reason,
+			boolean force) {
+		if (adapter != null && adapter.isEnabled() && wasEnabledByUs
+				&& (enableDisableReasons.contains(reason) || force)) {
+
+			if(enableDisableReasons.contains(reason)){
+				enableDisableReasons.remove(reason);
+			}
+
 			if (adapter.disable()) LOG.info("Disabling Bluetooth");
 			else LOG.info("Could not disable Bluetooth");
 		}
@@ -285,18 +314,21 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 		Map<ContactId, TransportProperties> remote =
 				callback.getRemoteProperties();
 		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
-			ContactId c = e.getKey();
+			final ContactId c = e.getKey();
 			if (connected.contains(c)) continue;
-			String address = e.getValue().get(PROP_ADDRESS);
+			final String address = e.getValue().get(PROP_ADDRESS);
 			if (StringUtils.isNullOrEmpty(address)) continue;
-			String uuid = e.getValue().get(PROP_UUID);
+			final String uuid = e.getValue().get(PROP_UUID);
 			if (StringUtils.isNullOrEmpty(uuid)) continue;
-			ioExecutor.execute(() -> {
-				if (!running) return;
-				BluetoothSocket s = connect(address, uuid);
-				if (s != null) {
-					backoff.reset();
-					callback.outgoingConnectionCreated(c, wrapSocket(s));
+			ioExecutor.execute(new Runnable() {
+				@Override
+				public void run() {
+					if (!running) return;
+					BluetoothSocket s = connect(address, uuid);
+					if (s != null) {
+						backoff.reset();
+						callback.outgoingConnectionCreated(c, wrapSocket(s));
+					}
 				}
 			});
 		}
@@ -419,18 +451,30 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof EnableBluetoothEvent) {
-			enableAdapterAsync();
+			EnableBluetoothEvent enable = (EnableBluetoothEvent) e;
+			enableAdapterAsync(enable.getReason());
 		} else if (e instanceof DisableBluetoothEvent) {
-			disableAdapterAsync();
+			DisableBluetoothEvent disable = (DisableBluetoothEvent) e;
+			disableAdapterAsync(disable.getReason());
 		}
 	}
 
-	private void enableAdapterAsync() {
-		ioExecutor.execute(this::enableAdapter);
+	private void enableAdapterAsync(final BluetoothEnableDisableReason reason) {
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				enableAdapter(reason);
+			}
+		});
 	}
 
-	private void disableAdapterAsync() {
-		ioExecutor.execute(this::disableAdapter);
+	private void disableAdapterAsync(final BluetoothEnableDisableReason reason) {
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				disableAdapter(reason, false);
+			}
+		});
 	}
 
 	private class BluetoothStateReceiver extends BroadcastReceiver {
@@ -468,13 +512,16 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return () -> {
-				BluetoothSocket s = ss.accept();
-				if (LOG.isLoggable(INFO))
-					LOG.info(ID.getString() + ": Incoming connection");
-				return new KeyAgreementConnection(
-						new DroidtoothTransportConnection(
-								DroidtoothPlugin.this, s), ID);
+			return new Callable<KeyAgreementConnection>() {
+				@Override
+				public KeyAgreementConnection call() throws IOException {
+					BluetoothSocket s = ss.accept();
+					if (LOG.isLoggable(INFO))
+						LOG.info(ID.getString() + ": Incoming connection");
+					return new KeyAgreementConnection(
+							new DroidtoothTransportConnection(
+									DroidtoothPlugin.this, s), ID);
+				}
 			};
 		}
 

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

@@ -59,12 +59,7 @@ import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.zip.ZipInputStream;
@@ -75,15 +70,10 @@ import javax.net.SocketFactory;
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.POWER_SERVICE;
-import static android.content.Intent.ACTION_SCREEN_OFF;
-import static android.content.Intent.ACTION_SCREEN_ON;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
 import static android.net.ConnectivityManager.TYPE_WIFI;
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
 import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
@@ -112,7 +102,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			Logger.getLogger(TorPlugin.class.getName());
 
 	private final Executor ioExecutor;
-	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final LocationUtils locationUtils;
 	private final DevReporter reporter;
@@ -125,9 +114,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private final File torDirectory, torFile, geoIpFile, configFile;
 	private final File doneFile, cookieFile;
 	private final PowerManager.WakeLock wakeLock;
-	private final Lock connectionStatusLock;
-	private final AtomicReference<Future<?>> connectivityCheck =
-			new AtomicReference<>();
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
 	private volatile boolean running = false;
@@ -136,13 +122,12 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private volatile TorControlConnection controlConnection = null;
 	private volatile BroadcastReceiver networkStateReceiver = null;
 
-	TorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
-			Context appContext, LocationUtils locationUtils,
-			DevReporter reporter, SocketFactory torSocketFactory,
-			Backoff backoff, DuplexPluginCallback callback,
-			String architecture, int maxLatency, int maxIdleTime) {
+	TorPlugin(Executor ioExecutor, Context appContext,
+			LocationUtils locationUtils, DevReporter reporter,
+			SocketFactory torSocketFactory, Backoff backoff,
+			DuplexPluginCallback callback, String architecture, int maxLatency,
+			int maxIdleTime) {
 		this.ioExecutor = ioExecutor;
-		this.scheduler = scheduler;
 		this.appContext = appContext;
 		this.locationUtils = locationUtils;
 		this.reporter = reporter;
@@ -167,7 +152,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		// This tag will prevent Huawei's powermanager from killing us.
 		wakeLock = pm.newWakeLock(PARTIAL_WAKE_LOCK, "LocationManagerService");
 		wakeLock.setReferenceCounted(false);
-		connectionStatusLock = new ReentrantLock();
 	}
 
 	@Override
@@ -220,11 +204,11 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (LOG.isLoggable(INFO)) {
 			Scanner stdout = new Scanner(torProcess.getInputStream());
 			Scanner stderr = new Scanner(torProcess.getErrorStream());
-			while (stdout.hasNextLine() || stderr.hasNextLine()) {
-				if (stdout.hasNextLine()) {
+			while (stdout.hasNextLine() || stderr.hasNextLine()){
+				if(stdout.hasNextLine()) {
 					LOG.info(stdout.nextLine());
 				}
-				if (stderr.hasNextLine()) {
+				if(stderr.hasNextLine()){
 					LOG.info(stderr.nextLine());
 				}
 			}
@@ -273,11 +257,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 		// Register to receive network status events
 		networkStateReceiver = new NetworkStateReceiver();
-		IntentFilter filter = new IntentFilter();
-		filter.addAction(CONNECTIVITY_ACTION);
-		filter.addAction(ACTION_SCREEN_ON);
-		filter.addAction(ACTION_SCREEN_OFF);
-		if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
+		IntentFilter filter = new IntentFilter(CONNECTIVITY_ACTION);
 		appContext.registerReceiver(networkStateReceiver, filter);
 		// Bind a server socket to receive incoming hidden service connections
 		bind();
@@ -390,45 +370,57 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void sendDevReports() {
-		ioExecutor.execute(() -> {
-			// TODO: Trigger this with a TransportEnabledEvent
-			File reportDir = AndroidUtils.getReportDir(appContext);
-			reporter.sendReports(reportDir);
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				// TODO: Trigger this with a TransportEnabledEvent
+				File reportDir = AndroidUtils.getReportDir(appContext);
+				reporter.sendReports(reportDir);
+			}
 		});
 	}
 
 	private void bind() {
-		ioExecutor.execute(() -> {
-			// If there's already a port number stored in config, reuse it
-			String portString = callback.getSettings().get(PREF_TOR_PORT);
-			int port;
-			if (StringUtils.isNullOrEmpty(portString)) port = 0;
-			else port = Integer.parseInt(portString);
-			// Bind a server socket to receive connections from Tor
-			ServerSocket ss = null;
-			try {
-				ss = new ServerSocket();
-				ss.bind(new InetSocketAddress("127.0.0.1", port));
-			} catch (IOException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				tryToClose(ss);
-				return;
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				// If there's already a port number stored in config, reuse it
+				String portString = callback.getSettings().get(PREF_TOR_PORT);
+				int port;
+				if (StringUtils.isNullOrEmpty(portString)) port = 0;
+				else port = Integer.parseInt(portString);
+				// Bind a server socket to receive connections from Tor
+				ServerSocket ss = null;
+				try {
+					ss = new ServerSocket();
+					ss.bind(new InetSocketAddress("127.0.0.1", port));
+				} catch (IOException e) {
+					if (LOG.isLoggable(WARNING))
+						LOG.log(WARNING, e.toString(), e);
+					tryToClose(ss);
+					return;
+				}
+				if (!running) {
+					tryToClose(ss);
+					return;
+				}
+				socket = ss;
+				// Store the port number
+				final String localPort = String.valueOf(ss.getLocalPort());
+				Settings s = new Settings();
+				s.put(PREF_TOR_PORT, localPort);
+				callback.mergeSettings(s);
+				// Create a hidden service if necessary
+				ioExecutor.execute(new Runnable() {
+					@Override
+					public void run() {
+						publishHiddenService(localPort);
+					}
+				});
+				backoff.reset();
+				// Accept incoming hidden service connections from Tor
+				acceptContactConnections(ss);
 			}
-			if (!running) {
-				tryToClose(ss);
-				return;
-			}
-			socket = ss;
-			// Store the port number
-			String localPort = String.valueOf(ss.getLocalPort());
-			Settings s = new Settings();
-			s.put(PREF_TOR_PORT, localPort);
-			callback.mergeSettings(s);
-			// Create a hidden service if necessary
-			ioExecutor.execute(() -> publishHiddenService(localPort));
-			backoff.reset();
-			// Accept incoming hidden service connections from Tor
-			acceptContactConnections(ss);
 		});
 	}
 
@@ -556,13 +548,17 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	private void connectAndCallBack(ContactId c, TransportProperties p) {
-		ioExecutor.execute(() -> {
-			if (!isRunning()) return;
-			DuplexTransportConnection d = createConnection(p);
-			if (d != null) {
-				backoff.reset();
-				callback.outgoingConnectionCreated(c, d);
+	private void connectAndCallBack(final ContactId c,
+			final TransportProperties p) {
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				if (!isRunning()) return;
+				DuplexTransportConnection d = createConnection(p);
+				if (d != null) {
+					backoff.reset();
+					callback.outgoingConnectionCreated(c, d);
+				}
 			}
 		});
 	}
@@ -638,8 +634,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void orConnStatus(String status, String orName) {
 		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
-		if (status.equals("CLOSED") || status.equals("FAILED"))
-			updateConnectionStatus(); // Check whether we've lost connectivity
 	}
 
 	@Override
@@ -679,7 +673,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 
 		@Override
-		public void onEvent(int event, @Nullable String path) {
+		public void onEvent(int event, String path) {
 			stopWatching();
 			latch.countDown();
 		}
@@ -697,75 +691,60 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void updateConnectionStatus() {
-		ioExecutor.execute(() -> {
-			if (!running) return;
-			try {
-				connectionStatusLock.lock();
-				updateConnectionStatusLocked();
-			} finally {
-				connectionStatusLock.unlock();
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				if (!running) return;
+
+				Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
+				ConnectivityManager cm = (ConnectivityManager) o;
+				NetworkInfo net = cm.getActiveNetworkInfo();
+				boolean online = net != null && net.isConnected();
+				boolean wifi = online && net.getType() == TYPE_WIFI;
+				String country = locationUtils.getCurrentCountry();
+				boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
+						country);
+				Settings s = callback.getSettings();
+				int network = s.getInt(PREF_TOR_NETWORK,
+						PREF_TOR_NETWORK_ALWAYS);
+
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Online: " + online + ", wifi: " + wifi);
+					if ("".equals(country)) LOG.info("Country code unknown");
+					else LOG.info("Country code: " + country);
+				}
+
+				try {
+					if (!online) {
+						LOG.info("Disabling network, device is offline");
+						enableNetwork(false);
+					} else if (blocked) {
+						LOG.info("Disabling network, country is blocked");
+						enableNetwork(false);
+					} else if (network == PREF_TOR_NETWORK_NEVER
+							|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
+						LOG.info("Disabling network due to data setting");
+						enableNetwork(false);
+					} else {
+						LOG.info("Enabling network");
+						enableNetwork(true);
+					}
+				} catch (IOException e) {
+					if (LOG.isLoggable(WARNING))
+						LOG.log(WARNING, e.toString(), e);
+				}
 			}
 		});
 	}
 
-	// Locking: connectionStatusLock
-	private void updateConnectionStatusLocked() {
-		Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
-		ConnectivityManager cm = (ConnectivityManager) o;
-		NetworkInfo net = cm.getActiveNetworkInfo();
-		boolean online = net != null && net.isConnected();
-		boolean wifi = online && net.getType() == TYPE_WIFI;
-		String country = locationUtils.getCurrentCountry();
-		boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
-				country);
-		Settings s = callback.getSettings();
-		int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
-
-		if (LOG.isLoggable(INFO)) {
-			LOG.info("Online: " + online + ", wifi: " + wifi);
-			if ("".equals(country)) LOG.info("Country code unknown");
-			else LOG.info("Country code: " + country);
-		}
-
-		try {
-			if (!online) {
-				LOG.info("Disabling network, device is offline");
-				enableNetwork(false);
-			} else if (blocked) {
-				LOG.info("Disabling network, country is blocked");
-				enableNetwork(false);
-			} else if (network == PREF_TOR_NETWORK_NEVER
-					|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
-				LOG.info("Disabling network due to data setting");
-				enableNetwork(false);
-			} else {
-				LOG.info("Enabling network");
-				enableNetwork(true);
-			}
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		}
-	}
-
-	private void scheduleConnectionStatusUpdate() {
-		Future<?> newConnectivityCheck =
-				scheduler.schedule(this::updateConnectionStatus, 1, MINUTES);
-		Future<?> oldConnectivityCheck =
-				connectivityCheck.getAndSet(newConnectivityCheck);
-		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
-	}
-
 	private class NetworkStateReceiver extends BroadcastReceiver {
 
 		@Override
 		public void onReceive(Context ctx, Intent i) {
 			if (!running) return;
-			String action = i.getAction();
-			if (LOG.isLoggable(INFO)) LOG.info("Received broadcast " + action);
-			updateConnectionStatus();
-			if (ACTION_SCREEN_ON.equals(action)
-					|| ACTION_SCREEN_OFF.equals(action)) {
-				scheduleConnectionStatusUpdate();
+			if (CONNECTIVITY_ACTION.equals(i.getAction())) {
+				LOG.info("Detected connectivity change");
+				updateConnectionStatus();
 			}
 		}
 	}

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

@@ -17,7 +17,6 @@ import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.util.AndroidUtils;
 
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.Immutable;
@@ -37,7 +36,6 @@ public class TorPluginFactory implements DuplexPluginFactory {
 	private static final double BACKOFF_BASE = 1.2;
 
 	private final Executor ioExecutor;
-	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final LocationUtils locationUtils;
 	private final DevReporter reporter;
@@ -45,13 +43,11 @@ public class TorPluginFactory implements DuplexPluginFactory {
 	private final SocketFactory torSocketFactory;
 	private final BackoffFactory backoffFactory;
 
-	public TorPluginFactory(Executor ioExecutor,
-			ScheduledExecutorService scheduler, Context appContext,
+	public TorPluginFactory(Executor ioExecutor, Context appContext,
 			LocationUtils locationUtils, DevReporter reporter,
 			EventBus eventBus, SocketFactory torSocketFactory,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
-		this.scheduler = scheduler;
 		this.appContext = appContext;
 		this.locationUtils = locationUtils;
 		this.reporter = reporter;
@@ -93,9 +89,9 @@ public class TorPluginFactory implements DuplexPluginFactory {
 
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		TorPlugin plugin = new TorPlugin(ioExecutor, scheduler, appContext,
-				locationUtils, reporter, torSocketFactory, backoff, callback,
-				architecture, MAX_LATENCY, MAX_IDLE_TIME);
+		TorPlugin plugin = new TorPlugin(ioExecutor, appContext, locationUtils,
+				reporter, torSocketFactory, backoff, callback, architecture,
+				MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

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

@@ -27,11 +27,14 @@ class AndroidExecutorImpl implements AndroidExecutor {
 	@Inject
 	AndroidExecutorImpl(Application app) {
 		uiHandler = new Handler(app.getApplicationContext().getMainLooper());
-		loop = () -> {
-			Looper.prepare();
-			backgroundHandler = new Handler();
-			startLatch.countDown();
-			Looper.loop();
+		loop = new Runnable() {
+			@Override
+			public void run() {
+				Looper.prepare();
+				backgroundHandler = new Handler();
+				startLatch.countDown();
+				Looper.loop();
+			}
 		};
 	}
 

bramble-api/build.gradle

@@ -1,39 +1,30 @@
-apply plugin: 'java-library'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 apply plugin: 'witness'
 
 dependencies {
-	implementation "com.google.dagger:dagger:2.0.2"
-	implementation 'com.google.code.findbugs:jsr305:3.0.2'
+	compile "com.google.dagger:dagger:2.0.2"
+	compile 'com.google.dagger:dagger-compiler:2.0.2'
+	compile '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"
+	testCompile 'junit:junit:4.12'
+	testCompile "org.jmock:jmock:2.8.2"
+	testCompile "org.jmock:jmock-junit4:2.8.2"
+	testCompile "org.jmock:jmock-legacy:2.8.2"
+	testCompile "org.hamcrest:hamcrest-library:1.3"
+	testCompile "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',
+			'com.google.dagger:dagger:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
+			'com.google.dagger:dagger-compiler:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
+			'com.google.code.findbugs:jsr305:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
+			'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+			'com.google.dagger:dagger-producers:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
+			'com.google.guava:guava:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
 	]
 }
 
@@ -48,8 +39,3 @@ task jarTest(type: Jar, dependsOn: testClasses) {
 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)
-}

bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java

@@ -23,7 +23,7 @@ public class BdfMessageContext {
 	}
 
 	public BdfMessageContext(BdfDictionary dictionary) {
-		this(dictionary, Collections.emptyList());
+		this(dictionary, Collections.<MessageId>emptyList());
 	}
 
 	public BdfDictionary getDictionary() {

bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfDictionary.java

@@ -4,14 +4,11 @@ import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.FormatException;
 
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
 
-@NotThreadSafe
-public class BdfDictionary extends TreeMap<String, Object> {
+public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 
 	public static final Object NULL_VALUE = new Object();
 

bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfList.java

@@ -3,17 +3,15 @@ package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.FormatException;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Vector;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
 
 import static org.briarproject.bramble.api.data.BdfDictionary.NULL_VALUE;
 
-@NotThreadSafe
-public class BdfList extends ArrayList<Object> {
+public class BdfList extends Vector<Object> {
 
 	/**
 	 * Factory method for constructing lists inline.

bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java

@@ -122,9 +122,8 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Deletes the message with the given ID. Unlike
-	 * {@link #removeMessage(Transaction, MessageId)}, the message ID and any
-	 * other associated data are not deleted.
+	 * Deletes the message with the given ID. The message ID and any other
+	 * associated data are not deleted.
 	 */
 	void deleteMessage(Transaction txn, MessageId m) throws DbException;
 
@@ -453,11 +452,6 @@ public interface DatabaseComponent {
 	 */
 	void removeLocalAuthor(Transaction txn, AuthorId a) throws DbException;
 
-	/**
-	 * Removes a message (and all associated state) from the database.
-	 */
-	void removeMessage(Transaction txn, MessageId m) throws DbException;
-
 	/**
 	 * Removes a transport (and all associated state) from the database.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/db/Metadata.java

@@ -1,11 +1,11 @@
 package org.briarproject.bramble.api.db;
 
-import java.util.TreeMap;
+import java.util.Hashtable;
 
-import javax.annotation.concurrent.NotThreadSafe;
+import javax.annotation.concurrent.ThreadSafe;
 
-@NotThreadSafe
-public class Metadata extends TreeMap<String, byte[]> {
+@ThreadSafe
+public class Metadata extends Hashtable<String, byte[]> {
 
 	/**
 	 * Special value to indicate that a key is being removed.

bramble-api/src/main/java/org/briarproject/bramble/api/db/Transaction.java

@@ -45,7 +45,7 @@ public class Transaction {
 	 * committed.
 	 */
 	public void attach(Event e) {
-		if (events == null) events = new ArrayList<>();
+		if (events == null) events = new ArrayList<Event>();
 		events.add(e);
 	}
 

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

@@ -0,0 +1,6 @@
+package org.briarproject.bramble.api.plugin;
+
+public enum BluetoothEnableDisableReason {
+	COMMUNICATION,
+	ADD_CONTACT
+}

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

@@ -0,0 +1,16 @@
+package org.briarproject.bramble.api.plugin.event;
+
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.plugin.BluetoothEnableDisableReason;
+
+abstract class BluetoothEvent extends Event {
+	private BluetoothEnableDisableReason selectedReason;
+
+	BluetoothEvent(BluetoothEnableDisableReason reason){
+		selectedReason = reason;
+	}
+
+	public BluetoothEnableDisableReason getReason(){
+		return selectedReason;
+	}
+}

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

@@ -1,7 +1,7 @@
 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.BluetoothEnableDisableReason;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -11,5 +11,8 @@ import javax.annotation.concurrent.Immutable;
  */
 @Immutable
 @NotNullByDefault
-public class DisableBluetoothEvent extends Event {
+public class DisableBluetoothEvent extends BluetoothEvent {
+	public DisableBluetoothEvent(BluetoothEnableDisableReason reason) {
+		super(reason);
+	}
 }

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

@@ -2,6 +2,7 @@ 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.BluetoothEnableDisableReason;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -10,5 +11,8 @@ import javax.annotation.concurrent.Immutable;
  */
 @Immutable
 @NotNullByDefault
-public class EnableBluetoothEvent extends Event {
+public class EnableBluetoothEvent extends BluetoothEvent {
+	public EnableBluetoothEvent(BluetoothEnableDisableReason reason){
+		super(reason);
+	}
 }

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

@@ -33,7 +33,7 @@ public interface TransportPropertyManager {
 	/**
 	 * Returns the local transport properties for all transports.
 	 * <br/>
-	 * TODO: Transaction can be read-only when code is simplified
+	 * Read-Only
 	 */
 	Map<TransportId, TransportProperties> getLocalProperties(Transaction txn)
 			throws DbException;

bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageContext.java

@@ -22,7 +22,7 @@ public class MessageContext {
 	}
 
 	public MessageContext(Metadata metadata) {
-		this(metadata, Collections.emptyList());
+		this(metadata, Collections.<MessageId>emptyList());
 	}
 
 	public Metadata getMetadata() {

bramble-api/src/test/java/org/briarproject/bramble/test/BrambleMockTestCase.java

@@ -3,7 +3,8 @@ package org.briarproject.bramble.test;
 import org.jmock.Mockery;
 import org.junit.After;
 
-public abstract class BrambleMockTestCase extends BrambleTestCase {
+public abstract class BrambleMockTestCase extends
+		BrambleTestCase {
 
 	protected final Mockery context = new Mockery();
 

bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java

@@ -8,9 +8,12 @@ public abstract class BrambleTestCase {
 
 	public BrambleTestCase() {
 		// Ensure exceptions thrown on worker threads cause tests to fail
-		UncaughtExceptionHandler fail = (thread, throwable) -> {
-			throwable.printStackTrace();
-			fail();
+		UncaughtExceptionHandler fail = new UncaughtExceptionHandler() {
+			@Override
+			public void uncaughtException(Thread thread, Throwable throwable) {
+				throwable.printStackTrace();
+				fail();
+			}
 		};
 		Thread.setDefaultUncaughtExceptionHandler(fail);
 	}

bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java

@@ -2,27 +2,12 @@ package org.briarproject.bramble.test;
 
 import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.sync.ClientId;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.util.IoUtils;
 
 import java.io.File;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_GROUP_DESCRIPTOR_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
-
 public class TestUtils {
 
 	private static final AtomicInteger nextTestDir =
@@ -53,50 +38,4 @@ public class TestUtils {
 		return new SecretKey(getRandomBytes(SecretKey.LENGTH));
 	}
 
-	public static LocalAuthor getLocalAuthor() {
-		return getLocalAuthor(1 + random.nextInt(MAX_AUTHOR_NAME_LENGTH));
-	}
-
-	public static LocalAuthor getLocalAuthor(int nameLength) {
-		AuthorId id = new AuthorId(getRandomId());
-		String name = getRandomString(nameLength);
-		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
-		byte[] privateKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
-		long created = System.currentTimeMillis();
-		return new LocalAuthor(id, name, publicKey, privateKey, created);
-	}
-
-	public static Author getAuthor() {
-		return getAuthor(1 + random.nextInt(MAX_AUTHOR_NAME_LENGTH));
-	}
-
-	public static Author getAuthor(int nameLength) {
-		AuthorId id = new AuthorId(getRandomId());
-		String name = getRandomString(nameLength);
-		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
-		return new Author(id, name, publicKey);
-	}
-
-	public static Group getGroup(ClientId clientId) {
-		int descriptorLength = 1 + random.nextInt(MAX_GROUP_DESCRIPTOR_LENGTH);
-		return getGroup(clientId, descriptorLength);
-	}
-
-	public static Group getGroup(ClientId clientId, int descriptorLength) {
-		GroupId groupId = new GroupId(getRandomId());
-		byte[] descriptor = getRandomBytes(descriptorLength);
-		return new Group(groupId, clientId, descriptor);
-	}
-
-	public static Message getMessage(GroupId groupId) {
-		int bodyLength = 1 + random.nextInt(MAX_MESSAGE_BODY_LENGTH);
-		return getMessage(groupId, MESSAGE_HEADER_LENGTH + bodyLength);
-	}
-
-	public static Message getMessage(GroupId groupId, int rawLength) {
-		MessageId id = new MessageId(getRandomId());
-		byte[] raw = getRandomBytes(rawLength);
-		long timestamp = System.currentTimeMillis();
-		return new Message(id, groupId, timestamp, raw);
-	}
 }

bramble-core/build.gradle

@@ -1,54 +1,28 @@
-apply plugin: 'java-library'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+plugins {
+	id 'java'
+	id 'net.ltgt.apt' version '0.9'
+	id 'idea'
+}
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
-apply plugin: 'net.ltgt.apt'
-apply plugin: 'idea'
 apply plugin: 'witness'
 
 dependencies {
-	implementation project(path: ':bramble-api', configuration: 'default')
-	implementation 'com.madgag.spongycastle:core:1.58.0.0'
-	implementation 'com.h2database:h2:1.4.192' // This is the last version that supports Java 1.6
-	implementation 'org.bitlet:weupnp:0.1.4'
+	compile project(path: ':bramble-api', configuration: 'default')
+	compile 'com.madgag.spongycastle:core:1.58.0.0'
+	compile 'com.h2database:h2:1.4.192' // This is the last version that supports Java 1.6
+	compile 'org.bitlet:weupnp:0.1.4'
 
-	apt 'com.google.dagger:dagger-compiler:2.0.2'
-
-	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
-	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"
-
-	testApt 'com.google.dagger:dagger-compiler:2.0.2'
+	testCompile project(path: ':bramble-api', configuration: 'testOutput')
 }
 
 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-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.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.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
-			'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',
+			'com.madgag.spongycastle:core:199617dd5698c5a9312b898c0a4cec7ce9dd8649d07f65d91629f58229d72728',
+			'com.h2database:h2:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
+			'org.bitlet:weupnp:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
 	]
 }
 
@@ -63,8 +37,3 @@ task jarTest(type: Jar, dependsOn: testClasses) {
 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)
-}

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

@@ -24,7 +24,7 @@ public class PoliteExecutor implements Executor {
 
 	private final Object lock = new Object();
 	@GuardedBy("lock")
-	private final Queue<Runnable> queue = new LinkedList<>();
+	private final Queue<Runnable> queue = new LinkedList<Runnable>();
 	private final Executor delegate;
 	private final int maxConcurrentTasks;
 	private final Logger log;
@@ -48,17 +48,20 @@ public class PoliteExecutor implements Executor {
 	}
 
 	@Override
-	public void execute(Runnable r) {
-		long submitted = System.currentTimeMillis();
-		Runnable wrapped = () -> {
-			if (log.isLoggable(LOG_LEVEL)) {
-				long queued = System.currentTimeMillis() - submitted;
-				log.log(LOG_LEVEL, "Queue time " + queued + " ms");
-			}
-			try {
-				r.run();
-			} finally {
-				scheduleNext();
+	public void execute(final Runnable r) {
+		final long submitted = System.currentTimeMillis();
+		Runnable wrapped = new Runnable() {
+			@Override
+			public void run() {
+				if (log.isLoggable(LOG_LEVEL)) {
+					long queued = System.currentTimeMillis() - submitted;
+					log.log(LOG_LEVEL, "Queue time " + queued + " ms");
+				}
+				try {
+					r.run();
+				} finally {
+					scheduleNext();
+				}
 			}
 		};
 		synchronized (lock) {

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

@@ -28,16 +28,19 @@ public class TimeLoggingExecutor extends ThreadPoolExecutor {
 	}
 
 	@Override
-	public void execute(Runnable r) {
+	public void execute(final Runnable r) {
 		if (log.isLoggable(LOG_LEVEL)) {
-			long submitted = System.currentTimeMillis();
-			super.execute(() -> {
-				long started = System.currentTimeMillis();
-				long queued = started - submitted;
-				log.log(LOG_LEVEL, "Queue time " + queued + " ms");
-				r.run();
-				long executing = System.currentTimeMillis() - started;
-				log.log(LOG_LEVEL, "Execution time " + executing + " ms");
+			final long submitted = System.currentTimeMillis();
+			super.execute(new Runnable() {
+				@Override
+				public void run() {
+					long started = System.currentTimeMillis();
+					long queued = started - submitted;
+					log.log(LOG_LEVEL, "Queue time " + queued + " ms");
+					r.run();
+					long executing = System.currentTimeMillis() - started;
+					log.log(LOG_LEVEL, "Execution time " + executing + " ms");
+				}
 			});
 		} else {
 			super.execute(r);

bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java

@@ -201,7 +201,8 @@ class ClientHelperImpl implements ClientHelper {
 	public Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(
 			Transaction txn, GroupId g) throws DbException, FormatException {
 		Map<MessageId, Metadata> raw = db.getMessageMetadata(txn, g);
-		Map<MessageId, BdfDictionary> parsed = new HashMap<>(raw.size());
+		Map<MessageId, BdfDictionary> parsed =
+				new HashMap<MessageId, BdfDictionary>(raw.size());
 		for (Entry<MessageId, Metadata> e : raw.entrySet())
 			parsed.put(e.getKey(), metadataParser.parse(e.getValue()));
 		return parsed;
@@ -228,7 +229,8 @@ class ClientHelperImpl implements ClientHelper {
 			FormatException {
 		Metadata metadata = metadataEncoder.encode(query);
 		Map<MessageId, Metadata> raw = db.getMessageMetadata(txn, g, metadata);
-		Map<MessageId, BdfDictionary> parsed = new HashMap<>(raw.size());
+		Map<MessageId, BdfDictionary> parsed =
+				new HashMap<MessageId, BdfDictionary>(raw.size());
 		for (Entry<MessageId, Metadata> e : raw.entrySet())
 			parsed.put(e.getKey(), metadataParser.parse(e.getValue()));
 		return parsed;

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java

@@ -184,7 +184,12 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 			// Close the outgoing stream and expect EOF on the incoming stream
 			w.close();
 			if (!r.eof()) LOG.warning("Unexpected data at end of connection");
-		} catch (GeneralSecurityException | IOException e) {
+		} catch (GeneralSecurityException e) {
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+			listener.contactExchangeFailed();
+			tryToClose(conn, true);
+			return;
+		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			listener.contactExchangeFailed();
 			tryToClose(conn, true);
@@ -271,7 +276,8 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 
 	private Map<TransportId, TransportProperties> receiveTransportProperties(
 			BdfReader r) throws IOException {
-		Map<TransportId, TransportProperties> remote = new HashMap<>();
+		Map<TransportId, TransportProperties> remote =
+				new HashMap<TransportId, TransportProperties>();
 		r.readListStart();
 		while (!r.hasListEnd()) {
 			r.readListStart();

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java

@@ -34,8 +34,8 @@ class ContactManagerImpl implements ContactManager {
 	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager) {
 		this.db = db;
 		this.keyManager = keyManager;
-		addHooks = new CopyOnWriteArrayList<>();
-		removeHooks = new CopyOnWriteArrayList<>();
+		addHooks = new CopyOnWriteArrayList<AddContactHook>();
+		removeHooks = new CopyOnWriteArrayList<RemoveContactHook>();
 	}
 
 	@Override
@@ -125,7 +125,7 @@ class ContactManagerImpl implements ContactManager {
 		} finally {
 			db.endTransaction(txn);
 		}
-		List<Contact> active = new ArrayList<>(contacts.size());
+		List<Contact> active = new ArrayList<Contact>(contacts.size());
 		for (Contact c : contacts) if (c.isActive()) active.add(c);
 		return active;
 	}

bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java

@@ -602,8 +602,8 @@ class CryptoComponentImpl implements CryptoComponent {
 
 	// Package access for testing
 	int chooseIterationCount(int targetMillis) {
-		List<Long> quickSamples = new ArrayList<>(PBKDF_SAMPLES);
-		List<Long> slowSamples = new ArrayList<>(PBKDF_SAMPLES);
+		List<Long> quickSamples = new ArrayList<Long>(PBKDF_SAMPLES);
+		List<Long> slowSamples = new ArrayList<Long>(PBKDF_SAMPLES);
 		long iterationNanos = 0, initNanos = 0;
 		while (iterationNanos <= 0 || initNanos <= 0) {
 			// Sample the running time with one iteration and two iterations

bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoModule.java

@@ -48,7 +48,7 @@ public class CryptoModule {
 
 	public CryptoModule() {
 		// Use an unbounded queue
-		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
+		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();

bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImpl.java

@@ -16,7 +16,7 @@ class PasswordStrengthEstimatorImpl implements PasswordStrengthEstimator {
 
 	@Override
 	public float estimateStrength(String password) {
-		HashSet<Character> unique = new HashSet<>();
+		HashSet<Character> unique = new HashSet<Character>();
 		int length = password.length();
 		for (int i = 0; i < length; i++) unique.add(password.charAt(i));
 		return Math.min(1, (float) unique.size() / STRONG_UNIQUE_CHARS);

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -90,6 +90,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	private final ReentrantReadWriteLock lock =
 			new ReentrantReadWriteLock(true);
 
+	private volatile int shutdownHandle = -1;
+
 	@Inject
 	DatabaseComponentImpl(Database<T> db, Class<T> txnClass, EventBus eventBus,
 			ShutdownManager shutdown) {
@@ -101,20 +103,26 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 
 	@Override
 	public boolean open() throws DbException {
-		boolean reopened = db.open();
-		shutdown.addShutdownHook(() -> {
-			try {
-				close();
-			} catch (DbException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		Runnable shutdownHook = new Runnable() {
+			@Override
+			public void run() {
+				try {
+					close();
+				} catch (DbException e) {
+					if (LOG.isLoggable(WARNING))
+						LOG.log(WARNING, e.toString(), e);
+				}
 			}
-		});
+		};
+		boolean reopened = db.open();
+		shutdownHandle = shutdown.addShutdownHook(shutdownHook);
 		return reopened;
 	}
 
 	@Override
 	public void close() throws DbException {
 		if (closed.getAndSet(true)) return;
+		shutdown.removeShutdownHook(shutdownHandle);
 		db.close();
 	}
 
@@ -133,7 +141,11 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		}
 		try {
 			return new Transaction(db.startTransaction(), readOnly);
-		} catch (DbException | RuntimeException e) {
+		} catch (DbException e) {
+			if (readOnly) lock.readLock().unlock();
+			else lock.writeLock().unlock();
+			throw e;
+		} catch (RuntimeException e) {
 			if (readOnly) lock.readLock().unlock();
 			else lock.writeLock().unlock();
 			throw e;
@@ -319,7 +331,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
 		Collection<MessageId> ids = db.getMessagesToSend(txn, c, maxLength);
-		List<byte[]> messages = new ArrayList<>(ids.size());
+		List<byte[]> messages = new ArrayList<byte[]>(ids.size());
 		for (MessageId m : ids) {
 			messages.add(db.getRawMessage(txn, m));
 			db.updateExpiryTime(txn, c, m, maxLatency);
@@ -369,7 +381,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 			throw new NoSuchContactException();
 		Collection<MessageId> ids = db.getRequestedMessagesToSend(txn, c,
 				maxLength);
-		List<byte[]> messages = new ArrayList<>(ids.size());
+		List<byte[]> messages = new ArrayList<byte[]>(ids.size());
 		for (MessageId m : ids) {
 			messages.add(db.getRawMessage(txn, m));
 			db.updateExpiryTime(txn, c, m, maxLatency);
@@ -649,7 +661,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
-		Collection<MessageId> acked = new ArrayList<>();
+		Collection<MessageId> acked = new ArrayList<MessageId>();
 		for (MessageId m : a.getMessageIds()) {
 			if (db.containsVisibleMessage(txn, c, m)) {
 				db.raiseSeenFlag(txn, c, m);
@@ -758,16 +770,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		transaction.attach(new LocalAuthorRemovedEvent(a));
 	}
 
-	@Override
-	public void removeMessage(Transaction transaction, MessageId m)
-			throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsMessage(txn, m))
-			throw new NoSuchMessageException();
-		db.removeMessage(txn, m);
-	}
-
 	@Override
 	public void removeTransport(Transaction transaction, TransportId t)
 			throws DbException {
@@ -884,7 +886,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 			Map<ContactId, TransportKeys> keys) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();
 		T txn = unbox(transaction);
-		Map<ContactId, TransportKeys> filtered = new HashMap<>();
+		Map<ContactId, TransportKeys> filtered =
+				new HashMap<ContactId, TransportKeys>();
 		for (Entry<ContactId, TransportKeys> e : keys.entrySet()) {
 			ContactId c = e.getKey();
 			TransportKeys k = e.getValue();

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseExecutorModule.java

@@ -32,7 +32,7 @@ public class DatabaseExecutorModule {
 
 	public DatabaseExecutorModule() {
 		// Use an unbounded queue
-		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
+		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseModule.java

@@ -26,7 +26,7 @@ public class DatabaseModule {
 	@Singleton
 	DatabaseComponent provideDatabaseComponent(Database<Connection> db,
 			EventBus eventBus, ShutdownManager shutdown) {
-		return new DatabaseComponentImpl<>(db, Connection.class, eventBus,
-				shutdown);
+		return new DatabaseComponentImpl<Connection>(db, Connection.class,
+				eventBus, shutdown);
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java

@@ -232,30 +232,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " REFERENCES transports (transportId)"
 					+ " ON DELETE CASCADE)";
 
-	private static final String INDEX_CONTACTS_BY_AUTHOR_ID =
-			"CREATE INDEX IF NOT EXISTS contactsByAuthorId"
-					+ " ON contacts (authorId)";
-
-	private static final String INDEX_MESSAGES_BY_GROUP_ID =
-			"CREATE INDEX IF NOT EXISTS messagesByGroupId"
-					+ " ON messages (groupId)";
-
-	private static final String INDEX_OFFERS_BY_CONTACT_ID =
-			"CREATE INDEX IF NOT EXISTS offersByContactId"
-					+ " ON offers (contactId)";
-
-	private static final String INDEX_GROUPS_BY_CLIENT_ID =
-			"CREATE INDEX IF NOT EXISTS groupsByClientId"
-					+ " ON groups (clientId)";
-
-	private static final String INDEX_MESSAGE_METADATA_BY_MESSAGE_ID =
-			"CREATE INDEX IF NOT EXISTS messageMetadataByMessageId"
-					+ " ON messageMetadata (messageId)";
-
-	private static final String INDEX_GROUP_METADATA_BY_GROUP_ID =
-			"CREATE INDEX IF NOT EXISTS groupMetadataByGroupId"
-					+ " ON groupMetadata (groupId)";
-
 	private static final Logger LOG =
 			Logger.getLogger(JdbcDatabase.class.getName());
 
@@ -263,8 +239,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 	private final String hashType, binaryType, counterType, secretType;
 	private final Clock clock;
 
-	// Locking: connectionsLock
-	private final LinkedList<Connection> connections = new LinkedList<>();
+	private final LinkedList<Connection> connections =
+			new LinkedList<Connection>(); // Locking: connectionsLock
 
 	private int openConnections = 0; // Locking: connectionsLock
 	private boolean closed = false; // Locking: connectionsLock
@@ -291,7 +267,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		} catch (ClassNotFoundException e) {
 			throw new DbException(e);
 		}
-		// Open the database and create the tables and indexes if necessary
+		// Open the database and create the tables if necessary
 		Connection txn = startTransaction();
 		try {
 			if (reopen) {
@@ -300,7 +276,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 				createTables(txn);
 				storeSchemaVersion(txn);
 			}
-			createIndexes(txn);
 			commitTransaction(txn);
 		} catch (DbException e) {
 			abortTransaction(txn);
@@ -365,23 +340,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	private void createIndexes(Connection txn) throws DbException {
-		Statement s = null;
-		try {
-			s = txn.createStatement();
-			s.executeUpdate(INDEX_CONTACTS_BY_AUTHOR_ID);
-			s.executeUpdate(INDEX_MESSAGES_BY_GROUP_ID);
-			s.executeUpdate(INDEX_OFFERS_BY_CONTACT_ID);
-			s.executeUpdate(INDEX_GROUPS_BY_CLIENT_ID);
-			s.executeUpdate(INDEX_MESSAGE_METADATA_BY_MESSAGE_ID);
-			s.executeUpdate(INDEX_GROUP_METADATA_BY_GROUP_ID);
-			s.close();
-		} catch (SQLException e) {
-			tryToClose(s);
-			throw new DbException(e);
-		}
-	}
-
 	private String insertTypeNames(String s) {
 		s = s.replaceAll("HASH", hashType);
 		s = s.replaceAll("BINARY", binaryType);
@@ -1035,7 +993,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " FROM contacts";
 			ps = txn.prepareStatement(sql);
 			rs = ps.executeQuery();
-			List<Contact> contacts = new ArrayList<>();
+			List<Contact> contacts = new ArrayList<Contact>();
 			while (rs.next()) {
 				ContactId contactId = new ContactId(rs.getInt(1));
 				AuthorId authorId = new AuthorId(rs.getBytes(2));
@@ -1069,7 +1027,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, local.getBytes());
 			rs = ps.executeQuery();
-			List<ContactId> ids = new ArrayList<>();
+			List<ContactId> ids = new ArrayList<ContactId>();
 			while (rs.next()) ids.add(new ContactId(rs.getInt(1)));
 			rs.close();
 			ps.close();
@@ -1094,7 +1052,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, remote.getBytes());
 			rs = ps.executeQuery();
-			List<Contact> contacts = new ArrayList<>();
+			List<Contact> contacts = new ArrayList<Contact>();
 			while (rs.next()) {
 				ContactId c = new ContactId(rs.getInt(1));
 				String name = rs.getString(2);
@@ -1150,7 +1108,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, c.getString());
 			rs = ps.executeQuery();
-			List<Group> groups = new ArrayList<>();
+			List<Group> groups = new ArrayList<Group>();
 			while (rs.next()) {
 				GroupId id = new GroupId(rs.getBytes(1));
 				byte[] descriptor = rs.getBytes(2);
@@ -1203,7 +1161,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, g.getBytes());
 			rs = ps.executeQuery();
-			List<ContactId> visible = new ArrayList<>();
+			List<ContactId> visible = new ArrayList<ContactId>();
 			while (rs.next()) visible.add(new ContactId(rs.getInt(1)));
 			rs.close();
 			ps.close();
@@ -1255,7 +1213,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " FROM localAuthors";
 			ps = txn.prepareStatement(sql);
 			rs = ps.executeQuery();
-			List<LocalAuthor> authors = new ArrayList<>();
+			List<LocalAuthor> authors = new ArrayList<LocalAuthor>();
 			while (rs.next()) {
 				AuthorId authorId = new AuthorId(rs.getBytes(1));
 				String name = rs.getString(2);
@@ -1285,7 +1243,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, g.getBytes());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1308,7 +1266,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, state.getValue());
 			ps.setBytes(2, g.getBytes());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1343,7 +1301,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 				ps.setString(3, e.getKey());
 				ps.setBytes(4, e.getValue());
 				rs = ps.executeQuery();
-				Set<MessageId> ids = new HashSet<>();
+				Set<MessageId> ids = new HashSet<MessageId>();
 				while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 				rs.close();
 				ps.close();
@@ -1377,7 +1335,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, DELIVERED.getValue());
 			ps.setBytes(2, g.getBytes());
 			rs = ps.executeQuery();
-			Map<MessageId, Metadata> all = new HashMap<>();
+			Map<MessageId, Metadata> all = new HashMap<MessageId, Metadata>();
 			Metadata metadata = null;
 			MessageId lastMessageId = null;
 			while (rs.next()) {
@@ -1406,7 +1364,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 		Collection<MessageId> matches = getMessageIds(txn, g, query);
 		if (matches.isEmpty()) return Collections.emptyMap();
 		// Retrieve the metadata for each match
-		Map<MessageId, Metadata> all = new HashMap<>(matches.size());
+		Map<MessageId, Metadata> all = new HashMap<MessageId, Metadata>(
+				matches.size());
 		for (MessageId m : matches) all.put(m, getMessageMetadata(txn, m));
 		return all;
 	}
@@ -1504,7 +1463,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setBytes(1, g.getBytes());
 			ps.setInt(2, c.getInt());
 			rs = ps.executeQuery();
-			List<MessageStatus> statuses = new ArrayList<>();
+			List<MessageStatus> statuses = new ArrayList<MessageStatus>();
 			while (rs.next()) {
 				MessageId messageId = new MessageId(rs.getBytes(1));
 				boolean sent = rs.getBoolean(2);
@@ -1563,7 +1522,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, m.getBytes());
 			rs = ps.executeQuery();
-			Map<MessageId, State> dependencies = new HashMap<>();
+			Map<MessageId, State> dependencies = new HashMap<MessageId, State>();
 			while (rs.next()) {
 				MessageId dependency = new MessageId(rs.getBytes(1));
 				State state = State.fromValue(rs.getInt(2));
@@ -1601,7 +1560,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, m.getBytes());
 			rs = ps.executeQuery();
-			Map<MessageId, State> dependents = new HashMap<>();
+			Map<MessageId, State> dependents = new HashMap<MessageId, State>();
 			while (rs.next()) {
 				MessageId dependent = new MessageId(rs.getBytes(1));
 				State state = State.fromValue(rs.getInt(2));
@@ -1653,7 +1612,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, maxMessages);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1689,7 +1648,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setLong(3, now);
 			ps.setInt(4, maxMessages);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1714,7 +1673,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, maxMessages);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1749,7 +1708,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			int total = 0;
 			while (rs.next()) {
 				int length = rs.getInt(1);
@@ -1791,7 +1750,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, state.getValue());
 			ps.setString(2, c.getString());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1821,7 +1780,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, c.getString());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1880,7 +1839,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			List<MessageId> ids = new ArrayList<MessageId>();
 			int total = 0;
 			while (rs.next()) {
 				int length = rs.getInt(1);
@@ -1934,7 +1893,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, t.getString());
 			rs = ps.executeQuery();
-			List<IncomingKeys> inKeys = new ArrayList<>();
+			List<IncomingKeys> inKeys = new ArrayList<IncomingKeys>();
 			while (rs.next()) {
 				long rotationPeriod = rs.getLong(1);
 				SecretKey tagKey = new SecretKey(rs.getBytes(2));
@@ -1954,7 +1913,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, t.getString());
 			rs = ps.executeQuery();
-			Map<ContactId, TransportKeys> keys = new HashMap<>();
+			Map<ContactId, TransportKeys> keys =
+					new HashMap<ContactId, TransportKeys>();
 			for (int i = 0; rs.next(); i++) {
 				// There should be three times as many incoming keys
 				if (inKeys.size() < (i + 1) * 3) throw new DbStateException();
@@ -2072,8 +2032,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 		PreparedStatement ps = null;
 		try {
 			// Determine which keys are being removed
-			List<String> removed = new ArrayList<>();
-			Map<String, byte[]> retained = new HashMap<>();
+			List<String> removed = new ArrayList<String>();
+			Map<String, byte[]> retained = new HashMap<String, byte[]>();
 			for (Entry<String, byte[]> e : meta.entrySet()) {
 				if (e.getValue() == REMOVE) removed.add(e.getKey());
 				else retained.put(e.getKey(), e.getValue());

bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java

@@ -15,7 +15,7 @@ import javax.annotation.concurrent.ThreadSafe;
 class EventBusImpl implements EventBus {
 
 	private final Collection<EventListener> listeners =
-			new CopyOnWriteArrayList<>();
+			new CopyOnWriteArrayList<EventListener>();
 
 	@Override
 	public void addListener(EventListener l) {

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

@@ -50,9 +50,10 @@ class KeyAgreementConnector {
 	private final PluginManager pluginManager;
 	private final CompletionService<KeyAgreementConnection> connect;
 
-	private final List<KeyAgreementListener> listeners = new ArrayList<>();
+	private final List<KeyAgreementListener> listeners =
+			new ArrayList<KeyAgreementListener>();
 	private final List<Future<KeyAgreementConnection>> pending =
-			new ArrayList<>();
+			new ArrayList<Future<KeyAgreementConnection>>();
 
 	private volatile boolean connecting = false;
 	private volatile boolean alice = false;
@@ -64,7 +65,8 @@ class KeyAgreementConnector {
 		this.clock = clock;
 		this.crypto = crypto;
 		this.pluginManager = pluginManager;
-		connect = new ExecutorCompletionService<>(ioExecutor);
+		connect = new ExecutorCompletionService<KeyAgreementConnection>(
+				ioExecutor);
 	}
 
 	public Payload listen(KeyPair localKeyPair) {
@@ -73,7 +75,8 @@ class KeyAgreementConnector {
 		byte[] commitment = crypto.deriveKeyCommitment(
 				localKeyPair.getPublic().getEncoded());
 		// Start all listeners and collect their descriptors
-		List<TransportDescriptor> descriptors = new ArrayList<>();
+		List<TransportDescriptor> descriptors =
+				new ArrayList<TransportDescriptor>();
 		for (DuplexPlugin plugin : pluginManager.getKeyAgreementPlugins()) {
 			KeyAgreementListener l =
 					plugin.createKeyAgreementListener(commitment);
@@ -129,7 +132,10 @@ class KeyAgreementConnector {
 			LOG.info("Interrupted while waiting for connection");
 			Thread.currentThread().interrupt();
 			return null;
-		} catch (ExecutionException | IOException e) {
+		} catch (ExecutionException e) {
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+			return null;
+		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return null;
 		} finally {

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

@@ -51,7 +51,8 @@ class PayloadParserImpl implements PayloadParser {
 		byte[] commitment = payload.getRaw(1);
 		if (commitment.length != COMMIT_LENGTH) throw new FormatException();
 		// Remaining elements: transport descriptors
-		List<TransportDescriptor> recognised = new ArrayList<>();
+		List<TransportDescriptor> recognised =
+				new ArrayList<TransportDescriptor>();
 		for (int i = 2; i < payload.size(); i++) {
 			BdfList descriptor = payload.getList(i);
 			long transportId = descriptor.getLong(0);

bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java

@@ -63,9 +63,9 @@ class LifecycleManagerImpl implements LifecycleManager {
 		this.crypto = crypto;
 		this.authorFactory = authorFactory;
 		this.identityManager = identityManager;
-		services = new CopyOnWriteArrayList<>();
-		clients = new CopyOnWriteArrayList<>();
-		executors = new CopyOnWriteArrayList<>();
+		services = new CopyOnWriteArrayList<Service>();
+		clients = new CopyOnWriteArrayList<Client>();
+		executors = new CopyOnWriteArrayList<ExecutorService>();
 	}
 
 	@Override
@@ -88,7 +88,7 @@ class LifecycleManagerImpl implements LifecycleManager {
 		executors.add(e);
 	}
 
-	private LocalAuthor createLocalAuthor(String nickname) {
+	private LocalAuthor createLocalAuthor(final String nickname) {
 		long now = System.currentTimeMillis();
 		KeyPair keyPair = crypto.generateSignatureKeyPair();
 		byte[] publicKey = keyPair.getPublic().getEncoded();
@@ -203,7 +203,9 @@ class LifecycleManagerImpl implements LifecycleManager {
 			if (LOG.isLoggable(INFO))
 				LOG.info("Closing database took " + duration + " ms");
 			shutdownLatch.countDown();
-		} catch (DbException | ServiceException e) {
+		} catch (DbException e) {
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		} catch (ServiceException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		} finally {
 			startStopSemaphore.release();

bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleModule.java

@@ -37,7 +37,7 @@ public class LifecycleModule {
 
 	public LifecycleModule() {
 		// The thread pool is unbounded, so use direct handoff
-		BlockingQueue<Runnable> queue = new SynchronousQueue<>();
+		BlockingQueue<Runnable> queue = new SynchronousQueue<Runnable>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();

bramble-core/src/main/java/org/briarproject/bramble/lifecycle/ShutdownManagerImpl.java

@@ -21,7 +21,7 @@ class ShutdownManagerImpl implements ShutdownManager {
 	private int nextHandle = 0;
 
 	ShutdownManagerImpl() {
-		hooks = new HashMap<>();
+		hooks = new HashMap<Integer, Thread>();
 	}
 
 	@Override

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

@@ -134,7 +134,11 @@ class ConnectionManagerImpl implements ConnectionManager {
 			try {
 				byte[] tag = readTag(reader);
 				ctx = keyManager.getStreamContext(transportId, tag);
-			} catch (IOException | DbException e) {
+			} catch (IOException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+				disposeReader(true, false);
+				return;
+			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				disposeReader(true, false);
 				return;
@@ -245,7 +249,11 @@ class ConnectionManagerImpl implements ConnectionManager {
 			try {
 				byte[] tag = readTag(reader);
 				ctx = keyManager.getStreamContext(transportId, tag);
-			} catch (IOException | DbException e) {
+			} catch (IOException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+				disposeReader(true, false);
+				return;
+			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				disposeReader(true, false);
 				return;
@@ -258,7 +266,12 @@ class ConnectionManagerImpl implements ConnectionManager {
 			contactId = ctx.getContactId();
 			connectionRegistry.registerConnection(contactId, transportId, true);
 			// Start the outgoing session on another thread
-			ioExecutor.execute(this::runOutgoingSession);
+			ioExecutor.execute(new Runnable() {
+				@Override
+				public void run() {
+					runOutgoingSession();
+				}
+			});
 			try {
 				// Create and run the incoming session
 				incomingSession = createIncomingSession(ctx, reader);
@@ -355,7 +368,12 @@ class ConnectionManagerImpl implements ConnectionManager {
 				return;
 			}
 			// Start the incoming session on another thread
-			ioExecutor.execute(this::runIncomingSession);
+			ioExecutor.execute(new Runnable() {
+				@Override
+				public void run() {
+					runIncomingSession();
+				}
+			});
 			try {
 				// Create and run the outgoing session
 				outgoingSession = createDuplexOutgoingSession(ctx, writer);
@@ -373,7 +391,11 @@ class ConnectionManagerImpl implements ConnectionManager {
 			try {
 				byte[] tag = readTag(reader);
 				ctx = keyManager.getStreamContext(transportId, tag);
-			} catch (IOException | DbException e) {
+			} catch (IOException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+				disposeReader(true, false);
+				return;
+			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				disposeReader(true, false);
 				return;

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

@@ -42,8 +42,8 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 	@Inject
 	ConnectionRegistryImpl(EventBus eventBus) {
 		this.eventBus = eventBus;
-		connections = new HashMap<>();
-		contactCounts = new HashMap<>();
+		connections = new HashMap<TransportId, Map<ContactId, Integer>>();
+		contactCounts = new HashMap<ContactId, Integer>();
 	}
 
 	@Override
@@ -58,7 +58,7 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 		try {
 			Map<ContactId, Integer> m = connections.get(t);
 			if (m == null) {
-				m = new HashMap<>();
+				m = new HashMap<ContactId, Integer>();
 				connections.put(t, m);
 			}
 			Integer count = m.get(c);
@@ -124,7 +124,7 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 		try {
 			Map<ContactId, Integer> m = connections.get(t);
 			if (m == null) return Collections.emptyList();
-			List<ContactId> ids = new ArrayList<>(m.keySet());
+			List<ContactId> ids = new ArrayList<ContactId>(m.keySet());
 			if (LOG.isLoggable(INFO))
 				LOG.info(ids.size() + " contacts connected");
 			return ids;

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

@@ -82,10 +82,10 @@ class PluginManagerImpl implements PluginManager, Service {
 		this.settingsManager = settingsManager;
 		this.transportPropertyManager = transportPropertyManager;
 		this.uiCallback = uiCallback;
-		plugins = new ConcurrentHashMap<>();
-		simplexPlugins = new CopyOnWriteArrayList<>();
-		duplexPlugins = new CopyOnWriteArrayList<>();
-		startLatches = new ConcurrentHashMap<>();
+		plugins = new ConcurrentHashMap<TransportId, Plugin>();
+		simplexPlugins = new CopyOnWriteArrayList<SimplexPlugin>();
+		duplexPlugins = new CopyOnWriteArrayList<DuplexPlugin>();
+		startLatches = new ConcurrentHashMap<TransportId, CountDownLatch>();
 	}
 
 	@Override
@@ -156,17 +156,17 @@ class PluginManagerImpl implements PluginManager, Service {
 
 	@Override
 	public Collection<SimplexPlugin> getSimplexPlugins() {
-		return new ArrayList<>(simplexPlugins);
+		return new ArrayList<SimplexPlugin>(simplexPlugins);
 	}
 
 	@Override
 	public Collection<DuplexPlugin> getDuplexPlugins() {
-		return new ArrayList<>(duplexPlugins);
+		return new ArrayList<DuplexPlugin>(duplexPlugins);
 	}
 
 	@Override
 	public Collection<DuplexPlugin> getKeyAgreementPlugins() {
-		List<DuplexPlugin> supported = new ArrayList<>();
+		List<DuplexPlugin> supported = new ArrayList<DuplexPlugin>();
 		for (DuplexPlugin d : duplexPlugins)
 			if (d.supportsKeyAgreement()) supported.add(d);
 		return supported;

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

@@ -66,7 +66,7 @@ class Poller implements EventListener {
 		this.random = random;
 		this.clock = clock;
 		lock = new ReentrantLock();
-		tasks = new HashMap<>();
+		tasks = new HashMap<TransportId, PollTask>();
 	}
 
 	@Override
@@ -111,24 +111,30 @@ class Poller implements EventListener {
 			connectToContact(c, (DuplexPlugin) p);
 	}
 
-	private void connectToContact(ContactId c, SimplexPlugin p) {
-		ioExecutor.execute(() -> {
-			TransportId t = p.getId();
-			if (!connectionRegistry.isConnected(c, t)) {
-				TransportConnectionWriter w = p.createWriter(c);
-				if (w != null)
-					connectionManager.manageOutgoingConnection(c, t, w);
+	private void connectToContact(final ContactId c, final SimplexPlugin p) {
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				TransportId t = p.getId();
+				if (!connectionRegistry.isConnected(c, t)) {
+					TransportConnectionWriter w = p.createWriter(c);
+					if (w != null)
+						connectionManager.manageOutgoingConnection(c, t, w);
+				}
 			}
 		});
 	}
 
-	private void connectToContact(ContactId c, DuplexPlugin p) {
-		ioExecutor.execute(() -> {
-			TransportId t = p.getId();
-			if (!connectionRegistry.isConnected(c, t)) {
-				DuplexTransportConnection d = p.createConnection(c);
-				if (d != null)
-					connectionManager.manageOutgoingConnection(c, t, d);
+	private void connectToContact(final ContactId c, final DuplexPlugin p) {
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				TransportId t = p.getId();
+				if (!connectionRegistry.isConnected(c, t)) {
+					DuplexTransportConnection d = p.createConnection(c);
+					if (d != null)
+						connectionManager.manageOutgoingConnection(c, t, d);
+				}
 			}
 		});
 	}
@@ -153,10 +159,14 @@ class Poller implements EventListener {
 		try {
 			PollTask scheduled = tasks.get(t);
 			if (scheduled == null || due < scheduled.due) {
-				PollTask task = new PollTask(p, due, randomiseNext);
+				final PollTask task = new PollTask(p, due, randomiseNext);
 				tasks.put(t, task);
-				scheduler.schedule(
-						() -> ioExecutor.execute(task), delay, MILLISECONDS);
+				scheduler.schedule(new Runnable() {
+					@Override
+					public void run() {
+						ioExecutor.execute(task);
+					}
+				}, delay, MILLISECONDS);
 			}
 		} finally {
 			lock.unlock();
@@ -164,7 +174,7 @@ class Poller implements EventListener {
 	}
 
 	@IoExecutor
-	private void poll(Plugin p) {
+	private void poll(final Plugin p) {
 		TransportId t = p.getId();
 		if (LOG.isLoggable(INFO)) LOG.info("Polling plugin " + t);
 		p.poll(connectionRegistry.getConnectedContacts(t));

bramble-core/src/main/java/org/briarproject/bramble/plugin/file/FilePlugin.java

@@ -108,7 +108,7 @@ abstract class FilePlugin implements SimplexPlugin {
 		}
 	}
 
-	protected void createReaderFromFile(File f) {
+	protected void createReaderFromFile(final File f) {
 		if (!running) return;
 		ioExecutor.execute(new ReaderCreator(f));
 	}

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

@@ -63,7 +63,7 @@ class LanTcpPlugin extends TcpPlugin {
 		TransportProperties p = callback.getLocalProperties();
 		String oldIpPorts = p.get(PROP_IP_PORTS);
 		List<InetSocketAddress> olds = parseSocketAddresses(oldIpPorts);
-		List<InetSocketAddress> locals = new LinkedList<>();
+		List<InetSocketAddress> locals = new LinkedList<InetSocketAddress>();
 		for (InetAddress local : getLocalIpAddresses()) {
 			if (isAcceptableAddress(local)) {
 				// If this is the old address, try to use the same port
@@ -82,7 +82,7 @@ class LanTcpPlugin extends TcpPlugin {
 	private List<InetSocketAddress> parseSocketAddresses(String ipPorts) {
 		if (StringUtils.isNullOrEmpty(ipPorts)) return Collections.emptyList();
 		String[] split = ipPorts.split(SEPARATOR);
-		List<InetSocketAddress> addresses = new ArrayList<>();
+		List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>();
 		for (String ipPort : split) {
 			InetSocketAddress a = parseSocketAddress(ipPort);
 			if (a != null) addresses.add(a);
@@ -95,7 +95,7 @@ class LanTcpPlugin extends TcpPlugin {
 		String ipPort = getIpPortString(a);
 		// Get the list of recently used addresses
 		String setting = callback.getSettings().get(PREF_LAN_IP_PORTS);
-		List<String> recent = new ArrayList<>();
+		List<String> recent = new ArrayList<String>();
 		if (!StringUtils.isNullOrEmpty(setting))
 			Collections.addAll(recent, setting.split(SEPARATOR));
 		// Is the address already in the list?
@@ -111,7 +111,7 @@ class LanTcpPlugin extends TcpPlugin {
 				recent = recent.subList(0, MAX_ADDRESSES);
 			setting = StringUtils.join(recent, SEPARATOR);
 			// Update the list of addresses shared with contacts
-			List<String> shared = new ArrayList<>(recent);
+			List<String> shared = new ArrayList<String>(recent);
 			Collections.sort(shared);
 			String property = StringUtils.join(shared, SEPARATOR);
 			TransportProperties properties = new TransportProperties();
@@ -260,12 +260,16 @@ class LanTcpPlugin extends TcpPlugin {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return () -> {
-				Socket s = ss.accept();
-				if (LOG.isLoggable(INFO))
-					LOG.info(ID.getString() + ": Incoming connection");
-				return new KeyAgreementConnection(
-						new TcpTransportConnection(LanTcpPlugin.this, s), ID);
+			return new Callable<KeyAgreementConnection>() {
+				@Override
+				public KeyAgreementConnection call() throws IOException {
+					Socket s = ss.accept();
+					if (LOG.isLoggable(INFO))
+						LOG.info(ID.getString() + ": Incoming connection");
+					return new KeyAgreementConnection(
+							new TcpTransportConnection(LanTcpPlugin.this, s),
+							ID);
+				}
 			};
 		}
 

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

@@ -37,7 +37,7 @@ class PortMapperImpl implements PortMapper {
 	}
 
 	@Override
-	public MappingResult map(int port) {
+	public MappingResult map(final int port) {
 		if (!started.getAndSet(true)) start();
 		if (gateway == null) return null;
 		InetAddress internal = gateway.getLocalAddress();
@@ -50,7 +50,12 @@ class PortMapperImpl implements PortMapper {
 			succeeded = gateway.addPortMapping(port, port,
 					getHostAddress(internal), "TCP", "TCP");
 			if (succeeded) {
-				shutdownManager.addShutdownHook(() -> deleteMapping(port));
+				shutdownManager.addShutdownHook(new Runnable() {
+					@Override
+					public void run() {
+						deleteMapping(port);
+					}
+				});
 			}
 			String externalString = gateway.getExternalIPAddress();
 			if (LOG.isLoggable(INFO))
@@ -58,7 +63,9 @@ class PortMapperImpl implements PortMapper {
 						"External address " + scrubInetAddress(externalString));
 			if (externalString != null)
 				external = InetAddress.getByName(externalString);
-		} catch (IOException | SAXException e) {
+		} catch (IOException e) {
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		} catch (SAXException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 		return new MappingResult(internal, external, port, succeeded);
@@ -75,7 +82,11 @@ class PortMapperImpl implements PortMapper {
 		GatewayDiscover d = new GatewayDiscover();
 		try {
 			d.discover();
-		} catch (IOException | SAXException | ParserConfigurationException e) {
+		} catch (IOException e) {
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		} catch (SAXException e) {
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		} catch (ParserConfigurationException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 		gateway = d.getValidGateway();
@@ -86,7 +97,9 @@ class PortMapperImpl implements PortMapper {
 			gateway.deletePortMapping(port, "TCP");
 			if (LOG.isLoggable(INFO))
 				LOG.info("Deleted mapping for port " + port);
-		} catch (IOException | SAXException e) {
+		} catch (IOException e) {
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		} catch (SAXException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}

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

@@ -110,37 +110,41 @@ abstract class TcpPlugin implements DuplexPlugin {
 	}
 
 	protected void bind() {
-		ioExecutor.execute(() -> {
-			if (!running) return;
-			ServerSocket ss = null;
-			for (InetSocketAddress addr : getLocalSocketAddresses()) {
-				try {
-					ss = new ServerSocket();
-					ss.bind(addr);
-					break;
-				} catch (IOException e) {
-					if (LOG.isLoggable(INFO))
-						LOG.info("Failed to bind " + scrubSocketAddress(addr));
-					tryToClose(ss);
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				if (!running) return;
+				ServerSocket ss = null;
+				for (InetSocketAddress addr : getLocalSocketAddresses()) {
+					try {
+						ss = new ServerSocket();
+						ss.bind(addr);
+						break;
+					} catch (IOException e) {
+						if (LOG.isLoggable(INFO))
+							LOG.info("Failed to bind " +
+									scrubSocketAddress(addr));
+						tryToClose(ss);
+					}
 				}
+				if (ss == null || !ss.isBound()) {
+					LOG.info("Could not bind server socket");
+					return;
+				}
+				if (!running) {
+					tryToClose(ss);
+					return;
+				}
+				socket = ss;
+				backoff.reset();
+				InetSocketAddress local =
+						(InetSocketAddress) ss.getLocalSocketAddress();
+				setLocalSocketAddress(local);
+				if (LOG.isLoggable(INFO))
+					LOG.info("Listening on " + scrubSocketAddress(local));
+				callback.transportEnabled();
+				acceptContactConnections();
 			}
-			if (ss == null || !ss.isBound()) {
-				LOG.info("Could not bind server socket");
-				return;
-			}
-			if (!running) {
-				tryToClose(ss);
-				return;
-			}
-			socket = ss;
-			backoff.reset();
-			InetSocketAddress local =
-					(InetSocketAddress) ss.getLocalSocketAddress();
-			setLocalSocketAddress(local);
-			if (LOG.isLoggable(INFO))
-				LOG.info("Listening on " + scrubSocketAddress(local));
-			callback.transportEnabled();
-			acceptContactConnections();
 		});
 	}
 
@@ -214,13 +218,17 @@ abstract class TcpPlugin implements DuplexPlugin {
 		}
 	}
 
-	private void connectAndCallBack(ContactId c, TransportProperties p) {
-		ioExecutor.execute(() -> {
-			if (!isRunning()) return;
-			DuplexTransportConnection d = createConnection(p);
-			if (d != null) {
-				backoff.reset();
-				callback.outgoingConnectionCreated(c, d);
+	private void connectAndCallBack(final ContactId c,
+			final TransportProperties p) {
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				if (!isRunning()) return;
+				DuplexTransportConnection d = createConnection(p);
+				if (d != null) {
+					backoff.reset();
+					callback.outgoingConnectionCreated(c, d);
+				}
 			}
 		});
 	}
@@ -309,7 +317,7 @@ abstract class TcpPlugin implements DuplexPlugin {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return Collections.emptyList();
 		}
-		List<InetAddress> addrs = new ArrayList<>();
+		List<InetAddress> addrs = new ArrayList<InetAddress>();
 		for (NetworkInterface iface : ifaces)
 			addrs.addAll(Collections.list(iface.getInetAddresses()));
 		return addrs;

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

@@ -43,7 +43,7 @@ class WanTcpPlugin extends TcpPlugin {
 		// Use the same address and port as last time if available
 		TransportProperties p = callback.getLocalProperties();
 		InetSocketAddress old = parseSocketAddress(p.get(PROP_IP_PORT));
-		List<InetSocketAddress> addrs = new LinkedList<>();
+		List<InetSocketAddress> addrs = new LinkedList<InetSocketAddress>();
 		for (InetAddress a : getLocalIpAddresses()) {
 			if (isAcceptableAddress(a)) {
 				// If this is the old address, try to use the same port

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

@@ -40,12 +40,9 @@ public class PropertiesModule {
 	@Provides
 	@Singleton
 	TransportPropertyManager getTransportPropertyManager(
-			LifecycleManager lifecycleManager,
-			ValidationManager validationManager, ContactManager contactManager,
+			LifecycleManager lifecycleManager, ContactManager contactManager,
 			TransportPropertyManagerImpl transportPropertyManager) {
 		lifecycleManager.registerClient(transportPropertyManager);
-		validationManager.registerIncomingMessageHook(CLIENT_ID,
-				transportPropertyManager);
 		contactManager.registerAddContactHook(transportPropertyManager);
 		contactManager.registerRemoveContactHook(transportPropertyManager);
 		return transportPropertyManager;

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

@@ -9,10 +9,8 @@ import org.briarproject.bramble.api.contact.ContactManager.AddContactHook;
 import org.briarproject.bramble.api.contact.ContactManager.RemoveContactHook;
 import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.data.MetadataParser;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
@@ -21,10 +19,8 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.sync.Client;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.ValidationManager.IncomingMessageHook;
 import org.briarproject.bramble.api.system.Clock;
 
 import java.util.HashMap;
@@ -40,22 +36,20 @@ import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 @Immutable
 @NotNullByDefault
 class TransportPropertyManagerImpl implements TransportPropertyManager,
-		Client, AddContactHook, RemoveContactHook, IncomingMessageHook {
+		Client, AddContactHook, RemoveContactHook {
 
 	private final DatabaseComponent db;
 	private final ClientHelper clientHelper;
-	private final MetadataParser metadataParser;
 	private final ContactGroupFactory contactGroupFactory;
 	private final Clock clock;
 	private final Group localGroup;
 
 	@Inject
 	TransportPropertyManagerImpl(DatabaseComponent db,
-			ClientHelper clientHelper, MetadataParser metadataParser,
-			ContactGroupFactory contactGroupFactory, Clock clock) {
+			ClientHelper clientHelper, ContactGroupFactory contactGroupFactory,
+			Clock clock) {
 		this.db = db;
 		this.clientHelper = clientHelper;
-		this.metadataParser = metadataParser;
 		this.contactGroupFactory = contactGroupFactory;
 		this.clock = clock;
 		localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID);
@@ -63,7 +57,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 
 	@Override
 	public void createLocalState(Transaction txn) throws DbException {
-		if (db.containsGroup(txn, localGroup.getId())) return;
 		db.addGroup(txn, localGroup);
 		// Ensure we've set things up for any pre-existing contacts
 		for (Contact c : db.getContacts(txn)) addingContact(txn, c);
@@ -91,31 +84,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 		db.removeGroup(txn, getContactGroup(c));
 	}
 
-	@Override
-	public boolean incomingMessage(Transaction txn, Message m, Metadata meta)
-			throws DbException, InvalidMessageException {
-		try {
-			// Find the latest update for this transport, if any
-			BdfDictionary d = metadataParser.parse(meta);
-			TransportId t = new TransportId(d.getString("transportId"));
-			LatestUpdate latest = findLatest(txn, m.getGroupId(), t, false);
-			if (latest != null) {
-				if (d.getLong("version") > latest.version) {
-					// This update is newer - delete the previous update
-					db.deleteMessage(txn, latest.messageId);
-					db.deleteMessageMetadata(txn, latest.messageId);
-				} else {
-					// We've already received a newer update - delete this one
-					db.deleteMessage(txn, m.getId());
-					db.deleteMessageMetadata(txn, m.getId());
-				}
-			}
-		} catch (FormatException e) {
-			throw new InvalidMessageException(e);
-		}
-		return false;
-	}
-
 	@Override
 	public void addRemoteProperties(Transaction txn, ContactId c,
 			Map<TransportId, TransportProperties> props) throws DbException {
@@ -130,8 +98,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	public Map<TransportId, TransportProperties> getLocalProperties()
 			throws DbException {
 		Map<TransportId, TransportProperties> local;
-		// TODO: Transaction can be read-only when code is simplified
-		Transaction txn = db.startTransaction(false);
+		Transaction txn = db.startTransaction(true);
 		try {
 			local = getLocalProperties(txn);
 			db.commitTransaction(txn);
@@ -145,9 +112,11 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	public Map<TransportId, TransportProperties> getLocalProperties(
 			Transaction txn) throws DbException {
 		try {
-			Map<TransportId, TransportProperties> local = new HashMap<>();
+			Map<TransportId, TransportProperties> local =
+					new HashMap<TransportId, TransportProperties>();
 			// Find the latest local update for each transport
-			Map<TransportId, LatestUpdate> latest = findLatestLocal(txn);
+			Map<TransportId, LatestUpdate> latest = findLatest(txn,
+					localGroup.getId(), true);
 			// Retrieve and parse the latest local properties
 			for (Entry<TransportId, LatestUpdate> e : latest.entrySet()) {
 				BdfList message = clientHelper.getMessageAsList(txn,
@@ -166,8 +135,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 			throws DbException {
 		try {
 			TransportProperties p = null;
-			// TODO: Transaction can be read-only when code is simplified
-			Transaction txn = db.startTransaction(false);
+			Transaction txn = db.startTransaction(true);
 			try {
 				// Find the latest local update
 				LatestUpdate latest = findLatest(txn, localGroup.getId(), t,
@@ -192,9 +160,9 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	@Override
 	public Map<ContactId, TransportProperties> getRemoteProperties(
 			TransportId t) throws DbException {
-		Map<ContactId, TransportProperties> remote = new HashMap<>();
-		// TODO: Transaction can be read-only when code is simplified
-		Transaction txn = db.startTransaction(false);
+		Map<ContactId, TransportProperties> remote =
+				new HashMap<ContactId, TransportProperties>();
+		Transaction txn = db.startTransaction(true);
 		try {
 			for (Contact c : db.getContacts(txn))
 				remote.put(c.getId(), getRemoteProperties(txn, c, t));
@@ -228,8 +196,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	public TransportProperties getRemoteProperties(ContactId c, TransportId t)
 			throws DbException {
 		TransportProperties p;
-		// TODO: Transaction can be read-only when code is simplified
-		Transaction txn = db.startTransaction(false);
+		Transaction txn = db.startTransaction(true);
 		try {
 			p = getRemoteProperties(txn, db.getContact(txn, c), t);
 			db.commitTransaction(txn);
@@ -267,9 +234,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 					long version = latest == null ? 1 : latest.version + 1;
 					storeMessage(txn, localGroup.getId(), t, merged, version,
 							true, false);
-					// Delete the previous update, if any
-					if (latest != null)
-						db.removeMessage(txn, latest.messageId);
 					// Store the merged properties in each contact's group
 					for (Contact c : db.getContacts(txn)) {
 						Group g = getContactGroup(c);
@@ -277,9 +241,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 						version = latest == null ? 1 : latest.version + 1;
 						storeMessage(txn, g.getId(), t, merged, version,
 								true, true);
-						// Delete the previous update, if any
-						if (latest != null)
-							db.removeMessage(txn, latest.messageId);
 					}
 				}
 				db.commitTransaction(txn);
@@ -317,26 +278,20 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 		return BdfList.of(t.getString(), version, p);
 	}
 
-	private Map<TransportId, LatestUpdate> findLatestLocal(Transaction txn)
-			throws DbException, FormatException {
-		// TODO: This can be simplified before 1.0
-		Map<TransportId, LatestUpdate> latestUpdates = new HashMap<>();
-		Map<MessageId, BdfDictionary> metadata = clientHelper
-				.getMessageMetadataAsDictionary(txn, localGroup.getId());
+	private Map<TransportId, LatestUpdate> findLatest(Transaction txn,
+			GroupId g, boolean local) throws DbException, FormatException {
+		Map<TransportId, LatestUpdate> latestUpdates =
+				new HashMap<TransportId, LatestUpdate>();
+		Map<MessageId, BdfDictionary> metadata =
+				clientHelper.getMessageMetadataAsDictionary(txn, g);
 		for (Entry<MessageId, BdfDictionary> e : metadata.entrySet()) {
 			BdfDictionary meta = e.getValue();
-			TransportId t = new TransportId(meta.getString("transportId"));
-			long version = meta.getLong("version");
-			LatestUpdate latest = latestUpdates.get(t);
-			if (latest == null) {
-				latestUpdates.put(t, new LatestUpdate(e.getKey(), version));
-			} else if (version > latest.version) {
-				// This update is newer - delete the previous one
-				db.removeMessage(txn, latest.messageId);
-				latestUpdates.put(t, new LatestUpdate(e.getKey(), version));
-			} else {
-				// We've already found a newer update - delete this one
-				db.removeMessage(txn, e.getKey());
+			if (meta.getBoolean("local") == local) {
+				TransportId t = new TransportId(meta.getString("transportId"));
+				long version = meta.getLong("version");
+				LatestUpdate latest = latestUpdates.get(t);
+				if (latest == null || version > latest.version)
+					latestUpdates.put(t, new LatestUpdate(e.getKey(), version));
 			}
 		}
 		return latestUpdates;
@@ -345,7 +300,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	@Nullable
 	private LatestUpdate findLatest(Transaction txn, GroupId g, TransportId t,
 			boolean local) throws DbException, FormatException {
-		// TODO: This can be simplified before 1.0
 		LatestUpdate latest = null;
 		Map<MessageId, BdfDictionary> metadata =
 				clientHelper.getMessageMetadataAsDictionary(txn, g);
@@ -354,26 +308,8 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 			if (meta.getString("transportId").equals(t.getString())
 					&& meta.getBoolean("local") == local) {
 				long version = meta.getLong("version");
-				if (latest == null) {
+				if (latest == null || version > latest.version)
 					latest = new LatestUpdate(e.getKey(), version);
-				} else if (version > latest.version) {
-					// This update is newer - delete the previous one
-					if (local) {
-						db.removeMessage(txn, latest.messageId);
-					} else {
-						db.deleteMessage(txn, latest.messageId);
-						db.deleteMessageMetadata(txn, latest.messageId);
-					}
-					latest = new LatestUpdate(e.getKey(), version);
-				} else {
-					// We've already found a newer update - delete this one
-					if (local) {
-						db.removeMessage(txn, e.getKey());
-					} else {
-						db.deleteMessage(txn, e.getKey());
-						db.deleteMessageMetadata(txn, e.getKey());
-					}
-				}
 			}
 		}
 		return latest;

bramble-core/src/main/java/org/briarproject/bramble/reliability/Receiver.java

@@ -41,7 +41,7 @@ class Receiver implements ReadHandler {
 	Receiver(Clock clock, Sender sender) {
 		this.sender = sender;
 		this.clock = clock;
-		dataFrames = new TreeSet<>(new SequenceNumberComparator());
+		dataFrames = new TreeSet<Data>(new SequenceNumberComparator());
 	}
 
 	Data read() throws IOException, InterruptedException {

bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerImpl.java

@@ -42,44 +42,48 @@ class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {
 		this.executor = executor;
 		this.clock = clock;
 		this.writeHandler = writeHandler;
-		writes = new LinkedBlockingQueue<>();
+		writes = new LinkedBlockingQueue<byte[]>();
 	}
 
 	@Override
 	public void start() {
 		SlipEncoder encoder = new SlipEncoder(this);
-		Sender sender = new Sender(clock, encoder);
+		final Sender sender = new Sender(clock, encoder);
 		receiver = new Receiver(clock, sender);
 		decoder = new SlipDecoder(receiver, Data.MAX_LENGTH);
 		inputStream = new ReceiverInputStream(receiver);
 		outputStream = new SenderOutputStream(sender);
 		running = true;
-		executor.execute(() -> {
-			long now = clock.currentTimeMillis();
-			long next = now + TICK_INTERVAL;
-			try {
-				while (running) {
-					byte[] b = null;
-					while (now < next && b == null) {
-						b = writes.poll(next - now, MILLISECONDS);
-						if (!running) return;
-						now = clock.currentTimeMillis();
-					}
-					if (b == null) {
-						sender.tick();
-						while (next <= now) next += TICK_INTERVAL;
-					} else {
-						if (b.length == 0) return; // Poison pill
-						writeHandler.handleWrite(b);
+		executor.execute(new Runnable() {
+			@Override
+			public void run() {
+				long now = clock.currentTimeMillis();
+				long next = now + TICK_INTERVAL;
+				try {
+					while (running) {
+						byte[] b = null;
+						while (now < next && b == null) {
+							b = writes.poll(next - now, MILLISECONDS);
+							if (!running) return;
+							now = clock.currentTimeMillis();
+						}
+						if (b == null) {
+							sender.tick();
+							while (next <= now) next += TICK_INTERVAL;
+						} else {
+							if (b.length == 0) return; // Poison pill
+							writeHandler.handleWrite(b);
+						}
 					}
+				} catch (InterruptedException e) {
+					LOG.warning("Interrupted while waiting to write");
+					Thread.currentThread().interrupt();
+					running = false;
+				} catch (IOException e) {
+					if (LOG.isLoggable(WARNING))
+						LOG.log(WARNING, e.toString(), e);
+					running = false;
 				}
-			} catch (InterruptedException e) {
-				LOG.warning("Interrupted while waiting to write");
-				Thread.currentThread().interrupt();
-				running = false;
-			} catch (IOException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				running = false;
 			}
 		});
 	}

bramble-core/src/main/java/org/briarproject/bramble/reliability/Sender.java

@@ -46,7 +46,7 @@ class Sender {
 	Sender(Clock clock, WriteHandler writeHandler) {
 		this.clock = clock;
 		this.writeHandler = writeHandler;
-		outstanding = new LinkedList<>();
+		outstanding = new LinkedList<Outstanding>();
 	}
 
 	void sendAck(long sequenceNumber, int windowSize) throws IOException {
@@ -136,7 +136,7 @@ class Sender {
 					if (now - o.lastTransmitted > rto) {
 						it.remove();
 						if (retransmit == null)
-							retransmit = new ArrayList<>();
+							retransmit = new ArrayList<Outstanding>();
 						retransmit.add(o);
 						// Update the retransmission timeout
 						rto <<= 1;

bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java

@@ -54,7 +54,12 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(DuplexOutgoingSession.class.getName());
 
-	private static final ThrowingRunnable<IOException> CLOSE = () -> {};
+	private static final ThrowingRunnable<IOException> CLOSE =
+			new ThrowingRunnable<IOException>() {
+				@Override
+				public void run() {
+				}
+			};
 
 	private final DatabaseComponent db;
 	private final Executor dbExecutor;
@@ -78,7 +83,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
 		this.recordWriter = recordWriter;
-		writerTasks = new LinkedBlockingQueue<>();
+		writerTasks = new LinkedBlockingQueue<ThrowingRunnable<IOException>>();
 	}
 
 	@IoExecutor

bramble-core/src/main/java/org/briarproject/bramble/sync/RecordReaderImpl.java

@@ -116,7 +116,7 @@ class RecordReaderImpl implements RecordReader {
 	private List<MessageId> readMessageIds() throws IOException {
 		if (payloadLength == 0) throw new FormatException();
 		if (payloadLength % UniqueId.LENGTH != 0) throw new FormatException();
-		List<MessageId> ids = new ArrayList<>();
+		List<MessageId> ids = new ArrayList<MessageId>();
 		for (int off = 0; off < payloadLength; off += UniqueId.LENGTH) {
 			byte[] id = new byte[UniqueId.LENGTH];
 			System.arraycopy(payload, off, id, 0, UniqueId.LENGTH);

bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java

@@ -43,7 +43,12 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(SimplexOutgoingSession.class.getName());
 
-	private static final ThrowingRunnable<IOException> CLOSE = () -> {};
+	private static final ThrowingRunnable<IOException> CLOSE =
+			new ThrowingRunnable<IOException>() {
+				@Override
+				public void run() {
+				}
+			};
 
 	private final DatabaseComponent db;
 	private final Executor dbExecutor;
@@ -66,7 +71,7 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 		this.maxLatency = maxLatency;
 		this.recordWriter = recordWriter;
 		outstandingQueries = new AtomicInteger(2); // One per type of record
-		writerTasks = new LinkedBlockingQueue<>();
+		writerTasks = new LinkedBlockingQueue<ThrowingRunnable<IOException>>();
 	}
 
 	@IoExecutor

bramble-core/src/main/java/org/briarproject/bramble/sync/ValidationManagerImpl.java

@@ -64,8 +64,8 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		this.dbExecutor = dbExecutor;
 		this.validationExecutor = validationExecutor;
 		this.messageFactory = messageFactory;
-		validators = new ConcurrentHashMap<>();
-		hooks = new ConcurrentHashMap<>();
+		validators = new ConcurrentHashMap<ClientId, MessageValidator>();
+		hooks = new ConcurrentHashMap<ClientId, IncomingMessageHook>();
 	}
 
 	@Override
@@ -93,14 +93,19 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		hooks.put(c, hook);
 	}
 
-	private void validateOutstandingMessagesAsync(ClientId c) {
-		dbExecutor.execute(() -> validateOutstandingMessages(c));
+	private void validateOutstandingMessagesAsync(final ClientId c) {
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				validateOutstandingMessages(c);
+			}
+		});
 	}
 
 	@DatabaseExecutor
 	private void validateOutstandingMessages(ClientId c) {
 		try {
-			Queue<MessageId> unvalidated = new LinkedList<>();
+			Queue<MessageId> unvalidated = new LinkedList<MessageId>();
 			Transaction txn = db.startTransaction(true);
 			try {
 				unvalidated.addAll(db.getMessagesToValidate(txn, c));
@@ -114,9 +119,14 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void validateNextMessageAsync(Queue<MessageId> unvalidated) {
+	private void validateNextMessageAsync(final Queue<MessageId> unvalidated) {
 		if (unvalidated.isEmpty()) return;
-		dbExecutor.execute(() -> validateNextMessage(unvalidated));
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				validateNextMessage(unvalidated);
+			}
+		});
 	}
 
 	@DatabaseExecutor
@@ -148,14 +158,19 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void deliverOutstandingMessagesAsync(ClientId c) {
-		dbExecutor.execute(() -> deliverOutstandingMessages(c));
+	private void deliverOutstandingMessagesAsync(final ClientId c) {
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				deliverOutstandingMessages(c);
+			}
+		});
 	}
 
 	@DatabaseExecutor
 	private void deliverOutstandingMessages(ClientId c) {
 		try {
-			Queue<MessageId> pending = new LinkedList<>();
+			Queue<MessageId> pending = new LinkedList<MessageId>();
 			Transaction txn = db.startTransaction(true);
 			try {
 				pending.addAll(db.getPendingMessages(txn, c));
@@ -169,9 +184,15 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void deliverNextPendingMessageAsync(Queue<MessageId> pending) {
+	private void deliverNextPendingMessageAsync(
+			final Queue<MessageId> pending) {
 		if (pending.isEmpty()) return;
-		dbExecutor.execute(() -> deliverNextPendingMessage(pending));
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				deliverNextPendingMessage(pending);
+			}
+		});
 	}
 
 	@DatabaseExecutor
@@ -208,7 +229,8 @@ class ValidationManagerImpl implements ValidationManager, Service,
 							pending.addAll(getPendingDependents(txn, id));
 							if (result.share) {
 								db.setMessageShared(txn, id);
-								toShare = new LinkedList<>(states.keySet());
+								toShare = new LinkedList<MessageId>(
+										states.keySet());
 							}
 						} else {
 							invalidate = getDependentsToInvalidate(txn, id);
@@ -233,8 +255,13 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void validateMessageAsync(Message m, Group g) {
-		validationExecutor.execute(() -> validateMessage(m, g));
+	private void validateMessageAsync(final Message m, final Group g) {
+		validationExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				validateMessage(m, g);
+			}
+		});
 	}
 
 	@ValidationExecutor
@@ -250,16 +277,21 @@ class ValidationManagerImpl implements ValidationManager, Service,
 			} catch (InvalidMessageException e) {
 				if (LOG.isLoggable(INFO))
 					LOG.log(INFO, e.toString(), e);
-				Queue<MessageId> invalidate = new LinkedList<>();
+				Queue<MessageId> invalidate = new LinkedList<MessageId>();
 				invalidate.add(m.getId());
 				invalidateNextMessageAsync(invalidate);
 			}
 		}
 	}
 
-	private void storeMessageContextAsync(Message m, ClientId c,
-			MessageContext result) {
-		dbExecutor.execute(() -> storeMessageContext(m, c, result));
+	private void storeMessageContextAsync(final Message m, final ClientId c,
+			final MessageContext result) {
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				storeMessageContext(m, c, result);
+			}
+		});
 	}
 
 	@DatabaseExecutor
@@ -299,7 +331,8 @@ class ValidationManagerImpl implements ValidationManager, Service,
 							pending = getPendingDependents(txn, id);
 							if (result.share) {
 								db.setMessageShared(txn, id);
-								toShare = new LinkedList<>(dependencies);
+								toShare =
+										new LinkedList<MessageId>(dependencies);
 							}
 						} else {
 							invalidate = getDependentsToInvalidate(txn, id);
@@ -345,7 +378,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	@DatabaseExecutor
 	private Queue<MessageId> getPendingDependents(Transaction txn, MessageId m)
 			throws DbException {
-		Queue<MessageId> pending = new LinkedList<>();
+		Queue<MessageId> pending = new LinkedList<MessageId>();
 		Map<MessageId, State> states = db.getMessageDependents(txn, m);
 		for (Entry<MessageId, State> e : states.entrySet()) {
 			if (e.getValue() == PENDING) pending.add(e.getKey());
@@ -353,14 +386,19 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		return pending;
 	}
 
-	private void shareOutstandingMessagesAsync(ClientId c) {
-		dbExecutor.execute(() -> shareOutstandingMessages(c));
+	private void shareOutstandingMessagesAsync(final ClientId c) {
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				shareOutstandingMessages(c);
+			}
+		});
 	}
 
 	@DatabaseExecutor
 	private void shareOutstandingMessages(ClientId c) {
 		try {
-			Queue<MessageId> toShare = new LinkedList<>();
+			Queue<MessageId> toShare = new LinkedList<MessageId>();
 			Transaction txn = db.startTransaction(true);
 			try {
 				toShare.addAll(db.getMessagesToShare(txn, c));
@@ -380,9 +418,14 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	 * This method should only be called for messages that have all their
 	 * dependencies delivered and have been delivered themselves.
 	 */
-	private void shareNextMessageAsync(Queue<MessageId> toShare) {
+	private void shareNextMessageAsync(final Queue<MessageId> toShare) {
 		if (toShare.isEmpty()) return;
-		dbExecutor.execute(() -> shareNextMessage(toShare));
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				shareNextMessage(toShare);
+			}
+		});
 	}
 
 	@DatabaseExecutor
@@ -409,9 +452,14 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void invalidateNextMessageAsync(Queue<MessageId> invalidate) {
+	private void invalidateNextMessageAsync(final Queue<MessageId> invalidate) {
 		if (invalidate.isEmpty()) return;
-		dbExecutor.execute(() -> invalidateNextMessage(invalidate));
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				invalidateNextMessage(invalidate);
+			}
+		});
 	}
 
 	@DatabaseExecutor
@@ -448,7 +496,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	@DatabaseExecutor
 	private Queue<MessageId> getDependentsToInvalidate(Transaction txn,
 			MessageId m) throws DbException {
-		Queue<MessageId> invalidate = new LinkedList<>();
+		Queue<MessageId> invalidate = new LinkedList<MessageId>();
 		Map<MessageId, State> states = db.getMessageDependents(txn, m);
 		for (Entry<MessageId, State> e : states.entrySet()) {
 			if (e.getValue() != INVALID) invalidate.add(e.getKey());
@@ -466,12 +514,17 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void loadGroupAndValidateAsync(Message m) {
-		dbExecutor.execute(() -> loadGroupAndValidate(m));
+	private void loadGroupAndValidateAsync(final Message m) {
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				loadGroupAndValidate(m);
+			}
+		});
 	}
 
 	@DatabaseExecutor
-	private void loadGroupAndValidate(Message m) {
+	private void loadGroupAndValidate(final Message m) {
 		try {
 			Group g;
 			Transaction txn = db.startTransaction(true);

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

@@ -58,14 +58,15 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 		this.pluginConfig = pluginConfig;
 		this.transportKeyManagerFactory = transportKeyManagerFactory;
 		// Use a ConcurrentHashMap as a thread-safe set
-		activeContacts = new ConcurrentHashMap<>();
-		managers = new ConcurrentHashMap<>();
+		activeContacts = new ConcurrentHashMap<ContactId, Boolean>();
+		managers = new ConcurrentHashMap<TransportId, TransportKeyManager>();
 	}
 
 	@Override
 	public void startService() throws ServiceException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
-		Map<TransportId, Integer> transports = new HashMap<>();
+		Map<TransportId, Integer> transports =
+				new HashMap<TransportId, Integer>();
 		for (SimplexPluginFactory f : pluginConfig.getSimplexFactories())
 			transports.put(f.getId(), f.getMaxLatency());
 		for (DuplexPluginFactory f : pluginConfig.getDuplexFactories())
@@ -155,10 +156,14 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 		}
 	}
 
-	private void removeContact(ContactId c) {
+	private void removeContact(final ContactId c) {
 		activeContacts.remove(c);
-		dbExecutor.execute(() -> {
-			for (TransportKeyManager m : managers.values()) m.removeContact(c);
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				for (TransportKeyManager m : managers.values())
+					m.removeContact(c);
+			}
 		});
 	}
 }

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

@@ -45,7 +45,7 @@ class ReorderingWindow {
 	}
 
 	List<Long> getUnseen() {
-		List<Long> unseen = new ArrayList<>(seen.length);
+		List<Long> unseen = new ArrayList<Long>(seen.length);
 		for (int i = 0; i < seen.length; i++)
 			if (!seen[i]) unseen.add(base + i);
 		return unseen;
@@ -69,8 +69,8 @@ class ReorderingWindow {
 			return new Change(added, removed);
 		}
 		// Record the elements that will be added and removed
-		List<Long> added = new ArrayList<>(slide);
-		List<Long> removed = new ArrayList<>(slide);
+		List<Long> added = new ArrayList<Long>(slide);
+		List<Long> removed = new ArrayList<Long>(slide);
 		for (int i = 0; i < slide; i++) {
 			if (!seen[i]) removed.add(base + i);
 			added.add(base + seen.length + i);

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

@@ -65,9 +65,9 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		this.transportId = transportId;
 		rotationPeriodLength = maxLatency + MAX_CLOCK_DIFFERENCE;
 		lock = new ReentrantLock();
-		inContexts = new HashMap<>();
-		outContexts = new HashMap<>();
-		keys = new HashMap<>();
+		inContexts = new HashMap<Bytes, TagContext>();
+		outContexts = new HashMap<ContactId, MutableOutgoingKeys>();
+		keys = new HashMap<ContactId, MutableTransportKeys>();
 	}
 
 	@Override
@@ -134,22 +134,32 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 	}
 
 	private void scheduleKeyRotation(long now) {
+		Runnable task = new Runnable() {
+			@Override
+			public void run() {
+				rotateKeys();
+			}
+		};
 		long delay = rotationPeriodLength - now % rotationPeriodLength;
-		scheduler.schedule((Runnable) this::rotateKeys, delay, MILLISECONDS);
+		scheduler.schedule(task, delay, MILLISECONDS);
 	}
 
 	private void rotateKeys() {
-		dbExecutor.execute(() -> {
-			try {
-				Transaction txn = db.startTransaction(false);
+		dbExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
 				try {
-					rotateKeys(txn);
-					db.commitTransaction(txn);
-				} finally {
-					db.endTransaction(txn);
+					Transaction txn = db.startTransaction(false);
+					try {
+						rotateKeys(txn);
+						db.commitTransaction(txn);
+					} finally {
+						db.endTransaction(txn);
+					}
+				} catch (DbException e) {
+					if (LOG.isLoggable(WARNING))
+						LOG.log(WARNING, e.toString(), e);
 				}
-			} catch (DbException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		});
 	}
@@ -262,7 +272,8 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		lock.lock();
 		try {
 			// Rotate the keys to the current rotation period
-			Map<ContactId, TransportKeys> snapshot = new HashMap<>();
+			Map<ContactId, TransportKeys> snapshot =
+					new HashMap<ContactId, TransportKeys>();
 			for (Entry<ContactId, MutableTransportKeys> e : keys.entrySet())
 				snapshot.put(e.getKey(), e.getValue().snapshot());
 			RotationResult rotationResult = rotateKeys(snapshot, now);
@@ -300,8 +311,8 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		private final Map<ContactId, TransportKeys> current, rotated;
 
 		private RotationResult() {
-			current = new HashMap<>();
-			rotated = new HashMap<>();
+			current = new HashMap<ContactId, TransportKeys>();
+			rotated = new HashMap<ContactId, TransportKeys>();
 		}
 	}
 }

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

@@ -24,13 +24,16 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newSingleThreadExecutor();
 		// Allow all the tasks to be delegated straight away
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, TASKS * 2);
-		List<Integer> list = new Vector<>();
-		CountDownLatch latch = new CountDownLatch(TASKS);
+		final List<Integer> list = new Vector<Integer>();
+		final CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
-			int result = i;
-			polite.execute(() -> {
-				list.add(result);
-				latch.countDown();
+			final int result = i;
+			polite.execute(new Runnable() {
+				@Override
+				public void run() {
+					list.add(result);
+					latch.countDown();
+				}
 			});
 		}
 		// Wait for all the tasks to finish
@@ -46,13 +49,16 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newSingleThreadExecutor();
 		// Allow two tasks to be delegated at a time
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, 2);
-		List<Integer> list = new Vector<>();
-		CountDownLatch latch = new CountDownLatch(TASKS);
+		final List<Integer> list = new Vector<Integer>();
+		final CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
-			int result = i;
-			polite.execute(() -> {
-				list.add(result);
-				latch.countDown();
+			final int result = i;
+			polite.execute(new Runnable() {
+				@Override
+				public void run() {
+					list.add(result);
+					latch.countDown();
+				}
 			});
 		}
 		// Wait for all the tasks to finish
@@ -67,20 +73,23 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newCachedThreadPool();
 		// Allow all the tasks to be delegated straight away
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, TASKS * 2);
-		List<Integer> list = new Vector<>();
-		CountDownLatch[] latches = new CountDownLatch[TASKS];
+		final List<Integer> list = new Vector<Integer>();
+		final CountDownLatch[] latches = new CountDownLatch[TASKS];
 		for (int i = 0; i < TASKS; i++) latches[i] = new CountDownLatch(1);
 		for (int i = 0; i < TASKS; i++) {
-			int result = i;
-			polite.execute(() -> {
-				try {
-					// Each task waits for the next task, if any, to finish
-					if (result < TASKS - 1) latches[result + 1].await();
-					list.add(result);
-				} catch (InterruptedException e) {
-					fail();
+			final int result = i;
+			polite.execute(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						// Each task waits for the next task, if any, to finish
+						if (result < TASKS - 1) latches[result + 1].await();
+						list.add(result);
+					} catch (InterruptedException e) {
+						fail();
+					}
+					latches[result].countDown();
 				}
-				latches[result].countDown();
 			});
 		}
 		// Wait for all the tasks to finish
@@ -95,19 +104,22 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newCachedThreadPool();
 		// Allow one task to be delegated at a time
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, 1);
-		List<Integer> list = new Vector<>();
-		CountDownLatch latch = new CountDownLatch(TASKS);
+		final List<Integer> list = new Vector<Integer>();
+		final CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
-			int result = i;
-			polite.execute(() -> {
-				try {
-					// Each task runs faster than the previous task
-					Thread.sleep(TASKS - result);
-					list.add(result);
-				} catch (InterruptedException e) {
-					fail();
+			final int result = i;
+			polite.execute(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						// Each task runs faster than the previous task
+						Thread.sleep(TASKS - result);
+						list.add(result);
+					} catch (InterruptedException e) {
+						fail();
+					}
+					latch.countDown();
 				}
-				latch.countDown();
 			});
 		}
 		// Wait for all the tasks to finish

bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java

@@ -83,9 +83,9 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 
 	@Test(expected = InvalidMessageException.class)
 	public void testRejectsTooShortMessage() throws Exception {
-		byte[] invalidRaw = new byte[MESSAGE_HEADER_LENGTH];
+		final byte[] invalidRaw = new byte[MESSAGE_HEADER_LENGTH];
 		// Use a mock message so the length of the raw message can be invalid
-		Message invalidMessage = context.mock(Message.class);
+		final Message invalidMessage = context.mock(Message.class);
 
 		context.checking(new Expectations() {{
 			oneOf(invalidMessage).getTimestamp();
@@ -101,8 +101,8 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 
 	@Test
 	public void testAcceptsMinLengthMessage() throws Exception {
-		byte[] shortRaw = new byte[MESSAGE_HEADER_LENGTH + 1];
-		Message shortMessage =
+		final byte[] shortRaw = new byte[MESSAGE_HEADER_LENGTH + 1];
+		final Message shortMessage =
 				new Message(messageId, groupId, timestamp, shortRaw);
 
 		context.checking(new Expectations() {{

bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java

@@ -76,8 +76,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testAddLocalMessage() throws Exception {
-		boolean shared = true;
-		Transaction txn = new Transaction(null, false);
+		final boolean shared = true;
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -95,7 +95,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testCreateMessage() throws Exception {
-		byte[] bytes = expectToByteArray(list);
+		final byte[] bytes = expectToByteArray(list);
 
 		context.checking(new Expectations() {{
 			oneOf(messageFactory).createMessage(groupId, timestamp, bytes);
@@ -107,7 +107,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageAsList() throws Exception {
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 
 		expectToList(true);
 		context.checking(new Expectations() {{
@@ -125,7 +125,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetGroupMetadataAsDictionary() throws Exception {
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -145,7 +145,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageMetadataAsDictionary() throws Exception {
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -165,9 +165,10 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageMetadataAsDictionaryMap() throws Exception {
-		Map<MessageId, BdfDictionary> map = new HashMap<>();
+		final Map<MessageId, BdfDictionary> map =
+				new HashMap<MessageId, BdfDictionary>();
 		map.put(messageId, dictionary);
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -187,13 +188,14 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageMetadataAsDictionaryQuery() throws Exception {
-		Map<MessageId, BdfDictionary> map = new HashMap<>();
+		final Map<MessageId, BdfDictionary> map =
+				new HashMap<MessageId, BdfDictionary>();
 		map.put(messageId, dictionary);
-		BdfDictionary query =
+		final BdfDictionary query =
 				BdfDictionary.of(new BdfEntry("query", "me"));
-		Metadata queryMetadata = new Metadata();
+		final Metadata queryMetadata = new Metadata();
 		queryMetadata.put("query", getRandomBytes(42));
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -215,7 +217,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testMergeGroupMetadata() throws Exception {
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -233,7 +235,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testMergeMessageMetadata() throws Exception {
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -280,10 +282,10 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testSign() throws Exception {
-		byte[] privateKey = getRandomBytes(42);
-		byte[] signed = getRandomBytes(42);
+		final byte[] privateKey = getRandomBytes(42);
+		final byte[] signed = getRandomBytes(42);
 
-		byte[] bytes = expectToByteArray(list);
+		final byte[] bytes = expectToByteArray(list);
 		context.checking(new Expectations() {{
 			oneOf(cryptoComponent).sign(label, bytes, privateKey);
 			will(returnValue(signed));
@@ -295,8 +297,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testVerifySignature() throws Exception {
-		byte[] publicKey = getRandomBytes(42);
-		byte[] bytes = expectToByteArray(list);
+		final byte[] publicKey = getRandomBytes(42);
+		final byte[] bytes = expectToByteArray(list);
 
 		context.checking(new Expectations() {{
 			oneOf(cryptoComponent).verify(label, bytes, publicKey, rawMessage);
@@ -309,8 +311,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testVerifyWrongSignature() throws Exception {
-		byte[] publicKey = getRandomBytes(42);
-		byte[] bytes = expectToByteArray(list);
+		final byte[] publicKey = getRandomBytes(42);
+		final byte[] bytes = expectToByteArray(list);
 
 		context.checking(new Expectations() {{
 			oneOf(cryptoComponent).verify(label, bytes, publicKey, rawMessage);
@@ -327,8 +329,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 		}
 	}
 
-	private byte[] expectToByteArray(BdfList list) throws Exception {
-		BdfWriter bdfWriter = context.mock(BdfWriter.class);
+	private byte[] expectToByteArray(final BdfList list) throws Exception {
+		final BdfWriter bdfWriter = context.mock(BdfWriter.class);
 
 		context.checking(new Expectations() {{
 			oneOf(bdfWriterFactory)
@@ -339,8 +341,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 		return new byte[0];
 	}
 
-	private void expectToList(boolean eof) throws Exception {
-		BdfReader bdfReader = context.mock(BdfReader.class);
+	private void expectToList(final boolean eof) throws Exception {
+		final BdfReader bdfReader = context.mock(BdfReader.class);
 
 		context.checking(new Expectations() {{
 			oneOf(bdfReaderFactory)

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

@@ -46,10 +46,10 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testAddContact() throws Exception {
-		SecretKey master = getSecretKey();
-		long timestamp = 42;
-		boolean alice = true;
-		Transaction txn = new Transaction(null, false);
+		final SecretKey master = getSecretKey();
+		final long timestamp = 42;
+		final boolean alice = true;
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -64,13 +64,14 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).endTransaction(txn);
 		}});
 
-		assertEquals(contactId, contactManager.addContact(remote, local,
-				master, timestamp, alice, verified, active));
+		assertEquals(contactId, contactManager
+				.addContact(remote, local, master, timestamp, alice, verified,
+						active));
 	}
 
 	@Test
 	public void testGetContact() throws Exception {
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -85,8 +86,8 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testGetContactByAuthor() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Collection<Contact> contacts = Collections.singleton(contact);
+		final Transaction txn = new Transaction(null, true);
+		final Collection<Contact> contacts = Collections.singleton(contact);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -101,7 +102,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test(expected = NoSuchContactException.class)
 	public void testGetContactByUnknownAuthor() throws Exception {
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -115,8 +116,8 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test(expected = NoSuchContactException.class)
 	public void testGetContactByUnknownLocalAuthor() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Collection<Contact> contacts = Collections.singleton(contact);
+		final Transaction txn = new Transaction(null, true);
+		final Collection<Contact> contacts = Collections.singleton(contact);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -131,9 +132,10 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testActiveContacts() throws Exception {
 		Collection<Contact> activeContacts = Collections.singletonList(contact);
-		Collection<Contact> contacts = new ArrayList<>(activeContacts);
+		final Collection<Contact> contacts =
+				new ArrayList<Contact>(activeContacts);
 		contacts.add(new Contact(new ContactId(3), remote, local, true, false));
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -148,7 +150,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testRemoveContact() throws Exception {
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
 			will(returnValue(txn));
@@ -164,7 +166,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testSetContactActive() throws Exception {
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 		context.checking(new Expectations() {{
 			oneOf(db).setContactActive(txn, contactId, active);
 		}});
@@ -174,7 +176,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testContactExists() throws Exception {
-		Transaction txn = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));

bramble-core/src/test/java/org/briarproject/bramble/crypto/EllipticCurvePerformanceTest.java

@@ -69,7 +69,7 @@ public class EllipticCurvePerformanceTest {
 		ECPublicKeyParameters public2 =
 				(ECPublicKeyParameters) keyPair2.getPublic();
 		// Time some ECDH key agreements
-		List<Long> samples = new ArrayList<>();
+		List<Long> samples = new ArrayList<Long>();
 		for (int i = 0; i < SAMPLES; i++) {
 			ECDHCBasicAgreement agreement = new ECDHCBasicAgreement();
 			long start = System.nanoTime();
@@ -79,7 +79,7 @@ public class EllipticCurvePerformanceTest {
 		}
 		long agreementMedian = median(samples);
 		// Time some signatures
-		List<byte[]> signatures = new ArrayList<>();
+		List<byte[]> signatures = new ArrayList<byte[]>();
 		samples.clear();
 		for (int i = 0; i < SAMPLES; i++) {
 			Digest digest = new Blake2sDigest();

bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java

@@ -145,7 +145,7 @@ public class KeyDerivationTest extends BrambleTestCase {
 	}
 
 	private void assertAllDifferent(TransportKeys... transportKeys) {
-		List<SecretKey> secretKeys = new ArrayList<>();
+		List<SecretKey> secretKeys = new ArrayList<SecretKey>();
 		for (TransportKeys k : transportKeys) {
 			secretKeys.add(k.getPreviousIncomingKeys().getTagKey());
 			secretKeys.add(k.getPreviousIncomingKeys().getHeaderKey());
@@ -160,7 +160,7 @@ public class KeyDerivationTest extends BrambleTestCase {
 	}
 
 	private void assertAllDifferent(List<SecretKey> keys) {
-		Set<Bytes> set = new HashSet<>();
+		Set<Bytes> set = new HashSet<Bytes>();
 		for (SecretKey k : keys) assertTrue(set.add(new Bytes(k.getBytes())));
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/crypto/TagEncodingTest.java

@@ -28,7 +28,7 @@ public class TagEncodingTest extends BrambleTestCase {
 
 	@Test
 	public void testKeyAffectsTag() throws Exception {
-		Set<Bytes> set = new HashSet<>();
+		Set<Bytes> set = new HashSet<Bytes>();
 		for (int i = 0; i < 100; i++) {
 			byte[] tag = new byte[TAG_LENGTH];
 			SecretKey tagKey = TestUtils.getSecretKey();
@@ -39,7 +39,7 @@ public class TagEncodingTest extends BrambleTestCase {
 
 	@Test
 	public void testProtocolVersionAffectsTag() throws Exception {
-		Set<Bytes> set = new HashSet<>();
+		Set<Bytes> set = new HashSet<Bytes>();
 		for (int i = 0; i < 100; i++) {
 			byte[] tag = new byte[TAG_LENGTH];
 			crypto.encodeTag(tag, tagKey, PROTOCOL_VERSION + i, streamNumber);
@@ -49,7 +49,7 @@ public class TagEncodingTest extends BrambleTestCase {
 
 	@Test
 	public void testStreamNumberAffectsTag() throws Exception {
-		Set<Bytes> set = new HashSet<>();
+		Set<Bytes> set = new HashSet<Bytes>();
 		for (int i = 0; i < 100; i++) {
 			byte[] tag = new byte[TAG_LENGTH];
 			crypto.encodeTag(tag, tagKey, PROTOCOL_VERSION, streamNumber + i);

bramble-core/src/test/java/org/briarproject/bramble/data/BdfWriterImplTest.java

@@ -1,6 +1,7 @@
 package org.briarproject.bramble.data;
 
 import org.briarproject.bramble.test.BrambleTestCase;
+import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.bramble.util.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -154,7 +155,7 @@ public class BdfWriterImplTest extends BrambleTestCase {
 
 	@Test
 	public void testWriteList() throws IOException {
-		List<Object> l = new ArrayList<>();
+		List<Object> l = new ArrayList<Object>();
 		for (int i = 0; i < 3; i++) l.add(i);
 		w.writeList(l);
 		// LIST tag, elements as integers, END tag
@@ -163,7 +164,7 @@ public class BdfWriterImplTest extends BrambleTestCase {
 
 	@Test
 	public void testListCanContainNull() throws IOException {
-		List<Object> l = new ArrayList<>();
+		List<Object> l = new ArrayList<Object>();
 		l.add(1);
 		l.add(null);
 		l.add(NULL_VALUE);
@@ -176,7 +177,7 @@ public class BdfWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testWriteDictionary() throws IOException {
 		// Use LinkedHashMap to get predictable iteration order
-		Map<String, Object> m = new LinkedHashMap<>();
+		Map<String, Object> m = new LinkedHashMap<String, Object>();
 		for (int i = 0; i < 4; i++) m.put(String.valueOf(i), i);
 		w.writeDictionary(m);
 		// DICTIONARY tag, keys as strings and values as integers, END tag
@@ -215,12 +216,12 @@ public class BdfWriterImplTest extends BrambleTestCase {
 
 	@Test
 	public void testWriteNestedDictionariesAndLists() throws IOException {
-		Map<String, Object> inner = new LinkedHashMap<>();
+		Map<String, Object> inner = new LinkedHashMap<String, Object>();
 		inner.put("bar", new byte[0]);
-		List<Object> list = new ArrayList<>();
+		List<Object> list = new ArrayList<Object>();
 		list.add(1);
 		list.add(inner);
-		Map<String, Object> outer = new LinkedHashMap<>();
+		Map<String, Object> outer = new LinkedHashMap<String, Object>();
 		outer.put("foo", list);
 		w.writeDictionary(outer);
 		// DICTIONARY tag, "foo" as string, LIST tag, 1 as integer,

bramble-core/src/test/java/org/briarproject/bramble/data/MetadataEncoderParserIntegrationTest.java

@@ -99,7 +99,7 @@ public class MetadataEncoderParserIntegrationTest extends BrambleTestCase {
 
 	@Test
 	public void testList() throws FormatException {
-		List<Long> l = new ArrayList<>(4);
+		List<Long> l = new ArrayList<Long>(4);
 		l.add(42L);
 		l.add(1337L);
 		l.add(Long.MIN_VALUE);
@@ -114,7 +114,7 @@ public class MetadataEncoderParserIntegrationTest extends BrambleTestCase {
 
 	@Test
 	public void testDictionary() throws FormatException {
-		Map<String, Boolean> m = new HashMap<>();
+		Map<String, Boolean> m = new HashMap<String, Boolean>();
 		m.put("1", true);
 		m.put("2", false);
 
@@ -130,19 +130,19 @@ public class MetadataEncoderParserIntegrationTest extends BrambleTestCase {
 
 	@Test
 	public void testComplexDictionary() throws FormatException {
-		Map<String, List> m = new HashMap<>();
-		List<String> one = new ArrayList<>(3);
+		Map<String, List> m = new HashMap<String, List>();
+		List<String> one = new ArrayList<String>(3);
 		one.add("\uFDD0");
 		one.add("\uFDD1");
 		one.add("\uFDD2");
 		m.put("One", one);
-		List<String> two = new ArrayList<>(2);
+		List<String> two = new ArrayList<String>(2);
 		two.add("\u0080");
 		two.add("\uD800\uDC00");
 		m.put("Two", two);
 		d.put("test", m);
 
-		Map<String, Boolean> m2 = new HashMap<>();
+		Map<String, Boolean> m2 = new HashMap<String, Boolean>();
 		m2.put("should be true", true);
 		d.put("another test", m2);
 

bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java

@@ -323,7 +323,7 @@ public class BasicH2Test extends BrambleTestCase {
 
 	private List<String> getNames() throws SQLException {
 		String sql = "SELECT name FROM foo ORDER BY uniqueId";
-		List<String> names = new ArrayList<>();
+		List<String> names = new ArrayList<String>();
 		try {
 			PreparedStatement ps = connection.prepareStatement(sql);
 			ResultSet rs = ps.executeQuery();

bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java

@@ -47,10 +47,11 @@ import org.briarproject.bramble.api.sync.event.MessagesSentEvent;
 import org.briarproject.bramble.api.transport.IncomingKeys;
 import org.briarproject.bramble.api.transport.OutgoingKeys;
 import org.briarproject.bramble.api.transport.TransportKeys;
-import org.briarproject.bramble.test.BrambleMockTestCase;
+import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.bramble.util.StringUtils;
 import org.jmock.Expectations;
+import org.jmock.Mockery;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -73,13 +74,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-public class DatabaseComponentImplTest extends BrambleMockTestCase {
-
-	@SuppressWarnings("unchecked")
-	private final Database<Object> database = context.mock(Database.class);
-	private final ShutdownManager shutdown =
-			context.mock(ShutdownManager.class);
-	private final EventBus eventBus = context.mock(EventBus.class);
+public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	private final Object txn = new Object();
 	private final ClientId clientId;
@@ -125,13 +120,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 
 	private DatabaseComponent createDatabaseComponent(Database<Object> database,
 			EventBus eventBus, ShutdownManager shutdown) {
-		return new DatabaseComponentImpl<>(database, Object.class, eventBus,
-				shutdown);
+		return new DatabaseComponentImpl<Object>(database, Object.class,
+				eventBus, shutdown);
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testSimpleCalls() throws Exception {
-		int shutdownHandle = 12345;
+		final int shutdownHandle = 12345;
+		Mockery context = new Mockery();
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// open()
 			oneOf(database).open();
@@ -194,6 +194,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			// endTransaction()
 			oneOf(database).commitTransaction(txn);
 			// close()
+			oneOf(shutdown).removeShutdownHook(shutdownHandle);
 			oneOf(database).close();
 		}});
 		DatabaseComponent db = createDatabaseComponent(database, eventBus,
@@ -220,11 +221,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			db.endTransaction(transaction);
 		}
 		db.close();
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testLocalMessagesAreNotStoredUnlessGroupExists()
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -244,10 +252,17 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testAddLocalMessage() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -279,11 +294,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testVariousMethodsThrowExceptionIfContactIsMissing()
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the contact is in the DB (which it's not)
 			exactly(18).of(database).startTransaction();
@@ -478,11 +500,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testVariousMethodsThrowExceptionIfLocalAuthorIsMissing()
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the pseudonym is in the DB (which it's not)
 			exactly(3).of(database).startTransaction();
@@ -523,11 +552,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testVariousMethodsThrowExceptionIfGroupIsMissing()
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the group is in the DB (which it's not)
 			exactly(8).of(database).startTransaction();
@@ -621,11 +657,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testVariousMethodsThrowExceptionIfMessageIsMissing()
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the message is in the DB (which it's not)
 			exactly(11).of(database).startTransaction();
@@ -749,11 +792,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testVariousMethodsThrowExceptionIfTransportIsMissing()
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// startTransaction()
 			oneOf(database).startTransaction();
@@ -840,12 +890,19 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testGenerateAck() throws Exception {
-		Collection<MessageId> messagesToAck = Arrays.asList(messageId,
+		final Collection<MessageId> messagesToAck = Arrays.asList(messageId,
 				messageId1);
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -868,13 +925,20 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testGenerateBatch() throws Exception {
-		byte[] raw1 = new byte[size];
-		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
-		Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		final byte[] raw1 = new byte[size];
+		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		final Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -905,12 +969,19 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testGenerateOffer() throws Exception {
-		MessageId messageId1 = new MessageId(TestUtils.getRandomId());
-		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		final MessageId messageId1 = new MessageId(TestUtils.getRandomId());
+		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -936,12 +1007,19 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testGenerateRequest() throws Exception {
-		MessageId messageId1 = new MessageId(TestUtils.getRandomId());
-		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		final MessageId messageId1 = new MessageId(TestUtils.getRandomId());
+		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -964,13 +1042,20 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testGenerateRequestedBatch() throws Exception {
-		byte[] raw1 = new byte[size];
-		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
-		Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		final byte[] raw1 = new byte[size];
+		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		final Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1002,10 +1087,17 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testReceiveAck() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1028,10 +1120,17 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testReceiveMessage() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1076,10 +1175,17 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testReceiveDuplicateMessage() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1106,10 +1212,17 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testReceiveMessageWithoutVisibleGroup() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1129,13 +1242,20 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testReceiveOffer() throws Exception {
-		MessageId messageId1 = new MessageId(TestUtils.getRandomId());
-		MessageId messageId2 = new MessageId(TestUtils.getRandomId());
-		MessageId messageId3 = new MessageId(TestUtils.getRandomId());
+		final MessageId messageId1 = new MessageId(TestUtils.getRandomId());
+		final MessageId messageId2 = new MessageId(TestUtils.getRandomId());
+		final MessageId messageId3 = new MessageId(TestUtils.getRandomId());
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1176,10 +1296,17 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testReceiveRequest() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1203,10 +1330,17 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testChangingVisibilityCallsListeners() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1236,11 +1370,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testNotChangingVisibilityDoesNotCallListeners()
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1262,13 +1403,20 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testTransportKeys() throws Exception {
-		TransportKeys transportKeys = createTransportKeys();
-		Map<ContactId, TransportKeys> keys = Collections.singletonMap(
+		final TransportKeys transportKeys = createTransportKeys();
+		final Map<ContactId, TransportKeys> keys = Collections.singletonMap(
 				contactId, transportKeys);
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// startTransaction()
 			oneOf(database).startTransaction();
@@ -1298,6 +1446,8 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	private TransportKeys createTransportKeys() {
@@ -1322,14 +1472,19 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testMergeSettings() throws Exception {
-		Settings before = new Settings();
+		final Settings before = new Settings();
 		before.put("foo", "bar");
 		before.put("baz", "bam");
-		Settings update = new Settings();
+		final Settings update = new Settings();
 		update.put("baz", "qux");
-		Settings merged = new Settings();
+		final Settings merged = new Settings();
 		merged.put("foo", "bar");
 		merged.put("baz", "qux");
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// startTransaction()
 			oneOf(database).startTransaction();
@@ -1359,6 +1514,8 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test(expected = IllegalStateException.class)
@@ -1388,6 +1545,12 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 	private void testCannotStartTransactionDuringTransaction(
 			boolean firstTxnReadOnly, boolean secondTxnReadOnly)
 			throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
+
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1397,12 +1560,22 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 				shutdown);
 
 		assertNotNull(db.startTransaction(firstTxnReadOnly));
-		db.startTransaction(secondTxnReadOnly);
-		fail();
+		try {
+			db.startTransaction(secondTxnReadOnly);
+			fail();
+		} finally {
+			context.assertIsSatisfied();
+		}
 	}
 
 	@Test
 	public void testCannotAddLocalIdentityAsContact() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
+
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1426,10 +1599,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testCannotAddDuplicateContact() throws Exception {
+		Mockery context = new Mockery();
+		@SuppressWarnings("unchecked")
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
+
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1455,13 +1636,19 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		} finally {
 			db.endTransaction(transaction);
 		}
+
+		context.assertIsSatisfied();
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testMessageDependencies() throws Exception {
-		int shutdownHandle = 12345;
-		MessageId messageId2 = new MessageId(TestUtils.getRandomId());
+		final int shutdownHandle = 12345;
+		Mockery context = new Mockery();
+		final Database<Object> database = context.mock(Database.class);
+		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		final EventBus eventBus = context.mock(EventBus.class);
+		final MessageId messageId2 = new MessageId(TestUtils.getRandomId());
 		context.checking(new Expectations() {{
 			// open()
 			oneOf(database).open();
@@ -1506,6 +1693,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			// endTransaction()
 			oneOf(database).commitTransaction(txn);
 			// close()
+			oneOf(shutdown).removeShutdownHook(shutdownHandle);
 			oneOf(database).close();
 		}});
 		DatabaseComponent db = createDatabaseComponent(database, eventBus,
@@ -1515,7 +1703,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		Transaction transaction = db.startTransaction(false);
 		try {
 			db.addLocalMessage(transaction, message, metadata, true);
-			Collection<MessageId> dependencies = new ArrayList<>(2);
+			Collection<MessageId> dependencies = new ArrayList<MessageId>(2);
 			dependencies.add(messageId1);
 			dependencies.add(messageId2);
 			db.addMessageDependencies(transaction, message, dependencies);
@@ -1526,5 +1714,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			db.endTransaction(transaction);
 		}
 		db.close();
+
+		context.assertIsSatisfied();
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTest.java

@@ -464,25 +464,28 @@ public class H2DatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testCloseWaitsForCommit() throws Exception {
-		CountDownLatch closing = new CountDownLatch(1);
-		CountDownLatch closed = new CountDownLatch(1);
-		AtomicBoolean transactionFinished = new AtomicBoolean(false);
-		AtomicBoolean error = new AtomicBoolean(false);
-		Database<Connection> db = open(false);
+		final CountDownLatch closing = new CountDownLatch(1);
+		final CountDownLatch closed = new CountDownLatch(1);
+		final AtomicBoolean transactionFinished = new AtomicBoolean(false);
+		final AtomicBoolean error = new AtomicBoolean(false);
+		final Database<Connection> db = open(false);
 
 		// Start a transaction
 		Connection txn = db.startTransaction();
 		// In another thread, close the database
-		Thread close = new Thread(() -> {
-			try {
-				closing.countDown();
-				db.close();
-				if (!transactionFinished.get()) error.set(true);
-				closed.countDown();
-			} catch (Exception e) {
-				error.set(true);
+		Thread close = new Thread() {
+			@Override
+			public void run() {
+				try {
+					closing.countDown();
+					db.close();
+					if (!transactionFinished.get()) error.set(true);
+					closed.countDown();
+				} catch (Exception e) {
+					error.set(true);
+				}
 			}
-		});
+		};
 		close.start();
 		closing.await();
 		// Do whatever the transaction needs to do
@@ -498,25 +501,28 @@ public class H2DatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testCloseWaitsForAbort() throws Exception {
-		CountDownLatch closing = new CountDownLatch(1);
-		CountDownLatch closed = new CountDownLatch(1);
-		AtomicBoolean transactionFinished = new AtomicBoolean(false);
-		AtomicBoolean error = new AtomicBoolean(false);
-		Database<Connection> db = open(false);
+		final CountDownLatch closing = new CountDownLatch(1);
+		final CountDownLatch closed = new CountDownLatch(1);
+		final AtomicBoolean transactionFinished = new AtomicBoolean(false);
+		final AtomicBoolean error = new AtomicBoolean(false);
+		final Database<Connection> db = open(false);
 
 		// Start a transaction
 		Connection txn = db.startTransaction();
 		// In another thread, close the database
-		Thread close = new Thread(() -> {
-			try {
-				closing.countDown();
-				db.close();
-				if (!transactionFinished.get()) error.set(true);
-				closed.countDown();
-			} catch (Exception e) {
-				error.set(true);
+		Thread close = new Thread() {
+			@Override
+			public void run() {
+				try {
+					closing.countDown();
+					db.close();
+					if (!transactionFinished.get()) error.set(true);
+					closed.countDown();
+				} catch (Exception e) {
+					error.set(true);
+				}
 			}
-		});
+		};
 		close.start();
 		closing.await();
 		// Do whatever the transaction needs to do
@@ -864,7 +870,7 @@ public class H2DatabaseTest extends BrambleTestCase {
 		assertEquals(0, db.countOfferedMessages(txn, contactId));
 
 		// Add some offered messages and count them
-		List<MessageId> ids = new ArrayList<>();
+		List<MessageId> ids = new ArrayList<MessageId>();
 		for (int i = 0; i < 10; i++) {
 			MessageId m = new MessageId(TestUtils.getRandomId());
 			db.addOfferedMessage(txn, contactId, m);

bramble-core/src/test/java/org/briarproject/bramble/db/LockFairnessTest.java

@@ -17,50 +17,56 @@ public class LockFairnessTest extends BrambleTestCase {
 	@Test
 	public void testReadersCanShareTheLock() throws Exception {
 		// Use a fair lock
-		ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
-		CountDownLatch firstReaderHasLock = new CountDownLatch(1);
-		CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
-		CountDownLatch secondReaderHasLock = new CountDownLatch(1);
-		CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
+		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
+		final CountDownLatch firstReaderHasLock = new CountDownLatch(1);
+		final CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
+		final CountDownLatch secondReaderHasLock = new CountDownLatch(1);
+		final CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
 		// First reader
-		Thread first = new Thread(() -> {
-			try {
-				// Acquire the lock
-				lock.readLock().lock();
+		Thread first = new Thread() {
+			@Override
+			public void run() {
 				try {
-					// Allow the second reader to acquire the lock
-					firstReaderHasLock.countDown();
-					// Wait for the second reader to acquire the lock
-					assertTrue(secondReaderHasLock.await(10, SECONDS));
-				} finally {
-					// Release the lock
-					lock.readLock().unlock();
+					// Acquire the lock
+					lock.readLock().lock();
+					try {
+						// Allow the second reader to acquire the lock
+						firstReaderHasLock.countDown();
+						// Wait for the second reader to acquire the lock
+						assertTrue(secondReaderHasLock.await(10, SECONDS));
+					} finally {
+						// Release the lock
+						lock.readLock().unlock();
+					}
+				} catch (InterruptedException e) {
+					fail();
 				}
-			} catch (InterruptedException e) {
-				fail();
+				firstReaderHasFinished.countDown();
 			}
-			firstReaderHasFinished.countDown();
-		});
+		};
 		first.start();
 		// Second reader
-		Thread second = new Thread(() -> {
-			try {
-				// Wait for the first reader to acquire the lock
-				assertTrue(firstReaderHasLock.await(10, SECONDS));
-				// Acquire the lock
-				lock.readLock().lock();
+		Thread second = new Thread() {
+			@Override
+			public void run() {
 				try {
-					// Allow the first reader to release the lock
-					secondReaderHasLock.countDown();
-				} finally {
-					// Release the lock
-					lock.readLock().unlock();
+					// Wait for the first reader to acquire the lock
+					assertTrue(firstReaderHasLock.await(10, SECONDS));
+					// Acquire the lock
+					lock.readLock().lock();
+					try {
+						// Allow the first reader to release the lock
+						secondReaderHasLock.countDown();
+					} finally {
+						// Release the lock
+						lock.readLock().unlock();
+					}
+				} catch (InterruptedException e) {
+					fail();
 				}
-			} catch (InterruptedException e) {
-				fail();
+				secondReaderHasFinished.countDown();
 			}
-			secondReaderHasFinished.countDown();
-		});
+		};
 		second.start();
 		// Wait for both readers to finish
 		assertTrue(firstReaderHasFinished.await(10, SECONDS));
@@ -70,77 +76,86 @@ public class LockFairnessTest extends BrambleTestCase {
 	@Test
 	public void testWritersDoNotStarve() throws Exception {
 		// Use a fair lock
-		ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
-		CountDownLatch firstReaderHasLock = new CountDownLatch(1);
-		CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
-		CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
-		CountDownLatch writerHasFinished = new CountDownLatch(1);
-		AtomicBoolean secondReaderHasHeldLock = new AtomicBoolean(false);
-		AtomicBoolean writerHasHeldLock = new AtomicBoolean(false);
+		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
+		final CountDownLatch firstReaderHasLock = new CountDownLatch(1);
+		final CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
+		final CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
+		final CountDownLatch writerHasFinished = new CountDownLatch(1);
+		final AtomicBoolean secondReaderHasHeldLock = new AtomicBoolean(false);
+		final AtomicBoolean writerHasHeldLock = new AtomicBoolean(false);
 		// First reader
-		Thread first = new Thread(() -> {
-			try {
-				// Acquire the lock
-				lock.readLock().lock();
+		Thread first = new Thread() {
+			@Override
+			public void run() {
 				try {
-					// Allow the other threads to acquire the lock
-					firstReaderHasLock.countDown();
-					// Wait for both other threads to wait for the lock
-					while (lock.getQueueLength() < 2) Thread.sleep(10);
-					// No other thread should have acquired the lock
-					assertFalse(secondReaderHasHeldLock.get());
-					assertFalse(writerHasHeldLock.get());
-				} finally {
-					// Release the lock
-					lock.readLock().unlock();
+					// Acquire the lock
+					lock.readLock().lock();
+					try {
+						// Allow the other threads to acquire the lock
+						firstReaderHasLock.countDown();
+						// Wait for both other threads to wait for the lock
+						while (lock.getQueueLength() < 2) Thread.sleep(10);
+						// No other thread should have acquired the lock
+						assertFalse(secondReaderHasHeldLock.get());
+						assertFalse(writerHasHeldLock.get());
+					} finally {
+						// Release the lock
+						lock.readLock().unlock();
+					}
+				} catch (InterruptedException e) {
+					fail();
 				}
-			} catch (InterruptedException e) {
-				fail();
+				firstReaderHasFinished.countDown();
 			}
-			firstReaderHasFinished.countDown();
-		});
+		};
 		first.start();
 		// Writer
-		Thread writer = new Thread(() -> {
-			try {
-				// Wait for the first reader to acquire the lock
-				assertTrue(firstReaderHasLock.await(10, SECONDS));
-				// Acquire the lock
-				lock.writeLock().lock();
+		Thread writer = new Thread() {
+			@Override
+			public void run() {
 				try {
-					writerHasHeldLock.set(true);
-					// The second reader should not overtake the writer
-					assertFalse(secondReaderHasHeldLock.get());
-				} finally {
-					lock.writeLock().unlock();
+					// Wait for the first reader to acquire the lock
+					assertTrue(firstReaderHasLock.await(10, SECONDS));
+					// Acquire the lock
+					lock.writeLock().lock();
+					try {
+						writerHasHeldLock.set(true);
+						// The second reader should not overtake the writer
+						assertFalse(secondReaderHasHeldLock.get());
+					} finally {
+						lock.writeLock().unlock();
+					}
+				} catch (InterruptedException e) {
+					fail();
 				}
-			} catch (InterruptedException e) {
-				fail();
+				writerHasFinished.countDown();
 			}
-			writerHasFinished.countDown();
-		});
+		};
 		writer.start();
 		// Second reader
-		Thread second = new Thread(() -> {
-			try {
-				// Wait for the first reader to acquire the lock
-				assertTrue(firstReaderHasLock.await(10, SECONDS));
-				// Wait for the writer to wait for the lock
-				while (lock.getQueueLength() < 1) Thread.sleep(10);
-				// Acquire the lock
-				lock.readLock().lock();
+		Thread second = new Thread() {
+			@Override
+			public void run() {
 				try {
-					secondReaderHasHeldLock.set(true);
-					// The second reader should not overtake the writer
-					assertTrue(writerHasHeldLock.get());
-				} finally {
-					lock.readLock().unlock();
+					// Wait for the first reader to acquire the lock
+					assertTrue(firstReaderHasLock.await(10, SECONDS));
+					// Wait for the writer to wait for the lock
+					while (lock.getQueueLength() < 1) Thread.sleep(10);
+					// Acquire the lock
+					lock.readLock().lock();
+					try {
+						secondReaderHasHeldLock.set(true);
+						// The second reader should not overtake the writer
+						assertTrue(writerHasHeldLock.get());
+					} finally {
+						lock.readLock().unlock();
+					}
+				} catch (InterruptedException e) {
+					fail();
 				}
-			} catch (InterruptedException e) {
-				fail();
+				secondReaderHasFinished.countDown();
 			}
-			secondReaderHasFinished.countDown();
-		});
+		};
 		second.start();
 		// Wait for all the threads to finish
 		assertTrue(firstReaderHasFinished.await(10, SECONDS));

bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java

@@ -80,8 +80,8 @@ public class IdentityManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testGetAuthorStatus() throws DbException {
-		AuthorId authorId = new AuthorId(TestUtils.getRandomId());
-		Collection<Contact> contacts = new ArrayList<>();
+		final AuthorId authorId = new AuthorId(TestUtils.getRandomId());
+		final Collection<Contact> contacts = new ArrayList<Contact>();
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -125,8 +125,8 @@ public class IdentityManagerImplTest extends BrambleMockTestCase {
 				identityManager.getAuthorStatus(localAuthor.getId()));
 	}
 
-	private void checkAuthorStatusContext(AuthorId authorId,
-			Collection<Contact> contacts) throws DbException {
+	private void checkAuthorStatusContext(final AuthorId authorId,
+			final Collection<Contact> contacts) throws DbException {
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));

bramble-core/src/test/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocolTest.java

@@ -65,11 +65,11 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test
 	public void testAliceProtocol() throws Exception {
 		// set up
-		Payload theirPayload = new Payload(BOB_COMMIT, null);
-		Payload ourPayload = new Payload(ALICE_COMMIT, null);
-		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		SecretKey sharedSecret = TestUtils.getSecretKey();
-		SecretKey masterSecret = TestUtils.getSecretKey();
+		final Payload theirPayload = new Payload(BOB_COMMIT, null);
+		final Payload ourPayload = new Payload(ALICE_COMMIT, null);
+		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		final SecretKey sharedSecret = TestUtils.getSecretKey();
+		final SecretKey masterSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -129,11 +129,11 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test
 	public void testBobProtocol() throws Exception {
 		// set up
-		Payload theirPayload = new Payload(ALICE_COMMIT, null);
-		Payload ourPayload = new Payload(BOB_COMMIT, null);
-		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		SecretKey sharedSecret = TestUtils.getSecretKey();
-		SecretKey masterSecret = TestUtils.getSecretKey();
+		final Payload theirPayload = new Payload(ALICE_COMMIT, null);
+		final Payload ourPayload = new Payload(BOB_COMMIT, null);
+		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		final SecretKey sharedSecret = TestUtils.getSecretKey();
+		final SecretKey masterSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -192,9 +192,9 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testAliceProtocolAbortOnBadKey() throws Exception {
 		// set up
-		Payload theirPayload = new Payload(BOB_COMMIT, null);
-		Payload ourPayload = new Payload(ALICE_COMMIT, null);
-		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		final Payload theirPayload = new Payload(BOB_COMMIT, null);
+		final Payload ourPayload = new Payload(ALICE_COMMIT, null);
+		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -233,9 +233,9 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testBobProtocolAbortOnBadKey() throws Exception {
 		// set up
-		Payload theirPayload = new Payload(ALICE_COMMIT, null);
-		Payload ourPayload = new Payload(BOB_COMMIT, null);
-		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		final Payload theirPayload = new Payload(ALICE_COMMIT, null);
+		final Payload ourPayload = new Payload(BOB_COMMIT, null);
+		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -270,10 +270,10 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testAliceProtocolAbortOnBadConfirm() throws Exception {
 		// set up
-		Payload theirPayload = new Payload(BOB_COMMIT, null);
-		Payload ourPayload = new Payload(ALICE_COMMIT, null);
-		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		SecretKey sharedSecret = TestUtils.getSecretKey();
+		final Payload theirPayload = new Payload(BOB_COMMIT, null);
+		final Payload ourPayload = new Payload(ALICE_COMMIT, null);
+		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		final SecretKey sharedSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -335,10 +335,10 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testBobProtocolAbortOnBadConfirm() throws Exception {
 		// set up
-		Payload theirPayload = new Payload(ALICE_COMMIT, null);
-		Payload ourPayload = new Payload(BOB_COMMIT, null);
-		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		SecretKey sharedSecret = TestUtils.getSecretKey();
+		final Payload theirPayload = new Payload(ALICE_COMMIT, null);
+		final Payload ourPayload = new Payload(BOB_COMMIT, null);
+		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		final SecretKey sharedSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,

bramble-core/src/test/java/org/briarproject/bramble/lifecycle/ShutdownManagerImplTest.java

@@ -15,9 +15,13 @@ public class ShutdownManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testAddAndRemove() {
 		ShutdownManager s = createShutdownManager();
-		Set<Integer> handles = new HashSet<>();
+		Set<Integer> handles = new HashSet<Integer>();
 		for (int i = 0; i < 100; i++) {
-			int handle = s.addShutdownHook(() -> {});
+			int handle = s.addShutdownHook(new Runnable() {
+				@Override
+				public void run() {
+				}
+			});
 			// The handles should all be distinct
 			assertTrue(handles.add(handle));
 		}

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

@@ -35,7 +35,7 @@ public class ConnectionRegistryImplTest extends BrambleTestCase {
 	@Test
 	public void testRegisterAndUnregister() {
 		Mockery context = new Mockery();
-		EventBus eventBus = context.mock(EventBus.class);
+		final EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			exactly(5).of(eventBus).broadcast(with(any(
 					ConnectionOpenedEvent.class)));

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

@@ -30,36 +30,36 @@ public class PluginManagerImplTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor ioExecutor = Executors.newSingleThreadExecutor();
-		EventBus eventBus = context.mock(EventBus.class);
-		PluginConfig pluginConfig = context.mock(PluginConfig.class);
-		ConnectionManager connectionManager =
+		final Executor ioExecutor = Executors.newSingleThreadExecutor();
+		final EventBus eventBus = context.mock(EventBus.class);
+		final PluginConfig pluginConfig = context.mock(PluginConfig.class);
+		final ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		SettingsManager settingsManager =
+		final SettingsManager settingsManager =
 				context.mock(SettingsManager.class);
-		TransportPropertyManager transportPropertyManager =
+		final TransportPropertyManager transportPropertyManager =
 				context.mock(TransportPropertyManager.class);
-		UiCallback uiCallback = context.mock(UiCallback.class);
+		final UiCallback uiCallback = context.mock(UiCallback.class);
 
 		// Two simplex plugin factories: both create plugins, one fails to start
-		SimplexPluginFactory simplexFactory =
+		final SimplexPluginFactory simplexFactory =
 				context.mock(SimplexPluginFactory.class);
-		SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
-		TransportId simplexId = new TransportId("simplex");
-		SimplexPluginFactory simplexFailFactory =
+		final SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
+		final TransportId simplexId = new TransportId("simplex");
+		final SimplexPluginFactory simplexFailFactory =
 				context.mock(SimplexPluginFactory.class, "simplexFailFactory");
-		SimplexPlugin simplexFailPlugin =
+		final SimplexPlugin simplexFailPlugin =
 				context.mock(SimplexPlugin.class, "simplexFailPlugin");
-		TransportId simplexFailId = new TransportId("simplex1");
+		final TransportId simplexFailId = new TransportId("simplex1");
 
 		// Two duplex plugin factories: one creates a plugin, the other fails
-		DuplexPluginFactory duplexFactory =
+		final DuplexPluginFactory duplexFactory =
 				context.mock(DuplexPluginFactory.class);
-		DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
-		TransportId duplexId = new TransportId("duplex");
-		DuplexPluginFactory duplexFailFactory =
+		final DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
+		final TransportId duplexId = new TransportId("duplex");
+		final DuplexPluginFactory duplexFailFactory =
 				context.mock(DuplexPluginFactory.class, "duplexFailFactory");
-		TransportId duplexFailId = new TransportId("duplex1");
+		final TransportId duplexFailId = new TransportId("duplex1");
 
 		context.checking(new Expectations() {{
 			allowing(simplexPlugin).getId();

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

@@ -42,35 +42,35 @@ public class PollerTest extends BrambleTestCase {
 	public void testConnectOnContactStatusChanged() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		Executor ioExecutor = new ImmediateExecutor();
-		ScheduledExecutorService scheduler =
+		final Executor ioExecutor = new ImmediateExecutor();
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		ConnectionManager connectionManager =
+		final ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		ConnectionRegistry connectionRegistry =
+		final ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		PluginManager pluginManager = context.mock(PluginManager.class);
-		SecureRandom random = context.mock(SecureRandom.class);
-		Clock clock = context.mock(Clock.class);
+		final PluginManager pluginManager = context.mock(PluginManager.class);
+		final SecureRandom random = context.mock(SecureRandom.class);
+		final Clock clock = context.mock(Clock.class);
 
 		// Two simplex plugins: one supports polling, the other doesn't
-		SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
-		SimplexPlugin simplexPlugin1 =
+		final SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
+		final SimplexPlugin simplexPlugin1 =
 				context.mock(SimplexPlugin.class, "simplexPlugin1");
-		TransportId simplexId1 = new TransportId("simplex1");
-		List<SimplexPlugin> simplexPlugins = Arrays.asList(simplexPlugin,
+		final TransportId simplexId1 = new TransportId("simplex1");
+		final List<SimplexPlugin> simplexPlugins = Arrays.asList(simplexPlugin,
 				simplexPlugin1);
-		TransportConnectionWriter simplexWriter =
+		final TransportConnectionWriter simplexWriter =
 				context.mock(TransportConnectionWriter.class);
 
 		// Two duplex plugins: one supports polling, the other doesn't
-		DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
-		TransportId duplexId = new TransportId("duplex");
-		DuplexPlugin duplexPlugin1 =
+		final DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
+		final TransportId duplexId = new TransportId("duplex");
+		final DuplexPlugin duplexPlugin1 =
 				context.mock(DuplexPlugin.class, "duplexPlugin1");
-		List<DuplexPlugin> duplexPlugins = Arrays.asList(duplexPlugin,
+		final List<DuplexPlugin> duplexPlugins = Arrays.asList(duplexPlugin,
 				duplexPlugin1);
-		DuplexTransportConnection duplexConnection =
+		final DuplexTransportConnection duplexConnection =
 				context.mock(DuplexTransportConnection.class);
 
 		context.checking(new Expectations() {{
@@ -129,20 +129,20 @@ public class PollerTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		Executor ioExecutor = new ImmediateExecutor();
-		ScheduledExecutorService scheduler =
+		final Executor ioExecutor = new ImmediateExecutor();
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		ConnectionManager connectionManager =
+		final ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		ConnectionRegistry connectionRegistry =
+		final ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		PluginManager pluginManager = context.mock(PluginManager.class);
-		SecureRandom random = context.mock(SecureRandom.class);
-		Clock clock = context.mock(Clock.class);
+		final PluginManager pluginManager = context.mock(PluginManager.class);
+		final SecureRandom random = context.mock(SecureRandom.class);
+		final Clock clock = context.mock(Clock.class);
 
-		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
-		TransportId transportId = new TransportId("id");
-		DuplexTransportConnection duplexConnection =
+		final DuplexPlugin plugin = context.mock(DuplexPlugin.class);
+		final TransportId transportId = new TransportId("id");
+		final DuplexTransportConnection duplexConnection =
 				context.mock(DuplexTransportConnection.class);
 
 		context.checking(new Expectations() {{
@@ -194,19 +194,19 @@ public class PollerTest extends BrambleTestCase {
 	public void testRescheduleOnConnectionOpened() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		Executor ioExecutor = new ImmediateExecutor();
-		ScheduledExecutorService scheduler =
+		final Executor ioExecutor = new ImmediateExecutor();
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		ConnectionManager connectionManager =
+		final ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		ConnectionRegistry connectionRegistry =
+		final ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		PluginManager pluginManager = context.mock(PluginManager.class);
-		SecureRandom random = context.mock(SecureRandom.class);
-		Clock clock = context.mock(Clock.class);
+		final PluginManager pluginManager = context.mock(PluginManager.class);
+		final SecureRandom random = context.mock(SecureRandom.class);
+		final Clock clock = context.mock(Clock.class);
 
-		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
-		TransportId transportId = new TransportId("id");
+		final DuplexPlugin plugin = context.mock(DuplexPlugin.class);
+		final TransportId transportId = new TransportId("id");
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();
@@ -239,19 +239,19 @@ public class PollerTest extends BrambleTestCase {
 	public void testRescheduleDoesNotReplaceEarlierTask() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		Executor ioExecutor = new ImmediateExecutor();
-		ScheduledExecutorService scheduler =
+		final Executor ioExecutor = new ImmediateExecutor();
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		ConnectionManager connectionManager =
+		final ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		ConnectionRegistry connectionRegistry =
+		final ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		PluginManager pluginManager = context.mock(PluginManager.class);
-		SecureRandom random = context.mock(SecureRandom.class);
-		Clock clock = context.mock(Clock.class);
+		final PluginManager pluginManager = context.mock(PluginManager.class);
+		final SecureRandom random = context.mock(SecureRandom.class);
+		final Clock clock = context.mock(Clock.class);
 
-		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
-		TransportId transportId = new TransportId("id");
+		final DuplexPlugin plugin = context.mock(DuplexPlugin.class);
+		final TransportId transportId = new TransportId("id");
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();
@@ -299,20 +299,20 @@ public class PollerTest extends BrambleTestCase {
 	public void testPollOnTransportEnabled() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		Executor ioExecutor = new ImmediateExecutor();
-		ScheduledExecutorService scheduler =
+		final Executor ioExecutor = new ImmediateExecutor();
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		ConnectionManager connectionManager =
+		final ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		ConnectionRegistry connectionRegistry =
+		final ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		PluginManager pluginManager = context.mock(PluginManager.class);
-		SecureRandom random = context.mock(SecureRandom.class);
-		Clock clock = context.mock(Clock.class);
+		final PluginManager pluginManager = context.mock(PluginManager.class);
+		final SecureRandom random = context.mock(SecureRandom.class);
+		final Clock clock = context.mock(Clock.class);
 
-		Plugin plugin = context.mock(Plugin.class);
-		TransportId transportId = new TransportId("id");
-		List<ContactId> connected = Collections.singletonList(contactId);
+		final Plugin plugin = context.mock(Plugin.class);
+		final TransportId transportId = new TransportId("id");
+		final List<ContactId> connected = Collections.singletonList(contactId);
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();

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

@@ -145,11 +145,11 @@ public class LanTcpPluginTest extends BrambleTestCase {
 		assertEquals(2, split.length);
 		String addrString = split[0];
 		// Listen on the same interface as the plugin
-		ServerSocket ss = new ServerSocket();
+		final ServerSocket ss = new ServerSocket();
 		ss.bind(new InetSocketAddress(addrString, 0), 10);
 		int port = ss.getLocalPort();
-		CountDownLatch latch = new CountDownLatch(1);
-		AtomicBoolean error = new AtomicBoolean(false);
+		final CountDownLatch latch = new CountDownLatch(1);
+		final AtomicBoolean error = new AtomicBoolean(false);
 		new Thread() {
 			@Override
 			public void run() {
@@ -194,7 +194,8 @@ public class LanTcpPluginTest extends BrambleTestCase {
 				plugin.createKeyAgreementListener(new byte[COMMIT_LENGTH]);
 		assertNotNull(kal);
 		Callable<KeyAgreementConnection> c = kal.listen();
-		FutureTask<KeyAgreementConnection> f = new FutureTask<>(c);
+		FutureTask<KeyAgreementConnection> f =
+				new FutureTask<KeyAgreementConnection>(c);
 		new Thread(f).start();
 		// The plugin should have bound a socket and stored the port number
 		BdfList descriptor = kal.getDescriptor();
@@ -239,10 +240,10 @@ public class LanTcpPluginTest extends BrambleTestCase {
 		assertEquals(2, split.length);
 		String addrString = split[0];
 		// Listen on the same interface as the plugin
-		ServerSocket ss = new ServerSocket();
+		final ServerSocket ss = new ServerSocket();
 		ss.bind(new InetSocketAddress(addrString, 0), 10);
-		CountDownLatch latch = new CountDownLatch(1);
-		AtomicBoolean error = new AtomicBoolean(false);
+		final CountDownLatch latch = new CountDownLatch(1);
+		final AtomicBoolean error = new AtomicBoolean(false);
 		new Thread() {
 			@Override
 			public void run() {
@@ -290,7 +291,7 @@ public class LanTcpPluginTest extends BrambleTestCase {
 	private static class Callback implements DuplexPluginCallback {
 
 		private final Map<ContactId, TransportProperties> remote =
-				new Hashtable<>();
+				new Hashtable<ContactId, TransportProperties>();
 		private final CountDownLatch propertiesLatch = new CountDownLatch(1);
 		private final CountDownLatch connectionsLatch = new CountDownLatch(1);
 		private final TransportProperties local = new TransportProperties();

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

@@ -1,723 +0,0 @@
-package org.briarproject.bramble.properties;
-
-import org.briarproject.bramble.api.client.ClientHelper;
-import org.briarproject.bramble.api.client.ContactGroupFactory;
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.data.BdfDictionary;
-import org.briarproject.bramble.api.data.BdfEntry;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.data.MetadataParser;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.Metadata;
-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.identity.LocalAuthor;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.jmock.Expectations;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.bramble.api.properties.TransportPropertyManager.CLIENT_ID;
-import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_GROUP_DESCRIPTOR_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
-import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
-import static org.briarproject.bramble.test.TestUtils.getRandomId;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
-
-	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
-	private final ClientHelper clientHelper = context.mock(ClientHelper.class);
-	private final MetadataParser metadataParser =
-			context.mock(MetadataParser.class);
-	private final ContactGroupFactory contactGroupFactory =
-			context.mock(ContactGroupFactory.class);
-	private final Clock clock = context.mock(Clock.class);
-
-	private final Group localGroup = getGroup();
-	private final LocalAuthor localAuthor = getLocalAuthor();
-	private final BdfDictionary fooPropertiesDict = BdfDictionary.of(
-			new BdfEntry("fooKey1", "fooValue1"),
-			new BdfEntry("fooKey2", "fooValue2")
-	);
-	private final BdfDictionary barPropertiesDict = BdfDictionary.of(
-			new BdfEntry("barKey1", "barValue1"),
-			new BdfEntry("barKey2", "barValue2")
-	);
-	private final TransportProperties fooProperties, barProperties;
-
-	private int nextContactId = 0;
-
-	public TransportPropertyManagerImplTest() throws Exception {
-		fooProperties = new TransportProperties();
-		for (String key : fooPropertiesDict.keySet())
-			fooProperties.put(key, fooPropertiesDict.getString(key));
-		barProperties = new TransportProperties();
-		for (String key : barPropertiesDict.keySet())
-			barProperties.put(key, barPropertiesDict.getString(key));
-	}
-
-	private TransportPropertyManagerImpl createInstance() {
-		context.checking(new Expectations() {{
-			oneOf(contactGroupFactory).createLocalGroup(CLIENT_ID);
-			will(returnValue(localGroup));
-		}});
-		return new TransportPropertyManagerImpl(db, clientHelper,
-				metadataParser, contactGroupFactory, clock);
-	}
-
-	@Test
-	public void testCreatesGroupsAtStartup() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact1 = getContact(true);
-		Contact contact2 = getContact(true);
-		List<Contact> contacts = Arrays.asList(contact1, contact2);
-		Group contactGroup1 = getGroup(), contactGroup2 = getGroup();
-
-		context.checking(new Expectations() {{
-			oneOf(db).containsGroup(txn, localGroup.getId());
-			will(returnValue(false));
-			oneOf(db).addGroup(txn, localGroup);
-			oneOf(db).getContacts(txn);
-			will(returnValue(contacts));
-			// The first contact's group has already been set up
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact1);
-			will(returnValue(contactGroup1));
-			oneOf(db).containsGroup(txn, contactGroup1.getId());
-			will(returnValue(true));
-			// The second contact's group hasn't been set up
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact2);
-			will(returnValue(contactGroup2));
-			oneOf(db).containsGroup(txn, contactGroup2.getId());
-			will(returnValue(false));
-			oneOf(db).addGroup(txn, contactGroup2);
-			oneOf(db).setGroupVisibility(txn, contact2.getId(),
-					contactGroup2.getId(), SHARED);
-		}});
-		// Copy the latest local properties into the group
-		expectGetLocalProperties(txn);
-		expectStoreMessage(txn, contactGroup2.getId(), "foo", fooPropertiesDict,
-				1, true, true);
-		expectStoreMessage(txn, contactGroup2.getId(), "bar", barPropertiesDict,
-				1, true, true);
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.createLocalState(txn);
-	}
-
-	@Test
-	public void testDoesNotCreateGroupsAtStartupIfAlreadyCreated()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-
-		context.checking(new Expectations() {{
-			oneOf(db).containsGroup(txn, localGroup.getId());
-			will(returnValue(true));
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.createLocalState(txn);
-	}
-
-	@Test
-	public void testCreatesContactGroupWhenAddingContact() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact = getContact(true);
-		Group contactGroup = getGroup();
-
-		context.checking(new Expectations() {{
-			// Create the group and share it with the contact
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact);
-			will(returnValue(contactGroup));
-			oneOf(db).containsGroup(txn, contactGroup.getId());
-			will(returnValue(false));
-			oneOf(db).addGroup(txn, contactGroup);
-			oneOf(db).setGroupVisibility(txn, contact.getId(),
-					contactGroup.getId(), SHARED);
-		}});
-		// Copy the latest local properties into the group
-		expectGetLocalProperties(txn);
-		expectStoreMessage(txn, contactGroup.getId(), "foo", fooPropertiesDict,
-				1, true, true);
-		expectStoreMessage(txn, contactGroup.getId(), "bar", barPropertiesDict,
-				1, true, true);
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.addingContact(txn, contact);
-	}
-
-	@Test
-	public void testRemovesGroupWhenRemovingContact() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact = getContact(true);
-		Group contactGroup = getGroup();
-
-		context.checking(new Expectations() {{
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact);
-			will(returnValue(contactGroup));
-			oneOf(db).removeGroup(txn, contactGroup);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.removingContact(txn, contact);
-	}
-
-	@Test
-	public void testDoesNotDeleteAnythingWhenFirstUpdateIsDelivered()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-		GroupId contactGroupId = new GroupId(getRandomId());
-		long timestamp = 123456789;
-		Message message = getMessage(contactGroupId, timestamp);
-		Metadata meta = new Metadata();
-		BdfDictionary metaDictionary = BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 2),
-				new BdfEntry("local", false)
-		);
-		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<>();
-		// A remote update for another transport should be ignored
-		MessageId barUpdateId = new MessageId(getRandomId());
-		messageMetadata.put(barUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "bar"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", false)
-		));
-		// A local update for the same transport should be ignored
-		MessageId localUpdateId = new MessageId(getRandomId());
-		messageMetadata.put(localUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", true)
-		));
-
-		context.checking(new Expectations() {{
-			oneOf(metadataParser).parse(meta);
-			will(returnValue(metaDictionary));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroupId);
-			will(returnValue(messageMetadata));
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		assertFalse(t.incomingMessage(txn, message, meta));
-	}
-
-	@Test
-	public void testDeletesOlderUpdatesWhenUpdateIsDelivered()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-		GroupId contactGroupId = new GroupId(getRandomId());
-		long timestamp = 123456789;
-		Message message = getMessage(contactGroupId, timestamp);
-		Metadata meta = new Metadata();
-		BdfDictionary metaDictionary = BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 4),
-				new BdfEntry("local", false)
-		);
-		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<>();
-		// Old remote updates for the same transport should be deleted
-		MessageId fooVersion2 = new MessageId(getRandomId());
-		messageMetadata.put(fooVersion2, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 2),
-				new BdfEntry("local", false)
-		));
-		MessageId fooVersion1 = new MessageId(getRandomId());
-		messageMetadata.put(fooVersion1, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", false)
-		));
-		MessageId fooVersion3 = new MessageId(getRandomId());
-		messageMetadata.put(fooVersion3, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 3),
-				new BdfEntry("local", false)
-		));
-
-		context.checking(new Expectations() {{
-			oneOf(metadataParser).parse(meta);
-			will(returnValue(metaDictionary));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroupId);
-			will(returnValue(messageMetadata));
-			// Versions 1-3 should be deleted
-			oneOf(db).deleteMessage(txn, fooVersion1);
-			oneOf(db).deleteMessageMetadata(txn, fooVersion1);
-			oneOf(db).deleteMessage(txn, fooVersion2);
-			oneOf(db).deleteMessageMetadata(txn, fooVersion2);
-			oneOf(db).deleteMessage(txn, fooVersion3);
-			oneOf(db).deleteMessageMetadata(txn, fooVersion3);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		assertFalse(t.incomingMessage(txn, message, meta));
-	}
-
-	@Test
-	public void testDeletesObsoleteUpdateWhenDelivered() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		GroupId contactGroupId = new GroupId(getRandomId());
-		long timestamp = 123456789;
-		Message message = getMessage(contactGroupId, timestamp);
-		Metadata meta = new Metadata();
-		BdfDictionary metaDictionary = BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 3),
-				new BdfEntry("local", false)
-		);
-		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<>();
-		// Old remote updates for the same transport should be deleted
-		MessageId fooVersion2 = new MessageId(getRandomId());
-		messageMetadata.put(fooVersion2, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 2),
-				new BdfEntry("local", false)
-		));
-		MessageId fooVersion1 = new MessageId(getRandomId());
-		messageMetadata.put(fooVersion1, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", false)
-		));
-		// A newer remote update for the same transport should not be deleted
-		MessageId fooVersion4 = new MessageId(getRandomId());
-		messageMetadata.put(fooVersion4, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 4),
-				new BdfEntry("local", false)
-		));
-
-		context.checking(new Expectations() {{
-			oneOf(metadataParser).parse(meta);
-			will(returnValue(metaDictionary));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroupId);
-			will(returnValue(messageMetadata));
-			// Versions 1 and 2 should be deleted, version 4 should not
-			oneOf(db).deleteMessage(txn, fooVersion1);
-			oneOf(db).deleteMessageMetadata(txn, fooVersion1);
-			oneOf(db).deleteMessage(txn, fooVersion2);
-			oneOf(db).deleteMessageMetadata(txn, fooVersion2);
-			// The update being delivered (version 3) should be deleted
-			oneOf(db).deleteMessage(txn, message.getId());
-			oneOf(db).deleteMessageMetadata(txn, message.getId());
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		assertFalse(t.incomingMessage(txn, message, meta));
-	}
-
-	@Test
-	public void testStoresRemotePropertiesWithVersion0() throws Exception {
-		Contact contact = getContact(true);
-		Group contactGroup = getGroup();
-		Transaction txn = new Transaction(null, false);
-		Map<TransportId, TransportProperties> properties =
-				new LinkedHashMap<>();
-		properties.put(new TransportId("foo"), fooProperties);
-		properties.put(new TransportId("bar"), barProperties);
-
-		context.checking(new Expectations() {{
-			oneOf(db).getContact(txn, contact.getId());
-			will(returnValue(contact));
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact);
-			will(returnValue(contactGroup));
-		}});
-		expectStoreMessage(txn, contactGroup.getId(), "foo", fooPropertiesDict,
-				0, false, false);
-		expectStoreMessage(txn, contactGroup.getId(), "bar", barPropertiesDict,
-				0, false, false);
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.addRemoteProperties(txn, contact.getId(), properties);
-	}
-
-	@Test
-	public void testReturnsLatestLocalProperties() throws Exception {
-		Transaction txn = new Transaction(null, false);
-
-		expectGetLocalProperties(txn);
-
-		TransportPropertyManagerImpl t = createInstance();
-		Map<TransportId, TransportProperties> local = t.getLocalProperties(txn);
-		assertEquals(2, local.size());
-		assertEquals(fooProperties, local.get(new TransportId("foo")));
-		assertEquals(barProperties, local.get(new TransportId("bar")));
-	}
-
-	@Test
-	public void testReturnsEmptyPropertiesIfNoLocalPropertiesAreFound()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<>();
-		// A local update for another transport should be ignored
-		MessageId barUpdateId = new MessageId(getRandomId());
-		messageMetadata.put(barUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "bar"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", true)
-		));
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(false);
-			will(returnValue(txn));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(db).commitTransaction(txn);
-			oneOf(db).endTransaction(txn);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		assertEquals(0, t.getLocalProperties(new TransportId("foo")).size());
-	}
-
-	@Test
-	public void testReturnsLocalProperties() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<>();
-		// A local update for another transport should be ignored
-		MessageId barUpdateId = new MessageId(getRandomId());
-		messageMetadata.put(barUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "bar"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", true)
-		));
-		// A local update for the right transport should be returned
-		MessageId fooUpdateId = new MessageId(getRandomId());
-		messageMetadata.put(fooUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", true)
-		));
-		BdfList fooUpdate = BdfList.of("foo", 1, fooPropertiesDict);
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(false);
-			will(returnValue(txn));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, fooUpdateId);
-			will(returnValue(fooUpdate));
-			oneOf(db).commitTransaction(txn);
-			oneOf(db).endTransaction(txn);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		assertEquals(fooProperties,
-				t.getLocalProperties(new TransportId("foo")));
-	}
-
-	@Test
-	public void testReturnsRemotePropertiesOrEmptyProperties()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact1 = getContact(false);
-		Contact contact2 = getContact(true);
-		Contact contact3 = getContact(true);
-		List<Contact> contacts =
-				Arrays.asList(contact1, contact2, contact3);
-		Group contactGroup2 = getGroup();
-		Group contactGroup3 = getGroup();
-		Map<MessageId, BdfDictionary> messageMetadata3 =
-				new LinkedHashMap<>();
-		// A remote update for another transport should be ignored
-		MessageId barUpdateId = new MessageId(getRandomId());
-		messageMetadata3.put(barUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "bar"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", false)
-		));
-		// A local update for the right transport should be ignored
-		MessageId localUpdateId = new MessageId(getRandomId());
-		messageMetadata3.put(localUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", true)
-		));
-		// A remote update for the right transport should be returned
-		MessageId fooUpdateId = new MessageId(getRandomId());
-		messageMetadata3.put(fooUpdateId, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", false)
-		));
-		BdfList fooUpdate = BdfList.of("foo", 1, fooPropertiesDict);
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(false);
-			will(returnValue(txn));
-			oneOf(db).getContacts(txn);
-			will(returnValue(contacts));
-			// First contact: skipped because not active
-			// Second contact: no updates
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact2);
-			will(returnValue(contactGroup2));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup2.getId());
-			will(returnValue(Collections.emptyMap()));
-			// Third contact: returns an update
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact3);
-			will(returnValue(contactGroup3));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup3.getId());
-			will(returnValue(messageMetadata3));
-			oneOf(clientHelper).getMessageAsList(txn, fooUpdateId);
-			will(returnValue(fooUpdate));
-			oneOf(db).commitTransaction(txn);
-			oneOf(db).endTransaction(txn);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		Map<ContactId, TransportProperties> properties =
-				t.getRemoteProperties(new TransportId("foo"));
-		assertEquals(3, properties.size());
-		assertEquals(0, properties.get(contact1.getId()).size());
-		assertEquals(0, properties.get(contact2.getId()).size());
-		assertEquals(fooProperties, properties.get(contact3.getId()));
-	}
-
-	@Test
-	public void testMergingUnchangedPropertiesDoesNotCreateUpdate()
-			throws Exception {
-		Transaction txn = new Transaction(null, false);
-		MessageId updateId = new MessageId(getRandomId());
-		Map<MessageId, BdfDictionary> messageMetadata =
-				Collections.singletonMap(updateId, BdfDictionary.of(
-						new BdfEntry("transportId", "foo"),
-						new BdfEntry("version", 1),
-						new BdfEntry("local", true)
-				));
-		BdfList update = BdfList.of("foo", 1, fooPropertiesDict);
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(false);
-			will(returnValue(txn));
-			// Merge the new properties with the existing properties
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, updateId);
-			will(returnValue(update));
-			// Properties are unchanged so we're done
-			oneOf(db).commitTransaction(txn);
-			oneOf(db).endTransaction(txn);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.mergeLocalProperties(new TransportId("foo"), fooProperties);
-	}
-
-	@Test
-	public void testMergingNewPropertiesCreatesUpdate() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact = getContact(true);
-		Group contactGroup = getGroup();
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(false);
-			will(returnValue(txn));
-			// There are no existing properties to merge with
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(Collections.emptyMap()));
-			// Store the new properties in the local group, version 1
-			expectStoreMessage(txn, localGroup.getId(), "foo",
-					fooPropertiesDict, 1, true, false);
-			// Store the new properties in each contact's group, version 1
-			oneOf(db).getContacts(txn);
-			will(returnValue(Collections.singletonList(contact)));
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact);
-			will(returnValue(contactGroup));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(Collections.emptyMap()));
-			expectStoreMessage(txn, contactGroup.getId(), "foo",
-					fooPropertiesDict, 1, true, true);
-			oneOf(db).commitTransaction(txn);
-			oneOf(db).endTransaction(txn);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.mergeLocalProperties(new TransportId("foo"), fooProperties);
-	}
-
-	@Test
-	public void testMergingUpdatedPropertiesCreatesUpdate() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		Contact contact = getContact(true);
-		Group contactGroup = getGroup();
-		BdfDictionary oldMetadata = BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 1),
-				new BdfEntry("local", true)
-		);
-		MessageId localGroupUpdateId = new MessageId(getRandomId());
-		Map<MessageId, BdfDictionary> localGroupMessageMetadata =
-				Collections.singletonMap(localGroupUpdateId, oldMetadata);
-		MessageId contactGroupUpdateId = new MessageId(getRandomId());
-		Map<MessageId, BdfDictionary> contactGroupMessageMetadata =
-				Collections.singletonMap(contactGroupUpdateId, oldMetadata);
-		BdfList oldUpdate = BdfList.of("foo", 1, BdfDictionary.of(
-				new BdfEntry("fooKey1", "oldFooValue1")
-		));
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(false);
-			will(returnValue(txn));
-			// Merge the new properties with the existing properties
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(localGroupMessageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, localGroupUpdateId);
-			will(returnValue(oldUpdate));
-			// Store the merged properties in the local group, version 2
-			expectStoreMessage(txn, localGroup.getId(), "foo",
-					fooPropertiesDict, 2, true, false);
-			// Delete the previous update
-			oneOf(db).removeMessage(txn, localGroupUpdateId);
-			// Store the merged properties in each contact's group, version 2
-			oneOf(db).getContacts(txn);
-			will(returnValue(Collections.singletonList(contact)));
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact);
-			will(returnValue(contactGroup));
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(contactGroupMessageMetadata));
-			expectStoreMessage(txn, contactGroup.getId(), "foo",
-					fooPropertiesDict, 2, true, true);
-			// Delete the previous update
-			oneOf(db).removeMessage(txn, contactGroupUpdateId);
-			oneOf(db).commitTransaction(txn);
-			oneOf(db).endTransaction(txn);
-		}});
-
-		TransportPropertyManagerImpl t = createInstance();
-		t.mergeLocalProperties(new TransportId("foo"), fooProperties);
-	}
-
-	private Group getGroup() {
-		GroupId g = new GroupId(getRandomId());
-		byte[] descriptor = getRandomBytes(MAX_GROUP_DESCRIPTOR_LENGTH);
-		return new Group(g, CLIENT_ID, descriptor);
-	}
-
-	private LocalAuthor getLocalAuthor() {
-		AuthorId id = new AuthorId(getRandomId());
-		String name = getRandomString(MAX_AUTHOR_NAME_LENGTH);
-		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
-		byte[] privateKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
-		long created = System.currentTimeMillis();
-		return new LocalAuthor(id, name, publicKey, privateKey, created);
-	}
-
-	private Contact getContact(boolean active) {
-		ContactId c = new ContactId(nextContactId++);
-		AuthorId a = new AuthorId(getRandomId());
-		String name = getRandomString(MAX_AUTHOR_NAME_LENGTH);
-		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
-		return new Contact(c, new Author(a, name, publicKey),
-				localAuthor.getId(), true, active);
-	}
-
-	private Message getMessage(GroupId g, long timestamp) {
-		MessageId messageId = new MessageId(getRandomId());
-		byte[] raw = getRandomBytes(MAX_MESSAGE_BODY_LENGTH);
-		return new Message(messageId, g, timestamp, raw);
-	}
-
-	private void expectGetLocalProperties(Transaction txn)
-			throws Exception {
-		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<>();
-		// The only update for transport "foo" should be returned
-		MessageId fooVersion999 = new MessageId(getRandomId());
-		messageMetadata.put(fooVersion999, BdfDictionary.of(
-				new BdfEntry("transportId", "foo"),
-				new BdfEntry("version", 999)
-		));
-		// An old update for transport "bar" should be deleted
-		MessageId barVersion2 = new MessageId(getRandomId());
-		messageMetadata.put(barVersion2, BdfDictionary.of(
-				new BdfEntry("transportId", "bar"),
-				new BdfEntry("version", 2)
-		));
-		// An even older update for transport "bar" should be deleted
-		MessageId barVersion1 = new MessageId(getRandomId());
-		messageMetadata.put(barVersion1, BdfDictionary.of(
-				new BdfEntry("transportId", "bar"),
-				new BdfEntry("version", 1)
-		));
-		// The latest update for transport "bar" should be returned
-		MessageId barVersion3 = new MessageId(getRandomId());
-		messageMetadata.put(barVersion3, BdfDictionary.of(
-				new BdfEntry("transportId", "bar"),
-				new BdfEntry("version", 3)
-		));
-		BdfList fooUpdate = BdfList.of("foo", 999, fooPropertiesDict);
-		BdfList barUpdate = BdfList.of("bar", 3, barPropertiesDict);
-
-		context.checking(new Expectations() {{
-			// Find the latest local update for each transport
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					localGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(db).removeMessage(txn, barVersion1);
-			oneOf(db).removeMessage(txn, barVersion2);
-			// Retrieve and parse the latest local properties
-			oneOf(clientHelper).getMessageAsList(txn, fooVersion999);
-			will(returnValue(fooUpdate));
-			oneOf(clientHelper).getMessageAsList(txn, barVersion3);
-			will(returnValue(barUpdate));
-		}});
-	}
-
-	private void expectStoreMessage(Transaction txn, GroupId g,
-			String transportId, BdfDictionary properties, long version,
-			boolean local, boolean shared) throws Exception {
-		long timestamp = 123456789;
-		BdfList body = BdfList.of(transportId, version, properties);
-		Message message = getMessage(g, timestamp);
-		BdfDictionary meta = BdfDictionary.of(
-				new BdfEntry("transportId", transportId),
-				new BdfEntry("version", version),
-				new BdfEntry("local", local)
-		);
-
-		context.checking(new Expectations() {{
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(timestamp));
-			oneOf(clientHelper).createMessage(g, timestamp, body);
-			will(returnValue(message));
-			oneOf(clientHelper).addLocalMessage(txn, message, meta, shared);
-		}});
-	}
-}

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

@@ -6,10 +6,10 @@ import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.sync.Ack;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.RecordWriter;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.bramble.test.TestUtils;
+import org.briarproject.bramble.api.sync.RecordWriter;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;
@@ -44,10 +44,10 @@ public class SimplexOutgoingSessionTest extends BrambleTestCase {
 
 	@Test
 	public void testNothingToSend() throws Exception {
-		SimplexOutgoingSession session = new SimplexOutgoingSession(db,
+		final SimplexOutgoingSession session = new SimplexOutgoingSession(db,
 				dbExecutor, eventBus, contactId, maxLatency, recordWriter);
-		Transaction noAckTxn = new Transaction(null, false);
-		Transaction noMsgTxn = new Transaction(null, false);
+		final Transaction noAckTxn = new Transaction(null, false);
+		final Transaction noMsgTxn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Add listener
@@ -80,14 +80,14 @@ public class SimplexOutgoingSessionTest extends BrambleTestCase {
 
 	@Test
 	public void testSomethingToSend() throws Exception {
-		Ack ack = new Ack(Collections.singletonList(messageId));
-		byte[] raw = new byte[1234];
-		SimplexOutgoingSession session = new SimplexOutgoingSession(db,
+		final Ack ack = new Ack(Collections.singletonList(messageId));
+		final byte[] raw = new byte[1234];
+		final SimplexOutgoingSession session = new SimplexOutgoingSession(db,
 				dbExecutor, eventBus, contactId, maxLatency, recordWriter);
-		Transaction ackTxn = new Transaction(null, false);
-		Transaction noAckTxn = new Transaction(null, false);
-		Transaction msgTxn = new Transaction(null, false);
-		Transaction noMsgTxn = new Transaction(null, false);
+		final Transaction ackTxn = new Transaction(null, false);
+		final Transaction noAckTxn = new Transaction(null, false);
+		final Transaction msgTxn = new Transaction(null, false);
+		final Transaction noMsgTxn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Add listener

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

@@ -92,9 +92,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testStartAndStop() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, true);
+		final Transaction txn2 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// validateOutstandingMessages()
@@ -126,13 +126,13 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testMessagesAreValidatedAtStartup() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, false);
-		Transaction txn3 = new Transaction(null, true);
-		Transaction txn4 = new Transaction(null, false);
-		Transaction txn5 = new Transaction(null, true);
-		Transaction txn6 = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, true);
+		final Transaction txn2 = new Transaction(null, false);
+		final Transaction txn3 = new Transaction(null, true);
+		final Transaction txn4 = new Transaction(null, false);
+		final Transaction txn5 = new Transaction(null, true);
+		final Transaction txn6 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -217,11 +217,11 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testPendingMessagesAreDeliveredAtStartup() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, false);
-		Transaction txn3 = new Transaction(null, false);
-		Transaction txn4 = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, true);
+		final Transaction txn2 = new Transaction(null, false);
+		final Transaction txn3 = new Transaction(null, false);
+		final Transaction txn4 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -303,11 +303,11 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testMessagesAreSharedAtStartup() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, true);
-		Transaction txn3 = new Transaction(null, false);
-		Transaction txn4 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, true);
+		final Transaction txn2 = new Transaction(null, true);
+		final Transaction txn3 = new Transaction(null, false);
+		final Transaction txn4 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// No messages to validate
@@ -355,9 +355,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testIncomingMessagesAreShared() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
-		Transaction txn2 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
+		final Transaction txn2 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -405,12 +405,12 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testValidationContinuesAfterNoSuchMessageException()
 			throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, true);
-		Transaction txn3 = new Transaction(null, false);
-		Transaction txn4 = new Transaction(null, true);
-		Transaction txn5 = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, true);
+		final Transaction txn2 = new Transaction(null, true);
+		final Transaction txn3 = new Transaction(null, false);
+		final Transaction txn4 = new Transaction(null, true);
+		final Transaction txn5 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -476,12 +476,12 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testValidationContinuesAfterNoSuchGroupException()
 			throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, true);
-		Transaction txn3 = new Transaction(null, false);
-		Transaction txn4 = new Transaction(null, true);
-		Transaction txn5 = new Transaction(null, true);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, true);
+		final Transaction txn2 = new Transaction(null, true);
+		final Transaction txn3 = new Transaction(null, false);
+		final Transaction txn4 = new Transaction(null, true);
+		final Transaction txn5 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -551,8 +551,8 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testNonLocalMessagesAreValidatedWhenAdded() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -591,8 +591,8 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testMessagesWithUndeliveredDependenciesArePending()
 			throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -624,8 +624,8 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testMessagesWithDeliveredDependenciesGetDelivered()
 			throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -663,9 +663,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testMessagesWithInvalidDependenciesAreInvalid()
 			throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
-		Transaction txn2 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
+		final Transaction txn2 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -716,18 +716,19 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testRecursiveInvalidation() throws Exception {
-		MessageId messageId3 = new MessageId(TestUtils.getRandomId());
-		MessageId messageId4 = new MessageId(TestUtils.getRandomId());
-		Map<MessageId, State> twoDependents = new LinkedHashMap<>();
+		final MessageId messageId3 = new MessageId(TestUtils.getRandomId());
+		final MessageId messageId4 = new MessageId(TestUtils.getRandomId());
+		final Map<MessageId, State> twoDependents =
+				new LinkedHashMap<MessageId, State>();
 		twoDependents.put(messageId1, PENDING);
 		twoDependents.put(messageId2, PENDING);
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
-		Transaction txn2 = new Transaction(null, false);
-		Transaction txn3 = new Transaction(null, false);
-		Transaction txn4 = new Transaction(null, false);
-		Transaction txn5 = new Transaction(null, false);
-		Transaction txn6 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
+		final Transaction txn2 = new Transaction(null, false);
+		final Transaction txn3 = new Transaction(null, false);
+		final Transaction txn4 = new Transaction(null, false);
+		final Transaction txn5 = new Transaction(null, false);
+		final Transaction txn6 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -819,25 +820,27 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testPendingDependentsGetDelivered() throws Exception {
-		MessageId messageId3 = new MessageId(TestUtils.getRandomId());
-		MessageId messageId4 = new MessageId(TestUtils.getRandomId());
-		Message message3 = new Message(messageId3, groupId, timestamp,
+		final MessageId messageId3 = new MessageId(TestUtils.getRandomId());
+		final MessageId messageId4 = new MessageId(TestUtils.getRandomId());
+		final Message message3 = new Message(messageId3, groupId, timestamp,
 				raw);
-		Message message4 = new Message(messageId4, groupId, timestamp,
+		final Message message4 = new Message(messageId4, groupId, timestamp,
 				raw);
-		Map<MessageId, State> twoDependents = new LinkedHashMap<>();
+		final Map<MessageId, State> twoDependents =
+				new LinkedHashMap<MessageId, State>();
 		twoDependents.put(messageId1, PENDING);
 		twoDependents.put(messageId2, PENDING);
-		Map<MessageId, State> twoDependencies = new LinkedHashMap<>();
+		final Map<MessageId, State> twoDependencies =
+				new LinkedHashMap<MessageId, State>();
 		twoDependencies.put(messageId1, DELIVERED);
 		twoDependencies.put(messageId2, DELIVERED);
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
-		Transaction txn2 = new Transaction(null, false);
-		Transaction txn3 = new Transaction(null, false);
-		Transaction txn4 = new Transaction(null, false);
-		Transaction txn5 = new Transaction(null, false);
-		Transaction txn6 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
+		final Transaction txn2 = new Transaction(null, false);
+		final Transaction txn3 = new Transaction(null, false);
+		final Transaction txn4 = new Transaction(null, false);
+		final Transaction txn5 = new Transaction(null, false);
+		final Transaction txn6 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -976,12 +979,13 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testOnlyReadyPendingDependentsGetDelivered() throws Exception {
-		Map<MessageId, State> twoDependencies = new LinkedHashMap<>();
+		final Map<MessageId, State> twoDependencies =
+				new LinkedHashMap<MessageId, State>();
 		twoDependencies.put(messageId, DELIVERED);
 		twoDependencies.put(messageId2, UNKNOWN);
-		Transaction txn = new Transaction(null, true);
-		Transaction txn1 = new Transaction(null, false);
-		Transaction txn2 = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, true);
+		final Transaction txn1 = new Transaction(null, false);
+		final Transaction txn2 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group

bramble-core/src/test/java/org/briarproject/bramble/system/LinuxSecureRandomSpiTest.java

@@ -38,7 +38,7 @@ public class LinuxSecureRandomSpiTest extends BrambleTestCase {
 			System.err.println("WARNING: Skipping test, can't run on this OS");
 			return;
 		}
-		Set<Bytes> seeds = new HashSet<>();
+		Set<Bytes> seeds = new HashSet<Bytes>();
 		LinuxSecureRandomSpi engine = new LinuxSecureRandomSpi();
 		for (int i = 0; i < 1000; i++) {
 			byte[] seed = engine.engineGenerateSeed(SEED_BYTES);

bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java

@@ -58,21 +58,21 @@ public class KeyManagerImplTest extends BrambleTestCase {
 
 	@Before
 	public void testStartService() throws Exception {
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 		AuthorId remoteAuthorId = new AuthorId(getRandomId());
 		Author remoteAuthor = new Author(remoteAuthorId, "author",
 				getRandomBytes(42));
 		AuthorId localAuthorId = new AuthorId(getRandomId());
-		Collection<Contact> contacts = new ArrayList<>();
+		final Collection<Contact> contacts = new ArrayList<Contact>();
 		contacts.add(new Contact(contactId, remoteAuthor, localAuthorId, true,
 				true));
 		contacts.add(new Contact(inactiveContactId, remoteAuthor, localAuthorId,
 				true, false));
-		SimplexPluginFactory pluginFactory =
+		final SimplexPluginFactory pluginFactory =
 				context.mock(SimplexPluginFactory.class);
-		Collection<SimplexPluginFactory> factories = Collections
+		final Collection<SimplexPluginFactory> factories = Collections
 				.singletonList(pluginFactory);
-		int maxLatency = 1337;
+		final int maxLatency = 1337;
 
 		context.checking(new Expectations() {{
 			oneOf(pluginConfig).getSimplexFactories();
@@ -100,9 +100,9 @@ public class KeyManagerImplTest extends BrambleTestCase {
 
 	@Test
 	public void testAddContact() throws Exception {
-		SecretKey secretKey = getSecretKey();
-		long timestamp = 42L;
-		boolean alice =  true;
+		final SecretKey secretKey = getSecretKey();
+		final long timestamp = 42L;
+		final boolean alice =  true;
 
 		context.checking(new Expectations() {{
 			oneOf(transportKeyManager)

bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderImplTest.java

@@ -14,7 +14,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testEmptyFramesAreSkipped() throws Exception {
 		Mockery context = new Mockery();
-		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(0)); // Empty frame
@@ -37,7 +37,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testEmptyFramesAreSkippedWithBuffer() throws Exception {
 		Mockery context = new Mockery();
-		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(0)); // Empty frame
@@ -63,7 +63,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testMultipleReadsPerFrame() throws Exception {
 		Mockery context = new Mockery();
-		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(MAX_PAYLOAD_LENGTH)); // Nice long frame
@@ -85,7 +85,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testMultipleReadsPerFrameWithOffsets() throws Exception {
 		Mockery context = new Mockery();
-		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(MAX_PAYLOAD_LENGTH)); // Nice long frame

bramble-core/src/test/java/org/briarproject/bramble/transport/StreamWriterImplTest.java

@@ -14,7 +14,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testCloseWithoutWritingWritesFinalFrame() throws Exception {
 		Mockery context = new Mockery();
-		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		context.checking(new Expectations() {{
 			// Write an empty final frame
 			oneOf(encrypter).writeFrame(with(any(byte[].class)), with(0),
@@ -31,7 +31,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	public void testFlushWithoutBufferedDataWritesFrameAndFlushes()
 			throws Exception {
 		Mockery context = new Mockery();
-		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write a non-final frame with an empty payload
@@ -58,7 +58,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	public void testFlushWithBufferedDataWritesFrameAndFlushes()
 			throws Exception {
 		Mockery context = new Mockery();
-		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write a non-final frame with one payload byte
@@ -85,7 +85,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testSingleByteWritesWriteFullFrame() throws Exception {
 		Mockery context = new Mockery();
-		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write a full non-final frame
@@ -109,7 +109,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testMultiByteWritesWriteFullFrames() throws Exception {
 		Mockery context = new Mockery();
-		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write two full non-final frames
@@ -140,7 +140,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testLargeMultiByteWriteWritesFullFrames() throws Exception {
 		Mockery context = new Mockery();
-		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write two full non-final frames

bramble-core/src/test/java/org/briarproject/bramble/transport/TransportKeyManagerImplTest.java

@@ -56,20 +56,21 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testKeysAreRotatedAtStartup() throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		Map<ContactId, TransportKeys> loaded = new LinkedHashMap<>();
-		TransportKeys shouldRotate = createTransportKeys(900, 0);
-		TransportKeys shouldNotRotate = createTransportKeys(1000, 0);
+		final Map<ContactId, TransportKeys> loaded =
+				new LinkedHashMap<ContactId, TransportKeys>();
+		final TransportKeys shouldRotate = createTransportKeys(900, 0);
+		final TransportKeys shouldNotRotate = createTransportKeys(1000, 0);
 		loaded.put(contactId, shouldRotate);
 		loaded.put(contactId1, shouldNotRotate);
-		TransportKeys rotated = createTransportKeys(1000, 0);
-		Transaction txn = new Transaction(null, false);
+		final TransportKeys rotated = createTransportKeys(1000, 0);
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Get the current time (1 ms after start of rotation period 1000)
@@ -108,17 +109,17 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testKeysAreRotatedWhenAddingContact() throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		boolean alice = true;
-		TransportKeys transportKeys = createTransportKeys(999, 0);
-		TransportKeys rotated = createTransportKeys(1000, 0);
-		Transaction txn = new Transaction(null, false);
+		final boolean alice = true;
+		final TransportKeys transportKeys = createTransportKeys(999, 0);
+		final TransportKeys rotated = createTransportKeys(1000, 0);
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 999,
@@ -155,14 +156,14 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	public void testOutgoingStreamContextIsNullIfContactIsNotFound()
 			throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 
 		TransportKeyManager
 				transportKeyManager = new TransportKeyManagerImpl(db,
@@ -176,18 +177,18 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	public void testOutgoingStreamContextIsNullIfStreamCounterIsExhausted()
 			throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		boolean alice = true;
+		final boolean alice = true;
 		// The stream counter has been exhausted
-		TransportKeys transportKeys = createTransportKeys(1000,
+		final TransportKeys transportKeys = createTransportKeys(1000,
 				MAX_32_BIT_UNSIGNED + 1);
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -224,18 +225,18 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testOutgoingStreamCounterIsIncremented() throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		boolean alice = true;
+		final boolean alice = true;
 		// The stream counter can be used one more time before being exhausted
-		TransportKeys transportKeys = createTransportKeys(1000,
+		final TransportKeys transportKeys = createTransportKeys(1000,
 				MAX_32_BIT_UNSIGNED);
-		Transaction txn = new Transaction(null, false);
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -285,16 +286,16 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	public void testIncomingStreamContextIsNullIfTagIsNotFound()
 			throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		boolean alice = true;
-		TransportKeys transportKeys = createTransportKeys(1000, 0);
-		Transaction txn = new Transaction(null, false);
+		final boolean alice = true;
+		final TransportKeys transportKeys = createTransportKeys(1000, 0);
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -332,18 +333,18 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testTagIsNotRecognisedTwice() throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		boolean alice = true;
-		TransportKeys transportKeys = createTransportKeys(1000, 0);
+		final boolean alice = true;
+		final TransportKeys transportKeys = createTransportKeys(1000, 0);
 		// Keep a copy of the tags
-		List<byte[]> tags = new ArrayList<>();
-		Transaction txn = new Transaction(null, false);
+		final List<byte[]> tags = new ArrayList<byte[]>();
+		final Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -402,19 +403,19 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testKeysAreRotatedToCurrentPeriod() throws Exception {
 		Mockery context = new Mockery();
-		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		Executor dbExecutor = context.mock(Executor.class);
-		ScheduledExecutorService scheduler =
+		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		final Executor dbExecutor = context.mock(Executor.class);
+		final ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		Clock clock = context.mock(Clock.class);
+		final Clock clock = context.mock(Clock.class);
 
-		TransportKeys transportKeys = createTransportKeys(1000, 0);
-		Map<ContactId, TransportKeys> loaded =
+		final TransportKeys transportKeys = createTransportKeys(1000, 0);
+		final Map<ContactId, TransportKeys> loaded =
 				Collections.singletonMap(contactId, transportKeys);
-		TransportKeys rotated = createTransportKeys(1001, 0);
-		Transaction txn = new Transaction(null, false);
-		Transaction txn1 = new Transaction(null, false);
+		final TransportKeys rotated = createTransportKeys(1001, 0);
+		final Transaction txn = new Transaction(null, false);
+		final Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Get the current time (the start of rotation period 1000)

bramble-j2se/build.gradle

@@ -1,55 +1,22 @@
-apply plugin: 'java-library'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+apply plugin: 'java'
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 
-apply plugin: 'net.ltgt.apt'
-apply plugin: 'idea'
 apply plugin: 'witness'
 
 dependencies {
-	implementation project(path: ':bramble-core', configuration: 'default')
-	implementation fileTree(dir: 'libs', include: '*.jar')
-	implementation 'net.java.dev.jna:jna:4.4.0'
-	implementation 'net.java.dev.jna:jna-platform:4.4.0'
+	compile project(path: ':bramble-core', configuration: 'default')
+	compile fileTree(dir: 'libs', include: '*.jar')
+	compile 'net.java.dev.jna:jna:4.4.0'
+	compile 'net.java.dev.jna:jna-platform:4.4.0'
 
-	apt 'com.google.dagger:dagger-compiler:2.0.2'
-
-	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
-	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
-	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"
+	testCompile project(path: ':bramble-core', configuration: 'testOutput')
 }
 
 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-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.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-			'net.java.dev.jna:jna-platform:4.4.0:jna-platform-4.4.0.jar:e9dda9e884fc107eb6367710540789a12dfa8ad28be9326b22ca6e352e325499',
-			'net.java.dev.jna:jna:4.4.0:jna-4.4.0.jar:c4dadeeecaa90c8847902082aee5eb107fcf59c5d0e63a17fcaf273c0e2d2bd1',
-			'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.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
-			'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',
+			'net.java.dev.jna:jna:c4dadeeecaa90c8847902082aee5eb107fcf59c5d0e63a17fcaf273c0e2d2bd1',
+			'net.java.dev.jna:jna-platform:e9dda9e884fc107eb6367710540789a12dfa8ad28be9326b22ca6e352e325499',
 	]
 }
 

bramble-j2se/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java

@@ -110,16 +110,20 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
 		public void run() {
 			try {
 				// Load user32.dll
-				User32 user32 = (User32) Native.loadLibrary("user32",
+				final User32 user32 = (User32) Native.loadLibrary("user32",
 						User32.class, options);
 				// Create a callback to handle the WM_QUERYENDSESSION message
-				WindowProc proc = (hwnd, msg, wp, lp) -> {
-					if (msg == WM_QUERYENDSESSION) {
-						// It's safe to delay returning from this message
-						runShutdownHooks();
+				WindowProc proc = new WindowProc() {
+					@Override
+					public LRESULT callback(HWND hwnd, int msg, WPARAM wp,
+							LPARAM lp) {
+						if (msg == WM_QUERYENDSESSION) {
+							// It's safe to delay returning from this message
+							runShutdownHooks();
+						}
+						// Pass the message to the default window procedure
+						return user32.DefWindowProc(hwnd, msg, wp, lp);
 					}
-					// Pass the message to the default window procedure
-					return user32.DefWindowProc(hwnd, msg, wp, lp);
 				};
 				// Create a native window
 				HWND hwnd = user32.CreateWindowEx(0, "STATIC", "", WS_MINIMIZE,

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

@@ -41,9 +41,9 @@ public class DesktopPluginModule extends PluginModule {
 				backoffFactory, shutdownManager);
 		SimplexPluginFactory removable =
 				new RemovableDrivePluginFactory(ioExecutor);
-		Collection<SimplexPluginFactory> simplex =
+		final Collection<SimplexPluginFactory> simplex =
 				Collections.singletonList(removable);
-		Collection<DuplexPluginFactory> duplex =
+		final Collection<DuplexPluginFactory> duplex =
 				Arrays.asList(bluetooth, modem, lan, wan);
 		@NotNullByDefault
 		PluginConfig pluginConfig = new PluginConfig() {

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

@@ -108,30 +108,33 @@ class BluetoothPlugin implements DuplexPlugin {
 	}
 
 	private void bind() {
-		ioExecutor.execute(() -> {
-			if (!running) return;
-			// Advertise the Bluetooth address to contacts
-			TransportProperties p = new TransportProperties();
-			p.put(PROP_ADDRESS, localDevice.getBluetoothAddress());
-			callback.mergeLocalProperties(p);
-			// Bind a server socket to accept connections from contacts
-			String url = makeUrl("localhost", getUuid());
-			StreamConnectionNotifier ss;
-			try {
-				ss = (StreamConnectionNotifier) Connector.open(url);
-			} catch (IOException e) {
-				if (LOG.isLoggable(WARNING))
-					LOG.log(WARNING, e.toString(), e);
-				return;
+		ioExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				if (!running) return;
+				// Advertise the Bluetooth address to contacts
+				TransportProperties p = new TransportProperties();
+				p.put(PROP_ADDRESS, localDevice.getBluetoothAddress());
+				callback.mergeLocalProperties(p);
+				// Bind a server socket to accept connections from contacts
+				String url = makeUrl("localhost", getUuid());
+				StreamConnectionNotifier ss;
+				try {
+					ss = (StreamConnectionNotifier) Connector.open(url);
+				} catch (IOException e) {
+					if (LOG.isLoggable(WARNING))
+						LOG.log(WARNING, e.toString(), e);
+					return;
+				}
+				if (!running) {
+					tryToClose(ss);
+					return;
+				}
+				socket = ss;
+				backoff.reset();
+				callback.transportEnabled();
+				acceptContactConnections(ss);
 			}
-			if (!running) {
-				tryToClose(ss);
-				return;
-			}
-			socket = ss;
-			backoff.reset();
-			callback.transportEnabled();
-			acceptContactConnections(ss);
 		});
 	}
 
@@ -204,31 +207,33 @@ class BluetoothPlugin implements DuplexPlugin {
 	}
 
 	@Override
-	public void poll(Collection<ContactId> connected) {
+	public void poll(final Collection<ContactId> connected) {
 		if (!running) return;
 		backoff.increment();
 		// Try to connect to known devices in parallel
 		Map<ContactId, TransportProperties> remote =
 				callback.getRemoteProperties();
 		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
-			ContactId c = e.getKey();
+			final ContactId c = e.getKey();
 			if (connected.contains(c)) continue;
-			String address = e.getValue().get(PROP_ADDRESS);
+			final String address = e.getValue().get(PROP_ADDRESS);
 			if (StringUtils.isNullOrEmpty(address)) continue;
-			String uuid = e.getValue().get(PROP_UUID);
+			final String uuid = e.getValue().get(PROP_UUID);
 			if (StringUtils.isNullOrEmpty(uuid)) continue;
-			ioExecutor.execute(() -> {
-				if (!running) return;
-				StreamConnection s = connect(makeUrl(address, uuid));
-				if (s != null) {
-					backoff.reset();
-					callback.outgoingConnectionCreated(c, wrapSocket(s));
+			ioExecutor.execute(new Runnable() {
+				@Override
+				public void run() {
+					if (!running) return;
+					StreamConnection s = connect(makeUrl(address, uuid));
+					if (s != null) {
+						backoff.reset();
+						callback.outgoingConnectionCreated(c, wrapSocket(s));
+					}
 				}
 			});
 		}
 	}
 
-	@Nullable
 	private StreamConnection connect(String url) {
 		if (LOG.isLoggable(INFO)) LOG.info("Connecting to " + url);
 		try {
@@ -270,7 +275,7 @@ class BluetoothPlugin implements DuplexPlugin {
 		// Make the device discoverable if possible
 		makeDeviceDiscoverable();
 		// Bind a server socket for receiving key agreementconnections
-		StreamConnectionNotifier ss;
+		final StreamConnectionNotifier ss;
 		try {
 			ss = (StreamConnectionNotifier) Connector.open(url);
 		} catch (IOException e) {
@@ -336,13 +341,16 @@ class BluetoothPlugin implements DuplexPlugin {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return () -> {
-				StreamConnection s = ss.acceptAndOpen();
-				if (LOG.isLoggable(INFO))
-					LOG.info(ID.getString() + ": Incoming connection");
-				return new KeyAgreementConnection(
-						new BluetoothTransportConnection(
-								BluetoothPlugin.this, s), ID);
+			return new Callable<KeyAgreementConnection>() {
+				@Override
+				public KeyAgreementConnection call() throws Exception {
+					StreamConnection s = ss.acceptAndOpen();
+					if (LOG.isLoggable(INFO))
+						LOG.info(ID.getString() + ": Incoming connection");
+					return new KeyAgreementConnection(
+							new BluetoothTransportConnection(
+									BluetoothPlugin.this, s), ID);
+				}
 			};
 		}
 

bramble-j2se/src/main/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitor.java

@@ -13,8 +13,6 @@ import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import javax.annotation.Nullable;
-
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 abstract class UnixRemovableDriveMonitor implements RemovableDriveMonitor,
@@ -36,12 +34,13 @@ JNotifyListener {
 
 	protected abstract String[] getPathsToWatch();
 
-	@Nullable
 	private static Throwable tryLoad() {
 		try {
 			Class.forName("net.contentobjects.jnotify.JNotify");
 			return null;
-		} catch (UnsatisfiedLinkError | ClassNotFoundException e) {
+		} catch (UnsatisfiedLinkError e) {
+			return e;
+		} catch (ClassNotFoundException e) {
 			return e;
 		}
 	}

bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java

@@ -390,12 +390,15 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
 						lock.unlock();
 					}
 				} else if (s.equals("RING")) {
-					ioExecutor.execute(() -> {
-						try {
-							answer();
-						} catch (IOException e) {
-							if (LOG.isLoggable(WARNING))
-								LOG.log(WARNING, e.toString(), e);
+					ioExecutor.execute(new Runnable() {
+						@Override
+						public void run() {
+							try {
+								answer();
+							} catch (IOException e) {
+								if (LOG.isLoggable(WARNING))
+									LOG.log(WARNING, e.toString(), e);
+							}
 						}
 					});
 				}

bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/PollingRemovableDriveMonitorTest.java

@@ -26,10 +26,10 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 	@Test
 	public void testOneCallbackPerFile() throws Exception {
 		// Create a finder that returns no files the first time, then two files
-		File file1 = new File("foo");
-		File file2 = new File("bar");
+		final File file1 = new File("foo");
+		final File file2 = new File("bar");
 		@NotNullByDefault
-		RemovableDriveFinder finder = new RemovableDriveFinder() {
+		final RemovableDriveFinder finder = new RemovableDriveFinder() {
 
 			private AtomicBoolean firstCall = new AtomicBoolean(true);
 
@@ -40,8 +40,8 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create a callback that waits for two files
-		CountDownLatch latch = new CountDownLatch(2);
-		List<File> detected = new ArrayList<>();
+		final CountDownLatch latch = new CountDownLatch(2);
+		final List<File> detected = new ArrayList<>();
 		@NotNullByDefault
 		Callback callback = new Callback() {
 
@@ -57,7 +57,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create the monitor and start it
-		RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
+		final RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
 				Executors.newCachedThreadPool(), finder, 1);
 		monitor.start(callback);
 		// Wait for the monitor to detect the files
@@ -72,7 +72,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 	@Test
 	public void testExceptionCallback() throws Exception {
 		// Create a finder that throws an exception the second time it's polled
-		RemovableDriveFinder finder = new RemovableDriveFinder() {
+		final RemovableDriveFinder finder = new RemovableDriveFinder() {
 
 			private AtomicBoolean firstCall = new AtomicBoolean(true);
 
@@ -83,7 +83,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create a callback that waits for an exception
-		CountDownLatch latch = new CountDownLatch(1);
+		final CountDownLatch latch = new CountDownLatch(1);
 		@NotNullByDefault
 		Callback callback = new Callback() {
 
@@ -98,7 +98,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create the monitor and start it
-		RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
+		final RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
 				Executors.newCachedThreadPool(), finder, 1);
 		monitor.start(callback);
 		assertTrue(latch.await(10, SECONDS));

bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginTest.java

@@ -41,17 +41,17 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfNoDrivesAreFound() throws Exception {
-		List<File> drives = Collections.emptyList();
+		final List<File> drives = Collections.emptyList();
 
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -71,21 +71,21 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfNoDriveIsChosen() throws Exception {
-		File drive1 = new File(testDir, "1");
-		File drive2 = new File(testDir, "2");
-		List<File> drives = new ArrayList<>();
+		final File drive1 = new File(testDir, "1");
+		final File drive2 = new File(testDir, "2");
+		final List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -110,21 +110,21 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfOutputDirDoesNotExist() throws Exception {
-		File drive1 = new File(testDir, "1");
-		File drive2 = new File(testDir, "2");
-		List<File> drives = new ArrayList<>();
+		final File drive1 = new File(testDir, "1");
+		final File drive2 = new File(testDir, "2");
+		final List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -149,9 +149,9 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfOutputDirIsAFile() throws Exception {
-		File drive1 = new File(testDir, "1");
-		File drive2 = new File(testDir, "2");
-		List<File> drives = new ArrayList<>();
+		final File drive1 = new File(testDir, "1");
+		final File drive2 = new File(testDir, "2");
+		final List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 		// Create drive1 as a file rather than a directory
@@ -160,12 +160,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -190,9 +190,9 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNotNullIfOutputDirIsADir() throws Exception {
-		File drive1 = new File(testDir, "1");
-		File drive2 = new File(testDir, "2");
-		List<File> drives = new ArrayList<>();
+		final File drive1 = new File(testDir, "1");
+		final File drive2 = new File(testDir, "2");
+		final List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 		// Create drive1 as a directory
@@ -201,12 +201,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -234,9 +234,9 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWritingToWriter() throws Exception {
-		File drive1 = new File(testDir, "1");
-		File drive2 = new File(testDir, "2");
-		List<File> drives = new ArrayList<>();
+		final File drive1 = new File(testDir, "1");
+		final File drive2 = new File(testDir, "2");
+		final List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 		// Create drive1 as a directory
@@ -245,12 +245,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -292,12 +292,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -318,12 +318,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		Executor executor = context.mock(Executor.class);
-		SimplexPluginCallback callback =
+		final Executor executor = context.mock(Executor.class);
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		RemovableDrivePlugin plugin = new RemovableDrivePlugin(executor,
@@ -344,11 +344,11 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		SimplexPluginCallback callback =
+		final SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		RemovableDriveFinder finder =
+		final RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		RemovableDriveMonitor monitor =
+		final RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{

bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitorTest.java

@@ -61,10 +61,10 @@ public class UnixRemovableDriveMonitorTest extends BrambleTestCase {
 			return;
 		}
 		// Create a callback that will wait for two files before stopping
-		List<File> detected = new ArrayList<>();
-		CountDownLatch latch = new CountDownLatch(2);
+		final List<File> detected = new ArrayList<>();
+		final CountDownLatch latch = new CountDownLatch(2);
 		@NotNullByDefault
-		Callback callback = new Callback() {
+		final Callback callback = new Callback() {
 
 			@Override
 			public void driveInserted(File f) {
@@ -99,7 +99,7 @@ public class UnixRemovableDriveMonitorTest extends BrambleTestCase {
 		TestUtils.deleteTestDirectory(testDir);
 	}
 
-	private RemovableDriveMonitor createMonitor(File dir) {
+	private RemovableDriveMonitor createMonitor(final File dir) {
 		@NotNullByDefault
 		RemovableDriveMonitor monitor = new UnixRemovableDriveMonitor() {
 			@Override