Temporarily add self-built Windows tor binary

Until it's officially published by the Briar Project.

.gitlab-ci.yml

@@ -98,16 +98,16 @@ bridge test:
       allow_failure: true
   script:
     - OPTIONAL_TESTS=org.briarproject.bramble.plugin.tor.BridgeTest ./gradlew --info bramble-java:test --tests BridgeTest
-  timeout: 3h
 
 mailbox integration test:
   extends: .optional_tests
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: on_success
+      allow_failure: false
     - if: '$CI_COMMIT_TAG == null'
       when: manual
-      allow_failure: true # TODO figure out how not to allow failure while leaving this optional
+      allow_failure: false
   script:
     # start mailbox
     - cd /opt && git clone --depth 1 https://code.briarproject.org/briar/briar-mailbox.git briar-mailbox
@@ -123,6 +123,5 @@ pre_release_tests:
   extends: .optional_tests
   script:
     - OPTIONAL_TESTS=org.briarproject.bramble.plugin.tor.BridgeTest ./gradlew --info bramble-java:test --tests BridgeTest
-  timeout: 3h
   only:
     - tags

bramble-android/build.gradle

@@ -15,8 +15,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10408
+		versionCode 10404
-		versionName "1.4.8"
+		versionName "1.4.4"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -43,7 +43,7 @@ configurations {
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
 	tor "org.briarproject:tor-android:$tor_version"
-	tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version"
+	tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version@zip"
 
 	annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
 
@@ -70,6 +70,11 @@ clean.dependsOn cleanTorBinaries
 
 task unpackTorBinaries {
 	doLast {
+		copy {
+			from configurations.tor.collect { zipTree(it) }
+			into torBinariesDir
+			include 'geoip.zip'
+		}
 		configurations.tor.each { outer ->
 			zipTree(outer).each { inner ->
 				if (inner.name.endsWith('_arm_pie.zip')) {

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

@@ -11,10 +11,7 @@ import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 
-import org.briarproject.bramble.api.Cancellable;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventExecutor;
 import org.briarproject.bramble.api.lifecycle.Service;
@@ -24,6 +21,7 @@ import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;
@@ -40,7 +38,6 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.WIFI_SERVICE;
 import static android.content.Intent.ACTION_SCREEN_OFF;
 import static android.content.Intent.ACTION_SCREEN_ON;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
@@ -114,37 +111,15 @@ class AndroidNetworkManager implements NetworkManager, Service {
 
 	@Override
 	public NetworkStatus getNetworkStatus() {
-		// https://issuetracker.google.com/issues/175055271
+		NetworkInfo net = connectivityManager.getActiveNetworkInfo();
-		try {
+		boolean connected = net != null && net.isConnected();
-			NetworkInfo net = connectivityManager.getActiveNetworkInfo();
+		boolean wifi = false, ipv6Only = false;
-			boolean connected = net != null && net.isConnected();
+		if (connected) {
-			boolean wifi = false, ipv6Only = false;
+			wifi = net.getType() == TYPE_WIFI;
-			if (connected) {
+			if (SDK_INT >= 23) ipv6Only = isActiveNetworkIpv6Only();
-				wifi = net.getType() == TYPE_WIFI;
+			else ipv6Only = areAllAvailableNetworksIpv6Only();
-				if (SDK_INT >= 23) ipv6Only = isActiveNetworkIpv6Only();
-				else ipv6Only = areAllAvailableNetworksIpv6Only();
-			}
-			return new NetworkStatus(connected, wifi, ipv6Only);
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
-			// Without the ConnectivityManager we can't detect whether we have
-			// internet access. Assume we do, which is probably less harmful
-			// than assuming we don't. Likewise, assume the connection is
-			// IPv6-only. Fall back to the WifiManager to detect whether we
-			// have a wifi connection.
-			LOG.info("ConnectivityManager is broken, guessing connectivity");
-			boolean connected = true, wifi = false, ipv6Only = true;
-			WifiManager wm = (WifiManager) app.getSystemService(WIFI_SERVICE);
-			if (wm != null) {
-				WifiInfo info = wm.getConnectionInfo();
-				if (info != null && info.getIpAddress() != 0) {
-					LOG.info("Connected to wifi");
-					wifi = true;
-					ipv6Only = false;
-				}
-			}
-			return new NetworkStatus(connected, wifi, ipv6Only);
 		}
+		return new NetworkStatus(connected, wifi, ipv6Only);
 	}
 
 	/**
@@ -155,29 +130,23 @@ class AndroidNetworkManager implements NetworkManager, Service {
 	 */
 	@TargetApi(23)
 	private boolean isActiveNetworkIpv6Only() {
-		// https://issuetracker.google.com/issues/175055271
+		Network net = connectivityManager.getActiveNetwork();
-		try {
+		if (net == null) {
-			Network net = connectivityManager.getActiveNetwork();
+			LOG.info("No active network");
-			if (net == null) {
-				LOG.info("No active network");
-				return false;
-			}
-			LinkProperties props = connectivityManager.getLinkProperties(net);
-			if (props == null) {
-				LOG.info("No link properties for active network");
-				return false;
-			}
-			boolean hasIpv6Unicast = false;
-			for (LinkAddress linkAddress : props.getLinkAddresses()) {
-				InetAddress addr = linkAddress.getAddress();
-				if (addr instanceof Inet4Address) return false;
-				if (!addr.isMulticastAddress()) hasIpv6Unicast = true;
-			}
-			return hasIpv6Unicast;
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
 			return false;
 		}
+		LinkProperties props = connectivityManager.getLinkProperties(net);
+		if (props == null) {
+			LOG.info("No link properties for active network");
+			return false;
+		}
+		boolean hasIpv6Unicast = false;
+		for (LinkAddress linkAddress : props.getLinkAddresses()) {
+			InetAddress addr = linkAddress.getAddress();
+			if (addr instanceof Inet4Address) return false;
+			if (!addr.isMulticastAddress()) hasIpv6Unicast = true;
+		}
+		return hasIpv6Unicast;
 	}
 
 	/**

bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java

@@ -32,22 +32,13 @@ class AndroidRemovableDrivePlugin extends RemovableDrivePlugin {
 	InputStream openInputStream(TransportProperties p) throws IOException {
 		String uri = p.get(PROP_URI);
 		if (isNullOrEmpty(uri)) throw new IllegalArgumentException();
-		try {
+		return app.getContentResolver().openInputStream(Uri.parse(uri));
-			return app.getContentResolver().openInputStream(Uri.parse(uri));
-		} catch (SecurityException e) {
-			throw new IOException(e);
-		}
 	}
 
 	@Override
 	OutputStream openOutputStream(TransportProperties p) throws IOException {
 		String uri = p.get(PROP_URI);
 		if (isNullOrEmpty(uri)) throw new IllegalArgumentException();
-		try {
+		return app.getContentResolver().openOutputStream(Uri.parse(uri));
-			return app.getContentResolver()
-					.openOutputStream(Uri.parse(uri), "wt");
-		} catch (SecurityException e) {
-			throw new IOException(e);
-		}
 	}
 }

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

@@ -175,24 +175,16 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 	@TargetApi(21)
 	@Nullable
 	private InetAddress getWifiClientIpv6Address() {
-		// https://issuetracker.google.com/issues/175055271
+		for (Network net : connectivityManager.getAllNetworks()) {
-		try {
+			NetworkCapabilities caps =
-			for (Network net : connectivityManager.getAllNetworks()) {
+					connectivityManager.getNetworkCapabilities(net);
-				NetworkCapabilities caps =
+			if (caps == null || !caps.hasTransport(TRANSPORT_WIFI)) continue;
-						connectivityManager.getNetworkCapabilities(net);
+			LinkProperties props = connectivityManager.getLinkProperties(net);
-				if (caps == null || !caps.hasTransport(TRANSPORT_WIFI)) {
+			if (props == null) continue;
-					continue;
+			for (LinkAddress linkAddress : props.getLinkAddresses()) {
-				}
+				InetAddress addr = linkAddress.getAddress();
-				LinkProperties props =
+				if (isIpv6LinkLocalAddress(addr)) return addr;
-						connectivityManager.getLinkProperties(net);
-				if (props == null) continue;
-				for (LinkAddress linkAddress : props.getLinkAddresses()) {
-					InetAddress addr = linkAddress.getAddress();
-					if (isIpv6LinkLocalAddress(addr)) return addr;
-				}
 			}
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
 		}
 		return null;
 	}
@@ -235,17 +227,12 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 	// network's socket factory may try to connect via another network
 	private SocketFactory getSocketFactory() {
 		if (SDK_INT < 21) return SocketFactory.getDefault();
-		// https://issuetracker.google.com/issues/175055271
+		for (Network net : connectivityManager.getAllNetworks()) {
-		try {
+			NetworkCapabilities caps =
-			for (Network net : connectivityManager.getAllNetworks()) {
+					connectivityManager.getNetworkCapabilities(net);
-				NetworkCapabilities caps =
+			if (caps != null && caps.hasTransport(TRANSPORT_WIFI)) {
-						connectivityManager.getNetworkCapabilities(net);
+				return net.getSocketFactory();
-				if (caps != null && caps.hasTransport(TRANSPORT_WIFI)) {
-					return net.getSocketFactory();
-				}
 			}
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
 		}
 		LOG.warning("Could not find suitable socket factory");
 		return SocketFactory.getDefault();

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

@@ -11,35 +11,62 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.plugin.TorControlPort;
 import org.briarproject.bramble.api.plugin.TorDirectory;
 import org.briarproject.bramble.api.plugin.TorSocksPort;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.WakefulIoExecutor;
+import org.briarproject.bramble.util.AndroidUtils;
 
 import java.io.File;
 import java.util.concurrent.Executor;
+import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 import javax.net.SocketFactory;
 
-import static org.briarproject.bramble.util.AndroidUtils.getSupportedArchitectures;
-
 @Immutable
 @NotNullByDefault
-public class AndroidTorPluginFactory extends TorPluginFactory {
+public class AndroidTorPluginFactory implements DuplexPluginFactory {
 
+	private static final Logger LOG =
+			Logger.getLogger(AndroidTorPluginFactory.class.getName());
+
+	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
+	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
+	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
+	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
+	private static final double BACKOFF_BASE = 1.2;
+
+	private final Executor ioExecutor, wakefulIoExecutor;
 	private final Application app;
+	private final NetworkManager networkManager;
+	private final LocationUtils locationUtils;
+	private final EventBus eventBus;
+	private final SocketFactory torSocketFactory;
+	private final BackoffFactory backoffFactory;
+	private final ResourceProvider resourceProvider;
+	private final CircumventionProvider circumventionProvider;
+	private final BatteryManager batteryManager;
 	private final AndroidWakeLockManager wakeLockManager;
+	private final Clock clock;
+	private final File torDirectory;
+	private int torSocksPort;
+	private int torControlPort;
+	private final CryptoComponent crypto;
 
 	@Inject
 	AndroidTorPluginFactory(@IoExecutor Executor ioExecutor,
 			@WakefulIoExecutor Executor wakefulIoExecutor,
+			Application app,
 			NetworkManager networkManager,
 			LocationUtils locationUtils,
 			EventBus eventBus,
@@ -48,43 +75,80 @@ public class AndroidTorPluginFactory extends TorPluginFactory {
 			ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager,
+			AndroidWakeLockManager wakeLockManager,
 			Clock clock,
-			CryptoComponent crypto,
 			@TorDirectory File torDirectory,
 			@TorSocksPort int torSocksPort,
 			@TorControlPort int torControlPort,
-			Application app,
+			CryptoComponent crypto) {
-			AndroidWakeLockManager wakeLockManager) {
+		this.ioExecutor = ioExecutor;
-		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
+		this.wakefulIoExecutor = wakefulIoExecutor;
-				eventBus, torSocketFactory, backoffFactory, resourceProvider,
-				circumventionProvider, batteryManager, clock, crypto,
-				torDirectory, torSocksPort, torControlPort);
 		this.app = app;
+		this.networkManager = networkManager;
+		this.locationUtils = locationUtils;
+		this.eventBus = eventBus;
+		this.torSocketFactory = torSocketFactory;
+		this.backoffFactory = backoffFactory;
+		this.resourceProvider = resourceProvider;
+		this.circumventionProvider = circumventionProvider;
+		this.batteryManager = batteryManager;
 		this.wakeLockManager = wakeLockManager;
+		this.clock = clock;
+		this.torDirectory = torDirectory;
+		this.torSocksPort = torSocksPort;
+		this.torControlPort = torControlPort;
+		this.crypto = crypto;
 	}
 
-	@Nullable
 	@Override
-	String getArchitectureForTorBinary() {
+	public TransportId getId() {
-		for (String abi : getSupportedArchitectures()) {
+		return TorConstants.ID;
-			if (abi.startsWith("x86_64")) return "x86_64_pie";
+	}
-			else if (abi.startsWith("x86")) return "x86_pie";
+
-			else if (abi.startsWith("arm64")) return "arm64_pie";
+	@Override
-			else if (abi.startsWith("armeabi")) return "arm_pie";
+	public long getMaxLatency() {
+		return MAX_LATENCY;
+	}
+
+	@Override
+	public DuplexPlugin createPlugin(PluginCallback callback) {
+
+		// Check that we have a Tor binary for this architecture
+		String architecture = null;
+		for (String abi : AndroidUtils.getSupportedArchitectures()) {
+			if (abi.startsWith("x86_64")) {
+				architecture = "x86_64";
+				break;
+			} else if (abi.startsWith("x86")) {
+				architecture = "x86";
+				break;
+			} else if (abi.startsWith("arm64")) {
+				architecture = "arm64";
+				break;
+			} else if (abi.startsWith("armeabi")) {
+				architecture = "arm";
+				break;
+			}
 		}
-		return null;
+		if (architecture == null) {
-	}
+			LOG.info("Tor is not supported on this architecture");
+			return null;
+		}
+		// Use position-independent executable
+		architecture += "_pie";
 
-	@Override
+		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-	TorPlugin createPluginInstance(Backoff backoff,
+				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-			TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback,
+		TorRendezvousCrypto torRendezvousCrypto =
-			String architecture) {
+				new TorRendezvousCryptoImpl(crypto);
-		return new AndroidTorPlugin(ioExecutor,
+		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor,
 				wakefulIoExecutor, app, networkManager, locationUtils,
 				torSocketFactory, clock, resourceProvider,
 				circumventionProvider, batteryManager, wakeLockManager,
 				backoff, torRendezvousCrypto, callback, architecture,
 				MAX_LATENCY, MAX_IDLE_TIME, torDirectory, torSocksPort,
 				torControlPort);
+		eventBus.addListener(plugin);
+		return plugin;
 	}
 }

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

@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.os.Process;
 import android.os.SystemClock;
 
-import org.briarproject.bramble.api.Cancellable;
 import org.briarproject.bramble.api.lifecycle.Service;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.system.AlarmListener;
@@ -117,12 +116,10 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
 		long dueMillis = now + MILLISECONDS.convert(delay, unit);
 		Runnable wakeful = () ->
 				wakeLockManager.executeWakefully(task, executor, "TaskHandoff");
-		// Acquire the lock before scheduling the check to ensure the check
+		Future<?> check = scheduleCheckForDueTasks(delay, unit);
-		// doesn't access the task queue before the task has been added
+		ScheduledTask s = new ScheduledTask(wakeful, dueMillis, check,
-		ScheduledTask s;
+				cancelled);
 		synchronized (lock) {
-			Future<?> check = scheduleCheckForDueTasks(delay, unit);
-			s = new ScheduledTask(wakeful, dueMillis, check, cancelled);
 			tasks.add(s);
 		}
 		return s;
@@ -139,7 +136,6 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
 		return schedule(wrapped, executor, delay, unit, cancelled);
 	}
 
-	@GuardedBy("lock")
 	private Future<?> scheduleCheckForDueTasks(long delay, TimeUnit unit) {
 		Runnable wakeful = () -> wakeLockManager.runWakefully(
 				this::runDueTasks, "TaskScheduler");
@@ -210,7 +206,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
 		private final Future<?> check;
 		private final AtomicBoolean cancelled;
 
-		private ScheduledTask(Runnable task, long dueMillis,
+		public ScheduledTask(Runnable task, long dueMillis,
 				Future<?> check, AtomicBoolean cancelled) {
 			this.task = task;
 			this.dueMillis = dueMillis;

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.os.Build;
-import android.os.Looper;
 import android.provider.Settings;
 
 import org.briarproject.bramble.api.Pair;
@@ -135,8 +134,4 @@ public class AndroidUtils {
 			return null;
 		}
 	}
-
-	public static boolean isUiThread() {
-		return Looper.myLooper() == Looper.getMainLooper();
-	}
 }

bramble-android/witness.gradle

@@ -87,8 +87,8 @@ dependencyVerification {
         'org.apache.httpcomponents:httpmime:4.5.6:httpmime-4.5.6.jar:0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e',
         'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
-        'org.briarproject:obfs4proxy-android:0.0.12:obfs4proxy-android-0.0.12.jar:84159d2a4668abc40e3fccaa1f6fa0c04892863f9eb80a866ac8928d9f9a7e89',
+        'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a:obfs4proxy-android-0.0.12-dev-40245c4a.zip:8ab05a8f8391be2cb5ab2b665c281a06d9e3a756bd0f95a40a36ca927866ea82',
-        'org.briarproject:tor-android:0.4.5.12-2:tor-android-0.4.5.12-2.jar:8545dbcef2bb6aa89c32bb6f8ac51f7a64bce3ae85845b3578ffdeb9b206feb9',
+        'org.briarproject:tor-android:0.3.5.17:tor-android-0.3.5.17.jar:1888afc10a26b93d00a010ea27bf0b1b162a6d524688b08b98d70d14dc363b54',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
         'org.checkerframework:checker-qual:3.5.0:checker-qual-3.5.0.jar:729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4',

bramble-api/build.gradle

@@ -9,7 +9,6 @@ apply from: 'witness.gradle'
 dependencies {
 	implementation "com.google.dagger:dagger:$dagger_version"
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
-	implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
 
 	testImplementation "junit:junit:$junit_version"
 	testImplementation "org.jmock:jmock:$jmock_version"

bramble-api/src/main/java/org/briarproject/bramble/api/Cancellable.java

@@ -1,6 +0,0 @@
-package org.briarproject.bramble.api;
-
-public interface Cancellable {
-
-	void cancel();
-}

bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java

@@ -11,8 +11,6 @@ public interface FeatureFlags {
 
 	boolean shouldEnableDisappearingMessages();
 
-	boolean shouldEnableMailbox();
-
 	boolean shouldEnablePrivateGroupsInCore();
 
 	boolean shouldEnableForumsInCore();

bramble-api/src/main/java/org/briarproject/bramble/api/StringMap.java

@@ -1,14 +1,8 @@
 package org.briarproject.bramble.api;
 
-import org.briarproject.bramble.util.StringUtils;
-
-import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public abstract class StringMap extends Hashtable<String, String> {
 
 	protected StringMap(Map<String, String> m) {
@@ -58,31 +52,4 @@ public abstract class StringMap extends Hashtable<String, String> {
 	public void putLong(String key, long value) {
 		put(key, String.valueOf(value));
 	}
-
-	@Nullable
-	public int[] getIntArray(String key) {
-		String s = get(key);
-		if (s == null) return null;
-		// Handle empty string because "".split(",") returns {""}
-		if (s.length() == 0) return new int[0];
-		String[] intStrings = s.split(",");
-		int[] ints = new int[intStrings.length];
-		try {
-			for (int i = 0; i < ints.length; i++) {
-				ints[i] = Integer.parseInt(intStrings[i]);
-			}
-		} catch (NumberFormatException e) {
-			return null;
-		}
-		return ints;
-	}
-
-	public void putIntArray(String key, int[] value) {
-		List<String> intStrings = new ArrayList<>();
-		for (int integer : value) {
-			intStrings.add(String.valueOf(integer));
-		}
-		// Puts empty string if input array value is empty
-		put(key, StringUtils.join(intStrings, ","));
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java

@@ -6,14 +6,14 @@ import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
 @NotNullByDefault
-public class UniqueId extends Bytes {
+public abstract class UniqueId extends Bytes {
 
 	/**
 	 * The length of a unique identifier in bytes.
 	 */
 	public static final int LENGTH = 32;
 
-	public UniqueId(byte[] id) {
+	protected UniqueId(byte[] id) {
 		super(id);
 		if (id.length != LENGTH) throw new IllegalArgumentException();
 	}

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

@@ -9,8 +9,6 @@ import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.mailbox.MailboxUpdate;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
@@ -20,7 +18,6 @@ import org.briarproject.bramble.api.sync.MessageId;
 
 import java.security.GeneralSecurityException;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 @NotNullByDefault
@@ -126,19 +123,6 @@ public interface ClientHelper {
 	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
 			BdfDictionary properties) throws FormatException;
 
-	/**
-	 * Parse and validate the elements of a Mailbox update message.
-	 *
-	 * @return the parsed update message
-	 * @throws FormatException if the message elements are invalid
-	 */
-	MailboxUpdate parseAndValidateMailboxUpdate(BdfList clientSupports,
-			BdfList serverSupports, BdfDictionary properties)
-			throws FormatException;
-
-	List<MailboxVersion> parseMailboxVersionList(BdfList bdfList)
-			throws FormatException;
-
 	/**
 	 * Retrieves the contact ID from the group metadata of the given contact
 	 * group.

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java

@@ -178,12 +178,6 @@ public interface ContactManager {
 	 */
 	void removePendingContact(PendingContactId p) throws DbException;
 
-	/**
-	 * Removes a {@link PendingContact}.
-	 */
-	void removePendingContact(Transaction txn, PendingContactId p)
-			throws DbException;
-
 	/**
 	 * Returns the contact with the given ID.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java

@@ -3,6 +3,7 @@ package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -16,4 +17,9 @@ public class PendingContactId extends UniqueId {
 	public PendingContactId(byte[] id) {
 		super(id);
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+		return o instanceof PendingContactId && super.equals(o);
+	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.api.crypto;
 
-import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.security.GeneralSecurityException;
@@ -11,8 +10,6 @@ import javax.annotation.Nullable;
 @NotNullByDefault
 public interface CryptoComponent {
 
-	UniqueId generateUniqueId();
-
 	SecretKey generateSecretKey();
 
 	SecureRandom getSecureRandom();
@@ -175,11 +172,9 @@ public interface CryptoComponent {
 	String asciiArmour(byte[] b, int lineLength);
 
 	/**
-	 * Encode the Onion given its public key. Specified here:
+	 * Encode the onion/hidden service address given its public key. As
-	 * https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt?id=29245fd5#n2135
+	 * specified here: https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt?id=29245fd5#n2135
-	 *
-	 * @return the encoded onion, base32 chars
 	 */
-	String encodeOnion(byte[] publicKey);
+	String encodeOnionAddress(byte[] publicKey);
 
 }

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

@@ -33,18 +33,11 @@ import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
 
 /**
  * Encapsulates the database implementation and exposes high-level operations
  * to other components.
- * <p>
- * With the exception of the {@link #open(SecretKey, MigrationListener)} and
- * {@link #close()} methods, which must not be called concurrently, the
- * database can be accessed from any thread. See {@link TransactionManager}
- * for locking behaviour.
  */
-@ThreadSafe
 @NotNullByDefault
 public interface DatabaseComponent extends TransactionManager {
 
@@ -200,15 +193,26 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 
 	/**
-	 * Returns a batch of messages for the given contact, for transmission over
+	 * Returns a batch of messages for the given contact, with a total length
-	 * a transport with the given maximum latency. The total length of the
+	 * less than or equal to the given length, for transmission over a
-	 * messages, including record headers, will be no more than the given
+	 * transport with the given maximum latency. Returns null if there are no
-	 * capacity. Returns null if there are no sendable messages that would fit
+	 * sendable messages that fit in the given length.
-	 * in the given capacity.
 	 */
 	@Nullable
 	Collection<Message> generateBatch(Transaction txn, ContactId c,
-			long capacity, long maxLatency) throws DbException;
+			int maxLength, long maxLatency) throws DbException;
+
+	/**
+	 * Returns a batch of messages for the given contact containing the
+	 * messages with the given IDs, for transmission over a transport with
+	 * the given maximum latency.
+	 * <p/>
+	 * If any of the given messages are not in the database or are not visible
+	 * to the contact, they are omitted from the batch without throwing an
+	 * exception.
+	 */
+	Collection<Message> generateBatch(Transaction txn, ContactId c,
+			Collection<MessageId> ids, long maxLatency) throws DbException;
 
 	/**
 	 * Returns an offer for the given contact for transmission over a
@@ -228,16 +232,15 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 
 	/**
-	 * Returns a batch of messages for the given contact, for transmission over
+	 * Returns a batch of messages for the given contact, with a total length
-	 * a transport with the given maximum latency. Only messages that have been
+	 * less than or equal to the given length, for transmission over a
-	 * requested by the contact are returned. The total length of the messages,
+	 * transport with the given maximum latency. Only messages that have been
-	 * including record headers, will be no more than the given capacity.
+	 * requested by the contact are returned. Returns null if there are no
-	 * Returns null if there are no sendable messages that have been requested
+	 * sendable messages that fit in the given length.
-	 * by the contact and would fit in the given capacity.
 	 */
 	@Nullable
 	Collection<Message> generateRequestedBatch(Transaction txn, ContactId c,
-			long capacity, long maxLatency) throws DbException;
+			int maxLength, long maxLatency) throws DbException;
 
 	/**
 	 * Returns the contact with the given ID.
@@ -341,30 +344,6 @@ public interface DatabaseComponent extends TransactionManager {
 	Collection<MessageId> getMessageIds(Transaction txn, GroupId g,
 			Metadata query) throws DbException;
 
-	/**
-	 * Returns the IDs of some messages received from the given contact that
-	 * need to be acknowledged, up to the given number of messages.
-	 * <p/>
-	 * Read-only.
-	 */
-	Collection<MessageId> getMessagesToAck(Transaction txn, ContactId c,
-			int maxMessages) throws DbException;
-
-	/**
-	 * Returns the IDs of some messages that are eligible to be sent to the
-	 * given contact over a transport with the given maximum latency. The total
-	 * length of the messages including record headers will be no more than the
-	 * given capacity.
-	 * <p/>
-	 * Unlike {@link #getUnackedMessagesToSend(Transaction, ContactId)} this
-	 * method does not return messages that have already been sent unless they
-	 * are due for retransmission.
-	 * <p/>
-	 * Read-only.
-	 */
-	Collection<MessageId> getMessagesToSend(Transaction txn, ContactId c,
-			long capacity, long maxLatency) throws DbException;
-
 	/**
 	 * Returns the IDs of any messages that need to be validated.
 	 * <p/>
@@ -481,36 +460,21 @@ public interface DatabaseComponent extends TransactionManager {
 	MessageStatus getMessageStatus(Transaction txn, ContactId c, MessageId m)
 			throws DbException;
 
-	/**
-	 * Returns the message with the given ID for transmission to the given
-	 * contact over a transport with the given maximum latency. Returns null
-	 * if the message is no longer visible to the contact.
-	 *
-	 * @param markAsSent True if the message should be marked as sent.
-	 * If false it can be marked as sent by calling
-	 * {@link #setMessagesSent(Transaction, ContactId, Collection, long)}.
-	 */
-	@Nullable
-	Message getMessageToSend(Transaction txn, ContactId c, MessageId m,
-			long maxLatency, boolean markAsSent) throws DbException;
-
 	/**
 	 * Returns the IDs of all messages that are eligible to be sent to the
-	 * given contact.
+	 * given contact, together with their raw lengths. This may include
-	 * <p>
+	 * messages that have already been sent and are not yet due for
-	 * Unlike {@link #getMessagesToSend(Transaction, ContactId, long, long)}
+	 * retransmission.
-	 * this method may return messages that have already been sent and are
-	 * not yet due for retransmission.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getUnackedMessagesToSend(Transaction txn,
+	Map<MessageId, Integer> getUnackedMessagesToSend(Transaction txn,
 			ContactId c) throws DbException;
 
 	/**
-	 * Resets the transmission count, expiry time and max latency of all messages
+	 * Reset the transmission count, expiry time and ETA of all messages that
-	 * that are eligible to be sent to the given contact. This includes messages
+	 * are eligible to be sent to the given contact. This includes messages that
-	 * that have already been sent and are not yet due for retransmission.
+	 * have already been sent and are not yet due for retransmission.
 	 */
 	void resetUnackedMessagesToSend(Transaction txn, ContactId c)
 			throws DbException;
@@ -684,13 +648,6 @@ public interface DatabaseComponent extends TransactionManager {
 	void removeTransportKeys(Transaction txn, TransportId t, KeySetId k)
 			throws DbException;
 
-	/**
-	 * Records an ack for the given messages as having been sent to the given
-	 * contact.
-	 */
-	void setAckSent(Transaction txn, ContactId c, Collection<MessageId> acked)
-			throws DbException;
-
 	/**
 	 * Sets the cleanup timer duration for the given message. This does not
 	 * start the message's cleanup timer.
@@ -737,13 +694,6 @@ public interface DatabaseComponent extends TransactionManager {
 	void setMessageState(Transaction txn, MessageId m, MessageState state)
 			throws DbException;
 
-	/**
-	 * Records the given messages as having been sent to the given contact
-	 * over a transport with the given maximum latency.
-	 */
-	void setMessagesSent(Transaction txn, ContactId c,
-			Collection<MessageId> sent, long maxLatency) throws DbException;
-
 	/**
 	 * Adds dependencies for a message
 	 */

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

@@ -18,10 +18,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  * submitted, tasks are not run concurrently, and submitting a task will never
  * block. Tasks must not run indefinitely. Tasks submitted during shutdown are
  * discarded.
- * <p>
- * It is not mandatory to use this executor for database tasks. The database
- * can be accessed from any thread, but this executor's guarantee that tasks
- * are run in the order they're submitted may be useful in some cases.
  */
 @Qualifier
 @Target({FIELD, METHOD, PARAMETER})

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

@@ -45,9 +45,6 @@ public class Transaction {
 	/**
 	 * Attaches an event to be broadcast when the transaction has been
 	 * committed. The event will be broadcast on the {@link EventExecutor}.
-	 * Events and {@link #attach(Runnable) tasks} are submitted to the
-	 * {@link EventExecutor} in the order they were attached to the
-	 * transaction.
 	 */
 	public void attach(Event e) {
 		if (actions == null) actions = new ArrayList<>();
@@ -57,9 +54,6 @@ public class Transaction {
 	/**
 	 * Attaches a task to be executed when the transaction has been
 	 * committed. The task will be run on the {@link EventExecutor}.
-	 * {@link #attach(Event) Events} and tasks are submitted to the
-	 * {@link EventExecutor} in the order they were attached to the
-	 * transaction.
 	 */
 	public void attach(Runnable r) {
 		if (actions == null) actions = new ArrayList<>();

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

@@ -1,95 +1,51 @@
 package org.briarproject.bramble.api.db;
 
-import org.briarproject.bramble.api.event.EventExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
 
-/**
- * An interface for managing database transactions.
- * <p>
- * Read-only transactions may access the database concurrently. Read-write
- * transactions access the database exclusively, so starting a read-only or
- * read-write transaction will block until there are no read-write
- * transactions in progress.
- * <p>
- * Failing to {@link #endTransaction(Transaction) end} a transaction will
- * prevent other callers from accessing the database, so it is recommended to
- * use the {@link #transaction(boolean, DbRunnable)},
- * {@link #transactionWithResult(boolean, DbCallable)} and
- * {@link #transactionWithNullableResult(boolean, NullableDbCallable)} methods
- * where possible, which handle committing or aborting the transaction on the
- * caller's behalf.
- * <p>
- * Transactions are not reentrant, i.e. it is not permitted to start a
- * transaction on a thread that already has a transaction in progress.
- */
-@ThreadSafe
 @NotNullByDefault
 public interface TransactionManager {
 
 	/**
-	 * Starts a new transaction and returns an object representing it. This
+	 * Starts a new transaction and returns an object representing it.
-	 * method acquires the database lock, which is held until
+	 * <p/>
-	 * {@link #endTransaction(Transaction)} is called.
+	 * This method acquires locks, so it must not be called while holding a
+	 * lock.
 	 *
-	 * @param readOnly True if the transaction will only be used for reading,
+	 * @param readOnly true if the transaction will only be used for reading.
-	 * in which case the database lock can be shared with other read-only
-	 * transactions.
 	 */
 	Transaction startTransaction(boolean readOnly) throws DbException;
 
 	/**
 	 * Commits a transaction to the database.
-	 * {@link #endTransaction(Transaction)} must be called to release the
-	 * database lock.
 	 */
 	void commitTransaction(Transaction txn) throws DbException;
 
 	/**
-	 * Ends a transaction. If the transaction has not been committed by
+	 * Ends a transaction. If the transaction has not been committed,
-	 * calling {@link #commitTransaction(Transaction)}, it is aborted and the
+	 * it will be aborted. If the transaction has been committed,
-	 * database lock is released.
+	 * any events attached to the transaction are broadcast.
-	 * <p>
+	 * The database lock will be released in either case.
-	 * If the transaction has been committed, any
-	 * {@link Transaction#attach events} attached to the transaction are
-	 * broadcast and any {@link Transaction#attach(Runnable) tasks} attached
-	 * to the transaction are submitted to the {@link EventExecutor}. The
-	 * database lock is then released.
 	 */
 	void endTransaction(Transaction txn);
 
 	/**
-	 * Runs the given task within a transaction. The database lock is held
+	 * Runs the given task within a transaction.
-	 * while running the task.
-	 *
-	 * @param readOnly True if the transaction will only be used for reading,
-	 * in which case the database lock can be shared with other read-only
-	 * transactions.
 	 */
 	<E extends Exception> void transaction(boolean readOnly,
 			DbRunnable<E> task) throws DbException, E;
 
 	/**
 	 * Runs the given task within a transaction and returns the result of the
-	 * task. The database lock is held while running the task.
+	 * task.
-	 *
-	 * @param readOnly True if the transaction will only be used for reading,
-	 * in which case the database lock can be shared with other read-only
-	 * transactions.
 	 */
 	<R, E extends Exception> R transactionWithResult(boolean readOnly,
 			DbCallable<R, E> task) throws DbException, E;
 
 	/**
 	 * Runs the given task within a transaction and returns the result of the
-	 * task, which may be null. The database lock is held while running the
+	 * task, which may be null.
-	 * task.
-	 *
-	 * @param readOnly True if the transaction will only be used for reading,
-	 * in which case the database lock can be shared with other read-only
-	 * transactions.
 	 */
 	@Nullable
 	<R, E extends Exception> R transactionWithNullableResult(boolean readOnly,

bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java

@@ -21,4 +21,9 @@ public class AuthorId extends UniqueId {
 	public AuthorId(byte[] id) {
 		super(id);
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		return o instanceof AuthorId && super.equals(o);
+	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/InvalidMailboxIdException.java

@@ -1,8 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public class InvalidMailboxIdException extends Exception {
-
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxAuthToken.java

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-public class MailboxAuthToken extends MailboxId {
-	public MailboxAuthToken(byte[] id) {
-		super(id);
-	}
-
-	/**
-	 * Creates a {@link MailboxAuthToken} from the given string.
-	 *
-	 * @throws InvalidMailboxIdException if token is not valid.
-	 */
-	public static MailboxAuthToken fromString(@Nullable String token)
-			throws InvalidMailboxIdException {
-		return new MailboxAuthToken(bytesFromString(token));
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxConstants.java

@@ -1,37 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import static java.util.concurrent.TimeUnit.HOURS;
-import static org.briarproject.bramble.api.transport.TransportConstants.MAX_FRAME_LENGTH;
-import static org.briarproject.bramble.api.transport.TransportConstants.MAX_PAYLOAD_LENGTH;
-import static org.briarproject.bramble.api.transport.TransportConstants.STREAM_HEADER_LENGTH;
-import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
-
-public interface MailboxConstants {
-
-	/**
-	 * The maximum length of a file that can be uploaded to or downloaded from
-	 * a mailbox.
-	 */
-	int MAX_FILE_BYTES = 1024 * 1024;
-
-	/**
-	 * The maximum length of the plaintext payload of a file, such that the
-	 * ciphertext is no more than {@link #MAX_FILE_BYTES}.
-	 */
-	int MAX_FILE_PAYLOAD_BYTES =
-			(MAX_FILE_BYTES - TAG_LENGTH - STREAM_HEADER_LENGTH)
-					/ MAX_FRAME_LENGTH * MAX_PAYLOAD_LENGTH;
-
-	/**
-	 * The number of connection failures
-	 * that indicate a problem with the mailbox.
-	 */
-	int PROBLEM_NUM_CONNECTION_FAILURES = 5;
-
-	/**
-	 * The time in milliseconds since the last connection success
-	 * that need to pass to indicates a problem with the mailbox.
-	 */
-	long PROBLEM_MS_SINCE_LAST_SUCCESS = HOURS.toMillis(1);
-
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFileId.java

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-public class MailboxFileId extends MailboxId {
-	public MailboxFileId(byte[] id) {
-		super(id);
-	}
-
-	/**
-	 * Creates a {@link MailboxFileId} from the given string.
-	 *
-	 * @throws IllegalArgumentException if token is not valid.
-	 */
-	public static MailboxFileId fromString(@Nullable String token)
-			throws InvalidMailboxIdException {
-		return new MailboxFileId(bytesFromString(token));
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxFolderId.java

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-public class MailboxFolderId extends MailboxId {
-	public MailboxFolderId(byte[] id) {
-		super(id);
-	}
-
-	/**
-	 * Creates a {@link MailboxFolderId} from the given string.
-	 *
-	 * @throws IllegalArgumentException if token is not valid.
-	 */
-	public static MailboxFolderId fromString(@Nullable String token)
-			throws InvalidMailboxIdException {
-		return new MailboxFolderId(bytesFromString(token));
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxId.java

@@ -1,49 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-
-import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Locale;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static org.briarproject.bramble.util.StringUtils.fromHexString;
-import static org.briarproject.bramble.util.StringUtils.toHexString;
-
-@ThreadSafe
-@NotNullByDefault
-public abstract class MailboxId extends UniqueId {
-	MailboxId(byte[] id) {
-		super(id);
-	}
-
-	/**
-	 * Returns valid {@link MailboxId} bytes from the given string.
-	 *
-	 * @throws InvalidMailboxIdException if token is not valid.
-	 */
-	static byte[] bytesFromString(@Nullable String token)
-			throws InvalidMailboxIdException {
-		if (token == null || token.length() != 64) {
-			throw new InvalidMailboxIdException();
-		}
-		try {
-			return fromHexString(token);
-		} catch (IllegalArgumentException e) {
-			throw new InvalidMailboxIdException();
-		}
-	}
-
-	/**
-	 * Returns the string representation expected by the mailbox API.
-	 * Also used for serialization.
-	 */
-	@Override
-	@JsonValue
-	public String toString() {
-		return toHexString(getBytes()).toLowerCase(Locale.US);
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxManager.java

@@ -1,56 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent;
-
-import javax.annotation.Nullable;
-
-public interface MailboxManager {
-
-	/**
-	 * @return true if a mailbox is already paired.
-	 */
-	boolean isPaired(Transaction txn) throws DbException;
-
-	/**
-	 * @return the current status of the mailbox.
-	 */
-	MailboxStatus getMailboxStatus(Transaction txn) throws DbException;
-
-	/**
-	 * Returns the currently running pairing task,
-	 * or null if no pairing task is running.
-	 */
-	@Nullable
-	MailboxPairingTask getCurrentPairingTask();
-
-	/**
-	 * Starts and returns a pairing task. If a pairing task is already running,
-	 * it will be returned and the argument will be ignored.
-	 *
-	 * @param qrCodePayload The ISO-8859-1 encoded bytes of the mailbox QR code.
-	 */
-	MailboxPairingTask startPairingTask(String qrCodePayload);
-
-	/**
-	 * Can be used by the UI to test the mailbox connection.
-	 *
-	 * @return true (success) or false (error).
-	 * A {@link OwnMailboxConnectionStatusEvent} might be broadcast with a new
-	 * {@link MailboxStatus}.
-	 */
-	boolean checkConnection();
-
-	/**
-	 * Unpairs the owner's mailbox and tries to wipe it.
-	 * As this makes a network call, it should be run on the {@link IoExecutor}.
-	 *
-	 * @return true if we could wipe the mailbox, false if we couldn't.
-	 * It is advised to inform the user to wipe the mailbox themselves,
-	 * if we failed to wipe it.
-	 */
-	@IoExecutor
-	boolean unPair() throws DbException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPairingState.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-public abstract class MailboxPairingState {
-
-	public static class QrCodeReceived extends MailboxPairingState {
-	}
-
-	public static class Pairing extends MailboxPairingState {
-	}
-
-	public static class Paired extends MailboxPairingState {
-	}
-
-	public static class InvalidQrCode extends MailboxPairingState {
-	}
-
-	public static class MailboxAlreadyPaired extends MailboxPairingState {
-	}
-
-	public static class ConnectionError extends MailboxPairingState {
-	}
-
-	public static class UnexpectedError extends MailboxPairingState {
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxPairingTask.java

@@ -1,21 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.Consumer;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface MailboxPairingTask extends Runnable {
-
-	/**
-	 * Adds an observer to the task. The observer will be notified on the
-	 * event thread of the current state of the task and any subsequent state
-	 * changes.
-	 */
-	void addObserver(Consumer<MailboxPairingState> observer);
-
-	/**
-	 * Removes an observer from the task.
-	 */
-	void removeObserver(Consumer<MailboxPairingState> observer);
-
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java

@@ -2,79 +2,31 @@ package org.briarproject.bramble.api.mailbox;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import java.util.List;
-
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
 @NotNullByDefault
 public class MailboxProperties {
 
-	private final String baseUrl;
+	private final String onionAddress, authToken;
-	private final MailboxAuthToken authToken;
 	private final boolean owner;
-	private final List<MailboxVersion> serverSupports;
-	@Nullable
-	private final MailboxFolderId inboxId; // Null for own mailbox
-	@Nullable
-	private final MailboxFolderId outboxId; // Null for own mailbox
 
-	/**
+	public MailboxProperties(String onionAddress, String authToken,
-	 * Constructor for properties used by the mailbox's owner.
+			boolean owner) {
-	 */
+		this.onionAddress = onionAddress;
-	public MailboxProperties(String baseUrl, MailboxAuthToken authToken,
-			List<MailboxVersion> serverSupports) {
-		this.baseUrl = baseUrl;
 		this.authToken = authToken;
-		this.owner = true;
+		this.owner = owner;
-		this.serverSupports = serverSupports;
-		this.inboxId = null;
-		this.outboxId = null;
 	}
 
-	/**
+	public String getOnionAddress() {
-	 * Constructor for properties used by a contact of the mailbox's owner.
+		return onionAddress;
-	 */
-	public MailboxProperties(String baseUrl, MailboxAuthToken authToken,
-			List<MailboxVersion> serverSupports, MailboxFolderId inboxId,
-			MailboxFolderId outboxId) {
-		this.baseUrl = baseUrl;
-		this.authToken = authToken;
-		this.owner = false;
-		this.serverSupports = serverSupports;
-		this.inboxId = inboxId;
-		this.outboxId = outboxId;
 	}
 
-	public String getBaseUrl() {
+	public String getAuthToken() {
-		return baseUrl;
-	}
-
-	public String getOnion() {
-		return baseUrl.replaceFirst("^http://", "")
-				.replaceFirst("\\.onion$", "");
-	}
-
-	public MailboxAuthToken getAuthToken() {
 		return authToken;
 	}
 
 	public boolean isOwner() {
 		return owner;
 	}
-
-	public List<MailboxVersion> getServerSupports() {
-		return serverSupports;
-	}
-
-	@Nullable
-	public MailboxFolderId getInboxId() {
-		return inboxId;
-	}
-
-	@Nullable
-	public MailboxFolderId getOutboxId() {
-		return outboxId;
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java

@@ -1,26 +1,15 @@
 package org.briarproject.bramble.api.mailbox;
 
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import java.util.List;
-
 import javax.annotation.Nullable;
 
 @NotNullByDefault
 public interface MailboxSettingsManager {
 
-	/**
-	 * Registers a hook to be called when a mailbox has been paired or unpaired.
-	 * This method should be called before
-	 * {@link LifecycleManager#startServices(SecretKey)}.
-	 */
-	void registerMailboxHook(MailboxHook hook);
-
 	@Nullable
 	MailboxProperties getOwnMailboxProperties(Transaction txn)
 			throws DbException;
@@ -28,8 +17,6 @@ public interface MailboxSettingsManager {
 	void setOwnMailboxProperties(Transaction txn, MailboxProperties p)
 			throws DbException;
 
-	void removeOwnMailboxProperties(Transaction txn) throws DbException;
-
 	MailboxStatus getOwnMailboxStatus(Transaction txn) throws DbException;
 
 	void recordSuccessfulConnection(Transaction txn, long now)
@@ -43,23 +30,4 @@ public interface MailboxSettingsManager {
 
 	@Nullable
 	String getPendingUpload(Transaction txn, ContactId id) throws DbException;
-
-	interface MailboxHook {
-		/**
-		 * Called when Briar is paired with a mailbox
-		 *
-		 * @param txn A read-write transaction
-		 * @param ownOnion Our new mailbox's onion (56 base32 chars)
-		 */
-		void mailboxPaired(Transaction txn, String ownOnion,
-				List<MailboxVersion> serverSupports)
-				throws DbException;
-
-		/**
-		 * Called when the mailbox is unpaired
-		 *
-		 * @param txn A read-write transaction
-		 */
-		void mailboxUnpaired(Transaction txn) throws DbException;
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxStatus.java

@@ -4,9 +4,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.Immutable;
 
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.PROBLEM_MS_SINCE_LAST_SUCCESS;
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.PROBLEM_NUM_CONNECTION_FAILURES;
-
 @Immutable
 @NotNullByDefault
 public class MailboxStatus {
@@ -59,12 +56,4 @@ public class MailboxStatus {
 	public int getAttemptsSinceSuccess() {
 		return attemptsSinceSuccess;
 	}
-
-	/**
-	 * @return true if this status indicates a problem with the mailbox.
-	 */
-	public boolean hasProblem(long now) {
-		return attemptsSinceSuccess >= PROBLEM_NUM_CONNECTION_FAILURES &&
-				(now - lastSuccess) >= PROBLEM_MS_SINCE_LAST_SUCCESS;
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdate.java

@@ -1,31 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class MailboxUpdate {
-	private final boolean hasMailbox;
-	private final List<MailboxVersion> clientSupports;
-
-	public MailboxUpdate(List<MailboxVersion> clientSupports) {
-		this(clientSupports, false);
-	}
-
-	MailboxUpdate(List<MailboxVersion> clientSupports, boolean hasMailbox) {
-		this.clientSupports = clientSupports;
-		this.hasMailbox = hasMailbox;
-	}
-
-	public List<MailboxVersion> getClientSupports() {
-		return clientSupports;
-	}
-
-	public boolean hasMailbox() {
-		return hasMailbox;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateManager.java

@@ -1,72 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.ClientId;
-
-import javax.annotation.Nullable;
-
-@NotNullByDefault
-public interface MailboxUpdateManager {
-
-	/**
-	 * The unique ID of the mailbox update (properties) client.
-	 */
-	ClientId CLIENT_ID =
-			new ClientId("org.briarproject.bramble.mailbox.properties");
-
-	/**
-	 * The current major version of the mailbox update (properties) client.
-	 */
-	int MAJOR_VERSION = 2;
-
-	/**
-	 * The current minor version of the mailbox update (properties) client.
-	 */
-	int MINOR_VERSION = 0;
-
-	/**
-	 * The number of properties required for an update message with a mailbox.
-	 */
-	int PROP_COUNT = 4;
-
-	/**
-	 * The required properties of an update message with a mailbox.
-	 */
-	String PROP_KEY_ONION = "onion";
-	String PROP_KEY_AUTHTOKEN = "authToken";
-	String PROP_KEY_INBOXID = "inboxId";
-	String PROP_KEY_OUTBOXID = "outboxId";
-
-	/**
-	 * Length of the Onion property.
-	 */
-	int PROP_ONION_LENGTH = 56;
-
-	/**
-	 * Message metadata key for the version number of a local or remote update,
-	 * as a BDF long.
-	 */
-	String MSG_KEY_VERSION = "version";
-
-	/**
-	 * Message metadata key for whether an update is local or remote, as a BDF
-	 * boolean.
-	 */
-	String MSG_KEY_LOCAL = "local";
-
-	/**
-	 * Key in the client's local group for storing the clientSupports list that
-	 * was last sent out.
-	 */
-	String GROUP_KEY_SENT_CLIENT_SUPPORTS = "sentClientSupports";
-
-	MailboxUpdate getLocalUpdate(Transaction txn, ContactId c)
-			throws DbException;
-
-	@Nullable
-	MailboxUpdate getRemoteUpdate(Transaction txn, ContactId c)
-			throws DbException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateWithMailbox.java

@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class MailboxUpdateWithMailbox extends MailboxUpdate {
-
-	private final MailboxProperties properties;
-
-	public MailboxUpdateWithMailbox(List<MailboxVersion> clientSupports,
-			MailboxProperties properties) {
-		super(clientSupports, true);
-		if (properties.isOwner()) throw new IllegalArgumentException();
-		this.properties = properties;
-	}
-
-	public MailboxUpdateWithMailbox(MailboxUpdateWithMailbox o,
-			List<MailboxVersion> newClientSupports) {
-		this(newClientSupports, o.getMailboxProperties());
-	}
-
-	public MailboxProperties getMailboxProperties() {
-		return properties;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxVersion.java

@@ -1,44 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class MailboxVersion implements Comparable<MailboxVersion> {
-
-	private final int major;
-	private final int minor;
-
-	public MailboxVersion(int major, int minor) {
-		this.major = major;
-		this.minor = minor;
-	}
-
-	public int getMajor() {
-		return major;
-	}
-
-	public int getMinor() {
-		return minor;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof MailboxVersion) {
-			MailboxVersion v = (MailboxVersion) o;
-			return major == v.major && minor == v.minor;
-		}
-		return false;
-	}
-
-	@Override
-	public int compareTo(MailboxVersion v) {
-		int c = major - v.major;
-		if (c != 0) {
-			return c;
-		}
-		return minor - v.minor;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/MailboxProblemEvent.java

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.mailbox.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast by {@link MailboxSettingsManager} when
- * recording a connection failure for own Mailbox
- * that has persistent for long enough for the mailbox owner to become active
- * and fix the problem with the mailbox.
- */
-@Immutable
-@NotNullByDefault
-public class MailboxProblemEvent extends Event {
-
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/OwnMailboxConnectionStatusEvent.java

@@ -1,27 +0,0 @@
-package org.briarproject.bramble.api.mailbox.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.mailbox.MailboxStatus;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast by {@link MailboxSettingsManager} when
- * recording the connection status of own Mailbox.
- */
-@Immutable
-@NotNullByDefault
-public class OwnMailboxConnectionStatusEvent extends Event {
-
-	private final MailboxStatus status;
-
-	public OwnMailboxConnectionStatusEvent(MailboxStatus status) {
-		this.status = status;
-	}
-
-	public MailboxStatus getStatus() {
-		return status;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/event/RemoteMailboxUpdateEvent.java

@@ -1,34 +0,0 @@
-package org.briarproject.bramble.api.mailbox.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.mailbox.MailboxUpdate;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when {@link MailboxUpdate} are received
- * from a contact.
- */
-@Immutable
-@NotNullByDefault
-public class RemoteMailboxUpdateEvent extends Event {
-
-	private final ContactId contactId;
-	private final MailboxUpdate mailboxUpdate;
-
-	public RemoteMailboxUpdateEvent(ContactId contactId,
-			MailboxUpdate mailboxUpdate) {
-		this.contactId = contactId;
-		this.mailboxUpdate = mailboxUpdate;
-	}
-
-	public ContactId getContact() {
-		return contactId;
-	}
-
-	public MailboxUpdate getMailboxUpdate() {
-		return mailboxUpdate;
-	}
-}

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

@@ -1,7 +1,5 @@
 package org.briarproject.bramble.api.plugin;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 public interface TorConstants {
 
 	TransportId ID = new TransportId("org.briarproject.bramble.tor");
@@ -12,9 +10,8 @@ public interface TorConstants {
 	int DEFAULT_SOCKS_PORT = 59050;
 	int DEFAULT_CONTROL_PORT = 59051;
 
-	int CONNECT_TO_PROXY_TIMEOUT = (int) SECONDS.toMillis(5);
+	int CONNECT_TO_PROXY_TIMEOUT = 5000; // Milliseconds
-	int EXTRA_CONNECT_TIMEOUT = (int) SECONDS.toMillis(120);
+	int EXTRA_SOCKET_TIMEOUT = 30000; // Milliseconds
-	int EXTRA_SOCKET_TIMEOUT = (int) SECONDS.toMillis(30);
 
 	// Local settings (not shared with contacts)
 	String PREF_TOR_NETWORK = "network2";

bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java

@@ -12,6 +12,4 @@ public interface RecordWriter {
 	void flush() throws IOException;
 
 	void close() throws IOException;
-
-	long getBytesWritten();
 }

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

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import java.util.Collection;
-
-/**
- * An interface for holding the IDs of messages sent and acked during an
- * outgoing {@link SyncSession} so they can be recorded in the DB as sent
- * or acked at some later time.
- */
-public interface DeferredSendHandler {
-
-	void onAckSent(Collection<MessageId> acked);
-
-	void onMessageSent(MessageId sent);
-}

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

@@ -20,4 +20,9 @@ public class GroupId extends UniqueId {
 	public GroupId(byte[] id) {
 		super(id);
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		return o instanceof GroupId && super.equals(o);
+	}
 }

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

@@ -27,4 +27,9 @@ public class MessageId extends UniqueId {
 	public MessageId(byte[] id) {
 		super(id);
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		return o instanceof MessageId && super.equals(o);
+	}
 }

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

@@ -20,6 +20,4 @@ public interface SyncRecordWriter {
 	void writePriority(Priority p) throws IOException;
 
 	void flush() throws IOException;
-
-	long getBytesWritten();
 }

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.api.system;
 
-import org.briarproject.bramble.api.Cancellable;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.util.concurrent.Executor;
@@ -17,8 +16,6 @@ public interface TaskScheduler {
 	 * <p>
 	 * If the platform supports wake locks, a wake lock will be held while
 	 * submitting and running the task.
-	 *
-	 * @return A {@link Cancellable} for cancelling the task.
 	 */
 	Cancellable schedule(Runnable task, Executor executor, long delay,
 			TimeUnit unit);
@@ -30,11 +27,17 @@ public interface TaskScheduler {
 	 * <p>
 	 * If the platform supports wake locks, a wake lock will be held while
 	 * submitting and running the task.
-	 *
-	 * @return A {@link Cancellable} for cancelling all future executions of
-	 * the task.
 	 */
 	Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
 			long delay, long interval, TimeUnit unit);
 
+	interface Cancellable {
+
+		/**
+		 * Cancels the task if it has not already started running. If the task
+		 * is {@link #scheduleWithFixedDelay(Runnable, Executor, long, long, TimeUnit) periodic},
+		 * all future executions of the task are cancelled.
+		 */
+		void cancel();
+	}
 }

bramble-api/src/main/java/org/briarproject/bramble/util/NetworkUtils.java

@@ -26,7 +26,7 @@ public class NetworkUtils {
 			// Despite what the docs say, the return value can be null
 			//noinspection ConstantConditions
 			return ifaces == null ? emptyList() : list(ifaces);
-		} catch (SocketException | NullPointerException e) {
+		} catch (SocketException e) {
 			logException(LOG, WARNING, e);
 			return emptyList();
 		}

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

@@ -1,46 +1,17 @@
 package org.briarproject.bramble.test;
 
-import org.junit.After;
-import org.junit.Before;
-
 import java.lang.Thread.UncaughtExceptionHandler;
-import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
+import static org.junit.Assert.fail;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
 
 public abstract class BrambleTestCase {
 
-	private static final Logger LOG =
-			getLogger(BrambleTestCase.class.getName());
-
-	@Nullable
-	protected volatile Throwable exceptionInBackgroundThread = null;
-
 	public BrambleTestCase() {
 		// Ensure exceptions thrown on worker threads cause tests to fail
 		UncaughtExceptionHandler fail = (thread, throwable) -> {
-			LOG.log(WARNING, "Caught unhandled exception", throwable);
+			throwable.printStackTrace();
-			exceptionInBackgroundThread = throwable;
+			fail();
 		};
 		Thread.setDefaultUncaughtExceptionHandler(fail);
 	}
-
-	@Before
-	public void beforeBrambleTestCase() {
-		exceptionInBackgroundThread = null;
-	}
-
-	@After
-	public void afterBrambleTestCase() {
-		Throwable thrown = exceptionInBackgroundThread;
-		if (thrown != null) {
-			LOG.log(WARNING,
-					"Background thread has thrown an exception unexpectedly",
-					thrown);
-			throw new AssertionError(thrown);
-		}
-	}
 }

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

@@ -12,20 +12,10 @@ import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.SignaturePrivateKey;
 import org.briarproject.bramble.api.crypto.SignaturePublicKey;
-import org.briarproject.bramble.api.db.CommitAction;
-import org.briarproject.bramble.api.db.EventAction;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.Identity;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.mailbox.MailboxAuthToken;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxUpdate;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateWithMailbox;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.sync.ClientId;
@@ -35,22 +25,17 @@ import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.util.IoUtils;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.annotation.Nullable;
-
 import static java.util.Arrays.asList;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_AGREEMENT_PUBLIC_KEY_BYTES;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_PUBLIC_KEY_BYTES;
@@ -61,8 +46,8 @@ import static org.briarproject.bramble.api.properties.TransportPropertyConstants
 import static org.briarproject.bramble.api.sync.ClientId.MAX_CLIENT_ID_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.util.IoUtils.copyAndClose;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
+import static org.briarproject.bramble.util.StringUtils.toHexString;
 
 public class TestUtils {
 
@@ -226,35 +211,8 @@ public class TestUtils {
 				getAgreementPublicKey(), verified);
 	}
 
-	public static MailboxProperties getMailboxProperties(boolean owner,
+	public static String getMailboxSecret() {
-			List<MailboxVersion> serverSupports) {
+		return toHexString(getRandomBytes(32)).toLowerCase(Locale.US);
-		String baseUrl = "http://" + getRandomString(56) + ".onion"; // TODO
-		MailboxAuthToken authToken = new MailboxAuthToken(getRandomId());
-		if (owner) {
-			return new MailboxProperties(baseUrl, authToken, serverSupports);
-		}
-		MailboxFolderId inboxId = new MailboxFolderId(getRandomId());
-		MailboxFolderId outboxId = new MailboxFolderId(getRandomId());
-		return new MailboxProperties(baseUrl, authToken, serverSupports,
-				inboxId, outboxId);
-	}
-
-	public static void writeBytes(File file, byte[] bytes)
-			throws IOException {
-		FileOutputStream outputStream = new FileOutputStream(file);
-		//noinspection TryFinallyCanBeTryWithResources
-		try {
-			outputStream.write(bytes);
-		} finally {
-			outputStream.close();
-		}
-	}
-
-	public static byte[] readBytes(File file) throws IOException {
-		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-		FileInputStream inputStream = new FileInputStream(file);
-		copyAndClose(inputStream, outputStream);
-		return outputStream.toByteArray();
 	}
 
 	public static double getMedian(Collection<? extends Number> samples) {
@@ -291,48 +249,9 @@ public class TestUtils {
 		return Math.sqrt(getVariance(samples));
 	}
 
-	public static boolean isOptionalTestEnabled(Class<?> testClass) {
+	public static boolean isOptionalTestEnabled(Class testClass) {
 		String optionalTests = System.getenv("OPTIONAL_TESTS");
 		return optionalTests != null &&
 				asList(optionalTests.split(",")).contains(testClass.getName());
 	}
-
-	public static boolean mailboxUpdateEqual(@Nullable MailboxUpdate a,
-			@Nullable MailboxUpdate b) {
-		if (a == null || b == null) {
-			return a == b;
-		}
-		if (!a.hasMailbox() && !b.hasMailbox()) {
-			return a.getClientSupports().equals(b.getClientSupports());
-		} else if (a.hasMailbox() && b.hasMailbox()) {
-			MailboxUpdateWithMailbox am = (MailboxUpdateWithMailbox) a;
-			MailboxUpdateWithMailbox bm = (MailboxUpdateWithMailbox) b;
-			return am.getClientSupports().equals(bm.getClientSupports()) &&
-					mailboxPropertiesEqual(am.getMailboxProperties(),
-							bm.getMailboxProperties());
-		}
-		return false;
-	}
-
-	public static boolean mailboxPropertiesEqual(@Nullable MailboxProperties a,
-			@Nullable MailboxProperties b) {
-		if (a == null || b == null) {
-			return a == b;
-		}
-		return a.getOnion().equals(b.getOnion()) &&
-				a.getAuthToken().equals(b.getAuthToken()) &&
-				a.isOwner() == b.isOwner() &&
-				a.getServerSupports().equals(b.getServerSupports());
-	}
-
-	public static boolean hasEvent(Transaction txn,
-			Class<? extends Event> eventClass) {
-		for (CommitAction action : txn.getActions()) {
-			if (action instanceof EventAction) {
-				Event event = ((EventAction) action).getEvent();
-				if (eventClass.isInstance(event)) return true;
-			}
-		}
-		return false;
-	}
 }

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

@@ -1,36 +0,0 @@
-package org.briarproject.bramble.test;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-public class ThreadExceptionTest extends BrambleTestCase {
-
-	@Test(expected = AssertionError.class)
-	public void testAssertionErrorMakesTestCaseFail() {
-		// This is what BrambleTestCase does, too:
-		fail();
-	}
-
-	@Test
-	public void testExceptionInThreadMakesTestCaseFail() {
-		Thread t = new Thread(() -> {
-			System.out.println("thread before exception");
-			throw new RuntimeException("boom");
-		});
-
-		t.start();
-		try {
-			t.join();
-			System.out.println("joined thread");
-		} catch (InterruptedException e) {
-			System.out.println("interrupted while joining thread");
-			fail();
-		}
-
-		assertNotNull(exceptionInBackgroundThread);
-		exceptionInBackgroundThread = null;
-	}
-
-}

bramble-api/witness.gradle

@@ -1,7 +1,6 @@
 dependencyVerification {
     verify = [
         'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
-        'com.fasterxml.jackson.core:jackson-annotations:2.13.0:jackson-annotations-2.13.0.jar:81f9724d8843e8b08f8f6c0609e7a2b030d00c34861c4ac7e2099a7235047d6f',
         'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
         'com.google.dagger:dagger:2.33:dagger-2.33.jar:d8798c5b8cf6b125234e33af5c6293bb9f2208ce29b57924c35b8c0be7b6bdcb',

bramble-core/build.gradle

@@ -16,7 +16,7 @@ dependencies {
 	implementation 'org.bitlet:weupnp:0.1.4'
 	implementation 'net.i2p.crypto:eddsa:0.2.0'
 	implementation 'org.whispersystems:curve25519-java:0.5.0'
-	implementation 'org.briarproject:jtorctl:0.4'
+	implementation 'org.briarproject:jtorctl:0.3'
 
 	//noinspection GradleDependency
 	implementation "com.squareup.okhttp3:okhttp:$okhttp_version"

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

@@ -6,7 +6,6 @@ import org.briarproject.bramble.crypto.CryptoExecutorModule;
 import org.briarproject.bramble.db.DatabaseExecutorModule;
 import org.briarproject.bramble.identity.IdentityModule;
 import org.briarproject.bramble.lifecycle.LifecycleModule;
-import org.briarproject.bramble.mailbox.MailboxModule;
 import org.briarproject.bramble.plugin.PluginModule;
 import org.briarproject.bramble.properties.PropertiesModule;
 import org.briarproject.bramble.rendezvous.RendezvousModule;
@@ -29,8 +28,6 @@ public interface BrambleCoreEagerSingletons {
 
 	void inject(LifecycleModule.EagerSingletons init);
 
-	void inject(MailboxModule.EagerSingletons init);
-
 	void inject(PluginModule.EagerSingletons init);
 
 	void inject(PropertiesModule.EagerSingletons init);
@@ -54,7 +51,6 @@ public interface BrambleCoreEagerSingletons {
 			c.inject(new DatabaseExecutorModule.EagerSingletons());
 			c.inject(new IdentityModule.EagerSingletons());
 			c.inject(new LifecycleModule.EagerSingletons());
-			c.inject(new MailboxModule.EagerSingletons());
 			c.inject(new RendezvousModule.EagerSingletons());
 			c.inject(new PluginModule.EagerSingletons());
 			c.inject(new PropertiesModule.EagerSingletons());

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

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.client;
 
 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
@@ -23,12 +22,6 @@ 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.AuthorFactory;
-import org.briarproject.bramble.api.mailbox.MailboxAuthToken;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxUpdate;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateWithMailbox;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
@@ -36,16 +29,13 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.util.Base32;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -56,12 +46,6 @@ import static org.briarproject.bramble.api.client.ContactGroupConstants.GROUP_KE
 import static org.briarproject.bramble.api.identity.Author.FORMAT_VERSION;
 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.mailbox.MailboxUpdateManager.PROP_COUNT;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.PROP_KEY_AUTHTOKEN;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.PROP_KEY_INBOXID;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.PROP_KEY_ONION;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.PROP_KEY_OUTBOXID;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.PROP_ONION_LENGTH;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
 import static org.briarproject.bramble.util.ValidationUtils.checkLength;
@@ -415,69 +399,6 @@ class ClientHelperImpl implements ClientHelper {
 		return tpMap;
 	}
 
-	@Override
-	public MailboxUpdate parseAndValidateMailboxUpdate(BdfList clientSupports,
-			BdfList serverSupports, BdfDictionary properties)
-			throws FormatException {
-		List<MailboxVersion> clientSupportsList =
-				parseMailboxVersionList(clientSupports);
-		List<MailboxVersion> serverSupportsList =
-				parseMailboxVersionList(serverSupports);
-
-		// We must always learn what Mailbox API version(s) the client supports
-		if (clientSupports.isEmpty()) {
-			throw new FormatException();
-		}
-		if (properties.isEmpty()) {
-			// No mailbox -- cannot claim to support any API versions!
-			if (!serverSupports.isEmpty()) {
-				throw new FormatException();
-			}
-			return new MailboxUpdate(clientSupportsList);
-		}
-		// Mailbox must be accompanied by the Mailbox API version(s) it supports
-		if (serverSupports.isEmpty()) {
-			throw new FormatException();
-		}
-		// Accepting more props than we need, for forward compatibility
-		if (properties.size() < PROP_COUNT) {
-			throw new FormatException();
-		}
-		String onion = properties.getString(PROP_KEY_ONION);
-		checkLength(onion, PROP_ONION_LENGTH);
-		try {
-			Base32.decode(onion, true);
-		} catch (IllegalArgumentException e) {
-			throw new FormatException();
-		}
-		byte[] authToken = properties.getRaw(PROP_KEY_AUTHTOKEN);
-		checkLength(authToken, UniqueId.LENGTH);
-		byte[] inboxId = properties.getRaw(PROP_KEY_INBOXID);
-		checkLength(inboxId, UniqueId.LENGTH);
-		byte[] outboxId = properties.getRaw(PROP_KEY_OUTBOXID);
-		checkLength(outboxId, UniqueId.LENGTH);
-		String baseUrl = "http://" + onion + ".onion"; // TODO
-		MailboxProperties props = new MailboxProperties(baseUrl,
-				new MailboxAuthToken(authToken), serverSupportsList,
-				new MailboxFolderId(inboxId), new MailboxFolderId(outboxId));
-		return new MailboxUpdateWithMailbox(clientSupportsList, props);
-	}
-
-	@Override
-	public List<MailboxVersion> parseMailboxVersionList(BdfList bdfList)
-			throws FormatException {
-		List<MailboxVersion> list = new ArrayList<>();
-		for (int i = 0; i < bdfList.size(); i++) {
-			BdfList element = bdfList.getList(i);
-			if (element.size() != 2) {
-				throw new FormatException();
-			}
-			list.add(new MailboxVersion(element.getLong(0).intValue(),
-					element.getLong(1).intValue()));
-		}
-		return list;
-	}
-
 	@Override
 	public ContactId getContactId(Transaction txn, GroupId contactGroupId)
 			throws DbException {

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

@@ -131,8 +131,7 @@ class ContactManagerImpl implements ContactManager, EventListener {
 	}
 
 	@Override
-	public PendingContact addPendingContact(Transaction txn, String link,
+	public PendingContact addPendingContact(Transaction txn, String link, String alias)
-			String alias)
 			throws DbException, FormatException, GeneralSecurityException {
 		PendingContact p =
 				pendingContactFactory.createPendingContact(link, alias);
@@ -170,8 +169,7 @@ class ContactManagerImpl implements ContactManager, EventListener {
 	}
 
 	@Override
-	public Collection<Pair<PendingContact, PendingContactState>> getPendingContacts(
+	public Collection<Pair<PendingContact, PendingContactState>> getPendingContacts(Transaction txn)
-			Transaction txn)
 			throws DbException {
 		Collection<PendingContact> pendingContacts = db.getPendingContacts(txn);
 		List<Pair<PendingContact, PendingContactState>> pairs =
@@ -186,13 +184,7 @@ class ContactManagerImpl implements ContactManager, EventListener {
 
 	@Override
 	public void removePendingContact(PendingContactId p) throws DbException {
-		db.transaction(false, txn -> removePendingContact(txn, p));
+		db.transaction(false, txn -> db.removePendingContact(txn, p));
-	}
-
-	@Override
-	public void removePendingContact(Transaction txn, PendingContactId p)
-			throws DbException {
-		db.removePendingContact(txn, p);
 		states.remove(p);
 	}
 

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

@@ -8,7 +8,6 @@ import org.bouncycastle.crypto.CryptoException;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.Blake2bDigest;
 import org.bouncycastle.crypto.digests.SHA3Digest;
-import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.crypto.AgreementPrivateKey;
 import org.briarproject.bramble.api.crypto.AgreementPublicKey;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
@@ -42,7 +41,6 @@ import javax.inject.Inject;
 
 import static java.lang.System.arraycopy;
 import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_AGREEMENT;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
 import static org.briarproject.bramble.api.crypto.DecryptionResult.INVALID_CIPHERTEXT;
@@ -56,7 +54,7 @@ import static org.briarproject.bramble.util.LogUtils.now;
 class CryptoComponentImpl implements CryptoComponent {
 
 	private static final Logger LOG =
-			getLogger(CryptoComponentImpl.class.getName());
+			Logger.getLogger(CryptoComponentImpl.class.getName());
 
 	private static final int SIGNATURE_KEY_PAIR_BITS = 256;
 	private static final int STORAGE_IV_BYTES = 24; // 196 bits
@@ -130,13 +128,6 @@ class CryptoComponentImpl implements CryptoComponent {
 		}
 	}
 
-	@Override
-	public UniqueId generateUniqueId() {
-		byte[] b = new byte[UniqueId.LENGTH];
-		secureRandom.nextBytes(b);
-		return new UniqueId(b);
-	}
-
 	@Override
 	public SecretKey generateSecretKey() {
 		byte[] b = new byte[SecretKey.LENGTH];
@@ -458,7 +449,7 @@ class CryptoComponentImpl implements CryptoComponent {
 	}
 
 	@Override
-	public String encodeOnion(byte[] publicKey) {
+	public String encodeOnionAddress(byte[] publicKey) {
 		Digest digest = new SHA3Digest(256);
 		byte[] label = ".onion checksum".getBytes(Charset.forName("US-ASCII"));
 		digest.update(label, 0, label.length);

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

@@ -406,12 +406,6 @@ interface Database<T> {
 	Collection<MessageId> getMessageIds(T txn, GroupId g, Metadata query)
 			throws DbException;
 
-	/**
-	 * Returns the length of the given message in bytes, including the
-	 * message header.
-	 */
-	int getMessageLength(T txn, MessageId m) throws DbException;
-
 	/**
 	 * Returns the metadata for all delivered messages in the given group.
 	 * <p/>
@@ -502,8 +496,7 @@ interface Database<T> {
 
 	/**
 	 * Returns the IDs of some messages that are eligible to be sent to the
-	 * given contact. The total length of the messages including record headers
+	 * given contact, up to the given total length.
-	 * will be no more than the given capacity.
 	 * <p/>
 	 * Unlike {@link #getUnackedMessagesToSend(Object, ContactId)} this method
 	 * does not return messages that have already been sent unless they are
@@ -511,20 +504,20 @@ interface Database<T> {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessagesToSend(T txn, ContactId c, long capacity,
+	Collection<MessageId> getMessagesToSend(T txn, ContactId c, int maxLength,
 			long maxLatency) throws DbException;
 
 	/**
 	 * Returns the IDs of all messages that are eligible to be sent to the
-	 * given contact.
+	 * given contact, together with their raw lengths.
 	 * <p/>
-	 * Unlike {@link #getMessagesToSend(Object, ContactId, long, long)} this
+	 * Unlike {@link #getMessagesToSend(Object, ContactId, int, long)} this
 	 * method may return messages that have already been sent and are not yet
 	 * due for retransmission.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getUnackedMessagesToSend(T txn, ContactId c)
+	Map<MessageId, Integer> getUnackedMessagesToSend(T txn, ContactId c)
 			throws DbException;
 
 	/**
@@ -605,14 +598,13 @@ interface Database<T> {
 
 	/**
 	 * Returns the IDs of some messages that are eligible to be sent to the
-	 * given contact and have been requested by the contact. The total length
+	 * given contact and have been requested by the contact, up to the given
-	 * of the messages including record headers will be no more than the given
+	 * total length.
-	 * capacity.
 	 * <p/>
 	 * Read-only.
 	 */
 	Collection<MessageId> getRequestedMessagesToSend(T txn, ContactId c,
-			long capacity, long maxLatency) throws DbException;
+			int maxLength, long maxLatency) throws DbException;
 
 	/**
 	 * Returns all settings in the given namespace.
@@ -766,10 +758,9 @@ interface Database<T> {
 	void resetExpiryTime(T txn, ContactId c, MessageId m) throws DbException;
 
 	/**
-	 * Resets the transmission count, expiry time and max latency of all
+	 * Resets the transmission count, expiry time and ETA of all messages that
-	 * messages that are eligible to be sent to the given contact. This includes
+	 * are eligible to be sent to the given contact. This includes messages that
-	 * messages that have already been sent and are not yet due for
+	 * have already been sent and are not yet due for retransmission.
-	 * retransmission.
 	 */
 	void resetUnackedMessagesToSend(T txn, ContactId c) throws DbException;
 
@@ -857,13 +848,11 @@ interface Database<T> {
 	void stopCleanupTimer(T txn, MessageId m) throws DbException;
 
 	/**
-	 * Updates the transmission count, expiry time and max latency of the given
+	 * Updates the transmission count, expiry time and estimated time of arrival
-	 * message with respect to the given contact.
+	 * of the given message with respect to the given contact, using the latency
-	 *
+	 * of the transport over which it was sent.
-	 * @param maxLatency latency of the transport over which the message was
-	 * sent.
 	 */
-	void updateRetransmissionData(T txn, ContactId c, MessageId m,
+	void updateExpiryTimeAndEta(T txn, ContactId c, MessageId m,
 			long maxLatency) throws DbException;
 
 	/**

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

@@ -75,6 +75,7 @@ import org.briarproject.bramble.api.transport.TransportKeys;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
@@ -86,7 +87,6 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
-import static java.util.Collections.singletonList;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
@@ -424,27 +424,53 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	@Nullable
 	@Override
 	public Collection<Message> generateBatch(Transaction transaction,
-			ContactId c, long capacity, long maxLatency) throws DbException {
+			ContactId c, int maxLength, long maxLatency) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
 		Collection<MessageId> ids =
-				db.getMessagesToSend(txn, c, capacity, maxLatency);
+				db.getMessagesToSend(txn, c, maxLength, maxLatency);
-		if (ids.isEmpty()) return null;
 		long totalLength = 0;
 		List<Message> messages = new ArrayList<>(ids.size());
 		for (MessageId m : ids) {
 			Message message = db.getMessage(txn, m);
 			totalLength += message.getRawLength();
 			messages.add(message);
-			db.updateRetransmissionData(txn, c, m, maxLatency);
+			db.updateExpiryTimeAndEta(txn, c, m, maxLatency);
 		}
+		if (ids.isEmpty()) return null;
 		db.lowerRequestedFlag(txn, c, ids);
 		transaction.attach(new MessagesSentEvent(c, ids, totalLength));
 		return messages;
 	}
 
+	@Override
+	public Collection<Message> generateBatch(Transaction transaction,
+			ContactId c, Collection<MessageId> ids, long maxLatency)
+			throws DbException {
+		if (transaction.isReadOnly()) throw new IllegalArgumentException();
+		T txn = unbox(transaction);
+		if (!db.containsContact(txn, c))
+			throw new NoSuchContactException();
+		long totalLength = 0;
+		List<Message> messages = new ArrayList<>(ids.size());
+		List<MessageId> sentIds = new ArrayList<>(ids.size());
+		for (MessageId m : ids) {
+			if (db.containsVisibleMessage(txn, c, m)) {
+				Message message = db.getMessage(txn, m);
+				totalLength += message.getRawLength();
+				messages.add(message);
+				sentIds.add(m);
+				db.updateExpiryTimeAndEta(txn, c, m, maxLatency);
+			}
+		}
+		if (messages.isEmpty()) return messages;
+		db.lowerRequestedFlag(txn, c, sentIds);
+		transaction.attach(new MessagesSentEvent(c, sentIds, totalLength));
+		return messages;
+	}
+
 	@Nullable
 	@Override
 	public Offer generateOffer(Transaction transaction, ContactId c,
@@ -457,7 +483,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 				db.getMessagesToOffer(txn, c, maxMessages, maxLatency);
 		if (ids.isEmpty()) return null;
 		for (MessageId m : ids)
-			db.updateRetransmissionData(txn, c, m, maxLatency);
+			db.updateExpiryTimeAndEta(txn, c, m, maxLatency);
 		return new Offer(ids);
 	}
 
@@ -479,22 +505,22 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	@Nullable
 	@Override
 	public Collection<Message> generateRequestedBatch(Transaction transaction,
-			ContactId c, long capacity, long maxLatency) throws DbException {
+			ContactId c, int maxLength, long maxLatency) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
 		Collection<MessageId> ids =
-				db.getRequestedMessagesToSend(txn, c, capacity, maxLatency);
+				db.getRequestedMessagesToSend(txn, c, maxLength, maxLatency);
-		if (ids.isEmpty()) return null;
 		long totalLength = 0;
 		List<Message> messages = new ArrayList<>(ids.size());
 		for (MessageId m : ids) {
 			Message message = db.getMessage(txn, m);
 			totalLength += message.getRawLength();
 			messages.add(message);
-			db.updateRetransmissionData(txn, c, m, maxLatency);
+			db.updateExpiryTimeAndEta(txn, c, m, maxLatency);
 		}
+		if (ids.isEmpty()) return null;
 		db.lowerRequestedFlag(txn, c, ids);
 		transaction.attach(new MessagesSentEvent(c, ids, totalLength));
 		return messages;
@@ -609,24 +635,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return db.getMessageIds(txn, g, query);
 	}
 
-	@Override
-	public Collection<MessageId> getMessagesToAck(Transaction transaction,
-			ContactId c, int maxMessages) throws DbException {
-		T txn = unbox(transaction);
-		if (!db.containsContact(txn, c))
-			throw new NoSuchContactException();
-		return db.getMessagesToAck(txn, c, maxMessages);
-	}
-
-	@Override
-	public Collection<MessageId> getMessagesToSend(Transaction transaction,
-			ContactId c, long capacity, long maxLatency) throws DbException {
-		T txn = unbox(transaction);
-		if (!db.containsContact(txn, c))
-			throw new NoSuchContactException();
-		return db.getMessagesToSend(txn, c, capacity, maxLatency);
-	}
-
 	@Override
 	public Collection<MessageId> getMessagesToValidate(Transaction transaction)
 			throws DbException {
@@ -732,29 +740,10 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return status;
 	}
 
-	@Nullable
 	@Override
-	public Message getMessageToSend(Transaction transaction, ContactId c,
+	public Map<MessageId, Integer> getUnackedMessagesToSend(
-			MessageId m, long maxLatency, boolean markAsSent)
+			Transaction transaction,
-			throws DbException {
+			ContactId c) throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsContact(txn, c))
-			throw new NoSuchContactException();
-		if (!db.containsVisibleMessage(txn, c, m)) return null;
-		Message message = db.getMessage(txn, m);
-		if (markAsSent) {
-			db.updateRetransmissionData(txn, c, m, maxLatency);
-			db.lowerRequestedFlag(txn, c, singletonList(m));
-			transaction.attach(new MessagesSentEvent(c, singletonList(m),
-					message.getRawLength()));
-		}
-		return message;
-	}
-
-	@Override
-	public Collection<MessageId> getUnackedMessagesToSend(
-			Transaction transaction, ContactId c) throws DbException {
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
@@ -1080,20 +1069,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		db.removeTransportKeys(txn, t, k);
 	}
 
-	@Override
-	public void setAckSent(Transaction transaction, ContactId c,
-			Collection<MessageId> acked) throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsContact(txn, c))
-			throw new NoSuchContactException();
-		List<MessageId> visible = new ArrayList<>(acked.size());
-		for (MessageId m : acked) {
-			if (db.containsVisibleMessage(txn, c, m)) visible.add(m);
-		}
-		db.lowerAckFlag(txn, c, visible);
-	}
-
 	@Override
 	public void setCleanupTimerDuration(Transaction transaction, MessageId m,
 			long duration) throws DbException {
@@ -1140,7 +1115,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		if (old == INVISIBLE) db.addGroupVisibility(txn, c, g, v == SHARED);
 		else if (v == INVISIBLE) db.removeGroupVisibility(txn, c, g);
 		else db.setGroupVisibility(txn, c, g, v == SHARED);
-		List<ContactId> affected = singletonList(c);
+		List<ContactId> affected = Collections.singletonList(c);
 		transaction.attach(new GroupVisibilityUpdatedEvent(affected));
 	}
 
@@ -1188,28 +1163,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		transaction.attach(new MessageStateChangedEvent(m, false, state));
 	}
 
-	@Override
-	public void setMessagesSent(Transaction transaction, ContactId c,
-			Collection<MessageId> sent, long maxLatency) throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsContact(txn, c))
-			throw new NoSuchContactException();
-		long totalLength = 0;
-		List<MessageId> visible = new ArrayList<>(sent.size());
-		for (MessageId m : sent) {
-			if (db.containsVisibleMessage(txn, c, m)) {
-				visible.add(m);
-				totalLength += db.getMessageLength(txn, m);
-				db.updateRetransmissionData(txn, c, m, maxLatency);
-			}
-		}
-		db.lowerRequestedFlag(txn, c, visible);
-		if (!visible.isEmpty()) {
-			transaction.attach(new MessagesSentEvent(c, visible, totalLength));
-		}
-	}
-
 	@Override
 	public void addMessageDependencies(Transaction transaction,
 			Message dependent, Collection<MessageId> dependencies)

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

@@ -2,6 +2,8 @@ package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.settings.Settings;
 
+import static java.util.concurrent.TimeUnit.DAYS;
+
 interface DatabaseConstants {
 
 	/**
@@ -23,6 +25,19 @@ interface DatabaseConstants {
 	 */
 	String SCHEMA_VERSION_KEY = "schemaVersion";
 
+	/**
+	 * The {@link Settings} key under which the time of the last database
+	 * compaction is stored.
+	 */
+	String LAST_COMPACTED_KEY = "lastCompacted";
+
+	/**
+	 * The maximum time between database compactions in milliseconds. When the
+	 * database is opened it will be compacted if more than this amount of time
+	 * has passed since the last compaction.
+	 */
+	long MAX_COMPACTION_INTERVAL_MS = DAYS.toMillis(30);
+
 	/**
 	 * The {@link Settings} key under which the flag is stored indicating
 	 * whether the database is marked as dirty.

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

@@ -85,17 +85,12 @@ class H2Database extends JdbcDatabase {
 	public void close() throws DbException {
 		// H2 will close the database when the last connection closes
 		Connection c = null;
-		Statement s = null;
 		try {
 			c = createConnection();
-			closeAllConnections();
+			super.closeAllConnections();
 			setDirty(c, false);
-			s = c.createStatement();
-			s.execute("SHUTDOWN COMPACT");
-			s.close();
 			c.close();
 		} catch (SQLException e) {
-			tryToClose(s, LOG, WARNING);
 			tryToClose(c, LOG, WARNING);
 			throw new DbException(e);
 		}

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

@@ -79,11 +79,11 @@ class HyperSqlDatabase extends JdbcDatabase {
 		Connection c = null;
 		Statement s = null;
 		try {
-			closeAllConnections();
+			super.closeAllConnections();
 			c = createConnection();
 			setDirty(c, false);
 			s = c.createStatement();
-			s.executeQuery("SHUTDOWN COMPACT");
+			s.executeQuery("SHUTDOWN");
 			s.close();
 			c.close();
 		} catch (SQLException e) {
@@ -106,7 +106,7 @@ class HyperSqlDatabase extends JdbcDatabase {
 		Connection c = null;
 		Statement s = null;
 		try {
-			closeAllConnections();
+			super.closeAllConnections();
 			c = createConnection();
 			s = c.createStatement();
 			s.executeQuery("SHUTDOWN COMPACT");

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

@@ -51,6 +51,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -69,14 +70,12 @@ import static java.sql.Types.BOOLEAN;
 import static java.sql.Types.INTEGER;
 import static java.sql.Types.VARCHAR;
 import static java.util.Arrays.asList;
-import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.db.DatabaseComponent.NO_CLEANUP_DEADLINE;
 import static org.briarproject.bramble.api.db.DatabaseComponent.TIMER_NOT_STARTED;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
-import static org.briarproject.bramble.api.record.Record.RECORD_HEADER_BYTES;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
@@ -86,6 +85,8 @@ import static org.briarproject.bramble.api.sync.validation.MessageState.PENDING;
 import static org.briarproject.bramble.api.sync.validation.MessageState.UNKNOWN;
 import static org.briarproject.bramble.db.DatabaseConstants.DB_SETTINGS_NAMESPACE;
 import static org.briarproject.bramble.db.DatabaseConstants.DIRTY_KEY;
+import static org.briarproject.bramble.db.DatabaseConstants.LAST_COMPACTED_KEY;
+import static org.briarproject.bramble.db.DatabaseConstants.MAX_COMPACTION_INTERVAL_MS;
 import static org.briarproject.bramble.db.DatabaseConstants.SCHEMA_VERSION_KEY;
 import static org.briarproject.bramble.db.ExponentialBackoff.calculateExpiry;
 import static org.briarproject.bramble.db.JdbcUtils.tryToClose;
@@ -101,12 +102,7 @@ import static org.briarproject.bramble.util.LogUtils.now;
 abstract class JdbcDatabase implements Database<Connection> {
 
 	// Package access for testing
-	static final int CODE_SCHEMA_VERSION = 50;
+	static final int CODE_SCHEMA_VERSION = 49;
-
-	/**
-	 * The maximum number of idle connections to keep open.
-	 */
-	private static final int MAX_CONNECTION_POOL_SIZE = 1;
 
 	// Time period offsets for incoming transport keys
 	private static final int OFFSET_PREV = -1;
@@ -256,7 +252,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " requested BOOLEAN NOT NULL,"
 					+ " expiry BIGINT NOT NULL,"
 					+ " txCount INT NOT NULL,"
-					+ " maxLatency BIGINT," // Null if latency was reset
+					+ " eta BIGINT NOT NULL,"
 					+ " PRIMARY KEY (messageId, contactId),"
 					+ " FOREIGN KEY (messageId)"
 					+ " REFERENCES messages (messageId)"
@@ -369,7 +365,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 	private final Condition connectionsChanged = connectionsLock.newCondition();
 
 	@GuardedBy("connectionsLock")
-	private final LinkedList<Connection> connectionPool = new LinkedList<>();
+	private final LinkedList<Connection> connections = new LinkedList<>();
 
 	@GuardedBy("connectionsLock")
 	private int openConnections = 0;
@@ -382,7 +378,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 			throws DbException, SQLException;
 
 	// Used exclusively during open to compact the database after schema
-	// migrations or if the database was not shut down cleanly
+	// migrations or after DatabaseConstants#MAX_COMPACTION_INTERVAL_MS has
+	// elapsed
 	protected abstract void compactAndClose() throws DbException;
 
 	JdbcDatabase(DatabaseTypes databaseTypes, MessageFactory messageFactory,
@@ -408,8 +405,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			if (reopen) {
 				Settings s = getSettings(txn, DB_SETTINGS_NAMESPACE);
 				wasDirtyOnInitialisation = isDirty(s);
-				boolean migrated = migrateSchema(txn, s, listener);
+				compact = migrateSchema(txn, s, listener) || isCompactionDue(s);
-				compact = wasDirtyOnInitialisation || migrated;
 			} else {
 				wasDirtyOnInitialisation = false;
 				createTables(txn);
@@ -439,6 +435,14 @@ abstract class JdbcDatabase implements Database<Connection> {
 			} finally {
 				connectionsLock.unlock();
 			}
+			txn = startTransaction();
+			try {
+				storeLastCompacted(txn);
+				commitTransaction(txn);
+			} catch (DbException e) {
+				abortTransaction(txn);
+				throw e;
+			}
 		}
 	}
 
@@ -498,11 +502,18 @@ abstract class JdbcDatabase implements Database<Connection> {
 				new Migration45_46(),
 				new Migration46_47(dbTypes),
 				new Migration47_48(),
-				new Migration48_49(),
+				new Migration48_49()
-				new Migration49_50()
 		);
 	}
 
+	private boolean isCompactionDue(Settings s) {
+		long lastCompacted = s.getLong(LAST_COMPACTED_KEY, 0);
+		long elapsed = clock.currentTimeMillis() - lastCompacted;
+		if (LOG.isLoggable(INFO))
+			LOG.info(elapsed + " ms since last compaction");
+		return elapsed > MAX_COMPACTION_INTERVAL_MS;
+	}
+
 	private void storeSchemaVersion(Connection txn, int version)
 			throws DbException {
 		Settings s = new Settings();
@@ -510,6 +521,12 @@ abstract class JdbcDatabase implements Database<Connection> {
 		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
 	}
 
+	private void storeLastCompacted(Connection txn) throws DbException {
+		Settings s = new Settings();
+		s.putLong(LAST_COMPACTED_KEY, clock.currentTimeMillis());
+		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
+	}
+
 	private boolean isDirty(Settings s) {
 		return s.getBoolean(DIRTY_KEY, false);
 	}
@@ -523,6 +540,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 	private void initialiseSettings(Connection txn) throws DbException {
 		Settings s = new Settings();
 		s.putInt(SCHEMA_VERSION_KEY, CODE_SCHEMA_VERSION);
+		s.putLong(LAST_COMPACTED_KEY, clock.currentTimeMillis());
 		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
 	}
 
@@ -577,8 +595,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		connectionsLock.lock();
 		try {
 			if (closed) throw new DbClosedException();
-			txn = connectionPool.poll();
+			txn = connections.poll();
-			logConnectionCounts();
 		} finally {
 			connectionsLock.unlock();
 		}
@@ -589,14 +606,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 				txn.setAutoCommit(false);
 				connectionsLock.lock();
 				try {
-					// The DB may have been closed since the check above
-					if (closed) {
-						tryToClose(txn, LOG, WARNING);
-						throw new DbClosedException();
-					}
 					openConnections++;
-					logConnectionCounts();
-					connectionsChanged.signalAll();
 				} finally {
 					connectionsLock.unlock();
 				}
@@ -607,91 +617,67 @@ abstract class JdbcDatabase implements Database<Connection> {
 		return txn;
 	}
 
-	@GuardedBy("connectionsLock")
-	private void logConnectionCounts() {
-		if (LOG.isLoggable(FINE)) {
-			LOG.fine(openConnections + " connections open, "
-					+ connectionPool.size() + " in pool");
-		}
-	}
-
 	@Override
 	public void abortTransaction(Connection txn) {
-		// The transaction may have been aborted due to an earlier exception,
-		// so close the connection rather than returning it to the pool
 		try {
 			txn.rollback();
+			connectionsLock.lock();
+			try {
+				connections.add(txn);
+				connectionsChanged.signalAll();
+			} finally {
+				connectionsLock.unlock();
+			}
 		} catch (SQLException e) {
+			// Try to close the connection
 			logException(LOG, WARNING, e);
-		}
+			tryToClose(txn, LOG, WARNING);
-		closeConnection(txn);
+			// Whatever happens, allow the database to close
-	}
+			connectionsLock.lock();
-
+			try {
-	private void closeConnection(Connection txn) {
+				openConnections--;
-		tryToClose(txn, LOG, WARNING);
+				connectionsChanged.signalAll();
-		connectionsLock.lock();
+			} finally {
-		try {
+				connectionsLock.unlock();
-			openConnections--;
+			}
-			logConnectionCounts();
-			connectionsChanged.signalAll();
-		} finally {
-			connectionsLock.unlock();
 		}
 	}
 
 	@Override
 	public void commitTransaction(Connection txn) throws DbException {
-		// If the transaction commits successfully then return the connection
-		// to the pool, otherwise close it
 		try {
 			txn.commit();
-			returnConnectionToPool(txn);
 		} catch (SQLException e) {
-			logException(LOG, WARNING, e);
-			closeConnection(txn);
 			throw new DbException(e);
 		}
-	}
-
-	private void returnConnectionToPool(Connection txn) {
-		boolean shouldClose;
 		connectionsLock.lock();
 		try {
-			shouldClose = connectionPool.size() >= MAX_CONNECTION_POOL_SIZE;
+			connections.add(txn);
-			if (shouldClose) openConnections--;
-			else connectionPool.add(txn);
-			logConnectionCounts();
 			connectionsChanged.signalAll();
 		} finally {
 			connectionsLock.unlock();
 		}
-		if (shouldClose) tryToClose(txn, LOG, WARNING);
 	}
 
-	void closeAllConnections() {
+	void closeAllConnections() throws SQLException {
 		boolean interrupted = false;
 		connectionsLock.lock();
 		try {
 			closed = true;
-			for (Connection c : connectionPool) tryToClose(c, LOG, WARNING);
+			for (Connection c : connections) c.close();
-			openConnections -= connectionPool.size();
+			openConnections -= connections.size();
-			connectionPool.clear();
+			connections.clear();
 			while (openConnections > 0) {
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Waiting for " + openConnections
-							+ " connections to be closed");
-				}
 				try {
 					connectionsChanged.await();
 				} catch (InterruptedException e) {
 					LOG.warning("Interrupted while closing connections");
 					interrupted = true;
 				}
-				for (Connection c : connectionPool) tryToClose(c, LOG, WARNING);
+				for (Connection c : connections) c.close();
-				openConnections -= connectionPool.size();
+				openConnections -= connections.size();
-				connectionPool.clear();
+				connections.clear();
 			}
-			LOG.info("All connections closed");
 		} finally {
 			connectionsLock.unlock();
 		}
@@ -934,10 +920,9 @@ abstract class JdbcDatabase implements Database<Connection> {
 		try {
 			String sql = "INSERT INTO statuses (messageId, contactId, groupId,"
 					+ " timestamp, length, state, groupShared, messageShared,"
-					+ " deleted, ack, seen, requested, expiry, txCount,"
+					+ " deleted, ack, seen, requested, expiry, txCount, eta)"
-					+ " maxLatency)"
 					+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, FALSE, 0, 0,"
-					+ " NULL)";
+					+ " 0)";
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, m.getBytes());
 			ps.setInt(2, c.getInt());
@@ -1171,17 +1156,17 @@ abstract class JdbcDatabase implements Database<Connection> {
 				ps.setInt(2, DELIVERED.getValue());
 			} else {
 				long now = clock.currentTimeMillis();
+				long eta = now + maxLatency;
 				sql = "SELECT NULL FROM statuses"
 						+ " WHERE contactId = ? AND state = ?"
 						+ " AND groupShared = TRUE AND messageShared = TRUE"
 						+ " AND deleted = FALSE AND seen = FALSE"
-						+ " AND (expiry <= ? OR maxLatency IS NULL"
+						+ " AND (expiry <= ? OR eta > ?)";
-						+ " OR ? < maxLatency)";
 				ps = txn.prepareStatement(sql);
 				ps.setInt(1, c.getInt());
 				ps.setInt(2, DELIVERED.getValue());
 				ps.setLong(3, now);
-				ps.setLong(4, maxLatency);
+				ps.setLong(4, eta);
 			}
 			rs = ps.executeQuery();
 			boolean messagesToSend = rs.next();
@@ -1917,31 +1902,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	public int getMessageLength(Connection txn, MessageId m)
-			throws DbException {
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		try {
-			String sql = "SELECT length from messages"
-					+ " WHERE messageId = ? AND state = ?";
-			ps = txn.prepareStatement(sql);
-			ps.setBytes(1, m.getBytes());
-			ps.setInt(2, DELIVERED.getValue());
-			rs = ps.executeQuery();
-			if (!rs.next()) throw new DbStateException();
-			int length = rs.getInt(1);
-			if (rs.next()) throw new DbStateException();
-			rs.close();
-			ps.close();
-			return length;
-		} catch (SQLException e) {
-			tryToClose(rs, LOG, WARNING);
-			tryToClose(ps, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public Map<MessageId, Metadata> getMessageMetadata(Connection txn,
 			GroupId g) throws DbException {
@@ -2234,6 +2194,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 	public Collection<MessageId> getMessagesToOffer(Connection txn,
 			ContactId c, int maxMessages, long maxLatency) throws DbException {
 		long now = clock.currentTimeMillis();
+		long eta = now + maxLatency;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -2242,14 +2203,13 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE"
 					+ " AND seen = FALSE AND requested = FALSE"
-					+ " AND (expiry <= ? OR maxLatency IS NULL"
+					+ " AND (expiry <= ? OR eta > ?)"
-					+ " OR ? < maxLatency)"
 					+ " ORDER BY timestamp LIMIT ?";
 			ps = txn.prepareStatement(sql);
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
-			ps.setLong(4, maxLatency);
+			ps.setLong(4, eta);
 			ps.setInt(5, maxMessages);
 			rs = ps.executeQuery();
 			List<MessageId> ids = new ArrayList<>();
@@ -2290,9 +2250,10 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public Collection<MessageId> getMessagesToSend(Connection txn,
+	public Collection<MessageId> getMessagesToSend(Connection txn, ContactId c,
-			ContactId c, long capacity, long maxLatency) throws DbException {
+			int maxLength, long maxLatency) throws DbException {
 		long now = clock.currentTimeMillis();
+		long eta = now + maxLatency;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -2301,21 +2262,21 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE"
 					+ " AND seen = FALSE"
-					+ " AND (expiry <= ? OR maxLatency IS NULL"
+					+ " AND (expiry <= ? OR eta > ?)"
-					+ " OR ? < maxLatency)"
 					+ " ORDER BY timestamp";
 			ps = txn.prepareStatement(sql);
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
-			ps.setLong(4, maxLatency);
+			ps.setLong(4, eta);
 			rs = ps.executeQuery();
 			List<MessageId> ids = new ArrayList<>();
+			int total = 0;
 			while (rs.next()) {
 				int length = rs.getInt(1);
-				if (capacity < RECORD_HEADER_BYTES + length) break;
+				if (total + length > maxLength) break;
 				ids.add(new MessageId(rs.getBytes(2)));
-				capacity -= RECORD_HEADER_BYTES + length;
+				total += length;
 			}
 			rs.close();
 			ps.close();
@@ -2328,12 +2289,12 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public Collection<MessageId> getUnackedMessagesToSend(Connection txn,
+	public Map<MessageId, Integer> getUnackedMessagesToSend(Connection txn,
 			ContactId c) throws DbException {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
-			String sql = "SELECT messageId FROM statuses"
+			String sql = "SELECT length, messageId FROM statuses"
 					+ " WHERE contactId = ? AND state = ?"
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE AND seen = FALSE"
@@ -2342,11 +2303,15 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, DELIVERED.getValue());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<>();
+			Map<MessageId, Integer> results = new LinkedHashMap<>();
-			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
+			while (rs.next()) {
+				int length = rs.getInt(1);
+				MessageId id = new MessageId(rs.getBytes(2));
+				results.put(id, length);
+			}
 			rs.close();
 			ps.close();
-			return ids;
+			return results;
 		} catch (SQLException e) {
 			tryToClose(rs, LOG, WARNING);
 			tryToClose(ps, LOG, WARNING);
@@ -2459,7 +2424,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 				MessageId m = new MessageId(rs.getBytes(1));
 				GroupId g = new GroupId(rs.getBytes(2));
 				Collection<MessageId> messageIds = ids.get(g);
-				//noinspection Java8MapApi
 				if (messageIds == null) {
 					messageIds = new ArrayList<>();
 					ids.put(g, messageIds);
@@ -2586,8 +2550,9 @@ abstract class JdbcDatabase implements Database<Connection> {
 
 	@Override
 	public Collection<MessageId> getRequestedMessagesToSend(Connection txn,
-			ContactId c, long capacity, long maxLatency) throws DbException {
+			ContactId c, int maxLength, long maxLatency) throws DbException {
 		long now = clock.currentTimeMillis();
+		long eta = now + maxLatency;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -2596,21 +2561,21 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE"
 					+ " AND seen = FALSE AND requested = TRUE"
-					+ " AND (expiry <= ? OR maxLatency IS NULL"
+					+ " AND (expiry <= ? OR eta > ?)"
-					+ " OR ? < maxLatency)"
 					+ " ORDER BY timestamp";
 			ps = txn.prepareStatement(sql);
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
-			ps.setLong(4, maxLatency);
+			ps.setLong(4, eta);
 			rs = ps.executeQuery();
 			List<MessageId> ids = new ArrayList<>();
+			int total = 0;
 			while (rs.next()) {
 				int length = rs.getInt(1);
-				if (capacity < RECORD_HEADER_BYTES + length) break;
+				if (total + length > maxLength) break;
 				ids.add(new MessageId(rs.getBytes(2)));
-				capacity -= RECORD_HEADER_BYTES + length;
+				total += length;
 			}
 			rs.close();
 			ps.close();
@@ -2764,7 +2729,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 				ContactId c = new ContactId(rs.getInt(1));
 				TransportId t = new TransportId(rs.getString(2));
 				Collection<TransportId> transportIds = ids.get(c);
-				//noinspection Java8MapApi
 				if (transportIds == null) {
 					transportIds = new ArrayList<>();
 					ids.put(c, transportIds);
@@ -3334,8 +3298,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			throws DbException {
 		PreparedStatement ps = null;
 		try {
-			String sql = "UPDATE statuses SET expiry = 0, txCount = 0,"
+			String sql = "UPDATE statuses SET expiry = 0, txCount = 0, eta = 0"
-					+ " maxLatency = NULL"
 					+ " WHERE contactId = ? AND state = ?"
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE AND seen = FALSE";
@@ -3680,8 +3643,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public void updateRetransmissionData(Connection txn, ContactId c,
+	public void updateExpiryTimeAndEta(Connection txn, ContactId c, MessageId m,
-			MessageId m, long maxLatency) throws DbException {
+			long maxLatency) throws DbException {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -3697,12 +3660,13 @@ abstract class JdbcDatabase implements Database<Connection> {
 			rs.close();
 			ps.close();
 			sql = "UPDATE statuses"
-					+ " SET expiry = ?, txCount = txCount + 1, maxLatency = ?"
+					+ " SET expiry = ?, txCount = txCount + 1, eta = ?"
 					+ " WHERE messageId = ? AND contactId = ?";
 			ps = txn.prepareStatement(sql);
 			long now = clock.currentTimeMillis();
+			long eta = now + maxLatency;
 			ps.setLong(1, calculateExpiry(now, maxLatency, txCount));
-			ps.setLong(2, maxLatency);
+			ps.setLong(2, eta);
 			ps.setBytes(3, m.getBytes());
 			ps.setInt(4, c.getInt());
 			int affected = ps.executeUpdate();

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

@@ -1,45 +0,0 @@
-package org.briarproject.bramble.db;
-
-import org.briarproject.bramble.api.db.DbException;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.logging.Logger;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.db.JdbcUtils.tryToClose;
-
-class Migration49_50 implements Migration<Connection> {
-
-	private static final Logger LOG = getLogger(Migration49_50.class.getName());
-
-	@Override
-	public int getStartVersion() {
-		return 49;
-	}
-
-	@Override
-	public int getEndVersion() {
-		return 50;
-	}
-
-	@Override
-	public void migrate(Connection txn) throws DbException {
-		Statement s = null;
-		try {
-			s = txn.createStatement();
-			s.execute("ALTER TABLE statuses"
-					+ " ALTER COLUMN eta"
-					+ " RENAME TO maxLatency");
-			s.execute("ALTER TABLE statuses"
-					+ " ALTER COLUMN maxLatency"
-					+ " SET NULL");
-			s.execute("UPDATE statuses SET maxLatency = NULL");
-		} catch (SQLException e) {
-			tryToClose(s, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-}

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

@@ -1,10 +1,10 @@
 package org.briarproject.bramble.io;
 
-import org.briarproject.bramble.api.Cancellable;
 import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 import org.briarproject.bramble.api.system.Wakeful;
 
 import java.io.IOException;

bramble-core/src/main/java/org/briarproject/bramble/mailbox/ApiCall.java

@@ -1,21 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
-
-/**
- * An interface for calling an API endpoint with the option to retry the call.
- */
-interface ApiCall {
-
-	/**
-	 * This method makes a synchronous call to an API endpoint and returns
-	 * true if the call should be retried, in which case the method may be
-	 * called again on the same {@link ApiCall} instance after a delay.
-	 *
-	 * @return True if the API call needs to be retried, or false if the API
-	 * call succeeded or {@link TolerableFailureException failed tolerably}.
-	 */
-	@IoExecutor
-	boolean callApi();
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityChecker.java

@@ -1,32 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-/**
- * An interface for checking whether a mailbox is reachable.
- */
-@ThreadSafe
-@NotNullByDefault
-interface ConnectivityChecker {
-
-	/**
-	 * Destroys the checker. Any current connectivity check is cancelled.
-	 */
-	void destroy();
-
-	/**
-	 * Starts a connectivity check if needed and calls the given observer when
-	 * the check succeeds. If a check is already running then the observer is
-	 * called when the check succeeds. If a connectivity check has recently
-	 * succeeded then the observer is called immediately.
-	 */
-	void checkConnectivity(MailboxProperties properties,
-			ConnectivityObserver o);
-
-	interface ConnectivityObserver {
-		void onConnectivityCheckSucceeded();
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/ConnectivityCheckerImpl.java

@@ -1,111 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-abstract class ConnectivityCheckerImpl implements ConnectivityChecker {
-
-	/**
-	 * If no more than this much time has elapsed since the last connectivity
-	 * check succeeded, consider the result to be fresh and don't check again.
-	 * <p>
-	 * Package access for testing.
-	 */
-	static final long CONNECTIVITY_CHECK_FRESHNESS_MS = 10_000;
-
-	private final Object lock = new Object();
-
-	protected final Clock clock;
-	private final MailboxApiCaller mailboxApiCaller;
-
-	@GuardedBy("lock")
-	private boolean destroyed = false;
-
-	@GuardedBy("lock")
-	@Nullable
-	private Cancellable connectivityCheck = null;
-
-	@GuardedBy("lock")
-	private long lastConnectivityCheckSucceeded = 0;
-
-	@GuardedBy("lock")
-	private final List<ConnectivityObserver> connectivityObservers =
-			new ArrayList<>();
-
-	/**
-	 * Creates an {@link ApiCall} for checking whether the mailbox is
-	 * reachable. The {@link ApiCall} should call
-	 * {@link #onConnectivityCheckSucceeded(long)} if the check succeeds.
-	 */
-	abstract ApiCall createConnectivityCheckTask(MailboxProperties properties);
-
-	ConnectivityCheckerImpl(Clock clock, MailboxApiCaller mailboxApiCaller) {
-		this.clock = clock;
-		this.mailboxApiCaller = mailboxApiCaller;
-	}
-
-	@Override
-	public void destroy() {
-		synchronized (lock) {
-			destroyed = true;
-			connectivityObservers.clear();
-			if (connectivityCheck != null) {
-				connectivityCheck.cancel();
-				connectivityCheck = null;
-			}
-		}
-	}
-
-	@Override
-	public void checkConnectivity(MailboxProperties properties,
-			ConnectivityObserver o) {
-		boolean callNow = false;
-		synchronized (lock) {
-			if (destroyed) return;
-			if (connectivityCheck == null) {
-				// No connectivity check is running
-				long now = clock.currentTimeMillis();
-				if (now - lastConnectivityCheckSucceeded
-						> CONNECTIVITY_CHECK_FRESHNESS_MS) {
-					// The last connectivity check is stale, start a new one
-					connectivityObservers.add(o);
-					ApiCall task =
-							createConnectivityCheckTask(properties);
-					connectivityCheck = mailboxApiCaller.retryWithBackoff(task);
-				} else {
-					// The last connectivity check is fresh
-					callNow = true;
-				}
-			} else {
-				// A connectivity check is running, wait for it to succeed
-				connectivityObservers.add(o);
-			}
-		}
-		if (callNow) o.onConnectivityCheckSucceeded();
-	}
-
-	protected void onConnectivityCheckSucceeded(long now) {
-		List<ConnectivityObserver> observers;
-		synchronized (lock) {
-			if (destroyed) return;
-			connectivityCheck = null;
-			lastConnectivityCheckSucceeded = now;
-			observers = new ArrayList<>(connectivityObservers);
-			connectivityObservers.clear();
-		}
-		for (ConnectivityObserver o : observers) {
-			o.onConnectivityCheckSucceeded();
-		}
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java

@@ -1,39 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
-
-import java.io.IOException;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-class ContactMailboxConnectivityChecker extends ConnectivityCheckerImpl {
-
-	private final MailboxApi mailboxApi;
-
-	ContactMailboxConnectivityChecker(Clock clock,
-			MailboxApiCaller mailboxApiCaller, MailboxApi mailboxApi) {
-		super(clock, mailboxApiCaller);
-		this.mailboxApi = mailboxApi;
-	}
-
-	@Override
-	ApiCall createConnectivityCheckTask(MailboxProperties properties) {
-		if (properties.isOwner()) throw new IllegalArgumentException();
-		return new SimpleApiCall() {
-			@Override
-			void tryToCallApi() throws IOException, ApiException {
-				if (!mailboxApi.checkStatus(properties)) {
-					throw new ApiException();
-				}
-				// Call the observers and cache the result
-				onConnectivityCheckSucceeded(clock.currentTimeMillis());
-			}
-		};
-	}
-
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApi.java

@@ -3,37 +3,15 @@ package org.briarproject.bramble.mailbox;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.mailbox.MailboxAuthToken;
-import org.briarproject.bramble.api.mailbox.MailboxFileId;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
 import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateManager;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.List;
 
-import javax.annotation.Nonnull;
 import javax.annotation.concurrent.Immutable;
 
-import static java.util.Collections.singletonList;
-
-@NotNullByDefault
 interface MailboxApi {
 
-	/**
-	 * Mailbox API versions that we support as a client. This is reported to our
-	 * contacts by {@link MailboxUpdateManager}.
-	 */
-	List<MailboxVersion> CLIENT_SUPPORTS = singletonList(
-			new MailboxVersion(1, 0));
-
-	List<MailboxVersion> getServerSupports(MailboxProperties properties)
-			throws IOException, ApiException;
-
 	/**
 	 * Sets up the mailbox with the setup token.
 	 *
@@ -41,7 +19,7 @@ interface MailboxApi {
 	 * @return the owner token
 	 * @throws ApiException for 401 response.
 	 */
-	MailboxProperties setup(MailboxProperties properties)
+	String setup(MailboxProperties properties)
 			throws IOException, ApiException;
 
 	/**
@@ -53,14 +31,6 @@ interface MailboxApi {
 	boolean checkStatus(MailboxProperties properties)
 			throws IOException, ApiException;
 
-	/**
-	 * Unpairs Briar and the mailbox (owner only).
-	 * Resets mailbox state to that after first install
-	 * (e.g. removes all stored files as well).
-	 */
-	void wipeMailbox(MailboxProperties properties)
-			throws IOException, ApiException;
-
 	/**
 	 * Adds a new contact to the mailbox.
 	 *
@@ -87,69 +57,16 @@ interface MailboxApi {
 	Collection<ContactId> getContacts(MailboxProperties properties)
 			throws IOException, ApiException;
 
-	/**
-	 * Used by contacts to send files to the owner
-	 * and by the owner to send files to contacts.
-	 * <p>
-	 * The owner can add files to the contacts' inboxes
-	 * and the contacts can add files to their own outbox.
-	 */
-	void addFile(MailboxProperties properties, MailboxFolderId folderId,
-			File file) throws IOException, ApiException;
-
-	/**
-	 * Used by owner and contacts to list their files to retrieve.
-	 * <p>
-	 * Returns 200 OK with the list of files in JSON.
-	 */
-	List<MailboxFile> getFiles(MailboxProperties properties,
-			MailboxFolderId folderId) throws IOException, ApiException;
-
-	/**
-	 * Used by owner and contacts to retrieve a file.
-	 * <p>
-	 * Returns 200 OK if successful with the files' raw bytes
-	 * in the response body.
-	 *
-	 * @param file the empty file the response bytes will be written into.
-	 */
-	void getFile(MailboxProperties properties, MailboxFolderId folderId,
-			MailboxFileId fileId, File file) throws IOException, ApiException;
-
-	/**
-	 * Used by owner and contacts to delete files.
-	 * <p>
-	 * Returns 200 OK (no exception) if deletion was successful.
-	 *
-	 * @throws TolerableFailureException on 404 response,
-	 * because file was most likely deleted already.
-	 */
-	void deleteFile(MailboxProperties properties, MailboxFolderId folderId,
-			MailboxFileId fileId)
-			throws IOException, ApiException, TolerableFailureException;
-
-	/**
-	 * Lists all contact outboxes that have files available
-	 * for the owner to download.
-	 *
-	 * @return a list of folder names
-	 * to be used with {@link #getFiles(MailboxProperties, MailboxFolderId)}.
-	 * @throws IllegalArgumentException if used by non-owner.
-	 */
-	List<MailboxFolderId> getFolders(MailboxProperties properties)
-			throws IOException, ApiException;
-
 	@Immutable
 	@JsonSerialize
 	class MailboxContact {
 		public final int contactId;
-		public final MailboxAuthToken token;
+		public final String token, inboxId, outboxId;
-		public final MailboxFolderId inboxId, outboxId;
 
 		MailboxContact(ContactId contactId,
-				MailboxAuthToken token,
+				String token,
-				MailboxFolderId inboxId,
+				String inboxId,
-				MailboxFolderId outboxId) {
+				String outboxId) {
 			this.contactId = contactId.getInt();
 			this.token = token;
 			this.inboxId = inboxId;
@@ -157,32 +74,10 @@ interface MailboxApi {
 		}
 	}
 
-	@JsonSerialize
-	class MailboxFile implements Comparable<MailboxFile> {
-		public final MailboxFileId name;
-		public final long time;
-
-		public MailboxFile(MailboxFileId name, long time) {
-			this.name = name;
-			this.time = time;
-		}
-
-		@Override
-		public int compareTo(@Nonnull MailboxApi.MailboxFile mailboxFile) {
-			//noinspection UseCompareMethod
-			return time < mailboxFile.time ? -1 :
-					(time == mailboxFile.time ? 0 : 1);
-		}
-	}
-
 	@Immutable
 	class ApiException extends Exception {
 	}
 
-	@Immutable
-	class MailboxAlreadyPairedException extends ApiException {
-	}
-
 	/**
 	 * A failure that does not need to be retried,
 	 * e.g. when adding a contact that already exists.

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCaller.java

@@ -1,32 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import static java.util.concurrent.TimeUnit.DAYS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-
-@NotNullByDefault
-interface MailboxApiCaller {
-
-	/**
-	 * The minimum interval between retries in milliseconds.
-	 */
-	long MIN_RETRY_INTERVAL_MS = MINUTES.toMillis(1);
-
-	/**
-	 * The maximum interval between retries in milliseconds.
-	 */
-	long MAX_RETRY_INTERVAL_MS = DAYS.toMillis(1);
-
-	/**
-	 * Asynchronously calls the given API call on the {@link IoExecutor},
-	 * automatically retrying at increasing intervals until the API call
-	 * returns false or retries are cancelled.
-	 *
-	 * @return A {@link Cancellable} that can be used to cancel any future
-	 * retries.
-	 */
-	Cancellable retryWithBackoff(ApiCall apiCall);
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiCallerImpl.java

@@ -1,98 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.TaskScheduler;
-
-import java.util.concurrent.Executor;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-import static java.lang.Math.min;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-@Immutable
-@NotNullByDefault
-class MailboxApiCallerImpl implements MailboxApiCaller {
-
-	private final TaskScheduler taskScheduler;
-	private final Executor ioExecutor;
-
-	@Inject
-	MailboxApiCallerImpl(TaskScheduler taskScheduler,
-			@IoExecutor Executor ioExecutor) {
-		this.taskScheduler = taskScheduler;
-		this.ioExecutor = ioExecutor;
-	}
-
-	@Override
-	public Cancellable retryWithBackoff(ApiCall apiCall) {
-		Task task = new Task(apiCall);
-		task.start();
-		return task;
-	}
-
-	private class Task implements Cancellable {
-
-		private final ApiCall apiCall;
-		private final Object lock = new Object();
-
-		@GuardedBy("lock")
-		@Nullable
-		private Cancellable scheduledTask = null;
-
-		@GuardedBy("lock")
-		private boolean cancelled = false;
-
-		@GuardedBy("lock")
-		private long retryIntervalMs = MIN_RETRY_INTERVAL_MS;
-
-		private Task(ApiCall apiCall) {
-			this.apiCall = apiCall;
-		}
-
-		private void start() {
-			synchronized (lock) {
-				if (cancelled) throw new AssertionError();
-				ioExecutor.execute(this::callApi);
-			}
-		}
-
-		@IoExecutor
-		private void callApi() {
-			synchronized (lock) {
-				if (cancelled) return;
-			}
-			// The call returns true if we should retry
-			if (apiCall.callApi()) {
-				synchronized (lock) {
-					if (cancelled) return;
-					scheduledTask = taskScheduler.schedule(this::callApi,
-							ioExecutor, retryIntervalMs, MILLISECONDS);
-					// Increase the retry interval each time we retry
-					retryIntervalMs =
-							min(MAX_RETRY_INTERVAL_MS, retryIntervalMs * 2);
-				}
-			} else {
-				synchronized (lock) {
-					scheduledTask = null;
-				}
-			}
-		}
-
-		@Override
-		public void cancel() {
-			Cancellable scheduledTask;
-			synchronized (lock) {
-				cancelled = true;
-				scheduledTask = this.scheduledTask;
-				this.scheduledTask = null;
-			}
-			if (scheduledTask != null) scheduledTask.cancel();
-		}
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java

@@ -3,26 +3,15 @@ package org.briarproject.bramble.mailbox;
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import org.briarproject.bramble.api.WeakSingletonProvider;
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.mailbox.InvalidMailboxIdException;
-import org.briarproject.bramble.api.mailbox.MailboxAuthToken;
-import org.briarproject.bramble.api.mailbox.MailboxFileId;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxId;
 import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -37,7 +26,7 @@ import okhttp3.ResponseBody;
 import static com.fasterxml.jackson.databind.MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES;
 import static java.util.Objects.requireNonNull;
 import static okhttp3.internal.Util.EMPTY_REQUEST;
-import static org.briarproject.bramble.util.IoUtils.copyAndClose;
+import static org.briarproject.bramble.util.StringUtils.fromHexString;
 
 @NotNullByDefault
 class MailboxApiImpl implements MailboxApi {
@@ -48,8 +37,6 @@ class MailboxApiImpl implements MailboxApi {
 			.build();
 	private static final MediaType JSON =
 			requireNonNull(MediaType.parse("application/json; charset=utf-8"));
-	private static final MediaType FILE =
-			requireNonNull(MediaType.parse("application/octet-stream"));
 
 	@Inject
 	MailboxApiImpl(WeakSingletonProvider<OkHttpClient> httpClientProvider) {
@@ -57,33 +44,17 @@ class MailboxApiImpl implements MailboxApi {
 	}
 
 	@Override
-	public List<MailboxVersion> getServerSupports(MailboxProperties properties)
+	public String setup(MailboxProperties properties)
-			throws IOException, ApiException {
-		if (!properties.isOwner()) throw new IllegalArgumentException();
-		Response response = sendGetRequest(properties, "/versions");
-		if (response.code() != 200) throw new ApiException();
-
-		ResponseBody body = response.body();
-		if (body == null) throw new ApiException();
-		try {
-			JsonNode node = mapper.readTree(body.string());
-			return parseServerSupports(node);
-		} catch (JacksonException e) {
-			throw new ApiException();
-		}
-	}
-
-	@Override
-	public MailboxProperties setup(MailboxProperties properties)
 			throws IOException, ApiException {
 		if (!properties.isOwner()) throw new IllegalArgumentException();
 		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(properties.getBaseUrl() + "/setup")
+				.url(properties.getOnionAddress() + "/setup")
 				.put(EMPTY_REQUEST)
 				.build();
 		OkHttpClient client = httpClientProvider.get();
 		Response response = client.newCall(request).execute();
-		if (response.code() == 401) throw new MailboxAlreadyPairedException();
+		// TODO consider throwing a special exception for the 401 case
+		if (response.code() == 401) throw new ApiException();
 		if (!response.isSuccessful()) throw new ApiException();
 		ResponseBody body = response.body();
 		if (body == null) throw new ApiException();
@@ -93,67 +64,49 @@ class MailboxApiImpl implements MailboxApi {
 			if (tokenNode == null) {
 				throw new ApiException();
 			}
-			return new MailboxProperties(properties.getBaseUrl(),
+			String ownerToken = tokenNode.textValue();
-					MailboxAuthToken.fromString(tokenNode.textValue()),
+			if (ownerToken == null || !isValidToken(ownerToken)) {
-					parseServerSupports(node));
+				throw new ApiException();
-		} catch (JacksonException | InvalidMailboxIdException e) {
+			}
+			return ownerToken;
+		} catch (JacksonException e) {
 			throw new ApiException();
 		}
 	}
 
-	private List<MailboxVersion> parseServerSupports(JsonNode node)
+	private boolean isValidToken(String token) {
-			throws ApiException {
+		if (token.length() != 64) return false;
-		List<MailboxVersion> serverSupports = new ArrayList<>();
+		try {
-		ArrayNode serverSupportsNode = getArray(node, "serverSupports");
+			// try to convert to bytes
-		for (JsonNode versionNode : serverSupportsNode) {
+			fromHexString(token);
-			if (!versionNode.isObject()) throw new ApiException();
+			return true;
-			ObjectNode objectNode = (ObjectNode) versionNode;
+		} catch (IllegalArgumentException e) {
-			JsonNode majorNode = objectNode.get("major");
+			return false;
-			JsonNode minorNode = objectNode.get("minor");
-			if (majorNode == null || !majorNode.isNumber()) {
-				throw new ApiException();
-			}
-			if (minorNode == null || !minorNode.isNumber()) {
-				throw new ApiException();
-			}
-			int major = majorNode.asInt();
-			int minor = minorNode.asInt();
-			if (major < 0 || minor < 0) throw new ApiException();
-			serverSupports.add(new MailboxVersion(major, minor));
 		}
-		return serverSupports;
 	}
 
 	@Override
 	public boolean checkStatus(MailboxProperties properties)
 			throws IOException, ApiException {
+		if (!properties.isOwner()) throw new IllegalArgumentException();
 		Response response = sendGetRequest(properties, "/status");
 		if (response.code() == 401) throw new ApiException();
 		return response.isSuccessful();
 	}
 
-	@Override
-	public void wipeMailbox(MailboxProperties properties)
-			throws IOException, ApiException {
-		if (!properties.isOwner()) throw new IllegalArgumentException();
-		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(properties.getBaseUrl() + "/")
-				.delete()
-				.build();
-		OkHttpClient client = httpClientProvider.get();
-		Response response = client.newCall(request).execute();
-		if (response.code() != 204) throw new ApiException();
-	}
-
-	/* Contact Management API (owner only) */
-
 	@Override
 	public void addContact(MailboxProperties properties, MailboxContact contact)
-			throws IOException, ApiException, TolerableFailureException {
+			throws IOException, ApiException,
+			TolerableFailureException {
 		if (!properties.isOwner()) throw new IllegalArgumentException();
 		byte[] bodyBytes = mapper.writeValueAsBytes(contact);
 		RequestBody body = RequestBody.create(JSON, bodyBytes);
-		Response response = sendPostRequest(properties, "/contacts", body);
+		Request request = getRequestBuilder(properties.getAuthToken())
+				.url(properties.getOnionAddress() + "/contacts")
+				.post(body)
+				.build();
+		OkHttpClient client = httpClientProvider.get();
+		Response response = client.newCall(request).execute();
 		if (response.code() == 409) throw new TolerableFailureException();
 		if (!response.isSuccessful()) throw new ApiException();
 	}
@@ -162,7 +115,7 @@ class MailboxApiImpl implements MailboxApi {
 	public void deleteContact(MailboxProperties properties, ContactId contactId)
 			throws IOException, ApiException, TolerableFailureException {
 		if (!properties.isOwner()) throw new IllegalArgumentException();
-		String url = properties.getBaseUrl() + "/contacts/" +
+		String url = properties.getOnionAddress() + "/contacts/" +
 				contactId.getInt();
 		Request request = getRequestBuilder(properties.getAuthToken())
 				.delete()
@@ -185,7 +138,10 @@ class MailboxApiImpl implements MailboxApi {
 		if (body == null) throw new ApiException();
 		try {
 			JsonNode node = mapper.readTree(body.string());
-			ArrayNode contactsNode = getArray(node, "contacts");
+			JsonNode contactsNode = node.get("contacts");
+			if (contactsNode == null || !contactsNode.isArray()) {
+				throw new ApiException();
+			}
 			List<ContactId> list = new ArrayList<>();
 			for (JsonNode contactNode : contactsNode) {
 				if (!contactNode.isNumber()) throw new ApiException();
@@ -199,144 +155,18 @@ class MailboxApiImpl implements MailboxApi {
 		}
 	}
 
-	/* File Management (owner and contacts) */
-
-	@Override
-	public void addFile(MailboxProperties properties, MailboxFolderId folderId,
-			File file) throws IOException, ApiException {
-		String path = "/files/" + folderId;
-		RequestBody body = RequestBody.create(FILE, file);
-		Response response = sendPostRequest(properties, path, body);
-		if (response.code() != 200) throw new ApiException();
-	}
-
-	@Override
-	public List<MailboxFile> getFiles(MailboxProperties properties,
-			MailboxFolderId folderId) throws IOException, ApiException {
-		String path = "/files/" + folderId;
-		Response response = sendGetRequest(properties, path);
-		if (response.code() != 200) throw new ApiException();
-
-		ResponseBody body = response.body();
-		if (body == null) throw new ApiException();
-		try {
-			JsonNode node = mapper.readTree(body.string());
-			ArrayNode filesNode = getArray(node, "files");
-			List<MailboxFile> list = new ArrayList<>();
-			for (JsonNode fileNode : filesNode) {
-				if (!fileNode.isObject()) throw new ApiException();
-				ObjectNode objectNode = (ObjectNode) fileNode;
-				JsonNode nameNode = objectNode.get("name");
-				JsonNode timeNode = objectNode.get("time");
-				if (nameNode == null || !nameNode.isTextual()) {
-					throw new ApiException();
-				}
-				if (timeNode == null || !timeNode.isNumber()) {
-					throw new ApiException();
-				}
-				String name = nameNode.asText();
-				long time = timeNode.asLong();
-				if (time < 1) throw new ApiException();
-				list.add(new MailboxFile(MailboxFileId.fromString(name), time));
-			}
-			Collections.sort(list);
-			return list;
-		} catch (JacksonException | InvalidMailboxIdException e) {
-			throw new ApiException();
-		}
-	}
-
-	@Override
-	public void getFile(MailboxProperties properties, MailboxFolderId folderId,
-			MailboxFileId fileId, File file) throws IOException, ApiException {
-		String path = "/files/" + folderId + "/" + fileId;
-		Response response = sendGetRequest(properties, path);
-		if (response.code() != 200) throw new ApiException();
-
-		ResponseBody body = response.body();
-		if (body == null) throw new ApiException();
-		FileOutputStream outputStream = new FileOutputStream(file);
-		copyAndClose(body.byteStream(), outputStream);
-	}
-
-	@Override
-	public void deleteFile(MailboxProperties properties,
-			MailboxFolderId folderId, MailboxFileId fileId)
-			throws IOException, ApiException, TolerableFailureException {
-		String path = "/files/" + folderId + "/" + fileId;
-		Request request = getRequestBuilder(properties.getAuthToken())
-				.delete()
-				.url(properties.getBaseUrl() + path)
-				.build();
-		OkHttpClient client = httpClientProvider.get();
-		Response response = client.newCall(request).execute();
-		if (response.code() == 404) throw new TolerableFailureException();
-		if (response.code() != 200) throw new ApiException();
-	}
-
-	@Override
-	public List<MailboxFolderId> getFolders(MailboxProperties properties)
-			throws IOException, ApiException {
-		if (!properties.isOwner()) throw new IllegalArgumentException();
-		Response response = sendGetRequest(properties, "/folders");
-		if (response.code() != 200) throw new ApiException();
-
-		ResponseBody body = response.body();
-		if (body == null) throw new ApiException();
-		try {
-			JsonNode node = mapper.readTree(body.string());
-			ArrayNode filesNode = getArray(node, "folders");
-			List<MailboxFolderId> list = new ArrayList<>();
-			for (JsonNode fileNode : filesNode) {
-				if (!fileNode.isObject()) throw new ApiException();
-				ObjectNode objectNode = (ObjectNode) fileNode;
-				JsonNode idNode = objectNode.get("id");
-				if (idNode == null || !idNode.isTextual()) {
-					throw new ApiException();
-				}
-				String id = idNode.asText();
-				list.add(MailboxFolderId.fromString(id));
-			}
-			return list;
-		} catch (JacksonException | InvalidMailboxIdException e) {
-			throw new ApiException();
-		}
-	}
-
-	/* Helper Functions */
-
 	private Response sendGetRequest(MailboxProperties properties, String path)
 			throws IOException {
 		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(properties.getBaseUrl() + path)
+				.url(properties.getOnionAddress() + path)
 				.build();
 		OkHttpClient client = httpClientProvider.get();
 		return client.newCall(request).execute();
 	}
 
-	private Response sendPostRequest(MailboxProperties properties, String path,
+	private Request.Builder getRequestBuilder(String token) {
-			RequestBody body) throws IOException {
-		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(properties.getBaseUrl() + path)
-				.post(body)
-				.build();
-		OkHttpClient client = httpClientProvider.get();
-		return client.newCall(request).execute();
-	}
-
-	private Request.Builder getRequestBuilder(MailboxId token) {
 		return new Request.Builder()
 				.addHeader("Authorization", "Bearer " + token);
 	}
 
-	/* JSON helpers */
-
-	private ArrayNode getArray(JsonNode node, String name) throws ApiException {
-		JsonNode arrayNode = node.get(name);
-		if (arrayNode == null || !arrayNode.isArray()) {
-			throw new ApiException();
-		}
-		return (ArrayNode) arrayNode;
-	}
-
 }

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java

@@ -1,156 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.db.TransactionManager;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.mailbox.MailboxManager;
-import org.briarproject.bramble.api.mailbox.MailboxPairingTask;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.mailbox.MailboxStatus;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@Immutable
-@NotNullByDefault
-class MailboxManagerImpl implements MailboxManager {
-
-	private static final String TAG = MailboxManagerImpl.class.getName();
-	private final static Logger LOG = getLogger(TAG);
-
-	private final Executor ioExecutor;
-	private final MailboxApi api;
-	private final TransactionManager db;
-	private final MailboxSettingsManager mailboxSettingsManager;
-	private final MailboxPairingTaskFactory pairingTaskFactory;
-	private final Clock clock;
-	private final Object lock = new Object();
-
-	@Nullable
-	@GuardedBy("lock")
-	private MailboxPairingTask pairingTask = null;
-
-	@Inject
-	MailboxManagerImpl(
-			@IoExecutor Executor ioExecutor,
-			MailboxApi api,
-			TransactionManager db,
-			MailboxSettingsManager mailboxSettingsManager,
-			MailboxPairingTaskFactory pairingTaskFactory,
-			Clock clock) {
-		this.ioExecutor = ioExecutor;
-		this.api = api;
-		this.db = db;
-		this.mailboxSettingsManager = mailboxSettingsManager;
-		this.pairingTaskFactory = pairingTaskFactory;
-		this.clock = clock;
-	}
-
-	@Override
-	public boolean isPaired(Transaction txn) throws DbException {
-		return mailboxSettingsManager.getOwnMailboxProperties(txn) != null;
-	}
-
-	@Override
-	public MailboxStatus getMailboxStatus(Transaction txn) throws DbException {
-		return mailboxSettingsManager.getOwnMailboxStatus(txn);
-	}
-
-	@Nullable
-	@Override
-	public MailboxPairingTask getCurrentPairingTask() {
-		synchronized (lock) {
-			return pairingTask;
-		}
-	}
-
-	@Override
-	public MailboxPairingTask startPairingTask(String payload) {
-		MailboxPairingTask created;
-		synchronized (lock) {
-			if (pairingTask != null) return pairingTask;
-			created = pairingTaskFactory.createPairingTask(payload);
-			pairingTask = created;
-		}
-		ioExecutor.execute(() -> {
-			created.run();
-			synchronized (lock) {
-				// remove task after it finished
-				pairingTask = null;
-			}
-		});
-		return created;
-	}
-
-	@Override
-	public boolean checkConnection() {
-		boolean success;
-		try {
-			MailboxProperties props = db.transactionWithNullableResult(true,
-					mailboxSettingsManager::getOwnMailboxProperties);
-			if (props == null) throw new DbException();
-			success = api.checkStatus(props);
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-			// we don't treat this is a failure to record
-			return false;
-		} catch (IOException | MailboxApi.ApiException e) {
-			// we record this as a failure
-			success = false;
-			logException(LOG, WARNING, e);
-		}
-		try {
-			recordCheckResult(success);
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-		return success;
-	}
-
-	private void recordCheckResult(boolean success) throws DbException {
-		long now = clock.currentTimeMillis();
-		db.transaction(false, txn -> {
-			if (success) {
-				mailboxSettingsManager.recordSuccessfulConnection(txn, now);
-			} else {
-				mailboxSettingsManager.recordFailedConnectionAttempt(txn, now);
-			}
-		});
-	}
-
-	@Override
-	public boolean unPair() throws DbException {
-		MailboxProperties properties = db.transactionWithNullableResult(true,
-				mailboxSettingsManager::getOwnMailboxProperties);
-		if (properties == null) {
-			// no more mailbox, that's strange but possible if called in quick
-			// succession, so let's return true this time
-			return true;
-		}
-		boolean wasWiped;
-		try {
-			api.wipeMailbox(properties);
-			wasWiped = true;
-		} catch (IOException | MailboxApi.ApiException e) {
-			logException(LOG, WARNING, e);
-			wasWiped = false;
-		}
-		db.transaction(false,
-				mailboxSettingsManager::removeOwnMailboxProperties);
-		return wasWiped;
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java

@@ -1,104 +1,16 @@
 package org.briarproject.bramble.mailbox;
 
-import org.briarproject.bramble.api.FeatureFlags;
-import org.briarproject.bramble.api.client.ClientHelper;
-import org.briarproject.bramble.api.contact.ContactManager;
-import org.briarproject.bramble.api.data.MetadataEncoder;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.mailbox.MailboxManager;
 import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateManager;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
-import org.briarproject.bramble.api.sync.validation.ValidationManager;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.versioning.ClientVersioningManager;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
 
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.CLIENT_ID;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.MAJOR_VERSION;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.MINOR_VERSION;
-import static org.briarproject.bramble.mailbox.MailboxApi.CLIENT_SUPPORTS;
-
 @Module
 public class MailboxModule {
 
-	public static class EagerSingletons {
-		@Inject
-		MailboxUpdateValidator mailboxUpdateValidator;
-		@Inject
-		MailboxUpdateManager mailboxUpdateManager;
-	}
-
-	@Provides
-	@Singleton
-	MailboxManager providesMailboxManager(MailboxManagerImpl mailboxManager) {
-		return mailboxManager;
-	}
-
-	@Provides
-	MailboxPairingTaskFactory provideMailboxPairingTaskFactory(
-			MailboxPairingTaskFactoryImpl mailboxPairingTaskFactory) {
-		return mailboxPairingTaskFactory;
-	}
-
 	@Provides
 	MailboxSettingsManager provideMailboxSettingsManager(
 			MailboxSettingsManagerImpl mailboxSettingsManager) {
 		return mailboxSettingsManager;
 	}
-
-	@Provides
-	MailboxApi providesMailboxApi(MailboxApiImpl mailboxApi) {
-		return mailboxApi;
-	}
-
-	@Provides
-	@Singleton
-	MailboxUpdateValidator provideMailboxUpdateValidator(
-			ValidationManager validationManager,
-			ClientHelper clientHelper,
-			MetadataEncoder metadataEncoder,
-			Clock clock,
-			FeatureFlags featureFlags) {
-		MailboxUpdateValidator validator = new MailboxUpdateValidator(
-				clientHelper, metadataEncoder, clock);
-		if (featureFlags.shouldEnableMailbox()) {
-			validationManager.registerMessageValidator(CLIENT_ID,
-					MAJOR_VERSION, validator);
-		}
-		return validator;
-	}
-
-	@Provides
-	List<MailboxVersion> provideClientSupports() {
-		return CLIENT_SUPPORTS;
-	}
-
-	@Provides
-	@Singleton
-	MailboxUpdateManager provideMailboxUpdateManager(
-			FeatureFlags featureFlags,
-			LifecycleManager lifecycleManager,
-			ValidationManager validationManager, ContactManager contactManager,
-			ClientVersioningManager clientVersioningManager,
-			MailboxSettingsManager mailboxSettingsManager,
-			MailboxUpdateManagerImpl mailboxUpdateManager) {
-		if (featureFlags.shouldEnableMailbox()) {
-			lifecycleManager.registerOpenDatabaseHook(mailboxUpdateManager);
-			validationManager.registerIncomingMessageHook(CLIENT_ID,
-					MAJOR_VERSION, mailboxUpdateManager);
-			contactManager.registerContactHook(mailboxUpdateManager);
-			clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
-					MINOR_VERSION, mailboxUpdateManager);
-			mailboxSettingsManager.registerMailboxHook(mailboxUpdateManager);
-		}
-		return mailboxUpdateManager;
-	}
 }

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactory.java

@@ -1,12 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-
-import org.briarproject.bramble.api.mailbox.MailboxPairingTask;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-interface MailboxPairingTaskFactory {
-
-	MailboxPairingTask createPairingTask(String qrCodePayload);
-
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskFactoryImpl.java

@@ -1,53 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.event.EventExecutor;
-import org.briarproject.bramble.api.mailbox.MailboxPairingTask;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-
-import java.util.concurrent.Executor;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-@Immutable
-@NotNullByDefault
-class MailboxPairingTaskFactoryImpl implements MailboxPairingTaskFactory {
-
-	private final Executor eventExecutor;
-	private final DatabaseComponent db;
-	private final CryptoComponent crypto;
-	private final Clock clock;
-	private final MailboxApi api;
-	private final MailboxSettingsManager mailboxSettingsManager;
-	private final MailboxUpdateManager mailboxUpdateManager;
-
-	@Inject
-	MailboxPairingTaskFactoryImpl(
-			@EventExecutor Executor eventExecutor,
-			DatabaseComponent db,
-			CryptoComponent crypto,
-			Clock clock,
-			MailboxApi api,
-			MailboxSettingsManager mailboxSettingsManager,
-			MailboxUpdateManager mailboxUpdateManager) {
-		this.eventExecutor = eventExecutor;
-		this.db = db;
-		this.crypto = crypto;
-		this.clock = clock;
-		this.api = api;
-		this.mailboxSettingsManager = mailboxSettingsManager;
-		this.mailboxUpdateManager = mailboxUpdateManager;
-	}
-
-	@Override
-	public MailboxPairingTask createPairingTask(String qrCodePayload) {
-		return new MailboxPairingTaskImpl(qrCodePayload, eventExecutor, db,
-				crypto, clock, api, mailboxSettingsManager,
-				mailboxUpdateManager);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java

@@ -1,186 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Consumer;
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.event.EventExecutor;
-import org.briarproject.bramble.api.mailbox.MailboxAuthToken;
-import org.briarproject.bramble.api.mailbox.MailboxPairingState;
-import org.briarproject.bramble.api.mailbox.MailboxPairingTask;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.mailbox.MailboxUpdate;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
-import org.briarproject.bramble.mailbox.MailboxApi.MailboxAlreadyPairedException;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@ThreadSafe
-@NotNullByDefault
-class MailboxPairingTaskImpl implements MailboxPairingTask {
-
-	private final static Logger LOG =
-			getLogger(MailboxPairingTaskImpl.class.getName());
-	@SuppressWarnings("CharsetObjectCanBeUsed") // Requires minSdkVersion >= 19
-	private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
-	private static final int VERSION_REQUIRED = 32;
-
-	private final String payload;
-	private final Executor eventExecutor;
-	private final DatabaseComponent db;
-	private final CryptoComponent crypto;
-	private final Clock clock;
-	private final MailboxApi api;
-	private final MailboxSettingsManager mailboxSettingsManager;
-	private final MailboxUpdateManager mailboxUpdateManager;
-
-	private final Object lock = new Object();
-	@GuardedBy("lock")
-	private final List<Consumer<MailboxPairingState>> observers =
-			new ArrayList<>();
-	@GuardedBy("lock")
-	private MailboxPairingState state;
-
-	MailboxPairingTaskImpl(
-			String payload,
-			@EventExecutor Executor eventExecutor,
-			DatabaseComponent db,
-			CryptoComponent crypto,
-			Clock clock,
-			MailboxApi api,
-			MailboxSettingsManager mailboxSettingsManager,
-			MailboxUpdateManager mailboxUpdateManager) {
-		this.payload = payload;
-		this.eventExecutor = eventExecutor;
-		this.db = db;
-		this.crypto = crypto;
-		this.clock = clock;
-		this.api = api;
-		this.mailboxSettingsManager = mailboxSettingsManager;
-		this.mailboxUpdateManager = mailboxUpdateManager;
-		state = new MailboxPairingState.QrCodeReceived();
-	}
-
-	@Override
-	public void addObserver(Consumer<MailboxPairingState> o) {
-		MailboxPairingState state;
-		synchronized (lock) {
-			observers.add(o);
-			state = this.state;
-			eventExecutor.execute(() -> o.accept(state));
-		}
-	}
-
-	@Override
-	public void removeObserver(Consumer<MailboxPairingState> o) {
-		synchronized (lock) {
-			observers.remove(o);
-		}
-	}
-
-	@Override
-	public void run() {
-		try {
-			pairMailbox();
-		} catch (FormatException e) {
-			onMailboxError(e, new MailboxPairingState.InvalidQrCode());
-		} catch (MailboxAlreadyPairedException e) {
-			onMailboxError(e, new MailboxPairingState.MailboxAlreadyPaired());
-		} catch (IOException e) {
-			onMailboxError(e, new MailboxPairingState.ConnectionError());
-		} catch (ApiException | DbException e) {
-			onMailboxError(e, new MailboxPairingState.UnexpectedError());
-		}
-	}
-
-	private void pairMailbox() throws IOException, ApiException, DbException {
-		MailboxProperties mailboxProperties = decodeQrCodePayload(payload);
-		setState(new MailboxPairingState.Pairing());
-		MailboxProperties ownerProperties = api.setup(mailboxProperties);
-		long time = clock.currentTimeMillis();
-		db.transaction(false, txn -> {
-			mailboxSettingsManager
-					.setOwnMailboxProperties(txn, ownerProperties);
-			mailboxSettingsManager.recordSuccessfulConnection(txn, time);
-			// A (possibly new) mailbox is paired. Reset message retransmission
-			// timers for contacts who doesn't have their own mailbox. This way,
-			// data stranded on our old mailbox will be re-uploaded to our new.
-			for (Contact c : db.getContacts(txn)) {
-				MailboxUpdate update = mailboxUpdateManager.getRemoteUpdate(
-						txn, c.getId());
-				if (update == null || !update.hasMailbox()) {
-					db.resetUnackedMessagesToSend(txn, c.getId());
-				}
-			}
-		});
-		setState(new MailboxPairingState.Paired());
-	}
-
-	private void onMailboxError(Exception e, MailboxPairingState state) {
-		logException(LOG, WARNING, e);
-		setState(state);
-	}
-
-	private void setState(MailboxPairingState state) {
-		synchronized (lock) {
-			this.state = state;
-			notifyObservers();
-		}
-	}
-
-	@GuardedBy("lock")
-	private void notifyObservers() {
-		List<Consumer<MailboxPairingState>> observers =
-				new ArrayList<>(this.observers);
-		MailboxPairingState state = this.state;
-		eventExecutor.execute(() -> {
-			for (Consumer<MailboxPairingState> o : observers) o.accept(state);
-		});
-	}
-
-	private MailboxProperties decodeQrCodePayload(String payload)
-			throws FormatException {
-		byte[] bytes = payload.getBytes(ISO_8859_1);
-		if (bytes.length != 65) {
-			if (LOG.isLoggable(WARNING)) {
-				LOG.warning("QR code length is not 65: " + bytes.length);
-			}
-			throw new FormatException();
-		}
-		int version = bytes[0] & 0xFF;
-		if (version != VERSION_REQUIRED) {
-			if (LOG.isLoggable(WARNING)) {
-				LOG.warning("QR code has not version " + VERSION_REQUIRED +
-						": " + version);
-			}
-			throw new FormatException();
-		}
-		LOG.info("QR code is valid");
-		byte[] onionPubKey = Arrays.copyOfRange(bytes, 1, 33);
-		String onion = crypto.encodeOnion(onionPubKey);
-		String baseUrl = "http://" + onion + ".onion"; // TODO
-		byte[] tokenBytes = Arrays.copyOfRange(bytes, 33, 65);
-		MailboxAuthToken setupToken = new MailboxAuthToken(tokenBytes);
-		return new MailboxProperties(baseUrl, setupToken, new ArrayList<>());
-	}
-
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java

@@ -3,22 +3,13 @@ package org.briarproject.bramble.mailbox;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.mailbox.InvalidMailboxIdException;
-import org.briarproject.bramble.api.mailbox.MailboxAuthToken;
 import org.briarproject.bramble.api.mailbox.MailboxProperties;
 import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
 import org.briarproject.bramble.api.mailbox.MailboxStatus;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
-import org.briarproject.bramble.api.mailbox.event.MailboxProblemEvent;
-import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.SettingsManager;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
@@ -31,28 +22,20 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 
 	// Package access for testing
 	static final String SETTINGS_NAMESPACE = "mailbox";
-	// TODO: This currently stores the base URL, not the 56-char onion address
 	static final String SETTINGS_KEY_ONION = "onion";
 	static final String SETTINGS_KEY_TOKEN = "token";
-	static final String SETTINGS_KEY_SERVER_SUPPORTS = "serverSupports";
 	static final String SETTINGS_KEY_LAST_ATTEMPT = "lastAttempt";
 	static final String SETTINGS_KEY_LAST_SUCCESS = "lastSuccess";
 	static final String SETTINGS_KEY_ATTEMPTS = "attempts";
 	static final String SETTINGS_UPLOADS_NAMESPACE = "mailbox-uploads";
 
 	private final SettingsManager settingsManager;
-	private final List<MailboxHook> hooks = new CopyOnWriteArrayList<>();
 
 	@Inject
 	MailboxSettingsManagerImpl(SettingsManager settingsManager) {
 		this.settingsManager = settingsManager;
 	}
 
-	@Override
-	public void registerMailboxHook(MailboxHook hook) {
-		hooks.add(hook);
-	}
-
 	@Override
 	public MailboxProperties getOwnMailboxProperties(Transaction txn)
 			throws DbException {
@@ -60,52 +43,16 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 		String onion = s.get(SETTINGS_KEY_ONION);
 		String token = s.get(SETTINGS_KEY_TOKEN);
 		if (isNullOrEmpty(onion) || isNullOrEmpty(token)) return null;
-		int[] ints = s.getIntArray(SETTINGS_KEY_SERVER_SUPPORTS);
+		return new MailboxProperties(onion, token, true);
-		// We know we were paired, so we must have proper serverSupports
-		if (ints == null || ints.length == 0 || ints.length % 2 != 0) {
-			throw new DbException();
-		}
-		List<MailboxVersion> serverSupports = new ArrayList<>();
-		for (int i = 0; i < ints.length - 1; i += 2) {
-			serverSupports.add(new MailboxVersion(ints[i], ints[i + 1]));
-		}
-		try {
-			MailboxAuthToken tokenId = MailboxAuthToken.fromString(token);
-			return new MailboxProperties(onion, tokenId, serverSupports);
-		} catch (InvalidMailboxIdException e) {
-			throw new DbException(e);
-		}
 	}
 
 	@Override
 	public void setOwnMailboxProperties(Transaction txn, MailboxProperties p)
 			throws DbException {
 		Settings s = new Settings();
-		s.put(SETTINGS_KEY_ONION, p.getBaseUrl());
+		s.put(SETTINGS_KEY_ONION, p.getOnionAddress());
-		s.put(SETTINGS_KEY_TOKEN, p.getAuthToken().toString());
+		s.put(SETTINGS_KEY_TOKEN, p.getAuthToken());
-		List<MailboxVersion> serverSupports = p.getServerSupports();
-		int[] ints = new int[serverSupports.size() * 2];
-		int i = 0;
-		for (MailboxVersion v : serverSupports) {
-			ints[i++] = v.getMajor();
-			ints[i++] = v.getMinor();
-		}
-		s.putIntArray(SETTINGS_KEY_SERVER_SUPPORTS, ints);
 		settingsManager.mergeSettings(txn, s, SETTINGS_NAMESPACE);
-		for (MailboxHook hook : hooks) {
-			hook.mailboxPaired(txn, p.getOnion(), p.getServerSupports());
-		}
-	}
-
-	@Override
-	public void removeOwnMailboxProperties(Transaction txn) throws DbException {
-		Settings s = new Settings();
-		s.put(SETTINGS_KEY_ONION, "");
-		s.put(SETTINGS_KEY_TOKEN, "");
-		settingsManager.mergeSettings(txn, s, SETTINGS_NAMESPACE);
-		for (MailboxHook hook : hooks) {
-			hook.mailboxUnpaired(txn);
-		}
 	}
 
 	@Override
@@ -126,8 +73,6 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 		s.putLong(SETTINGS_KEY_LAST_SUCCESS, now);
 		s.putInt(SETTINGS_KEY_ATTEMPTS, 0);
 		settingsManager.mergeSettings(txn, s, SETTINGS_NAMESPACE);
-		MailboxStatus status = new MailboxStatus(now, now, 0);
-		txn.attach(new OwnMailboxConnectionStatusEvent(status));
 	}
 
 	@Override
@@ -135,15 +80,11 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 			throws DbException {
 		Settings oldSettings =
 				settingsManager.getSettings(txn, SETTINGS_NAMESPACE);
-		int newAttempts = 1 + oldSettings.getInt(SETTINGS_KEY_ATTEMPTS, 0);
+		int attempts = oldSettings.getInt(SETTINGS_KEY_ATTEMPTS, 0);
-		long lastSuccess = oldSettings.getLong(SETTINGS_KEY_LAST_SUCCESS, 0);
 		Settings newSettings = new Settings();
 		newSettings.putLong(SETTINGS_KEY_LAST_ATTEMPT, now);
-		newSettings.putInt(SETTINGS_KEY_ATTEMPTS, newAttempts);
+		newSettings.putInt(SETTINGS_KEY_ATTEMPTS, attempts + 1);
 		settingsManager.mergeSettings(txn, newSettings, SETTINGS_NAMESPACE);
-		MailboxStatus status = new MailboxStatus(now, lastSuccess, newAttempts);
-		txn.attach(new OwnMailboxConnectionStatusEvent(status));
-		if (status.hasProblem(now)) txn.attach(new MailboxProblemEvent());
 	}
 
 	@Override

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateManagerImpl.java

@@ -1,373 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.FormatException;
-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.contact.ContactManager.ContactHook;
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-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.DbException;
-import org.briarproject.bramble.api.db.Metadata;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook;
-import org.briarproject.bramble.api.mailbox.MailboxAuthToken;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager.MailboxHook;
-import org.briarproject.bramble.api.mailbox.MailboxUpdate;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateManager;
-import org.briarproject.bramble.api.mailbox.MailboxUpdateWithMailbox;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
-import org.briarproject.bramble.api.mailbox.event.RemoteMailboxUpdateEvent;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.Group.Visibility;
-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.validation.IncomingMessageHook;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.versioning.ClientVersioningManager;
-import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-import static org.briarproject.bramble.api.sync.validation.IncomingMessageHook.DeliveryAction.ACCEPT_DO_NOT_SHARE;
-
-@NotNullByDefault
-class MailboxUpdateManagerImpl implements MailboxUpdateManager,
-		OpenDatabaseHook, ContactHook, ClientVersioningHook,
-		IncomingMessageHook, MailboxHook {
-
-	private final List<MailboxVersion> clientSupports;
-	private final DatabaseComponent db;
-	private final ClientHelper clientHelper;
-	private final ClientVersioningManager clientVersioningManager;
-	private final MetadataParser metadataParser;
-	private final ContactGroupFactory contactGroupFactory;
-	private final Clock clock;
-	private final MailboxSettingsManager mailboxSettingsManager;
-	private final CryptoComponent crypto;
-	private final Group localGroup;
-
-	@Inject
-	MailboxUpdateManagerImpl(List<MailboxVersion> clientSupports,
-			DatabaseComponent db, ClientHelper clientHelper,
-			ClientVersioningManager clientVersioningManager,
-			MetadataParser metadataParser,
-			ContactGroupFactory contactGroupFactory, Clock clock,
-			MailboxSettingsManager mailboxSettingsManager,
-			CryptoComponent crypto) {
-		this.clientSupports = clientSupports;
-		this.db = db;
-		this.clientHelper = clientHelper;
-		this.clientVersioningManager = clientVersioningManager;
-		this.metadataParser = metadataParser;
-		this.contactGroupFactory = contactGroupFactory;
-		this.clock = clock;
-		this.mailboxSettingsManager = mailboxSettingsManager;
-		this.crypto = crypto;
-		localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID,
-				MAJOR_VERSION);
-	}
-
-	@Override
-	public void onDatabaseOpened(Transaction txn) throws DbException {
-		if (db.containsGroup(txn, localGroup.getId())) {
-			try {
-				BdfDictionary meta = clientHelper.getGroupMetadataAsDictionary(
-						txn, localGroup.getId());
-				BdfList sent = meta.getList(GROUP_KEY_SENT_CLIENT_SUPPORTS);
-				if (clientHelper.parseMailboxVersionList(sent)
-						.equals(clientSupports)) {
-					return;
-				}
-			} catch (FormatException e) {
-				throw new DbException();
-			}
-			// Our current clientSupports list has changed compared to what we
-			// last sent out.
-			for (Contact c : db.getContacts(txn)) {
-				MailboxUpdate latest = getLocalUpdate(txn, c.getId());
-				MailboxUpdate updated;
-				if (latest.hasMailbox()) {
-					updated = new MailboxUpdateWithMailbox(
-							(MailboxUpdateWithMailbox) latest, clientSupports);
-				} else {
-					updated = new MailboxUpdate(clientSupports);
-				}
-				Group g = getContactGroup(c);
-				storeMessageReplaceLatest(txn, g.getId(), updated);
-			}
-		} else {
-			db.addGroup(txn, localGroup);
-			// Set things up for any pre-existing contacts
-			for (Contact c : db.getContacts(txn)) {
-				addingContact(txn, c);
-			}
-		}
-
-		try {
-			BdfDictionary meta = BdfDictionary.of(new BdfEntry(
-					GROUP_KEY_SENT_CLIENT_SUPPORTS,
-					encodeSupportsList(clientSupports)));
-			clientHelper.mergeGroupMetadata(txn, localGroup.getId(), meta);
-		} catch (FormatException e) {
-			throw new DbException();
-		}
-	}
-
-	@Override
-	public void addingContact(Transaction txn, Contact c) throws DbException {
-		// Create a group to share with the contact
-		Group g = getContactGroup(c);
-		db.addGroup(txn, g);
-		// Apply the client's visibility to the contact group
-		Visibility client = clientVersioningManager
-				.getClientVisibility(txn, c.getId(), CLIENT_ID, MAJOR_VERSION);
-		db.setGroupVisibility(txn, c.getId(), g.getId(), client);
-		// Attach the contact ID to the group
-		clientHelper.setContactId(txn, g.getId(), c.getId());
-		MailboxProperties ownProps =
-				mailboxSettingsManager.getOwnMailboxProperties(txn);
-		if (ownProps != null) {
-			// We are paired, create and send props to the newly added contact
-			createAndSendUpdateWithMailbox(txn, c, ownProps.getServerSupports(),
-					ownProps.getOnion());
-		} else {
-			// Not paired, but we still want to get our clientSupports sent
-			sendUpdateNoMailbox(txn, c);
-		}
-	}
-
-	@Override
-	public void removingContact(Transaction txn, Contact c) throws DbException {
-		db.removeGroup(txn, getContactGroup(c));
-	}
-
-	@Override
-	public void mailboxPaired(Transaction txn, String ownOnion,
-			List<MailboxVersion> serverSupports) throws DbException {
-		for (Contact c : db.getContacts(txn)) {
-			createAndSendUpdateWithMailbox(txn, c, serverSupports, ownOnion);
-		}
-	}
-
-	@Override
-	public void mailboxUnpaired(Transaction txn) throws DbException {
-		for (Contact c : db.getContacts(txn)) {
-			sendUpdateNoMailbox(txn, c);
-		}
-	}
-
-	@Override
-	public void onClientVisibilityChanging(Transaction txn, Contact c,
-			Visibility v) throws DbException {
-		// Apply the client's visibility to the contact group
-		Group g = getContactGroup(c);
-		db.setGroupVisibility(txn, c.getId(), g.getId(), v);
-	}
-
-	@Override
-	public DeliveryAction incomingMessage(Transaction txn, Message m,
-			Metadata meta) throws DbException, InvalidMessageException {
-		try {
-			BdfDictionary d = metadataParser.parse(meta);
-			// Get latest non-local update in the same group (from same contact)
-			LatestUpdate latest = findLatest(txn, m.getGroupId(), false);
-			if (latest != null) {
-				if (d.getLong(MSG_KEY_VERSION) > latest.version) {
-					db.deleteMessage(txn, latest.messageId);
-					db.deleteMessageMetadata(txn, latest.messageId);
-				} else {
-					// Delete this update, we already have a newer one
-					db.deleteMessage(txn, m.getId());
-					db.deleteMessageMetadata(txn, m.getId());
-					return ACCEPT_DO_NOT_SHARE;
-				}
-			}
-			ContactId c = clientHelper.getContactId(txn, m.getGroupId());
-			BdfList body = clientHelper.getMessageAsList(txn, m.getId());
-			MailboxUpdate u = parseUpdate(body);
-			txn.attach(new RemoteMailboxUpdateEvent(c, u));
-			// Reset message retransmission timers for the contact. Avoiding
-			// messages getting stranded:
-			// - on our mailbox, if they now have a mailbox but didn't before
-			// - on the contact's old mailbox, if they removed their mailbox
-			// - on the contact's old mailbox, if they replaced their mailbox
-			db.resetUnackedMessagesToSend(txn, c);
-		} catch (FormatException e) {
-			throw new InvalidMessageException(e);
-		}
-		return ACCEPT_DO_NOT_SHARE;
-	}
-
-	@Override
-	public MailboxUpdate getLocalUpdate(Transaction txn, ContactId c)
-			throws DbException {
-		MailboxUpdate local = getUpdate(txn, db.getContact(txn, c), true);
-		// An update (with or without mailbox) is created when contact is added
-		if (local == null) {
-			throw new DbException();
-		}
-		return local;
-	}
-
-	@Override
-	@Nullable
-	public MailboxUpdate getRemoteUpdate(Transaction txn, ContactId c)
-			throws DbException {
-		return getUpdate(txn, db.getContact(txn, c), false);
-	}
-
-	/**
-	 * Creates and sends an update message to the given contact. The message
-	 * holds our own mailbox's onion, generated unique properties, and lists of
-	 * supported Mailbox API version(s). All of which the contact needs to
-	 * communicate with our Mailbox.
-	 */
-	private void createAndSendUpdateWithMailbox(Transaction txn, Contact c,
-			List<MailboxVersion> serverSupports, String ownOnion)
-			throws DbException {
-		String baseUrl = "http://" + ownOnion + ".onion"; // TODO
-		MailboxProperties properties = new MailboxProperties(baseUrl,
-				new MailboxAuthToken(crypto.generateUniqueId().getBytes()),
-				serverSupports,
-				new MailboxFolderId(crypto.generateUniqueId().getBytes()),
-				new MailboxFolderId(crypto.generateUniqueId().getBytes()));
-		MailboxUpdate u =
-				new MailboxUpdateWithMailbox(clientSupports, properties);
-		Group g = getContactGroup(c);
-		storeMessageReplaceLatest(txn, g.getId(), u);
-	}
-
-	/**
-	 * Sends an update message with empty properties to the given contact. The
-	 * empty update indicates for the receiving contact that we don't have any
-	 * Mailbox that they can use. It still includes the list of Mailbox API
-	 * version(s) that we support as a client.
-	 */
-	private void sendUpdateNoMailbox(Transaction txn, Contact c)
-			throws DbException {
-		Group g = getContactGroup(c);
-		MailboxUpdate u = new MailboxUpdate(clientSupports);
-		storeMessageReplaceLatest(txn, g.getId(), u);
-	}
-
-	@Nullable
-	private MailboxUpdate getUpdate(Transaction txn, Contact c, boolean local)
-			throws DbException {
-		MailboxUpdate u = null;
-		Group g = getContactGroup(c);
-		try {
-			LatestUpdate latest = findLatest(txn, g.getId(), local);
-			if (latest != null) {
-				BdfList body =
-						clientHelper.getMessageAsList(txn, latest.messageId);
-				u = parseUpdate(body);
-			}
-		} catch (FormatException e) {
-			throw new DbException(e);
-		}
-		return u;
-	}
-
-	private void storeMessageReplaceLatest(Transaction txn, GroupId g,
-			MailboxUpdate u) throws DbException {
-		try {
-			LatestUpdate latest = findLatest(txn, g, true);
-			long version = latest == null ? 1 : latest.version + 1;
-			Message m = clientHelper.createMessage(g, clock.currentTimeMillis(),
-					encodeProperties(version, u));
-			BdfDictionary meta = new BdfDictionary();
-			meta.put(MSG_KEY_VERSION, version);
-			meta.put(MSG_KEY_LOCAL, true);
-			clientHelper.addLocalMessage(txn, m, meta, true, false);
-			if (latest != null) {
-				db.removeMessage(txn, latest.messageId);
-			}
-		} catch (FormatException e) {
-			throw new DbException(e);
-		}
-	}
-
-	@Nullable
-	private LatestUpdate findLatest(Transaction txn, GroupId g, boolean local)
-			throws DbException, FormatException {
-		Map<MessageId, BdfDictionary> metadata =
-				clientHelper.getMessageMetadataAsDictionary(txn, g);
-		// We should have at most 1 local and 1 remote
-		if (metadata.size() > 2) {
-			throw new IllegalStateException();
-		}
-		for (Entry<MessageId, BdfDictionary> e : metadata.entrySet()) {
-			BdfDictionary meta = e.getValue();
-			if (meta.getBoolean(MSG_KEY_LOCAL) == local) {
-				return new LatestUpdate(e.getKey(),
-						meta.getLong(MSG_KEY_VERSION));
-			}
-		}
-		return null;
-	}
-
-	private BdfList encodeProperties(long version, MailboxUpdate u) {
-		BdfDictionary dict = new BdfDictionary();
-		BdfList serverSupports = new BdfList();
-		if (u.hasMailbox()) {
-			MailboxUpdateWithMailbox um = (MailboxUpdateWithMailbox) u;
-			MailboxProperties properties = um.getMailboxProperties();
-			serverSupports = encodeSupportsList(properties.getServerSupports());
-			dict.put(PROP_KEY_ONION, properties.getOnion());
-			dict.put(PROP_KEY_AUTHTOKEN, properties.getAuthToken());
-			dict.put(PROP_KEY_INBOXID, properties.getInboxId());
-			dict.put(PROP_KEY_OUTBOXID, properties.getOutboxId());
-		}
-		return BdfList.of(version, encodeSupportsList(u.getClientSupports()),
-				serverSupports, dict);
-	}
-
-	private BdfList encodeSupportsList(List<MailboxVersion> supportsList) {
-		BdfList supports = new BdfList();
-		for (MailboxVersion version : supportsList) {
-			supports.add(BdfList.of(version.getMajor(), version.getMinor()));
-		}
-		return supports;
-	}
-
-	private MailboxUpdate parseUpdate(BdfList body) throws FormatException {
-		BdfList clientSupports = body.getList(1);
-		BdfList serverSupports = body.getList(2);
-		BdfDictionary dict = body.getDictionary(3);
-		return clientHelper.parseAndValidateMailboxUpdate(clientSupports,
-				serverSupports, dict);
-	}
-
-	private Group getContactGroup(Contact c) {
-		return contactGroupFactory.createContactGroup(CLIENT_ID, MAJOR_VERSION,
-				c);
-	}
-
-	private static class LatestUpdate {
-
-		private final MessageId messageId;
-		private final long version;
-
-		private LatestUpdate(MessageId messageId, long version) {
-			this.messageId = messageId;
-			this.version = version;
-		}
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxUpdateValidator.java

@@ -1,54 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.client.BdfMessageContext;
-import org.briarproject.bramble.api.client.BdfMessageValidator;
-import org.briarproject.bramble.api.client.ClientHelper;
-import org.briarproject.bramble.api.data.BdfDictionary;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.data.MetadataEncoder;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.InvalidMessageException;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.system.Clock;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.MSG_KEY_LOCAL;
-import static org.briarproject.bramble.api.mailbox.MailboxUpdateManager.MSG_KEY_VERSION;
-import static org.briarproject.bramble.util.ValidationUtils.checkSize;
-
-@Immutable
-@NotNullByDefault
-class MailboxUpdateValidator extends BdfMessageValidator {
-
-	MailboxUpdateValidator(ClientHelper clientHelper,
-			MetadataEncoder metadataEncoder, Clock clock) {
-		super(clientHelper, metadataEncoder, clock);
-	}
-
-	@Override
-	protected BdfMessageContext validateMessage(Message m, Group g,
-			BdfList body) throws InvalidMessageException, FormatException {
-		// Version, Properties, clientSupports, serverSupports
-		checkSize(body, 4);
-		// Version
-		long version = body.getLong(0);
-		if (version < 0) throw new FormatException();
-		// clientSupports
-		BdfList clientSupports = body.getList(1);
-		// serverSupports
-		BdfList serverSupports = body.getList(2);
-		// Properties
-		BdfDictionary dictionary = body.getDictionary(3);
-		clientHelper.parseAndValidateMailboxUpdate(clientSupports,
-				serverSupports, dictionary);
-		// Return the metadata
-		BdfDictionary meta = new BdfDictionary();
-		meta.put(MSG_KEY_VERSION, version);
-		meta.put(MSG_KEY_LOCAL, false);
-		return new BdfMessageContext(meta);
-	}
-
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/OwnMailboxConnectivityChecker.java

@@ -1,75 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.TransactionManager;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@ThreadSafe
-@NotNullByDefault
-class OwnMailboxConnectivityChecker extends ConnectivityCheckerImpl {
-
-	private static final Logger LOG =
-			getLogger(OwnMailboxConnectivityChecker.class.getName());
-
-	private final MailboxApi mailboxApi;
-	private final TransactionManager db;
-	private final MailboxSettingsManager mailboxSettingsManager;
-
-	OwnMailboxConnectivityChecker(Clock clock,
-			MailboxApiCaller mailboxApiCaller,
-			MailboxApi mailboxApi,
-			TransactionManager db,
-			MailboxSettingsManager mailboxSettingsManager) {
-		super(clock, mailboxApiCaller);
-		this.mailboxApi = mailboxApi;
-		this.db = db;
-		this.mailboxSettingsManager = mailboxSettingsManager;
-	}
-
-	@Override
-	ApiCall createConnectivityCheckTask(MailboxProperties properties) {
-		if (!properties.isOwner()) throw new IllegalArgumentException();
-		return () -> {
-			try {
-				return checkConnectivityAndStoreResult(properties);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				return true; // Retry
-			}
-		};
-	}
-
-	private boolean checkConnectivityAndStoreResult(
-			MailboxProperties properties) throws DbException {
-		try {
-			if (!mailboxApi.checkStatus(properties)) throw new ApiException();
-			LOG.info("Own mailbox is reachable");
-			long now = clock.currentTimeMillis();
-			db.transaction(false, txn -> mailboxSettingsManager
-					.recordSuccessfulConnection(txn, now));
-			// Call the observers and cache the result
-			onConnectivityCheckSucceeded(now);
-			return false; // Don't retry
-		} catch (IOException | ApiException e) {
-			LOG.warning("Own mailbox is unreachable");
-			logException(LOG, WARNING, e);
-			long now = clock.currentTimeMillis();
-			db.transaction(false, txn -> mailboxSettingsManager
-					.recordFailedConnectionAttempt(txn, now));
-		}
-		return true; // Retry
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/mailbox/SimpleApiCall.java

@@ -1,39 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
-import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-/**
- * Convenience class for making simple API calls that don't return values.
- */
-@NotNullByDefault
-public abstract class SimpleApiCall implements ApiCall {
-
-	private static final Logger LOG = getLogger(SimpleApiCall.class.getName());
-
-	abstract void tryToCallApi()
-			throws IOException, ApiException, TolerableFailureException;
-
-	@Override
-	public boolean callApi() {
-		try {
-			tryToCallApi();
-			return false; // Succeeded, don't retry
-		} catch (IOException | ApiException e) {
-			logException(LOG, WARNING, e);
-			return true; // Failed, retry with backoff
-		} catch (TolerableFailureException e) {
-			logException(LOG, INFO, e);
-			return false; // Failed tolerably, don't retry
-		}
-	}
-}

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.plugin;
 
-import org.briarproject.bramble.api.Cancellable;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.connection.ConnectionManager;
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
@@ -28,6 +27,7 @@ import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 import org.briarproject.bramble.api.system.Wakeful;
 import org.briarproject.bramble.api.system.WakefulIoExecutor;
 

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

@@ -3,7 +3,6 @@ package org.briarproject.bramble.plugin.file;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.file.RemovableDriveTask;
 
-@Deprecated // We can simply remove tasks when they finish
 @NotNullByDefault
 interface RemovableDriveTaskRegistry {
 

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

@@ -11,7 +11,6 @@ public interface CircumventionProvider {
 	enum BridgeType {
 		DEFAULT_OBFS4,
 		NON_DEFAULT_OBFS4,
-		VANILLA,
 		MEEK
 	}
 
@@ -21,30 +20,30 @@ public interface CircumventionProvider {
 	 * See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 	 * and https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki
 	 */
-	String[] BLOCKED = {"BY", "CN", "EG", "IR", "RU", "TM", "VE"};
+	String[] BLOCKED = {"CN", "IR", "EG", "BY", "TR", "SY", "VE", "RU"};
 
 	/**
-	 * Countries where bridge connections are likely to work.
+	 * Countries where obfs4 or meek bridge connections are likely to work.
 	 * Should be a subset of {@link #BLOCKED} and the union of
-	 * {@link #DEFAULT_BRIDGES}, {@link #NON_DEFAULT_BRIDGES} and
+	 * {@link #DEFAULT_OBFS4_BRIDGES}, {@link #NON_DEFAULT_OBFS4_BRIDGES} and
 	 * {@link #MEEK_BRIDGES}.
 	 */
-	String[] BRIDGES = {"BY", "CN", "EG", "IR", "RU", "TM", "VE"};
+	String[] BRIDGES = {"CN", "IR", "EG", "BY", "TR", "SY", "VE", "RU"};
 
 	/**
-	 * Countries where default obfs4 or vanilla bridges are likely to work.
+	 * Countries where default obfs4 bridges are likely to work.
 	 * Should be a subset of {@link #BRIDGES}.
 	 */
-	String[] DEFAULT_BRIDGES = {"EG", "VE"};
+	String[] DEFAULT_OBFS4_BRIDGES = {"EG", "BY", "TR", "SY", "VE"};
 
 	/**
-	 * Countries where non-default obfs4 or vanilla bridges are likely to work.
+	 * Countries where non-default obfs4 bridges are likely to work.
 	 * Should be a subset of {@link #BRIDGES}.
 	 */
-	String[] NON_DEFAULT_BRIDGES = {"BY", "RU", "TM"};
+	String[] NON_DEFAULT_OBFS4_BRIDGES = {"RU"};
 
 	/**
-	 * Countries where obfs4 and vanilla bridges won't work and meek is needed.
+	 * Countries where obfs4 bridges won't work and meek is needed.
 	 * Should be a subset of {@link #BRIDGES}.
 	 */
 	String[] MEEK_BRIDGES = {"CN", "IR"};
@@ -61,11 +60,10 @@ public interface CircumventionProvider {
 	boolean doBridgesWork(String countryCode);
 
 	/**
-	 * Returns the types of bridge connection that are suitable for the given
+	 * Returns the best type of bridge connection for the given country, or
-	 * country, or {@link #DEFAULT_BRIDGES} if no bridge type is known
+	 * {@link #DEFAULT_OBFS4_BRIDGES} if no bridge type is known to work.
-	 * to work.
 	 */
-	List<BridgeType> getSuitableBridgeTypes(String countryCode);
+	BridgeType getBestBridgeType(String countryCode);
 
 	@IoExecutor
 	List<String> getBridges(BridgeType type);

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

@@ -14,12 +14,10 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4;
-import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA;
 
 @Immutable
 @NotNullByDefault
@@ -32,9 +30,9 @@ class CircumventionProviderImpl implements CircumventionProvider {
 	private static final Set<String> BRIDGE_COUNTRIES =
 			new HashSet<>(asList(BRIDGES));
 	private static final Set<String> DEFAULT_OBFS4_BRIDGE_COUNTRIES =
-			new HashSet<>(asList(DEFAULT_BRIDGES));
+			new HashSet<>(asList(DEFAULT_OBFS4_BRIDGES));
-	private static final Set<String> NON_DEFAULT_BRIDGE_COUNTRIES =
+	private static final Set<String> NON_DEFAULT_OBFS4_BRIDGE_COUNTRIES =
-			new HashSet<>(asList(NON_DEFAULT_BRIDGES));
+			new HashSet<>(asList(NON_DEFAULT_OBFS4_BRIDGES));
 	private static final Set<String> MEEK_COUNTRIES =
 			new HashSet<>(asList(MEEK_BRIDGES));
 
@@ -53,15 +51,15 @@ class CircumventionProviderImpl implements CircumventionProvider {
 	}
 
 	@Override
-	public List<BridgeType> getSuitableBridgeTypes(String countryCode) {
+	public BridgeType getBestBridgeType(String countryCode) {
 		if (DEFAULT_OBFS4_BRIDGE_COUNTRIES.contains(countryCode)) {
-			return asList(DEFAULT_OBFS4, VANILLA);
+			return DEFAULT_OBFS4;
-		} else if (NON_DEFAULT_BRIDGE_COUNTRIES.contains(countryCode)) {
+		} else if (NON_DEFAULT_OBFS4_BRIDGE_COUNTRIES.contains(countryCode)) {
-			return asList(NON_DEFAULT_OBFS4, VANILLA);
+			return NON_DEFAULT_OBFS4;
 		} else if (MEEK_COUNTRIES.contains(countryCode)) {
-			return singletonList(MEEK);
+			return MEEK;
 		} else {
-			return asList(DEFAULT_OBFS4, VANILLA);
+			return DEFAULT_OBFS4;
 		}
 	}
 
@@ -75,10 +73,12 @@ class CircumventionProviderImpl implements CircumventionProvider {
 		List<String> bridges = new ArrayList<>();
 		while (scanner.hasNextLine()) {
 			String line = scanner.nextLine();
-			if ((type == DEFAULT_OBFS4 && line.startsWith("d ")) ||
+			boolean isDefaultObfs4 = line.startsWith("d ");
-					(type == NON_DEFAULT_OBFS4 && line.startsWith("n ")) ||
+			boolean isNonDefaultObfs4 = line.startsWith("n ");
-					(type == VANILLA && line.startsWith("v ")) ||
+			boolean isMeek = line.startsWith("m ");
-					(type == MEEK && line.startsWith("m "))) {
+			if ((type == DEFAULT_OBFS4 && isDefaultObfs4) ||
+					(type == NON_DEFAULT_OBFS4 && isNonDefaultObfs4) ||
+					(type == MEEK && isMeek)) {
 				bridges.add(line.substring(2));
 			}
 		}

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

@@ -2,7 +2,6 @@ package org.briarproject.bramble.plugin.tor;
 
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
-import net.freehaven.tor.control.TorNotRunningException;
 
 import org.briarproject.bramble.PoliteExecutor;
 import org.briarproject.bramble.api.Pair;
@@ -86,6 +85,7 @@ import static org.briarproject.bramble.api.plugin.TorConstants.ID;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_MOBILE;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_AUTOMATIC;
+import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WITH_BRIDGES;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_ONLY_WHEN_CHARGING;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
@@ -93,9 +93,7 @@ import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3;
 import static org.briarproject.bramble.api.plugin.TorConstants.REASON_BATTERY;
 import static org.briarproject.bramble.api.plugin.TorConstants.REASON_COUNTRY_BLOCKED;
 import static org.briarproject.bramble.api.plugin.TorConstants.REASON_MOBILE_DATA;
-import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK;
-import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4;
 import static org.briarproject.bramble.plugin.tor.TorRendezvousCrypto.SEED_BYTES;
 import static org.briarproject.bramble.util.IoUtils.copyAndClose;
 import static org.briarproject.bramble.util.IoUtils.tryToClose;
@@ -107,50 +105,46 @@ import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 @ParametersNotNullByDefault
 abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
-	private static final Logger LOG = getLogger(TorPlugin.class.getName());
+	static final Logger LOG = getLogger(TorPlugin.class.getName());
 
-	private static final String[] EVENTS = {
+	static final String[] EVENTS = {
-			"CIRC",
+			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
-			"ORCONN",
-			"STATUS_GENERAL",
-			"STATUS_CLIENT",
-			"HS_DESC",
-			"NOTICE",
-			"WARN",
-			"ERR"
 	};
-	private static final String OWNER = "__OwningControllerProcess";
+	static final String OWNER = "__OwningControllerProcess";
-	private static final int COOKIE_TIMEOUT_MS = 3000;
+	static final int COOKIE_TIMEOUT_MS = 3000;
-	private static final int COOKIE_POLLING_INTERVAL_MS = 200;
+	static final int COOKIE_POLLING_INTERVAL_MS = 200;
 	private static final Pattern ONION_V3 = Pattern.compile("[a-z2-7]{56}");
 
 	private final Executor ioExecutor, wakefulIoExecutor;
 	private final Executor connectionStatusExecutor;
-	private final NetworkManager networkManager;
+	final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
 	private final SocketFactory torSocketFactory;
-	private final Clock clock;
+	final Clock clock;
-	private final BatteryManager batteryManager;
+	final BatteryManager batteryManager;
 	private final Backoff backoff;
 	private final TorRendezvousCrypto torRendezvousCrypto;
-	private final PluginCallback callback;
+	final PluginCallback callback;
 	private final String architecture;
 	private final CircumventionProvider circumventionProvider;
 	private final ResourceProvider resourceProvider;
 	private final long maxLatency;
 	private final int maxIdleTime;
 	private final int socketTimeout;
-	private final File torDirectory, geoIpFile, configFile;
+	final File torDirectory;
-	private final int torSocksPort;
+	final File geoIpFile;
-	private final int torControlPort;
+	final File configFile;
-	private final File doneFile, cookieFile;
+	final int torSocksPort;
-	private final AtomicBoolean used = new AtomicBoolean(false);
+	final int torControlPort;
+	private final File doneFile;
+	final File cookieFile;
+	final AtomicBoolean used = new AtomicBoolean(false);
 
 	protected final PluginState state = new PluginState();
 
-	private volatile Socket controlSocket = null;
+	volatile Socket controlSocket = null;
-	private volatile TorControlConnection controlConnection = null;
+	volatile TorControlConnection controlConnection = null;
-	private volatile Settings settings = null;
+	volatile Settings settings = null;
 
 	protected abstract int getProcessId();
 
@@ -237,7 +231,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			}
 		}
 		// Load the settings
-		settings = callback.getSettings();
+		settings = migrateSettings(callback.getSettings());
 		// Install or update the assets if necessary
 		if (!assetsAreUpToDate()) installAssets();
 		if (cookieFile.exists() && !cookieFile.delete())
@@ -251,6 +245,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		Process torProcess;
 		ProcessBuilder pb =
 				new ProcessBuilder(torPath, "-f", configPath, OWNER, pid);
+		// TODO: pb.redirectErrorStream on Linux, too?
 		Map<String, String> env = pb.environment();
 		env.put("HOME", torDirectory.getAbsolutePath());
 		pb.directory(torDirectory);
@@ -311,19 +306,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			controlConnection.setEventHandler(this);
 			controlConnection.setEvents(asList(EVENTS));
 			// Check whether Tor has already bootstrapped
-			String info = controlConnection.getInfo("status/bootstrap-phase");
+			String phase = controlConnection.getInfo("status/bootstrap-phase");
-			if (info != null && info.contains("PROGRESS=100")) {
+			if (phase != null && phase.contains("PROGRESS=100")) {
 				LOG.info("Tor has already bootstrapped");
 				state.setBootstrapped();
 			}
-			// Check whether Tor has already built a circuit
-			info = controlConnection.getInfo("status/circuit-established");
-			if ("1".equals(info)) {
-				LOG.info("Tor has already built a circuit");
-				state.getAndSetCircuitBuilt(true);
-			}
-		} catch (TorNotRunningException e) {
-			throw new RuntimeException(e);
 		} catch (IOException e) {
 			throw new PluginException(e);
 		}
@@ -335,23 +322,31 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		bind();
 	}
 
-	private boolean assetsAreUpToDate() {
+
+	// TODO: Remove after a reasonable migration period (added 2020-06-25)
+	Settings migrateSettings(Settings settings) {
+		int network = settings.getInt(PREF_TOR_NETWORK,
+				DEFAULT_PREF_TOR_NETWORK);
+		if (network == PREF_TOR_NETWORK_NEVER) {
+			settings.putInt(PREF_TOR_NETWORK, DEFAULT_PREF_TOR_NETWORK);
+			settings.putBoolean(PREF_PLUGIN_ENABLE, false);
+			callback.mergeSettings(settings);
+		}
+		return settings;
+	}
+
+	boolean assetsAreUpToDate() {
 		return doneFile.lastModified() > getLastUpdateTime();
 	}
 
-	private void installAssets() throws PluginException {
+	void installAssets() throws PluginException {
 		try {
 			// The done file may already exist from a previous installation
 			//noinspection ResultOfMethodCallIgnored
 			doneFile.delete();
-			// The GeoIP file may exist from a previous installation - we can
-			// save some space by deleting it.
-			// TODO: Remove after a reasonable migration period
-			//  (added 2022-03-29)
-			//noinspection ResultOfMethodCallIgnored
-			geoIpFile.delete();
 			installTorExecutable();
 			installObfs4Executable();
+			extract(getGeoIpInputStream(), geoIpFile);
 			extract(getConfigInputStream(), configFile);
 			if (!doneFile.createNewFile())
 				LOG.warning("Failed to create done file");
@@ -389,22 +384,30 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		return zin;
 	}
 
-	private InputStream getObfs4InputStream() throws IOException {
+	private InputStream getGeoIpInputStream() throws IOException {
-		InputStream in = resourceProvider
+		InputStream in = resourceProvider.getResourceInputStream("geoip",
-				.getResourceInputStream("obfs4proxy_" + architecture, ".zip");
+				".zip");
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 
-	private static void append(StringBuilder strb, String name, int value) {
+	private InputStream getObfs4InputStream() throws IOException {
+		InputStream in = resourceProvider
+				.getResourceInputStream("obfs4proxy_" + "linux-x86_64", ".zip");
+		ZipInputStream zin = new ZipInputStream(in);
+		if (zin.getNextEntry() == null) throw new IOException();
+		return zin;
+	}
+
+	protected static void append(StringBuilder strb, String name, int value) {
 		strb.append(name);
 		strb.append(" ");
 		strb.append(value);
 		strb.append("\n");
 	}
 
-	private InputStream getConfigInputStream() {
+	protected InputStream getConfigInputStream() {
 		StringBuilder strb = new StringBuilder();
 		append(strb, "ControlPort", torControlPort);
 		append(strb, "CookieAuthentication", 1);
@@ -417,7 +420,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				strb.toString().getBytes(Charset.forName("UTF-8")));
 	}
 
-	private void listFiles(File f) {
+	void listFiles(File f) {
 		if (f.isDirectory()) {
 			File[] children = f.listFiles();
 			if (children != null) for (File child : children) listFiles(child);
@@ -426,7 +429,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	private byte[] read(File f) throws IOException {
+	byte[] read(File f) throws IOException {
 		byte[] b = new byte[(int) f.length()];
 		FileInputStream in = new FileInputStream(f);
 		try {
@@ -442,7 +445,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	private void bind() {
+	void bind() {
 		ioExecutor.execute(() -> {
 			// If there's already a port number stored in config, reuse it
 			String portString = settings.get(PREF_TOR_PORT);
@@ -495,8 +498,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			} else {
 				response = controlConnection.addOnion(privKey, portLines);
 			}
-		} catch (TorNotRunningException e) {
-			throw new RuntimeException(e);
 		} catch (IOException e) {
 			logException(LOG, WARNING, e);
 			return;
@@ -545,38 +546,26 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	protected void enableNetwork(boolean enable) throws IOException {
 		state.enableNetwork(enable);
-		try {
+		controlConnection.setConf("DisableNetwork", enable ? "0" : "1");
-			controlConnection.setConf("DisableNetwork", enable ? "0" : "1");
-		} catch (TorNotRunningException e) {
-			throw new RuntimeException(e);
-		}
 	}
 
-	private void enableBridges(boolean enable, List<BridgeType> bridgeTypes)
+	private void enableBridges(boolean enable, BridgeType bridgeType)
 			throws IOException {
-		try {
+		if (enable) {
-			if (enable) {
+			Collection<String> conf = new ArrayList<>();
-				Collection<String> conf = new ArrayList<>();
+			conf.add("UseBridges 1");
-				conf.add("UseBridges 1");
+			File obfs4File = getObfs4ExecutableFile();
-				File obfs4File = getObfs4ExecutableFile();
+			if (bridgeType == MEEK) {
-				if (bridgeTypes.contains(MEEK)) {
+				conf.add("ClientTransportPlugin meek_lite exec " +
-					conf.add("ClientTransportPlugin meek_lite exec " +
+						obfs4File.getAbsolutePath());
-							obfs4File.getAbsolutePath());
-				}
-				if (bridgeTypes.contains(DEFAULT_OBFS4) ||
-						bridgeTypes.contains(NON_DEFAULT_OBFS4)) {
-					conf.add("ClientTransportPlugin obfs4 exec " +
-							obfs4File.getAbsolutePath());
-				}
-				for (BridgeType bridgeType : bridgeTypes) {
-					conf.addAll(circumventionProvider.getBridges(bridgeType));
-				}
-				controlConnection.setConf(conf);
 			} else {
-				controlConnection.setConf("UseBridges", "0");
+				conf.add("ClientTransportPlugin obfs4 exec " +
+						obfs4File.getAbsolutePath());
 			}
-		} catch (TorNotRunningException e) {
+			conf.addAll(circumventionProvider.getBridges(bridgeType));
-			throw new RuntimeException(e);
+			controlConnection.setConf(conf);
+		} else {
+			controlConnection.setConf("UseBridges", "0");
 		}
 	}
 
@@ -590,8 +579,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				controlConnection.setConf("DisableNetwork", "1");
 				controlConnection.shutdownTor("TERM");
 				controlSocket.close();
-			} catch (TorNotRunningException e) {
-				throw new RuntimeException(e);
 			} catch (IOException e) {
 				logException(LOG, WARNING, e);
 			}
@@ -664,7 +651,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		} catch (IOException e) {
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Could not connect to v3 "
-						+ scrubOnion(onion3) + ": " + e);
+						+ scrubOnion(onion3) + ": " + e.toString());
 			}
 			tryToClose(s, LOG, WARNING);
 			return null;
@@ -700,8 +687,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		byte[] localSeed = alice ? aliceSeed : bobSeed;
 		byte[] remoteSeed = alice ? bobSeed : aliceSeed;
 		String blob = torRendezvousCrypto.getPrivateKeyBlob(localSeed);
-		String localOnion = torRendezvousCrypto.getOnion(localSeed);
+		String localOnion = torRendezvousCrypto.getOnionAddress(localSeed);
-		String remoteOnion = torRendezvousCrypto.getOnion(remoteSeed);
+		String remoteOnion = torRendezvousCrypto.getOnionAddress(remoteSeed);
 		TransportProperties remoteProperties = new TransportProperties();
 		remoteProperties.put(PROP_ONION_V3, remoteOnion);
 		try {
@@ -723,11 +710,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			});
 			Map<Integer, String> portLines =
 					singletonMap(80, "127.0.0.1:" + port);
-			try {
+			controlConnection.addOnion(blob, portLines);
-				controlConnection.addOnion(blob, portLines);
-			} catch (TorNotRunningException e) {
-				throw new RuntimeException(e);
-			}
 			return new RendezvousEndpoint() {
 
 				@Override
@@ -737,11 +720,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 				@Override
 				public void close() throws IOException {
-					try {
+					controlConnection.delOnion(localOnion);
-						controlConnection.delOnion(localOnion);
-					} catch (TorNotRunningException e) {
-						throw new RuntimeException(e);
-					}
 					tryToClose(ss, LOG, WARNING);
 				}
 			};
@@ -753,10 +732,9 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public void circuitStatus(String status, String id, String path) {
-		// In case of races between receiving CIRCUIT_ESTABLISHED and setting
+		if (status.equals("BUILT") &&
-		// DisableNetwork, set our circuitBuilt flag if not already set
+				state.getAndSetCircuitBuilt()) {
-		if (status.equals("BUILT") && !state.getAndSetCircuitBuilt(true)) {
+			LOG.info("First circuit built");
-			LOG.info("Circuit built");
 			backoff.reset();
 		}
 	}
@@ -767,10 +745,13 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public void orConnStatus(String status, String orName) {
-		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
+		if (LOG.isLoggable(INFO))
-
+			LOG.info("OR connection " + status + " " + orName);
-		if (status.equals("CONNECTED")) state.onOrConnectionConnected();
+		if (status.equals("CLOSED") || status.equals("FAILED")) {
-		else if (status.equals("CLOSED")) state.onOrConnectionClosed();
+			// Check whether we've lost connectivity
+			updateConnectionStatus(networkManager.getNetworkStatus(),
+					batteryManager.isCharging());
+		}
 	}
 
 	@Override
@@ -784,78 +765,24 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void message(String severity, String msg) {
 		if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
+		if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
+			state.setBootstrapped();
+			backoff.reset();
+		}
 	}
 
 	@Override
 	public void unrecognized(String type, String msg) {
-		if (type.equals("STATUS_CLIENT")) {
+		if (type.equals("HS_DESC") && msg.startsWith("UPLOADED")) {
-			handleClientStatus(removeSeverity(msg));
+			if (LOG.isLoggable(INFO)) {
-		} else if (type.equals("STATUS_GENERAL")) {
+				String[] words = msg.split(" ");
-			handleGeneralStatus(removeSeverity(msg));
+				if (words.length > 1 && ONION_V3.matcher(words[1]).matches()) {
-		} else if (type.equals("HS_DESC") && msg.startsWith("UPLOADED")) {
+					LOG.info("V3 descriptor uploaded");
-			String[] parts = msg.split(" ");
+				} else {
-			if (parts.length < 2) {
+					LOG.info("V2 descriptor uploaded");
-				LOG.warning("Failed to parse HS_DESC UPLOADED event");
-			} else if (LOG.isLoggable(INFO)) {
-				LOG.info("V3 descriptor uploaded for " + scrubOnion(parts[1]));
-			}
-		}
-	}
-
-	private String removeSeverity(String msg) {
-		return msg.replaceFirst("[^ ]+ ", "");
-	}
-
-	private void handleClientStatus(String msg) {
-		if (msg.startsWith("BOOTSTRAP PROGRESS=100")) {
-			LOG.info("Bootstrapped");
-			state.setBootstrapped();
-			backoff.reset();
-		} else if (msg.startsWith("CIRCUIT_ESTABLISHED")) {
-			if (!state.getAndSetCircuitBuilt(true)) {
-				LOG.info("Circuit built");
-				backoff.reset();
-			}
-		} else if (msg.startsWith("CIRCUIT_NOT_ESTABLISHED")) {
-			if (state.getAndSetCircuitBuilt(false)) {
-				LOG.info("Circuit not built");
-				// TODO: Disable and re-enable network to prompt Tor to rebuild
-				//  its guard/bridge connections? This will also close any
-				//  established circuits, which might still be functioning
-			}
-		}
-	}
-
-	private void handleGeneralStatus(String msg) {
-		if (msg.startsWith("CLOCK_JUMPED")) {
-			Long time = parseLongArgument(msg, "TIME");
-			if (time != null && LOG.isLoggable(WARNING)) {
-				LOG.warning("Clock jumped " + time + " seconds");
-			}
-		} else if (msg.startsWith("CLOCK_SKEW")) {
-			Long skew = parseLongArgument(msg, "SKEW");
-			if (skew != null && LOG.isLoggable(WARNING)) {
-				LOG.warning("Clock is skewed by " + skew + " seconds");
-			}
-		}
-	}
-
-	@Nullable
-	private Long parseLongArgument(String msg, String argName) {
-		String[] args = msg.split(" ");
-		for (String arg : args) {
-			if (arg.startsWith(argName + "=")) {
-				try {
-					return Long.parseLong(arg.substring(argName.length() + 1));
-				} catch (NumberFormatException e) {
-					break;
 				}
 			}
 		}
-		if (LOG.isLoggable(WARNING)) {
-			LOG.warning("Failed to parse " + argName + " from '" + msg + "'");
-		}
-		return null;
 	}
 
 	@Override
@@ -865,6 +792,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (s.getNamespace().equals(ID.getString())) {
 				LOG.info("Tor settings updated");
 				settings = s.getSettings();
+				// Works around a bug introduced in Tor 0.3.4.8.
+				// https://trac.torproject.org/projects/tor/ticket/28027
+				// Could be replaced with callback.transportDisabled()
+				// when fixed.
+				disableNetwork();
 				updateConnectionStatus(networkManager.getNetworkStatus(),
 						batteryManager.isCharging());
 			}
@@ -877,8 +809,18 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	private void updateConnectionStatus(NetworkStatus status,
+	private void disableNetwork() {
-			boolean charging) {
+		connectionStatusExecutor.execute(() -> {
+			try {
+				if (state.isTorRunning()) enableNetwork(false);
+			} catch (IOException ex) {
+				logException(LOG, WARNING, ex);
+			}
+		});
+	}
+
+	void updateConnectionStatus(NetworkStatus status,
+								boolean charging) {
 		connectionStatusExecutor.execute(() -> {
 			if (!state.isTorRunning()) return;
 			boolean online = status.isConnected();
@@ -910,8 +852,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			int reasonsDisabled = 0;
 			boolean enableNetwork = false, enableBridges = false;
 			boolean enableConnectionPadding = false;
-			List<BridgeType> bridgeTypes =
+			BridgeType bridgeType =
-					circumventionProvider.getSuitableBridgeTypes(country);
+					circumventionProvider.getBestBridgeType(country);
 
 			if (!online) {
 				LOG.info("Disabling network, device is offline");
@@ -940,10 +882,10 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 					enableNetwork = true;
 					if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
 							(automatic && bridgesWork)) {
-						if (ipv6Only) bridgeTypes = singletonList(MEEK);
+						if (ipv6Only) bridgeType = MEEK;
 						enableBridges = true;
 						if (LOG.isLoggable(INFO)) {
-							LOG.info("Using bridge types " + bridgeTypes);
+							LOG.info("Using bridge type " + bridgeType);
 						}
 					} else {
 						LOG.info("Not using bridges");
@@ -961,7 +903,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 			try {
 				if (enableNetwork) {
-					enableBridges(enableBridges, bridgeTypes);
+					enableBridges(enableBridges, bridgeType);
 					enableConnectionPadding(enableConnectionPadding);
 					useIpv6(ipv6Only);
 				}
@@ -973,20 +915,12 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void enableConnectionPadding(boolean enable) throws IOException {
-		try {
+		controlConnection.setConf("ConnectionPadding", enable ? "1" : "0");
-			controlConnection.setConf("ConnectionPadding", enable ? "1" : "0");
-		} catch (TorNotRunningException e) {
-			throw new RuntimeException(e);
-		}
 	}
 
 	private void useIpv6(boolean ipv6Only) throws IOException {
-		try {
+		controlConnection.setConf("ClientUseIPv4", ipv6Only ? "0" : "1");
-			controlConnection.setConf("ClientUseIPv4", ipv6Only ? "0" : "1");
+		controlConnection.setConf("ClientUseIPv6", ipv6Only ? "1" : "0");
-			controlConnection.setConf("ClientUseIPv6", ipv6Only ? "1" : "0");
-		} catch (TorNotRunningException e) {
-			throw new RuntimeException(e);
-		}
 	}
 
 	@ThreadSafe
@@ -1009,15 +943,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		@Nullable
 		private ServerSocket serverSocket = null;
 
-		@GuardedBy("this")
-		private int orConnectionsConnected = 0;
-
 		private synchronized void setStarted() {
 			started = true;
 			callback.pluginStateChanged(getState());
 		}
 
-		@SuppressWarnings("BooleanMethodIsAlwaysInverted")
 		private synchronized boolean isTorRunning() {
 			return started && !stopped;
 		}
@@ -1036,11 +966,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			callback.pluginStateChanged(getState());
 		}
 
-		private synchronized boolean getAndSetCircuitBuilt(boolean built) {
+		private synchronized boolean getAndSetCircuitBuilt() {
-			boolean old = circuitBuilt;
+			boolean firstCircuit = !circuitBuilt;
-			circuitBuilt = built;
+			circuitBuilt = true;
-			if (built != old) callback.pluginStateChanged(getState());
+			callback.pluginStateChanged(getState());
-			return old;
+			return firstCircuit;
 		}
 
 		private synchronized void enableNetwork(boolean enable) {
@@ -1075,39 +1005,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (reasonsDisabled != 0) return DISABLED;
 			if (!networkInitialised) return ENABLING;
 			if (!networkEnabled) return INACTIVE;
-			return bootstrapped && circuitBuilt && orConnectionsConnected > 0
+			return bootstrapped && circuitBuilt ? ACTIVE : ENABLING;
-					? ACTIVE : ENABLING;
 		}
 
 		private synchronized int getReasonsDisabled() {
 			return getState() == DISABLED ? reasonsDisabled : 0;
 		}
-
-		private synchronized void onOrConnectionConnected() {
-			int oldConnected = orConnectionsConnected;
-			orConnectionsConnected++;
-			logOrConnections();
-			if (oldConnected == 0) callback.pluginStateChanged(getState());
-		}
-
-		private synchronized void onOrConnectionClosed() {
-			int oldConnected = orConnectionsConnected;
-			orConnectionsConnected--;
-			if (orConnectionsConnected < 0) {
-				LOG.warning("Count was zero before connection closed");
-				orConnectionsConnected = 0;
-			}
-			logOrConnections();
-			if (orConnectionsConnected == 0 && oldConnected != 0) {
-				callback.pluginStateChanged(getState());
-			}
-		}
-
-		@GuardedBy("this")
-		private void logOrConnections() {
-			if (LOG.isLoggable(INFO)) {
-				LOG.info(orConnectionsConnected + " OR connections connected");
-			}
-		}
 	}
 }

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

@@ -4,7 +4,7 @@ interface TorRendezvousCrypto {
 
 	static final int SEED_BYTES = 32;
 
-	String getOnion(byte[] seed);
+	String getOnionAddress(byte[] seed);
 
 	String getPrivateKeyBlob(byte[] seed);
 }

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

@@ -21,9 +21,9 @@ class TorRendezvousCryptoImpl implements TorRendezvousCrypto {
 	}
 
 	@Override
-	public String getOnion(byte[] seed) {
+	public String getOnionAddress(byte[] seed) {
 		EdDSAPrivateKeySpec spec = new EdDSAPrivateKeySpec(seed, CURVE_SPEC);
-		return crypto.encodeOnion(spec.getA().toByteArray());
+		return crypto.encodeOnionAddress(spec.getA().toByteArray());
 	}
 
 	@Override

bramble-core/src/main/java/org/briarproject/bramble/record/RecordWriterImpl.java

@@ -19,8 +19,6 @@ class RecordWriterImpl implements RecordWriter {
 	private final OutputStream out;
 	private final byte[] header = new byte[RECORD_HEADER_BYTES];
 
-	private long bytesWritten = 0;
-
 	RecordWriterImpl(OutputStream out) {
 		this.out = out;
 	}
@@ -33,7 +31,6 @@ class RecordWriterImpl implements RecordWriter {
 		ByteUtils.writeUint16(payload.length, header, 2);
 		out.write(header);
 		out.write(payload);
-		bytesWritten += RECORD_HEADER_BYTES + payload.length;
 	}
 
 	@Override
@@ -45,9 +42,4 @@ class RecordWriterImpl implements RecordWriter {
 	public void close() throws IOException {
 		out.close();
 	}
-
-	@Override
-	public long getBytesWritten() {
-		return bytesWritten;
-	}
 }

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

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.rendezvous;
 
 import org.briarproject.bramble.PoliteExecutor;
-import org.briarproject.bramble.api.Cancellable;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.connection.ConnectionManager;
 import org.briarproject.bramble.api.contact.PendingContact;
@@ -43,6 +42,7 @@ import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedE
 import org.briarproject.bramble.api.rendezvous.event.RendezvousPollEvent;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 import org.briarproject.bramble.api.system.Wakeful;
 
 import java.security.GeneralSecurityException;

bramble-core/src/main/java/org/briarproject/bramble/socks/SocksModule.java

@@ -10,7 +10,6 @@ import dagger.Module;
 import dagger.Provides;
 
 import static org.briarproject.bramble.api.plugin.TorConstants.CONNECT_TO_PROXY_TIMEOUT;
-import static org.briarproject.bramble.api.plugin.TorConstants.EXTRA_CONNECT_TIMEOUT;
 import static org.briarproject.bramble.api.plugin.TorConstants.EXTRA_SOCKET_TIMEOUT;
 
 @Module
@@ -21,6 +20,6 @@ public class SocksModule {
 		InetSocketAddress proxy = new InetSocketAddress("127.0.0.1",
 				torSocksPort);
 		return new SocksSocketFactory(proxy, CONNECT_TO_PROXY_TIMEOUT,
-				EXTRA_CONNECT_TIMEOUT, EXTRA_SOCKET_TIMEOUT);
+				EXTRA_SOCKET_TIMEOUT);
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocket.java

@@ -26,18 +26,15 @@ class SocksSocket extends Socket {
 			"Address type not supported"
 	};
 
-	@SuppressWarnings("MismatchedReadAndWriteOfArray")
 	private static final byte[] UNSPECIFIED_ADDRESS = new byte[4];
 
 	private final SocketAddress proxy;
-	private final int connectToProxyTimeout;
+	private final int connectToProxyTimeout, extraSocketTimeout;
-	private final int extraConnectTimeout, extraSocketTimeout;
 
 	SocksSocket(SocketAddress proxy, int connectToProxyTimeout,
-			int extraConnectTimeout, int extraSocketTimeout) {
+			int extraSocketTimeout) {
 		this.proxy = proxy;
 		this.connectToProxyTimeout = connectToProxyTimeout;
-		this.extraConnectTimeout = extraConnectTimeout;
 		this.extraSocketTimeout = extraSocketTimeout;
 	}
 
@@ -69,7 +66,7 @@ class SocksSocket extends Socket {
 
 		// Use the supplied timeout temporarily, plus any configured extra
 		int oldTimeout = getSoTimeout();
-		setSoTimeout(timeout + extraConnectTimeout);
+		setSoTimeout(timeout + extraSocketTimeout);
 
 		// Connect to the endpoint via the proxy
 		sendConnectRequest(out, host, port);

bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocketFactory.java

@@ -11,21 +11,18 @@ import javax.net.SocketFactory;
 class SocksSocketFactory extends SocketFactory {
 
 	private final SocketAddress proxy;
-	private final int connectToProxyTimeout;
+	private final int connectToProxyTimeout, extraSocketTimeout;
-	private final int extraConnectTimeout, extraSocketTimeout;
 
 	SocksSocketFactory(SocketAddress proxy, int connectToProxyTimeout,
-			int extraConnectTimeout, int extraSocketTimeout) {
+			int extraSocketTimeout) {
 		this.proxy = proxy;
 		this.connectToProxyTimeout = connectToProxyTimeout;
-		this.extraConnectTimeout = extraConnectTimeout;
 		this.extraSocketTimeout = extraSocketTimeout;
 	}
 
 	@Override
 	public Socket createSocket() {
-		return new SocksSocket(proxy, connectToProxyTimeout,
+		return new SocksSocket(proxy, connectToProxyTimeout, extraSocketTimeout);
-				extraConnectTimeout, extraSocketTimeout);
 	}
 
 	@Override

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

@@ -13,13 +13,11 @@ import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent;
-import org.briarproject.bramble.api.record.Record;
 import org.briarproject.bramble.api.sync.Ack;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.Offer;
 import org.briarproject.bramble.api.sync.Priority;
 import org.briarproject.bramble.api.sync.Request;
-import org.briarproject.bramble.api.sync.SyncConstants;
 import org.briarproject.bramble.api.sync.SyncRecordWriter;
 import org.briarproject.bramble.api.sync.SyncSession;
 import org.briarproject.bramble.api.sync.Versions;
@@ -49,9 +47,8 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STOPPING;
-import static org.briarproject.bramble.api.record.Record.RECORD_HEADER_BYTES;
+import static org.briarproject.bramble.api.record.Record.MAX_RECORD_PAYLOAD_BYTES;
 import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_IDS;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_LENGTH;
 import static org.briarproject.bramble.api.sync.SyncConstants.SUPPORTED_VERSIONS;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
@@ -74,16 +71,6 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 			NEXT_SEND_TIME_DECREASED = () -> {
 	};
 
-	/**
-	 * The batch capacity must be at least {@link Record#RECORD_HEADER_BYTES}
-	 * + {@link SyncConstants#MAX_MESSAGE_LENGTH} to ensure that maximum-size
-	 * messages can be selected for transmission. Larger batches will mean
-	 * fewer round-trips between the DB and the output stream, but each
-	 * round-trip will block the DB for longer.
-	 */
-	private static final int BATCH_CAPACITY =
-			(RECORD_HEADER_BYTES + MAX_MESSAGE_LENGTH) * 2;
-
 	private final DatabaseComponent db;
 	private final Executor dbExecutor;
 	private final EventBus eventBus;
@@ -309,7 +296,8 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 						db.transactionWithNullableResult(false, txn -> {
 							Collection<Message> batch =
 									db.generateRequestedBatch(txn, contactId,
-											BATCH_CAPACITY, maxLatency);
+											MAX_RECORD_PAYLOAD_BYTES,
+											maxLatency);
 							setNextSendTime(db.getNextSendTime(txn, contactId));
 							return batch;
 						});

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

@@ -1,66 +0,0 @@
-package org.briarproject.bramble.sync;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.SyncRecordWriter;
-import org.briarproject.bramble.api.transport.StreamWriter;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
-
-/**
- * A {@link SimplexOutgoingSession} that sends messages eagerly, ie
- * regardless of whether they're due for retransmission.
- */
-@ThreadSafe
-@NotNullByDefault
-class EagerSimplexOutgoingSession extends SimplexOutgoingSession {
-
-	private static final Logger LOG =
-			getLogger(EagerSimplexOutgoingSession.class.getName());
-
-	EagerSimplexOutgoingSession(DatabaseComponent db,
-			EventBus eventBus,
-			ContactId contactId,
-			TransportId transportId,
-			long maxLatency,
-			StreamWriter streamWriter,
-			SyncRecordWriter recordWriter) {
-		super(db, eventBus, contactId, transportId, maxLatency, streamWriter,
-				recordWriter);
-	}
-
-	@Override
-	void sendMessages() throws DbException, IOException {
-		for (MessageId m : loadUnackedMessageIdsToSend()) {
-			if (isInterrupted()) break;
-			Message message = db.transactionWithNullableResult(false, txn ->
-					db.getMessageToSend(txn, contactId, m, maxLatency, true));
-			if (message == null) continue; // No longer shared
-			recordWriter.writeMessage(message);
-			LOG.info("Sent message");
-		}
-	}
-
-	private Collection<MessageId> loadUnackedMessageIdsToSend()
-			throws DbException {
-		Collection<MessageId> ids = db.transactionWithResult(true, txn ->
-				db.getUnackedMessagesToSend(txn, contactId));
-		if (LOG.isLoggable(INFO)) {
-			LOG.info(ids.size() + " unacked messages to send");
-		}
-		return ids;
-	}
-}