Log DB table names.

bramble-android/build.gradle

@@ -15,8 +15,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10409
-		versionName "1.4.9"
+		versionCode 10408
+		versionName "1.4.8"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java

@@ -7,7 +7,6 @@ import org.briarproject.bramble.api.plugin.TransportConnectionReader;
 import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 
 @NotNullByDefault
 public interface ConnectionManager {
@@ -46,14 +45,6 @@ public interface ConnectionManager {
 	void manageOutgoingConnection(ContactId c, TransportId t,
 			TransportConnectionWriter w);
 
-	/**
-	 * Manages an outgoing connection to a contact via a mailbox. The IDs of
-	 * any messages sent or acked are added to the given
-	 * {@link OutgoingSessionRecord}.
-	 */
-	void manageOutgoingConnection(ContactId c, TransportId t,
-			TransportConnectionWriter w, OutgoingSessionRecord sessionRecord);
-
 	/**
 	 * Manages an outgoing connection to a contact over a duplex transport.
 	 */

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

@@ -126,11 +126,16 @@ public interface DatabaseComponent extends TransactionManager {
 			TransportKeys k) throws DbException;
 
 	/**
-	 * Returns true if there are any acks to send to the given contact.
+	 * Returns true if there are any acks or messages to send to the given
+	 * contact over a transport with the given maximum latency.
 	 * <p/>
 	 * Read-only.
+	 *
+	 * @param eager True if messages that are not yet due for retransmission
+	 * should be included
 	 */
-	boolean containsAcksToSend(Transaction txn, ContactId c) throws DbException;
+	boolean containsAnythingToSend(Transaction txn, ContactId c,
+			long maxLatency, boolean eager) throws DbException;
 
 	/**
 	 * Returns true if the database contains the given contact for the given
@@ -156,18 +161,6 @@ public interface DatabaseComponent extends TransactionManager {
 	 */
 	boolean containsIdentity(Transaction txn, AuthorId a) throws DbException;
 
-	/**
-	 * Returns true if there are any messages to send to the given contact
-	 * over a transport with the given maximum latency.
-	 * <p/>
-	 * Read-only.
-	 *
-	 * @param eager True if messages that are not yet due for retransmission
-	 * should be included
-	 */
-	boolean containsMessagesToSend(Transaction txn, ContactId c,
-			long maxLatency, boolean eager) throws DbException;
-
 	/**
 	 * Returns true if the database contains the given pending contact.
 	 * <p/>
@@ -541,18 +534,15 @@ public interface DatabaseComponent extends TransactionManager {
 	 */
 	long getNextCleanupDeadline(Transaction txn) throws DbException;
 
-	/**
+	/*
 	 * Returns the next time (in milliseconds since the Unix epoch) when a
-	 * message is due to be sent to the given contact over a transport with
-	 * the given latency.
-	 * <p>
-	 * The returned value may be zero if a message is due to be sent
-	 * immediately, or Long.MAX_VALUE if no messages are scheduled to be sent.
+	 * message is due to be sent to the given contact. The returned value may
+	 * be zero if a message is due to be sent immediately, or Long.MAX_VALUE if
+	 * no messages are scheduled to be sent.
 	 * <p/>
 	 * Read-only.
 	 */
-	long getNextSendTime(Transaction txn, ContactId c, long maxLatency)
-			throws DbException;
+	long getNextSendTime(Transaction txn, ContactId c) throws DbException;
 
 	/**
 	 * Returns the pending contact with the given ID.

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

@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import java.util.List;
 
 import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.DAYS;
 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;
@@ -66,8 +65,4 @@ public interface MailboxConstants {
 	 */
 	long PROBLEM_MS_SINCE_LAST_SUCCESS = HOURS.toMillis(1);
 
-	/**
-	 * The maximum latency of the mailbox transport in milliseconds.
-	 */
-	long MAX_LATENCY = DAYS.toMillis(14);
 }

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

@@ -2,7 +2,6 @@ package org.briarproject.bramble.api.mailbox;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
@@ -33,7 +32,7 @@ public abstract class MailboxId extends UniqueId {
 		}
 		try {
 			return fromHexString(token);
-		} catch (FormatException e) {
+		} catch (IllegalArgumentException e) {
 			throw new InvalidMailboxIdException();
 		}
 	}

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

@@ -11,7 +11,7 @@ import javax.annotation.concurrent.Immutable;
 @NotNullByDefault
 public class MailboxProperties {
 
-	private final String onion;
+	private final String baseUrl;
 	private final MailboxAuthToken authToken;
 	private final boolean owner;
 	private final List<MailboxVersion> serverSupports;
@@ -23,9 +23,9 @@ public class MailboxProperties {
 	/**
 	 * Constructor for properties used by the mailbox's owner.
 	 */
-	public MailboxProperties(String onion, MailboxAuthToken authToken,
+	public MailboxProperties(String baseUrl, MailboxAuthToken authToken,
 			List<MailboxVersion> serverSupports) {
-		this.onion = onion;
+		this.baseUrl = baseUrl;
 		this.authToken = authToken;
 		this.owner = true;
 		this.serverSupports = serverSupports;
@@ -36,10 +36,10 @@ public class MailboxProperties {
 	/**
 	 * Constructor for properties used by a contact of the mailbox's owner.
 	 */
-	public MailboxProperties(String onion, MailboxAuthToken authToken,
+	public MailboxProperties(String baseUrl, MailboxAuthToken authToken,
 			List<MailboxVersion> serverSupports, MailboxFolderId inboxId,
 			MailboxFolderId outboxId) {
-		this.onion = onion;
+		this.baseUrl = baseUrl;
 		this.authToken = authToken;
 		this.owner = false;
 		this.serverSupports = serverSupports;
@@ -47,11 +47,13 @@ public class MailboxProperties {
 		this.outboxId = outboxId;
 	}
 
-	/**
-	 * Returns the onion address of the mailbox, excluding the .onion suffix.
-	 */
+	public String getBaseUrl() {
+		return baseUrl;
+	}
+
 	public String getOnion() {
-		return onion;
+		return baseUrl.replaceFirst("^http://", "")
+				.replaceFirst("\\.onion$", "");
 	}
 
 	public MailboxAuthToken getAuthToken() {

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

@@ -35,9 +35,6 @@ public interface MailboxSettingsManager {
 	void recordSuccessfulConnection(Transaction txn, long now)
 			throws DbException;
 
-	void recordSuccessfulConnection(Transaction txn, long now,
-			List<MailboxVersion> versions) throws DbException;
-
 	void recordFailedConnectionAttempt(Transaction txn, long now)
 			throws DbException;
 

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

@@ -29,35 +29,19 @@ public interface MailboxUpdateManager {
 
 	/**
 	 * The number of properties required for an update message with a mailbox.
-	 * <p>
-	 * The required properties are {@link #PROP_KEY_ONION},
-	 * {@link #PROP_KEY_AUTHTOKEN}, {@link #PROP_KEY_INBOXID} and
-	 * {@link #PROP_KEY_OUTBOXID}.
 	 */
 	int PROP_COUNT = 4;
 
 	/**
-	 * The onion address of the mailbox, excluding the .onion suffix.
+	 * The required properties of an update message with a mailbox.
 	 */
 	String PROP_KEY_ONION = "onion";
-
-	/**
-	 * A bearer token for accessing the mailbox (64 hex digits).
-	 */
 	String PROP_KEY_AUTHTOKEN = "authToken";
-
-	/**
-	 * A folder ID for downloading messages (64 hex digits).
-	 */
 	String PROP_KEY_INBOXID = "inboxId";
-
-	/**
-	 * A folder ID for uploading messages (64 hex digits).
-	 */
 	String PROP_KEY_OUTBOXID = "outboxId";
 
 	/**
-	 * Length of the {@link #PROP_KEY_ONION} property.
+	 * Length of the Onion property.
 	 */
 	int PROP_ONION_LENGTH = 56;
 
@@ -79,26 +63,9 @@ public interface MailboxUpdateManager {
 	 */
 	String GROUP_KEY_SENT_CLIENT_SUPPORTS = "sentClientSupports";
 
-	/**
-	 * Returns the latest {@link MailboxUpdate} sent to the given contact.
-	 * <p>
-	 * If we have our own mailbox then the update will be a
-	 * {@link MailboxUpdateWithMailbox} containing the
-	 * {@link MailboxProperties} the contact should use for communicating with
-	 * our mailbox.
-	 */
 	MailboxUpdate getLocalUpdate(Transaction txn, ContactId c)
 			throws DbException;
 
-	/**
-	 * Returns the latest {@link MailboxUpdate} received from the given
-	 * contact, or null if no update has been received.
-	 * <p>
-	 * If the contact has a mailbox then the update will be a
-	 * {@link MailboxUpdateWithMailbox} containing the
-	 * {@link MailboxProperties} we should use for communicating with the
-	 * contact's mailbox.
-	 */
 	@Nullable
 	MailboxUpdate getRemoteUpdate(Transaction txn, ContactId c)
 			throws DbException;

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

@@ -0,0 +1,15 @@
+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/OutgoingSessionRecord.java

@@ -1,37 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-/**
- * A container 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.
- */
-@ThreadSafe
-@NotNullByDefault
-public class OutgoingSessionRecord {
-
-	private final Collection<MessageId> ackedIds = new CopyOnWriteArrayList<>();
-	private final Collection<MessageId> sentIds = new CopyOnWriteArrayList<>();
-
-	public void onAckSent(Collection<MessageId> acked) {
-		ackedIds.addAll(acked);
-	}
-
-	public void onMessageSent(MessageId sent) {
-		sentIds.add(sent);
-	}
-
-	public Collection<MessageId> getAckedIds() {
-		return ackedIds;
-	}
-
-	public Collection<MessageId> getSentIds() {
-		return sentIds;
-	}
-}

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

@@ -12,30 +12,12 @@ import javax.annotation.Nullable;
 @NotNullByDefault
 public interface SyncSessionFactory {
 
-	/**
-	 * Creates a session for receiving data from a contact.
-	 */
 	SyncSession createIncomingSession(ContactId c, InputStream in,
 			PriorityHandler handler);
 
-	/**
-	 * Creates a session for sending data to a contact over a simplex transport.
-	 *
-	 * @param eager True if messages should be sent eagerly, ie regardless of
-	 * whether they're due for retransmission.
-	 */
 	SyncSession createSimplexOutgoingSession(ContactId c, TransportId t,
 			long maxLatency, boolean eager, StreamWriter streamWriter);
 
-	/**
-	 * Creates a session for sending data to a contact via a mailbox. The IDs
-	 * of any messages sent or acked will be added to the given
-	 * {@link OutgoingSessionRecord}.
-	 */
-	SyncSession createSimplexOutgoingSession(ContactId c, TransportId t,
-			long maxLatency, StreamWriter streamWriter,
-			OutgoingSessionRecord sessionRecord);
-
 	SyncSession createDuplexOutgoingSession(ContactId c, TransportId t,
 			long maxLatency, int maxIdleTime, StreamWriter streamWriter,
 			@Nullable Priority priority);

bramble-api/src/main/java/org/briarproject/bramble/api/sync/event/GroupVisibilityUpdatedEvent.java

@@ -3,7 +3,6 @@ package org.briarproject.bramble.api.sync.event;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group.Visibility;
 
 import java.util.Collection;
 
@@ -16,19 +15,12 @@ import javax.annotation.concurrent.Immutable;
 @NotNullByDefault
 public class GroupVisibilityUpdatedEvent extends Event {
 
-	private final Visibility visibility;
 	private final Collection<ContactId> affected;
 
-	public GroupVisibilityUpdatedEvent(Visibility visibility,
-			Collection<ContactId> affected) {
-		this.visibility = visibility;
+	public GroupVisibilityUpdatedEvent(Collection<ContactId> affected) {
 		this.affected = affected;
 	}
 
-	public Visibility getVisibility() {
-		return visibility;
-	}
-
 	/**
 	 * Returns the contacts affected by the update.
 	 */

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

@@ -40,7 +40,7 @@ public class IoUtils {
 		}
 	}
 
-	public static void delete(File f) {
+	private static void delete(File f) {
 		if (!f.delete() && LOG.isLoggable(WARNING))
 			LOG.warning("Could not delete " + f.getAbsolutePath());
 	}

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.util;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.io.UnsupportedEncodingException;
@@ -96,10 +95,10 @@ public class StringUtils {
 	/**
 	 * Converts the given hex string to a byte array.
 	 */
-	public static byte[] fromHexString(String hex) throws FormatException {
+	public static byte[] fromHexString(String hex) {
 		int len = hex.length();
 		if (len % 2 != 0)
-			throw new FormatException();
+			throw new IllegalArgumentException("Not a hex string");
 		byte[] bytes = new byte[len / 2];
 		for (int i = 0, j = 0; i < len; i += 2, j++) {
 			int high = hexDigitToInt(hex.charAt(i));
@@ -109,11 +108,11 @@ public class StringUtils {
 		return bytes;
 	}
 
-	private static int hexDigitToInt(char c) throws FormatException {
+	private static int hexDigitToInt(char c) {
 		if (c >= '0' && c <= '9') return c - '0';
 		if (c >= 'A' && c <= 'F') return c - 'A' + 10;
 		if (c >= 'a' && c <= 'f') return c - 'a' + 10;
-		throw new FormatException();
+		throw new IllegalArgumentException("Not a hex digit: " + c);
 	}
 
 	public static String trim(String s) {
@@ -131,13 +130,13 @@ public class StringUtils {
 		return MAC.matcher(mac).matches();
 	}
 
-	public static byte[] macToBytes(String mac) throws FormatException {
-		if (!MAC.matcher(mac).matches()) throw new FormatException();
+	public static byte[] macToBytes(String mac) {
+		if (!MAC.matcher(mac).matches()) throw new IllegalArgumentException();
 		return fromHexString(mac.replaceAll(":", ""));
 	}
 
-	public static String macToString(byte[] mac) throws FormatException {
-		if (mac.length != 6) throw new FormatException();
+	public static String macToString(byte[] mac) {
+		if (mac.length != 6) throw new IllegalArgumentException();
 		StringBuilder s = new StringBuilder();
 		for (byte b : mac) {
 			if (s.length() > 0) s.append(':');

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

@@ -230,14 +230,14 @@ public class TestUtils {
 
 	public static MailboxProperties getMailboxProperties(boolean owner,
 			List<MailboxVersion> serverSupports) {
-		String onion = getRandomString(56);
+		String baseUrl = "http://" + getRandomString(56) + ".onion"; // TODO
 		MailboxAuthToken authToken = new MailboxAuthToken(getRandomId());
 		if (owner) {
-			return new MailboxProperties(onion, authToken, serverSupports);
+			return new MailboxProperties(baseUrl, authToken, serverSupports);
 		}
 		MailboxFolderId inboxId = new MailboxFolderId(getRandomId());
 		MailboxFolderId outboxId = new MailboxFolderId(getRandomId());
-		return new MailboxProperties(onion, authToken, serverSupports,
+		return new MailboxProperties(baseUrl, authToken, serverSupports,
 				inboxId, outboxId);
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.account;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.DecryptionException;
@@ -210,13 +209,7 @@ class AccountManagerImpl implements AccountManager {
 			LOG.warning("Failed to load encrypted database key");
 			throw new DecryptionException(INVALID_CIPHERTEXT);
 		}
-		byte[] ciphertext;
-		try {
-			ciphertext = fromHexString(hex);
-		} catch (FormatException e) {
-			LOG.warning("Encrypted database key has invalid format");
-			throw new DecryptionException(INVALID_CIPHERTEXT);
-		}
+		byte[] ciphertext = fromHexString(hex);
 		KeyStrengthener keyStrengthener = databaseConfig.getKeyStrengthener();
 		byte[] plaintext = crypto.decryptWithPassword(ciphertext, password,
 				keyStrengthener);

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

@@ -456,7 +456,8 @@ class ClientHelperImpl implements ClientHelper {
 		checkLength(inboxId, UniqueId.LENGTH);
 		byte[] outboxId = properties.getRaw(PROP_KEY_OUTBOXID);
 		checkLength(outboxId, UniqueId.LENGTH);
-		MailboxProperties props = new MailboxProperties(onion,
+		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);

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

@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 import org.briarproject.bramble.api.sync.SyncSessionFactory;
 import org.briarproject.bramble.api.transport.KeyManager;
 import org.briarproject.bramble.api.transport.StreamReaderFactory;
@@ -101,16 +100,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 			TransportConnectionWriter w) {
 		ioExecutor.execute(new OutgoingSimplexSyncConnection(keyManager,
 				connectionRegistry, streamReaderFactory, streamWriterFactory,
-				syncSessionFactory, transportPropertyManager, c, t, w, null));
-	}
-
-	@Override
-	public void manageOutgoingConnection(ContactId c, TransportId t,
-			TransportConnectionWriter w, OutgoingSessionRecord sessionRecord) {
-		ioExecutor.execute(new OutgoingSimplexSyncConnection(keyManager,
-				connectionRegistry, streamReaderFactory, streamWriterFactory,
-				syncSessionFactory, transportPropertyManager, c, t, w,
-				sessionRecord));
+				syncSessionFactory, transportPropertyManager, c, t, w));
 	}
 
 	@Override

bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java

@@ -6,7 +6,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 import org.briarproject.bramble.api.sync.SyncSession;
 import org.briarproject.bramble.api.sync.SyncSessionFactory;
 import org.briarproject.bramble.api.transport.KeyManager;
@@ -17,8 +16,6 @@ import org.briarproject.bramble.api.transport.StreamWriterFactory;
 
 import java.io.IOException;
 
-import javax.annotation.Nullable;
-
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.util.LogUtils.logException;
@@ -29,8 +26,6 @@ class OutgoingSimplexSyncConnection extends SyncConnection implements Runnable {
 	private final ContactId contactId;
 	private final TransportId transportId;
 	private final TransportConnectionWriter writer;
-	@Nullable
-	private final OutgoingSessionRecord sessionRecord;
 
 	OutgoingSimplexSyncConnection(KeyManager keyManager,
 			ConnectionRegistry connectionRegistry,
@@ -39,15 +34,13 @@ class OutgoingSimplexSyncConnection extends SyncConnection implements Runnable {
 			SyncSessionFactory syncSessionFactory,
 			TransportPropertyManager transportPropertyManager,
 			ContactId contactId, TransportId transportId,
-			TransportConnectionWriter writer,
-			@Nullable OutgoingSessionRecord sessionRecord) {
+			TransportConnectionWriter writer) {
 		super(keyManager, connectionRegistry, streamReaderFactory,
 				streamWriterFactory, syncSessionFactory,
 				transportPropertyManager);
 		this.contactId = contactId;
 		this.transportId = transportId;
 		this.writer = writer;
-		this.sessionRecord = sessionRecord;
 	}
 
 	@Override
@@ -78,16 +71,10 @@ class OutgoingSimplexSyncConnection extends SyncConnection implements Runnable {
 		StreamWriter streamWriter = streamWriterFactory.createStreamWriter(
 				w.getOutputStream(), ctx);
 		ContactId c = requireNonNull(ctx.getContactId());
-		if (sessionRecord == null) {
-			// Use eager retransmission if the transport is lossy and cheap
-			return syncSessionFactory.createSimplexOutgoingSession(c,
-					ctx.getTransportId(), w.getMaxLatency(),
-					w.isLossyAndCheap(), streamWriter);
-		} else {
-			return syncSessionFactory.createSimplexOutgoingSession(c,
-					ctx.getTransportId(), w.getMaxLatency(), streamWriter,
-					sessionRecord);
-		}
+		// Use eager retransmission if the transport is lossy and cheap
+		return syncSessionFactory.createSimplexOutgoingSession(c,
+				ctx.getTransportId(), w.getMaxLatency(), w.isLossyAndCheap(),
+				streamWriter);
 	}
 }
 

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

@@ -163,11 +163,16 @@ interface Database<T> {
 			throws DbException;
 
 	/**
-	 * Returns true if there are any acks to send to the given contact.
+	 * Returns true if there are any acks or messages to send to the given
+	 * contact over a transport with the given maximum latency.
 	 * <p/>
 	 * Read-only.
+	 *
+	 * @param eager True if messages that are not yet due for retransmission
+	 * should be included
 	 */
-	boolean containsAcksToSend(T txn, ContactId c) throws DbException;
+	boolean containsAnythingToSend(T txn, ContactId c, long maxLatency,
+			boolean eager) throws DbException;
 
 	/**
 	 * Returns true if the database contains the given contact for the given
@@ -207,18 +212,6 @@ interface Database<T> {
 	 */
 	boolean containsMessage(T txn, MessageId m) throws DbException;
 
-	/**
-	 * Returns true if there are any messages to send to the given
-	 * contact over a transport with the given maximum latency.
-	 * <p/>
-	 * Read-only.
-	 *
-	 * @param eager True if messages that are not yet due for retransmission
-	 * should be included
-	 */
-	boolean containsMessagesToSend(T txn, ContactId c, long maxLatency,
-			boolean eager) throws DbException;
-
 	/**
 	 * Returns true if the database contains the given pending contact.
 	 * <p/>
@@ -587,16 +580,13 @@ interface Database<T> {
 
 	/**
 	 * Returns the next time (in milliseconds since the Unix epoch) when a
-	 * message is due to be sent to the given contact over a transport with
-	 * the given latency.
-	 * <p>
-	 * The returned value may be zero if a message is due to be sent
-	 * immediately, or Long.MAX_VALUE if no messages are scheduled to be sent.
+	 * message is due to be sent to the given contact. The returned value may
+	 * be zero if a message is due to be sent immediately, or Long.MAX_VALUE
+	 * if no messages are scheduled to be sent.
 	 * <p/>
 	 * Read-only.
 	 */
-	long getNextSendTime(T txn, ContactId c, long maxLatency)
-			throws DbException;
+	long getNextSendTime(T txn, ContactId c) throws DbException;
 
 	/**
 	 * Returns the pending contact with the given ID.

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

@@ -342,12 +342,12 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	}
 
 	@Override
-	public boolean containsAcksToSend(Transaction transaction, ContactId c)
-			throws DbException {
+	public boolean containsAnythingToSend(Transaction transaction, ContactId c,
+			long maxLatency, boolean eager) throws DbException {
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
-		return db.containsAcksToSend(txn, c);
+		return db.containsAnythingToSend(txn, c, maxLatency, eager);
 	}
 
 	@Override
@@ -373,15 +373,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return db.containsIdentity(txn, a);
 	}
 
-	@Override
-	public boolean containsMessagesToSend(Transaction transaction, ContactId c,
-			long maxLatency, boolean eager) throws DbException {
-		T txn = unbox(transaction);
-		if (!db.containsContact(txn, c))
-			throw new NoSuchContactException();
-		return db.containsMessagesToSend(txn, c, maxLatency, eager);
-	}
-
 	@Override
 	public boolean containsPendingContact(Transaction transaction,
 			PendingContactId p) throws DbException {
@@ -814,10 +805,10 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	}
 
 	@Override
-	public long getNextSendTime(Transaction transaction, ContactId c,
-			long maxLatency) throws DbException {
+	public long getNextSendTime(Transaction transaction, ContactId c)
+			throws DbException {
 		T txn = unbox(transaction);
-		return db.getNextSendTime(txn, c, maxLatency);
+		return db.getNextSendTime(txn, c);
 	}
 
 	@Override
@@ -1025,8 +1016,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 				db.getGroupVisibility(txn, id).keySet();
 		db.removeGroup(txn, id);
 		transaction.attach(new GroupRemovedEvent(g));
-		transaction.attach(new GroupVisibilityUpdatedEvent(INVISIBLE,
-				affected));
+		transaction.attach(new GroupVisibilityUpdatedEvent(affected));
 	}
 
 	@Override
@@ -1151,7 +1141,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		else if (v == INVISIBLE) db.removeGroupVisibility(txn, c, g);
 		else db.setGroupVisibility(txn, c, g, v == SHARED);
 		List<ContactId> affected = singletonList(c);
-		transaction.attach(new GroupVisibilityUpdatedEvent(v, affected));
+		transaction.attach(new GroupVisibilityUpdatedEvent(affected));
 	}
 
 	@Override

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

@@ -3,15 +3,16 @@ package org.briarproject.bramble.db;
 class DatabaseTypes {
 
 	private final String hashType, secretType, binaryType;
-	private final String counterType, stringType;
+	private final String counterType, stringType, schemaQuery;
 
-	public DatabaseTypes(String hashType, String secretType, String binaryType,
-			String counterType, String stringType) {
+	DatabaseTypes(String hashType, String secretType, String binaryType,
+			String counterType, String stringType, String schemaQuery) {
 		this.hashType = hashType;
 		this.secretType = secretType;
 		this.binaryType = binaryType;
 		this.counterType = counterType;
 		this.stringType = stringType;
+		this.schemaQuery = schemaQuery;
 	}
 
 	/**
@@ -31,4 +32,8 @@ class DatabaseTypes {
 		s = s.replaceAll("_STRING", stringType);
 		return s;
 	}
+
+	String getSchemaQuery() {
+		return schemaQuery;
+	}
 }

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

@@ -41,8 +41,9 @@ class H2Database extends JdbcDatabase {
 	private static final String BINARY_TYPE = "BINARY";
 	private static final String COUNTER_TYPE = "INT NOT NULL AUTO_INCREMENT";
 	private static final String STRING_TYPE = "VARCHAR";
+	private static final String SCHEMA_QUERY = "SHOW TABLES";
 	private static final DatabaseTypes dbTypes = new DatabaseTypes(HASH_TYPE,
-			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE);
+			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE, SCHEMA_QUERY);
 
 	private final DatabaseConfig config;
 	private final String url;

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

@@ -41,8 +41,11 @@ class HyperSqlDatabase extends JdbcDatabase {
 	private static final String COUNTER_TYPE =
 			"INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY(START WITH 1)";
 	private static final String STRING_TYPE = "VARCHAR";
+	private static final String SCHEMA_QUERY =
+			"SELECT TABLE_NAME FROM INFORMATION_SCHEMA.SYSTEM_TABLES"
+					+ " WHERE TABLE_TYPE='TABLE'";
 	private static final DatabaseTypes dbTypes = new DatabaseTypes(HASH_TYPE,
-			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE);
+			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE, SCHEMA_QUERY);
 
 	private final DatabaseConfig config;
 	private final String url;

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

@@ -405,6 +405,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		boolean compact;
 		Connection txn = startTransaction();
 		try {
+			if (LOG.isLoggable(INFO)) logSchema(txn);
 			if (reopen) {
 				Settings s = getSettings(txn, DB_SETTINGS_NAMESPACE);
 				wasDirtyOnInitialisation = isDirty(s);
@@ -447,6 +448,24 @@ abstract class JdbcDatabase implements Database<Connection> {
 		return wasDirtyOnInitialisation;
 	}
 
+	private void logSchema(Connection txn) throws DbException {
+		Statement s = null;
+		ResultSet rs = null;
+		try {
+			s = txn.createStatement();
+			rs = s.executeQuery(dbTypes.getSchemaQuery());
+			StringBuilder sb = new StringBuilder("Tables:");
+			while (rs.next()) sb.append('\n').append(rs.getString(1));
+			LOG.info(sb.toString());
+			rs.close();
+			s.close();
+		} catch (SQLException e) {
+			tryToClose(rs, LOG, WARNING);
+			tryToClose(s, LOG, WARNING);
+			throw new DbException(e);
+		}
+	}
+
 	/**
 	 * Compares the schema version stored in the database with the schema
 	 * version used by the current code and applies any suitable migrations to
@@ -1147,8 +1166,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public boolean containsAcksToSend(Connection txn, ContactId c)
-			throws DbException {
+	public boolean containsAnythingToSend(Connection txn, ContactId c,
+			long maxLatency, boolean eager) throws DbException {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -1160,7 +1179,34 @@ abstract class JdbcDatabase implements Database<Connection> {
 			boolean acksToSend = rs.next();
 			rs.close();
 			ps.close();
-			return acksToSend;
+			if (acksToSend) return true;
+			if (eager) {
+				sql = "SELECT NULL from statuses"
+						+ " WHERE contactId = ? AND state = ?"
+						+ " AND groupShared = TRUE AND messageShared = TRUE"
+						+ " AND deleted = FALSE AND seen = FALSE";
+				ps = txn.prepareStatement(sql);
+				ps.setInt(1, c.getInt());
+				ps.setInt(2, DELIVERED.getValue());
+			} else {
+				long now = clock.currentTimeMillis();
+				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"
+						+ " OR ? < maxLatency)";
+				ps = txn.prepareStatement(sql);
+				ps.setInt(1, c.getInt());
+				ps.setInt(2, DELIVERED.getValue());
+				ps.setLong(3, now);
+				ps.setLong(4, maxLatency);
+			}
+			rs = ps.executeQuery();
+			boolean messagesToSend = rs.next();
+			rs.close();
+			ps.close();
+			return messagesToSend;
 		} catch (SQLException e) {
 			tryToClose(rs, LOG, WARNING);
 			tryToClose(ps, LOG, WARNING);
@@ -1280,46 +1326,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	public boolean containsMessagesToSend(Connection txn, ContactId c,
-			long maxLatency, boolean eager) throws DbException {
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		try {
-			if (eager) {
-				String sql = "SELECT NULL from statuses"
-						+ " WHERE contactId = ? AND state = ?"
-						+ " AND groupShared = TRUE AND messageShared = TRUE"
-						+ " AND deleted = FALSE AND seen = FALSE";
-				ps = txn.prepareStatement(sql);
-				ps.setInt(1, c.getInt());
-				ps.setInt(2, DELIVERED.getValue());
-			} else {
-				long now = clock.currentTimeMillis();
-				String 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"
-						+ " OR ? < maxLatency)";
-				ps = txn.prepareStatement(sql);
-				ps.setInt(1, c.getInt());
-				ps.setInt(2, DELIVERED.getValue());
-				ps.setLong(3, now);
-				ps.setLong(4, maxLatency);
-			}
-			rs = ps.executeQuery();
-			boolean messagesToSend = rs.next();
-			rs.close();
-			ps.close();
-			return messagesToSend;
-		} catch (SQLException e) {
-			tryToClose(rs, LOG, WARNING);
-			tryToClose(ps, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public boolean containsPendingContact(Connection txn, PendingContactId p)
 			throws DbException {
@@ -2490,28 +2496,12 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public long getNextSendTime(Connection txn, ContactId c, long maxLatency)
+	public long getNextSendTime(Connection txn, ContactId c)
 			throws DbException {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
-			// Are any messages sendable immediately?
-			String sql = "SELECT NULL FROM statuses"
-					+ " WHERE contactId = ? AND state = ?"
-					+ " AND groupShared = TRUE AND messageShared = TRUE"
-					+ " AND deleted = FALSE AND seen = FALSE"
-					+ " AND (maxLatency IS NULL OR ? < maxLatency)";
-			ps = txn.prepareStatement(sql);
-			ps.setInt(1, c.getInt());
-			ps.setInt(2, DELIVERED.getValue());
-			ps.setLong(3, maxLatency);
-			rs = ps.executeQuery();
-			boolean found = rs.next();
-			rs.close();
-			ps.close();
-			if (found) return 0;
-			// When is the earliest expiry time (could be in the past)?
-			sql = "SELECT expiry FROM statuses"
+			String sql = "SELECT expiry FROM statuses"
 					+ " WHERE contactId = ? AND state = ?"
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE AND seen = FALSE"

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

@@ -22,21 +22,10 @@ interface ConnectivityChecker {
 	 * 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.
-	 * <p>
-	 * Observers are removed after being called, or when the checker is
-	 * {@link #destroy() destroyed}.
 	 */
 	void checkConnectivity(MailboxProperties properties,
 			ConnectivityObserver o);
 
-	/**
-	 * Removes an observer that was added via
-	 * {@link #checkConnectivity(MailboxProperties, ConnectivityObserver)}. If
-	 * there are no remaining observers and a connectivity check is running
-	 * then the check will be cancelled.
-	 */
-	void removeObserver(ConnectivityObserver o);
-
 	interface ConnectivityObserver {
 		void onConnectivityCheckSucceeded();
 	}

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

@@ -80,7 +80,8 @@ abstract class ConnectivityCheckerImpl implements ConnectivityChecker {
 						> CONNECTIVITY_CHECK_FRESHNESS_MS) {
 					// The last connectivity check is stale, start a new one
 					connectivityObservers.add(o);
-					ApiCall task = createConnectivityCheckTask(properties);
+					ApiCall task =
+							createConnectivityCheckTask(properties);
 					connectivityCheck = mailboxApiCaller.retryWithBackoff(task);
 				} else {
 					// The last connectivity check is fresh
@@ -107,16 +108,4 @@ abstract class ConnectivityCheckerImpl implements ConnectivityChecker {
 			o.onConnectivityCheckSucceeded();
 		}
 	}
-
-	@Override
-	public void removeObserver(ConnectivityObserver o) {
-		synchronized (lock) {
-			if (destroyed) return;
-			connectivityObservers.remove(o);
-			if (connectivityObservers.isEmpty() && connectivityCheck != null) {
-				connectivityCheck.cancel();
-				connectivityCheck = null;
-			}
-		}
-	}
 }

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

@@ -1,122 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
-import static java.util.logging.Logger.getLogger;
-
-@ThreadSafe
-@NotNullByDefault
-class ContactMailboxClient implements MailboxClient {
-
-	private static final Logger LOG =
-			getLogger(ContactMailboxClient.class.getName());
-
-	private final MailboxWorkerFactory workerFactory;
-	private final ConnectivityChecker connectivityChecker;
-	private final TorReachabilityMonitor reachabilityMonitor;
-	private final Object lock = new Object();
-
-	@GuardedBy("lock")
-	@Nullable
-	private MailboxWorker uploadWorker = null, downloadWorker = null;
-
-	@Inject
-	ContactMailboxClient(MailboxWorkerFactory workerFactory,
-			ConnectivityChecker connectivityChecker,
-			TorReachabilityMonitor reachabilityMonitor) {
-		this.workerFactory = workerFactory;
-		this.connectivityChecker = connectivityChecker;
-		this.reachabilityMonitor = reachabilityMonitor;
-	}
-
-	@Override
-	public void start() {
-		LOG.info("Started");
-		// Nothing to do until contact is assigned
-	}
-
-	@Override
-	public void destroy() {
-		LOG.info("Destroyed");
-		MailboxWorker uploadWorker, downloadWorker;
-		synchronized (lock) {
-			uploadWorker = this.uploadWorker;
-			this.uploadWorker = null;
-			downloadWorker = this.downloadWorker;
-			this.downloadWorker = null;
-		}
-		if (uploadWorker != null) uploadWorker.destroy();
-		if (downloadWorker != null) downloadWorker.destroy();
-	}
-
-	@Override
-	public void assignContactForUpload(ContactId contactId,
-			MailboxProperties properties, MailboxFolderId folderId) {
-		LOG.info("Contact assigned for upload");
-		if (properties.isOwner()) throw new IllegalArgumentException();
-		// For a contact's mailbox we should always be uploading to the outbox
-		// assigned to us by the contact
-		if (!folderId.equals(properties.getOutboxId())) {
-			throw new IllegalArgumentException();
-		}
-		MailboxWorker uploadWorker = workerFactory.createUploadWorker(
-				connectivityChecker, properties, folderId, contactId);
-		synchronized (lock) {
-			if (this.uploadWorker != null) throw new IllegalStateException();
-			this.uploadWorker = uploadWorker;
-		}
-		uploadWorker.start();
-	}
-
-	@Override
-	public void deassignContactForUpload(ContactId contactId) {
-		LOG.info("Contact deassigned for upload");
-		MailboxWorker uploadWorker;
-		synchronized (lock) {
-			uploadWorker = this.uploadWorker;
-			this.uploadWorker = null;
-		}
-		if (uploadWorker != null) uploadWorker.destroy();
-	}
-
-	@Override
-	public void assignContactForDownload(ContactId contactId,
-			MailboxProperties properties, MailboxFolderId folderId) {
-		LOG.info("Contact assigned for download");
-		if (properties.isOwner()) throw new IllegalArgumentException();
-		// For a contact's mailbox we should always be downloading from the
-		// inbox assigned to us by the contact
-		if (!folderId.equals(properties.getInboxId())) {
-			throw new IllegalArgumentException();
-		}
-		MailboxWorker downloadWorker =
-				workerFactory.createDownloadWorkerForContactMailbox(
-						connectivityChecker, reachabilityMonitor, properties);
-		synchronized (lock) {
-			if (this.downloadWorker != null) throw new IllegalStateException();
-			this.downloadWorker = downloadWorker;
-		}
-		downloadWorker.start();
-	}
-
-	@Override
-	public void deassignContactForDownload(ContactId contactId) {
-		LOG.info("Contact deassigned for download");
-		MailboxWorker downloadWorker;
-		synchronized (lock) {
-			downloadWorker = this.downloadWorker;
-			this.downloadWorker = null;
-		}
-		if (downloadWorker != null) downloadWorker.destroy();
-	}
-}

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

@@ -5,6 +5,8 @@ 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
@@ -22,11 +24,16 @@ class ContactMailboxConnectivityChecker extends ConnectivityCheckerImpl {
 	@Override
 	ApiCall createConnectivityCheckTask(MailboxProperties properties) {
 		if (properties.isOwner()) throw new IllegalArgumentException();
-		return new SimpleApiCall(() -> {
-			if (!mailboxApi.checkStatus(properties)) throw new ApiException();
-			// Call the observers and cache the result
-			onConnectivityCheckSucceeded(clock.currentTimeMillis());
-		});
+		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/ContactMailboxDownloadWorker.java

@@ -1,243 +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.mailbox.ConnectivityChecker.ConnectivityObserver;
-import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
-import org.briarproject.bramble.mailbox.MailboxApi.MailboxFile;
-import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
-import org.briarproject.bramble.mailbox.TorReachabilityMonitor.TorReachabilityObserver;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@ThreadSafe
-@NotNullByDefault
-class ContactMailboxDownloadWorker implements MailboxWorker,
-		ConnectivityObserver, TorReachabilityObserver {
-
-	/**
-	 * When the worker is started it waits for a connectivity check, then
-	 * starts its first download cycle: checking the inbox, downloading and
-	 * deleting any files, and checking again until the inbox is empty.
-	 * <p>
-	 * The worker then waits for our Tor hidden service to be reachable before
-	 * starting its second download cycle. This ensures that if a contact
-	 * tried and failed to connect to our hidden service before it was
-	 * reachable, and therefore uploaded a file to the mailbox instead, we'll
-	 * find the file in the second download cycle.
-	 */
-	private enum State {
-		CREATED,
-		CONNECTIVITY_CHECK,
-		DOWNLOAD_CYCLE_1,
-		WAITING_FOR_TOR,
-		DOWNLOAD_CYCLE_2,
-		FINISHED,
-		DESTROYED
-	}
-
-	private static final Logger LOG =
-			getLogger(ContactMailboxDownloadWorker.class.getName());
-
-	private final ConnectivityChecker connectivityChecker;
-	private final TorReachabilityMonitor torReachabilityMonitor;
-	private final MailboxApiCaller mailboxApiCaller;
-	private final MailboxApi mailboxApi;
-	private final MailboxFileManager mailboxFileManager;
-	private final MailboxProperties mailboxProperties;
-	private final Object lock = new Object();
-
-	@GuardedBy("lock")
-	private State state = State.CREATED;
-
-	@GuardedBy("lock")
-	@Nullable
-	private Cancellable apiCall = null;
-
-	ContactMailboxDownloadWorker(
-			ConnectivityChecker connectivityChecker,
-			TorReachabilityMonitor torReachabilityMonitor,
-			MailboxApiCaller mailboxApiCaller,
-			MailboxApi mailboxApi,
-			MailboxFileManager mailboxFileManager,
-			MailboxProperties mailboxProperties) {
-		if (mailboxProperties.isOwner()) throw new IllegalArgumentException();
-		this.connectivityChecker = connectivityChecker;
-		this.torReachabilityMonitor = torReachabilityMonitor;
-		this.mailboxApiCaller = mailboxApiCaller;
-		this.mailboxApi = mailboxApi;
-		this.mailboxFileManager = mailboxFileManager;
-		this.mailboxProperties = mailboxProperties;
-	}
-
-	@Override
-	public void start() {
-		LOG.info("Started");
-		synchronized (lock) {
-			// Don't allow the worker to be reused
-			if (state != State.CREATED) return;
-			state = State.CONNECTIVITY_CHECK;
-		}
-		// Avoid leaking observer in case destroy() is called concurrently
-		// before observer is added
-		connectivityChecker.checkConnectivity(mailboxProperties, this);
-		boolean destroyed;
-		synchronized (lock) {
-			destroyed = state == State.DESTROYED;
-		}
-		if (destroyed) connectivityChecker.removeObserver(this);
-	}
-
-	@Override
-	public void destroy() {
-		LOG.info("Destroyed");
-		Cancellable apiCall;
-		synchronized (lock) {
-			state = State.DESTROYED;
-			apiCall = this.apiCall;
-			this.apiCall = null;
-		}
-		if (apiCall != null) apiCall.cancel();
-		connectivityChecker.removeObserver(this);
-		torReachabilityMonitor.removeObserver(this);
-	}
-
-	@Override
-	public void onConnectivityCheckSucceeded() {
-		LOG.info("Connectivity check succeeded");
-		synchronized (lock) {
-			if (state != State.CONNECTIVITY_CHECK) return;
-			state = State.DOWNLOAD_CYCLE_1;
-			// Start first download cycle
-			apiCall = mailboxApiCaller.retryWithBackoff(
-					new SimpleApiCall(this::apiCallListInbox));
-		}
-	}
-
-	private void apiCallListInbox() throws IOException, ApiException {
-		synchronized (lock) {
-			if (state == State.DESTROYED) return;
-		}
-		LOG.info("Listing inbox");
-		List<MailboxFile> files = mailboxApi.getFiles(mailboxProperties,
-				requireNonNull(mailboxProperties.getInboxId()));
-		if (files.isEmpty()) onDownloadCycleFinished();
-		else downloadNextFile(new LinkedList<>(files));
-	}
-
-	private void onDownloadCycleFinished() {
-		boolean addObserver = false;
-		synchronized (lock) {
-			if (state == State.DOWNLOAD_CYCLE_1) {
-				LOG.info("First download cycle finished");
-				state = State.WAITING_FOR_TOR;
-				apiCall = null;
-				addObserver = true;
-			} else if (state == State.DOWNLOAD_CYCLE_2) {
-				LOG.info("Second download cycle finished");
-				state = State.FINISHED;
-				apiCall = null;
-			}
-		}
-		if (addObserver) {
-			// Avoid leaking observer in case destroy() is called concurrently
-			// before observer is added
-			torReachabilityMonitor.addOneShotObserver(this);
-			boolean destroyed;
-			synchronized (lock) {
-				destroyed = state == State.DESTROYED;
-			}
-			if (destroyed) torReachabilityMonitor.removeObserver(this);
-		}
-	}
-
-	private void downloadNextFile(Queue<MailboxFile> queue) {
-		synchronized (lock) {
-			if (state == State.DESTROYED) return;
-			MailboxFile file = queue.remove();
-			apiCall = mailboxApiCaller.retryWithBackoff(
-					new SimpleApiCall(() -> apiCallDownloadFile(file, queue)));
-		}
-	}
-
-	private void apiCallDownloadFile(MailboxFile file,
-			Queue<MailboxFile> queue) throws IOException, ApiException {
-		synchronized (lock) {
-			if (state == State.DESTROYED) return;
-		}
-		LOG.info("Downloading file");
-		File tempFile = mailboxFileManager.createTempFileForDownload();
-		try {
-			mailboxApi.getFile(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()),
-					file.name, tempFile);
-		} catch (IOException | ApiException e) {
-			if (!tempFile.delete()) {
-				LOG.warning("Failed to delete temporary file");
-			}
-			throw e;
-		}
-		mailboxFileManager.handleDownloadedFile(tempFile);
-		deleteFile(file, queue);
-	}
-
-	private void deleteFile(MailboxFile file, Queue<MailboxFile> queue) {
-		synchronized (lock) {
-			if (state == State.DESTROYED) return;
-			apiCall = mailboxApiCaller.retryWithBackoff(
-					new SimpleApiCall(() -> apiCallDeleteFile(file, queue)));
-		}
-	}
-
-	private void apiCallDeleteFile(MailboxFile file, Queue<MailboxFile> queue)
-			throws IOException, ApiException {
-		synchronized (lock) {
-			if (state == State.DESTROYED) return;
-		}
-		try {
-			mailboxApi.deleteFile(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()), file.name);
-		} catch (TolerableFailureException e) {
-			// Catch this so we can continue to the next file
-			logException(LOG, INFO, e);
-		}
-		if (queue.isEmpty()) {
-			// List the inbox again to check for files that may have arrived
-			// while we were downloading
-			synchronized (lock) {
-				if (state == State.DESTROYED) return;
-				apiCall = mailboxApiCaller.retryWithBackoff(
-						new SimpleApiCall(this::apiCallListInbox));
-			}
-		} else {
-			downloadNextFile(queue);
-		}
-	}
-
-	@Override
-	public void onTorReachable() {
-		LOG.info("Our Tor hidden service is reachable");
-		synchronized (lock) {
-			if (state != State.WAITING_FOR_TOR) return;
-			state = State.DOWNLOAD_CYCLE_2;
-			// Start second download cycle
-			apiCall = mailboxApiCaller.retryWithBackoff(
-					new SimpleApiCall(this::apiCallListInbox));
-		}
-	}
-}

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

@@ -24,8 +24,6 @@ interface MailboxApiCaller {
 	 * 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.
-	 * <p>
-	 * This method is safe to call while holding a lock.
 	 *
 	 * @return A {@link Cancellable} that can be used to cancel any future
 	 * retries.

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

@@ -42,22 +42,18 @@ import static org.briarproject.bramble.util.IoUtils.copyAndClose;
 @NotNullByDefault
 class MailboxApiImpl implements MailboxApi {
 
+	private final WeakSingletonProvider<OkHttpClient> httpClientProvider;
+	private final JsonMapper mapper = JsonMapper.builder()
+			.enable(BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES)
+			.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"));
 
-	private final WeakSingletonProvider<OkHttpClient> httpClientProvider;
-	private final JsonMapper mapper = JsonMapper.builder()
-			.enable(BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES)
-			.build();
-	private final UrlConverter urlConverter;
-
 	@Inject
-	MailboxApiImpl(WeakSingletonProvider<OkHttpClient> httpClientProvider,
-			UrlConverter urlConverter) {
+	MailboxApiImpl(WeakSingletonProvider<OkHttpClient> httpClientProvider) {
 		this.httpClientProvider = httpClientProvider;
-		this.urlConverter = urlConverter;
 	}
 
 	@Override
@@ -82,7 +78,7 @@ class MailboxApiImpl implements MailboxApi {
 			throws IOException, ApiException {
 		if (!properties.isOwner()) throw new IllegalArgumentException();
 		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(getBaseUrl(properties) + "/setup")
+				.url(properties.getBaseUrl() + "/setup")
 				.put(EMPTY_REQUEST)
 				.build();
 		OkHttpClient client = httpClientProvider.get();
@@ -97,7 +93,7 @@ class MailboxApiImpl implements MailboxApi {
 			if (tokenNode == null) {
 				throw new ApiException();
 			}
-			return new MailboxProperties(properties.getOnion(),
+			return new MailboxProperties(properties.getBaseUrl(),
 					MailboxAuthToken.fromString(tokenNode.textValue()),
 					parseServerSupports(node));
 		} catch (JacksonException | InvalidMailboxIdException e) {
@@ -141,7 +137,7 @@ class MailboxApiImpl implements MailboxApi {
 			throws IOException, ApiException {
 		if (!properties.isOwner()) throw new IllegalArgumentException();
 		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(getBaseUrl(properties) + "/")
+				.url(properties.getBaseUrl() + "/")
 				.delete()
 				.build();
 		OkHttpClient client = httpClientProvider.get();
@@ -166,7 +162,7 @@ class MailboxApiImpl implements MailboxApi {
 	public void deleteContact(MailboxProperties properties, ContactId contactId)
 			throws IOException, ApiException, TolerableFailureException {
 		if (!properties.isOwner()) throw new IllegalArgumentException();
-		String url = getBaseUrl(properties) + "/contacts/" +
+		String url = properties.getBaseUrl() + "/contacts/" +
 				contactId.getInt();
 		Request request = getRequestBuilder(properties.getAuthToken())
 				.delete()
@@ -270,7 +266,7 @@ class MailboxApiImpl implements MailboxApi {
 		String path = "/files/" + folderId + "/" + fileId;
 		Request request = getRequestBuilder(properties.getAuthToken())
 				.delete()
-				.url(getBaseUrl(properties) + path)
+				.url(properties.getBaseUrl() + path)
 				.build();
 		OkHttpClient client = httpClientProvider.get();
 		Response response = client.newCall(request).execute();
@@ -312,7 +308,7 @@ class MailboxApiImpl implements MailboxApi {
 	private Response sendGetRequest(MailboxProperties properties, String path)
 			throws IOException {
 		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(getBaseUrl(properties) + path)
+				.url(properties.getBaseUrl() + path)
 				.build();
 		OkHttpClient client = httpClientProvider.get();
 		return client.newCall(request).execute();
@@ -321,7 +317,7 @@ class MailboxApiImpl implements MailboxApi {
 	private Response sendPostRequest(MailboxProperties properties, String path,
 			RequestBody body) throws IOException {
 		Request request = getRequestBuilder(properties.getAuthToken())
-				.url(getBaseUrl(properties) + path)
+				.url(properties.getBaseUrl() + path)
 				.post(body)
 				.build();
 		OkHttpClient client = httpClientProvider.get();
@@ -343,7 +339,4 @@ class MailboxApiImpl implements MailboxApi {
 		return (ArrayNode) arrayNode;
 	}
 
-	private String getBaseUrl(MailboxProperties properties) {
-		return urlConverter.convertOnionToBaseUrl(properties.getOnion());
-	}
 }

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

@@ -1,46 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-interface MailboxClient {
-
-	/**
-	 * Asynchronously starts the client.
-	 */
-	void start();
-
-	/**
-	 * Destroys the client and its workers, cancelling any pending tasks or
-	 * retries.
-	 */
-	void destroy();
-
-	/**
-	 * Assigns a contact to the client for upload.
-	 */
-	void assignContactForUpload(ContactId c, MailboxProperties properties,
-			MailboxFolderId folderId);
-
-	/**
-	 * Deassigns a contact from the client for upload.
-	 */
-	void deassignContactForUpload(ContactId c);
-
-	/**
-	 * Assigns a contact to the client for download.
-	 */
-	void assignContactForDownload(ContactId c, MailboxProperties properties,
-			MailboxFolderId folderId);
-
-	/**
-	 * Deassigns a contact from the client for download.
-	 */
-	void deassignContactForDownload(ContactId c);
-}

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

@@ -1,8 +1,6 @@
 package org.briarproject.bramble.mailbox;
 
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,14 +16,6 @@ interface MailboxFileManager {
 	 */
 	File createTempFileForDownload() throws IOException;
 
-	/**
-	 * Creates a file to be uploaded to the given contact and writes any
-	 * waiting data to the file. The IDs of any messages sent or acked will
-	 * be added to the given {@link OutgoingSessionRecord}.
-	 */
-	File createAndWriteTempFileForUpload(ContactId contactId,
-			OutgoingSessionRecord sessionRecord) throws IOException;
-
 	/**
 	 * Handles a file that has been downloaded. The file should be created
 	 * with {@link #createTempFileForDownload()}.

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

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.mailbox;
 
 import org.briarproject.bramble.api.connection.ConnectionManager;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventListener;
@@ -11,18 +10,13 @@ import org.briarproject.bramble.api.mailbox.MailboxDirectory;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.PluginManager;
 import org.briarproject.bramble.api.plugin.TransportConnectionReader;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
 import org.briarproject.bramble.api.plugin.event.TransportActiveEvent;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin;
 import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
@@ -36,7 +30,6 @@ import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleS
 import static org.briarproject.bramble.api.mailbox.MailboxConstants.ID;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.api.plugin.file.FileConstants.PROP_PATH;
-import static org.briarproject.bramble.util.IoUtils.delete;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @ThreadSafe
@@ -48,7 +41,6 @@ class MailboxFileManagerImpl implements MailboxFileManager, EventListener {
 
 	// Package access for testing
 	static final String DOWNLOAD_DIR_NAME = "downloads";
-	static final String UPLOAD_DIR_NAME = "uploads";
 
 	private final Executor ioExecutor;
 	private final PluginManager pluginManager;
@@ -75,44 +67,14 @@ class MailboxFileManagerImpl implements MailboxFileManager, EventListener {
 
 	@Override
 	public File createTempFileForDownload() throws IOException {
-		return createTempFile(DOWNLOAD_DIR_NAME);
-	}
-
-	@Override
-	public File createAndWriteTempFileForUpload(ContactId contactId,
-			OutgoingSessionRecord sessionRecord) throws IOException {
-		File f = createTempFile(UPLOAD_DIR_NAME);
-		// We shouldn't reach this point until the plugin has been started
-		SimplexPlugin plugin =
-				(SimplexPlugin) requireNonNull(pluginManager.getPlugin(ID));
-		TransportProperties p = new TransportProperties();
-		p.put(PROP_PATH, f.getAbsolutePath());
-		TransportConnectionWriter writer = plugin.createWriter(p);
-		if (writer == null) {
-			delete(f);
-			throw new IOException();
-		}
-		MailboxFileWriter decorated = new MailboxFileWriter(writer);
-		LOG.info("Writing file for upload");
-		connectionManager.manageOutgoingConnection(contactId, ID, decorated,
-				sessionRecord);
-		if (decorated.awaitDisposal()) {
-			// An exception was thrown during the session - delete the file
-			delete(f);
-			throw new IOException();
-		}
-		return f;
-	}
-
-	private File createTempFile(String dirName) throws IOException {
 		// Wait for orphaned files to be handled before creating new files
 		try {
 			orphanLatch.await();
 		} catch (InterruptedException e) {
 			throw new IOException(e);
 		}
-		File dir = createDirectoryIfNeeded(dirName);
-		return File.createTempFile("mailbox", ".tmp", dir);
+		File downloadDir = createDirectoryIfNeeded(DOWNLOAD_DIR_NAME);
+		return File.createTempFile("mailbox", ".tmp", downloadDir);
 	}
 
 	private File createDirectoryIfNeeded(String name) throws IOException {
@@ -154,8 +116,6 @@ class MailboxFileManagerImpl implements MailboxFileManager, EventListener {
 
 	@Override
 	public void eventOccurred(Event e) {
-		// Wait for the transport to become active before handling orphaned
-		// files so that we can get the plugin from the plugin manager
 		if (e instanceof TransportActiveEvent) {
 			TransportActiveEvent t = (TransportActiveEvent) e;
 			if (t.getTransportId().equals(ID)) {
@@ -167,25 +127,17 @@ class MailboxFileManagerImpl implements MailboxFileManager, EventListener {
 
 	/**
 	 * This method is called at startup, as soon as the plugin is started, to
-	 * delete any files that were left in the upload directory at the last
-	 * shutdown and handle any files that were left in the download directory.
+	 * handle any files that were left in the download directory at the last
+	 * shutdown.
 	 */
 	@IoExecutor
 	private void handleOrphanedFiles() {
 		try {
-			File uploadDir = createDirectoryIfNeeded(UPLOAD_DIR_NAME);
-			File[] orphanedUploads = uploadDir.listFiles();
-			if (orphanedUploads != null) {
-				for (File f : orphanedUploads) delete(f);
-			}
 			File downloadDir = createDirectoryIfNeeded(DOWNLOAD_DIR_NAME);
-			File[] orphanedDownloads = downloadDir.listFiles();
-			// Now that we've got the list of orphaned downloads, new files
-			// can be created in the download directory
+			File[] orphans = downloadDir.listFiles();
+			// Now that we've got the list of orphans, new files can be created
 			orphanLatch.countDown();
-			if (orphanedDownloads != null) {
-				for (File f : orphanedDownloads) handleDownloadedFile(f);
-			}
+			if (orphans != null) for (File f : orphans) handleDownloadedFile(f);
 		} catch (IOException e) {
 			logException(LOG, WARNING, e);
 		}
@@ -213,58 +165,9 @@ class MailboxFileManagerImpl implements MailboxFileManager, EventListener {
 			delegate.dispose(exception, recognised);
 			if (isHandlingComplete(exception, recognised)) {
 				LOG.info("Deleting downloaded file");
-				delete(file);
-			}
-		}
-	}
-
-	private static class MailboxFileWriter
-			implements TransportConnectionWriter {
-
-		private final TransportConnectionWriter delegate;
-		private final BlockingQueue<Boolean> disposalResult =
-				new ArrayBlockingQueue<>(1);
-
-		private MailboxFileWriter(TransportConnectionWriter delegate) {
-			this.delegate = delegate;
-		}
-
-		@Override
-		public long getMaxLatency() {
-			return delegate.getMaxLatency();
-		}
-
-		@Override
-		public int getMaxIdleTime() {
-			return delegate.getMaxIdleTime();
-		}
-
-		@Override
-		public boolean isLossyAndCheap() {
-			return delegate.isLossyAndCheap();
-		}
-
-		@Override
-		public OutputStream getOutputStream() throws IOException {
-			return delegate.getOutputStream();
-		}
-
-		@Override
-		public void dispose(boolean exception) throws IOException {
-			delegate.dispose(exception);
-			disposalResult.add(exception);
-		}
-
-		/**
-		 * Waits for the delegate to be disposed and returns true if an
-		 * exception occurred.
-		 */
-		private boolean awaitDisposal() {
-			try {
-				return disposalResult.take();
-			} catch (InterruptedException e) {
-				LOG.info("Interrupted while waiting for disposal");
-				return true;
+				if (!file.delete()) {
+					LOG.warning("Failed to delete downloaded file");
+				}
 			}
 		}
 	}

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

@@ -9,12 +9,10 @@ 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.mailbox.MailboxVersion;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.system.Clock;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
@@ -100,35 +98,34 @@ class MailboxManagerImpl implements MailboxManager {
 
 	@Override
 	public boolean checkConnection() {
-		List<MailboxVersion> versions = null;
+		boolean success;
 		try {
 			MailboxProperties props = db.transactionWithNullableResult(true,
 					mailboxSettingsManager::getOwnMailboxProperties);
 			if (props == null) throw new DbException();
-			versions = api.getServerSupports(props);
+			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(versions);
+			recordCheckResult(success);
 		} catch (DbException e) {
 			logException(LOG, WARNING, e);
 		}
-		return versions != null;
+		return success;
 	}
 
-	private void recordCheckResult(@Nullable List<MailboxVersion> versions)
-			throws DbException {
+	private void recordCheckResult(boolean success) throws DbException {
 		long now = clock.currentTimeMillis();
 		db.transaction(false, txn -> {
-			if (versions != null) {
-				mailboxSettingsManager
-						.recordSuccessfulConnection(txn, now, versions);
+			if (success) {
+				mailboxSettingsManager.recordSuccessfulConnection(txn, now);
 			} else {
 				mailboxSettingsManager.recordFailedConnectionAttempt(txn, now);
 			}

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

@@ -52,19 +52,13 @@ public class MailboxModule {
 	}
 
 	@Provides
-	@Singleton
 	MailboxSettingsManager provideMailboxSettingsManager(
 			MailboxSettingsManagerImpl mailboxSettingsManager) {
 		return mailboxSettingsManager;
 	}
 
 	@Provides
-	UrlConverter provideUrlConverter(UrlConverterImpl urlConverter) {
-		return urlConverter;
-	}
-
-	@Provides
-	MailboxApi provideMailboxApi(MailboxApiImpl mailboxApi) {
+	MailboxApi providesMailboxApi(MailboxApiImpl mailboxApi) {
 		return mailboxApi;
 	}
 
@@ -120,10 +114,4 @@ public class MailboxModule {
 		}
 		return mailboxFileManager;
 	}
-
-	@Provides
-	MailboxWorkerFactory provideMailboxWorkerFactory(
-			MailboxWorkerFactoryImpl mailboxWorkerFactory) {
-		return mailboxWorkerFactory;
-	}
 }

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

@@ -177,9 +177,10 @@ class MailboxPairingTaskImpl implements MailboxPairingTask {
 		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(onion, setupToken, new ArrayList<>());
+		return new MailboxProperties(baseUrl, setupToken, new ArrayList<>());
 	}
 
 }

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

@@ -20,13 +20,13 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.Collections.emptyList;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
-@ThreadSafe
+@Immutable
 @NotNullByDefault
 class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 
@@ -74,10 +74,16 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 	public void setOwnMailboxProperties(Transaction txn, MailboxProperties p)
 			throws DbException {
 		Settings s = new Settings();
-		s.put(SETTINGS_KEY_ONION, p.getOnion());
+		s.put(SETTINGS_KEY_ONION, p.getBaseUrl());
 		s.put(SETTINGS_KEY_TOKEN, p.getAuthToken().toString());
 		List<MailboxVersion> serverSupports = p.getServerSupports();
-		encodeServerSupports(serverSupports, s);
+		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());
@@ -115,30 +121,14 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 	@Override
 	public void recordSuccessfulConnection(Transaction txn, long now)
 			throws DbException {
-		recordSuccessfulConnection(txn, now, null);
-	}
-
-	@Override
-	public void recordSuccessfulConnection(Transaction txn, long now,
-			@Nullable List<MailboxVersion> versions) throws DbException {
+		Settings oldSettings =
+				settingsManager.getSettings(txn, SETTINGS_NAMESPACE);
 		Settings s = new Settings();
-		// fetch version that the server supports first
-		List<MailboxVersion> serverSupports;
-		if (versions == null) {
-			Settings oldSettings =
-					settingsManager.getSettings(txn, SETTINGS_NAMESPACE);
-			serverSupports = parseServerSupports(oldSettings);
-		} else {
-			serverSupports = versions;
-			// store new versions
-			encodeServerSupports(serverSupports, s);
-		}
-		// now record the successful connection
 		s.putLong(SETTINGS_KEY_LAST_ATTEMPT, now);
 		s.putLong(SETTINGS_KEY_LAST_SUCCESS, now);
 		s.putInt(SETTINGS_KEY_ATTEMPTS, 0);
 		settingsManager.mergeSettings(txn, s, SETTINGS_NAMESPACE);
-		// broadcast status event
+		List<MailboxVersion> serverSupports = parseServerSupports(oldSettings);
 		MailboxStatus status = new MailboxStatus(now, now, 0, serverSupports);
 		txn.attach(new OwnMailboxConnectionStatusEvent(status));
 	}
@@ -181,17 +171,6 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager {
 		return filename;
 	}
 
-	private void encodeServerSupports(List<MailboxVersion> serverSupports,
-			Settings s) {
-		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);
-	}
-
 	private List<MailboxVersion> parseServerSupports(Settings s)
 			throws DbException {
 		if (!s.containsKey(SETTINGS_KEY_SERVER_SUPPORTS)) return emptyList();

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

@@ -242,7 +242,8 @@ class MailboxUpdateManagerImpl implements MailboxUpdateManager,
 	private void createAndSendUpdateWithMailbox(Transaction txn, Contact c,
 			List<MailboxVersion> serverSupports, String ownOnion)
 			throws DbException {
-		MailboxProperties properties = new MailboxProperties(ownOnion,
+		String baseUrl = "http://" + ownOnion + ".onion"; // TODO
+		MailboxProperties properties = new MailboxProperties(baseUrl,
 				new MailboxAuthToken(crypto.generateUniqueId().getBytes()),
 				serverSupports,
 				new MailboxFolderId(crypto.generateUniqueId().getBytes()),

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

@@ -1,394 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-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.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventExecutor;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
-import org.briarproject.bramble.api.sync.event.GroupVisibilityUpdatedEvent;
-import org.briarproject.bramble.api.sync.event.MessageSharedEvent;
-import org.briarproject.bramble.api.sync.event.MessageToAckEvent;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.mailbox.ConnectivityChecker.ConnectivityObserver;
-import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-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.mailbox.MailboxConstants.MAX_LATENCY;
-import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
-import static org.briarproject.bramble.util.IoUtils.delete;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@ThreadSafe
-@NotNullByDefault
-class MailboxUploadWorker implements MailboxWorker, ConnectivityObserver,
-		EventListener {
-
-	/**
-	 * When the worker is started it checks for data to send. If data is ready
-	 * to send, the worker waits for a connectivity check, then writes and
-	 * uploads a file and checks again for data to send.
-	 * <p>
-	 * If data is due to be sent at some time in the future, the worker
-	 * schedules a wakeup for that time and also listens for events indicating
-	 * that new data may be ready to send.
-	 * <p>
-	 * If there's no data to send, the worker listens for events indicating
-	 * that new data may be ready to send.
-	 */
-	private enum State {
-		CREATED,
-		CHECKING_FOR_DATA,
-		WAITING_FOR_DATA,
-		CONNECTIVITY_CHECK,
-		WRITING_UPLOADING,
-		DESTROYED
-	}
-
-	private static final Logger LOG =
-			getLogger(MailboxUploadWorker.class.getName());
-
-	/**
-	 * When we're waiting for data to send and an event indicates that new data
-	 * may have become available, wait this long before checking the DB. This
-	 * should help to avoid creating lots of small files when several acks or
-	 * messages become available to send in a short period (eg when reading a
-	 * file downloaded from a mailbox).
-	 * <p>
-	 * Package access for testing.
-	 */
-	static final long CHECK_DELAY_MS = 5_000;
-
-	/**
-	 * How long to wait before retrying when an exception occurs while writing
-	 * a file.
-	 * <p>
-	 * Package access for testing.
-	 */
-	static final long RETRY_DELAY_MS = MINUTES.toMillis(1);
-
-	private final Executor ioExecutor;
-	private final DatabaseComponent db;
-	private final Clock clock;
-	private final TaskScheduler taskScheduler;
-	private final EventBus eventBus;
-	private final ConnectivityChecker connectivityChecker;
-	private final MailboxApiCaller mailboxApiCaller;
-	private final MailboxApi mailboxApi;
-	private final MailboxFileManager mailboxFileManager;
-	private final MailboxProperties mailboxProperties;
-	private final MailboxFolderId folderId;
-	private final ContactId contactId;
-
-	private final Object lock = new Object();
-
-	@GuardedBy("lock")
-	private State state = State.CREATED;
-
-	@GuardedBy("lock")
-	@Nullable
-	private Cancellable wakeupTask = null, checkTask = null, apiCall = null;
-
-	@GuardedBy("lock")
-	@Nullable
-	private File file = null;
-
-	MailboxUploadWorker(@IoExecutor Executor ioExecutor,
-			DatabaseComponent db,
-			Clock clock,
-			TaskScheduler taskScheduler,
-			EventBus eventBus,
-			ConnectivityChecker connectivityChecker,
-			MailboxApiCaller mailboxApiCaller,
-			MailboxApi mailboxApi,
-			MailboxFileManager mailboxFileManager,
-			MailboxProperties mailboxProperties,
-			MailboxFolderId folderId,
-			ContactId contactId) {
-		this.ioExecutor = ioExecutor;
-		this.db = db;
-		this.clock = clock;
-		this.taskScheduler = taskScheduler;
-		this.eventBus = eventBus;
-		this.connectivityChecker = connectivityChecker;
-		this.mailboxApiCaller = mailboxApiCaller;
-		this.mailboxApi = mailboxApi;
-		this.mailboxFileManager = mailboxFileManager;
-		this.mailboxProperties = mailboxProperties;
-		this.folderId = folderId;
-		this.contactId = contactId;
-	}
-
-	@Override
-	public void start() {
-		LOG.info("Started");
-		synchronized (lock) {
-			// Don't allow the worker to be reused
-			if (state != State.CREATED) return;
-			state = State.CHECKING_FOR_DATA;
-		}
-		ioExecutor.execute(this::checkForDataToSend);
-	}
-
-	@Override
-	public void destroy() {
-		LOG.info("Destroyed");
-		Cancellable wakeupTask, checkTask, apiCall;
-		File file;
-		synchronized (lock) {
-			state = State.DESTROYED;
-			wakeupTask = this.wakeupTask;
-			this.wakeupTask = null;
-			checkTask = this.checkTask;
-			this.checkTask = null;
-			apiCall = this.apiCall;
-			this.apiCall = null;
-			file = this.file;
-			this.file = null;
-		}
-		if (wakeupTask != null) wakeupTask.cancel();
-		if (checkTask != null) checkTask.cancel();
-		if (apiCall != null) apiCall.cancel();
-		if (file != null) delete(file);
-		connectivityChecker.removeObserver(this);
-		eventBus.removeListener(this);
-	}
-
-	@IoExecutor
-	private void checkForDataToSend() {
-		synchronized (lock) {
-			checkTask = null;
-			if (state != State.CHECKING_FOR_DATA) return;
-		}
-		LOG.info("Checking for data to send");
-		try {
-			db.transaction(true, txn -> {
-				long nextSendTime;
-				if (db.containsAcksToSend(txn, contactId)) {
-					nextSendTime = 0L;
-				} else {
-					nextSendTime = db.getNextSendTime(txn, contactId,
-							MAX_LATENCY);
-				}
-				// Handle the result on the event executor to avoid races with
-				// incoming events
-				txn.attach(() -> handleNextSendTime(nextSendTime));
-			});
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-
-	@EventExecutor
-	private void handleNextSendTime(long nextSendTime) {
-		if (nextSendTime == Long.MAX_VALUE) {
-			// Nothing is sendable now or due to be sent in the future. Wait
-			// for an event indicating that new data may be ready to send
-			waitForDataToSend();
-		} else {
-			// Work out the delay until data's ready to send (may be negative)
-			long delay = nextSendTime - clock.currentTimeMillis();
-			if (delay > 0) {
-				// Schedule a wakeup when data will be ready to send. If an
-				// event is received in the meantime indicating that new data
-				// may be ready to send, we'll cancel the wakeup
-				scheduleWakeup(delay);
-			} else {
-				// Data is ready to send now
-				checkConnectivity();
-			}
-		}
-	}
-
-	@EventExecutor
-	private void waitForDataToSend() {
-		synchronized (lock) {
-			if (state != State.CHECKING_FOR_DATA) return;
-			state = State.WAITING_FOR_DATA;
-			LOG.info("Waiting for data to send");
-		}
-	}
-
-	@EventExecutor
-	private void scheduleWakeup(long delay) {
-		synchronized (lock) {
-			if (state != State.CHECKING_FOR_DATA) return;
-			state = State.WAITING_FOR_DATA;
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Scheduling wakeup in " + delay + " ms");
-			}
-			wakeupTask = taskScheduler.schedule(this::wakeUp, ioExecutor,
-					delay, MILLISECONDS);
-		}
-	}
-
-	@IoExecutor
-	private void wakeUp() {
-		LOG.info("Woke up");
-		synchronized (lock) {
-			wakeupTask = null;
-			if (state != State.WAITING_FOR_DATA) return;
-			state = State.CHECKING_FOR_DATA;
-		}
-		checkForDataToSend();
-	}
-
-	@EventExecutor
-	private void checkConnectivity() {
-		synchronized (lock) {
-			if (state != State.CHECKING_FOR_DATA) return;
-			state = State.CONNECTIVITY_CHECK;
-		}
-		LOG.info("Checking connectivity");
-		// Avoid leaking observer in case destroy() is called concurrently
-		// before observer is added
-		connectivityChecker.checkConnectivity(mailboxProperties, this);
-		boolean destroyed;
-		synchronized (lock) {
-			destroyed = state == State.DESTROYED;
-		}
-		if (destroyed) connectivityChecker.removeObserver(this);
-	}
-
-	@Override
-	public void onConnectivityCheckSucceeded() {
-		LOG.info("Connectivity check succeeded");
-		synchronized (lock) {
-			if (state != State.CONNECTIVITY_CHECK) return;
-			state = State.WRITING_UPLOADING;
-		}
-		ioExecutor.execute(this::writeAndUploadFile);
-	}
-
-	@IoExecutor
-	private void writeAndUploadFile() {
-		synchronized (lock) {
-			if (state != State.WRITING_UPLOADING) return;
-		}
-		OutgoingSessionRecord sessionRecord = new OutgoingSessionRecord();
-		File file;
-		try {
-			file = mailboxFileManager.createAndWriteTempFileForUpload(
-					contactId, sessionRecord);
-		} catch (IOException e) {
-			logException(LOG, WARNING, e);
-			// Try again after a delay
-			synchronized (lock) {
-				if (state != State.WRITING_UPLOADING) return;
-				state = State.CHECKING_FOR_DATA;
-				checkTask = taskScheduler.schedule(this::checkForDataToSend,
-						ioExecutor, RETRY_DELAY_MS, MILLISECONDS);
-			}
-			return;
-		}
-		boolean deleteFile = false;
-		synchronized (lock) {
-			if (state == State.WRITING_UPLOADING) {
-				this.file = file;
-				apiCall = mailboxApiCaller.retryWithBackoff(
-						new SimpleApiCall(() -> apiCallUploadFile(file,
-								sessionRecord)));
-			} else {
-				deleteFile = true;
-			}
-		}
-		if (deleteFile) delete(file);
-	}
-
-	@IoExecutor
-	private void apiCallUploadFile(File file,
-			OutgoingSessionRecord sessionRecord)
-			throws IOException, ApiException {
-		synchronized (lock) {
-			if (state != State.WRITING_UPLOADING) return;
-		}
-		LOG.info("Uploading file");
-		mailboxApi.addFile(mailboxProperties, folderId, file);
-		markMessagesSentOrAcked(sessionRecord);
-		synchronized (lock) {
-			if (state != State.WRITING_UPLOADING) return;
-			state = State.CHECKING_FOR_DATA;
-			apiCall = null;
-			this.file = null;
-		}
-		delete(file);
-		checkForDataToSend();
-	}
-
-	private void markMessagesSentOrAcked(OutgoingSessionRecord sessionRecord) {
-		Collection<MessageId> acked = sessionRecord.getAckedIds();
-		Collection<MessageId> sent = sessionRecord.getSentIds();
-		try {
-			db.transaction(false, txn -> {
-				if (!acked.isEmpty()) {
-					db.setAckSent(txn, contactId, acked);
-				}
-				if (!sent.isEmpty()) {
-					db.setMessagesSent(txn, contactId, sent, MAX_LATENCY);
-				}
-			});
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof MessageToAckEvent) {
-			MessageToAckEvent m = (MessageToAckEvent) e;
-			if (m.getContactId().equals(contactId)) {
-				LOG.info("Message to ack");
-				onDataToSend();
-			}
-		} else if (e instanceof MessageSharedEvent) {
-			LOG.info("Message shared");
-			onDataToSend();
-		} else if (e instanceof GroupVisibilityUpdatedEvent) {
-			GroupVisibilityUpdatedEvent g = (GroupVisibilityUpdatedEvent) e;
-			if (g.getVisibility() == SHARED &&
-					g.getAffectedContacts().contains(contactId)) {
-				LOG.info("Group shared");
-				onDataToSend();
-			}
-		}
-	}
-
-	@EventExecutor
-	private void onDataToSend() {
-		Cancellable wakeupTask;
-		synchronized (lock) {
-			if (state != State.WAITING_FOR_DATA) return;
-			state = State.CHECKING_FOR_DATA;
-			wakeupTask = this.wakeupTask;
-			this.wakeupTask = null;
-			// Delay the check to avoid creating lots of small files
-			checkTask = taskScheduler.schedule(this::checkForDataToSend,
-					ioExecutor, CHECK_DELAY_MS, MILLISECONDS);
-		}
-		// If we had scheduled a wakeup when data was due to be sent, cancel it
-		if (wakeupTask != null) wakeupTask.cancel();
-	}
-}

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

@@ -1,23 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-/**
- * A worker that downloads files from a contact's mailbox.
- */
-@ThreadSafe
-@NotNullByDefault
-interface MailboxWorker {
-
-	/**
-	 * Asynchronously starts the worker.
-	 */
-	void start();
-
-	/**
-	 * Destroys the worker and cancels any pending tasks or retries.
-	 */
-	void destroy();
-}

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

@@ -1,27 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-interface MailboxWorkerFactory {
-
-	MailboxWorker createUploadWorker(ConnectivityChecker connectivityChecker,
-			MailboxProperties properties, MailboxFolderId folderId,
-			ContactId contactId);
-
-	MailboxWorker createDownloadWorkerForContactMailbox(
-			ConnectivityChecker connectivityChecker,
-			TorReachabilityMonitor reachabilityMonitor,
-			MailboxProperties properties);
-
-	MailboxWorker createDownloadWorkerForOwnMailbox(
-			ConnectivityChecker connectivityChecker,
-			TorReachabilityMonitor reachabilityMonitor,
-			MailboxProperties properties);
-}

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

@@ -1,81 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-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.api.system.TaskScheduler;
-
-import java.util.concurrent.Executor;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-@Immutable
-@NotNullByDefault
-class MailboxWorkerFactoryImpl implements MailboxWorkerFactory {
-
-	private final Executor ioExecutor;
-	private final DatabaseComponent db;
-	private final Clock clock;
-	private final TaskScheduler taskScheduler;
-	private final EventBus eventBus;
-	private final MailboxApiCaller mailboxApiCaller;
-	private final MailboxApi mailboxApi;
-	private final MailboxFileManager mailboxFileManager;
-
-	@Inject
-	MailboxWorkerFactoryImpl(@IoExecutor Executor ioExecutor,
-			DatabaseComponent db,
-			Clock clock,
-			TaskScheduler taskScheduler,
-			EventBus eventBus,
-			MailboxApiCaller mailboxApiCaller,
-			MailboxApi mailboxApi,
-			MailboxFileManager mailboxFileManager) {
-		this.ioExecutor = ioExecutor;
-		this.db = db;
-		this.clock = clock;
-		this.taskScheduler = taskScheduler;
-		this.eventBus = eventBus;
-		this.mailboxApiCaller = mailboxApiCaller;
-		this.mailboxApi = mailboxApi;
-		this.mailboxFileManager = mailboxFileManager;
-	}
-
-	@Override
-	public MailboxWorker createUploadWorker(
-			ConnectivityChecker connectivityChecker,
-			MailboxProperties properties, MailboxFolderId folderId,
-			ContactId contactId) {
-		MailboxUploadWorker worker = new MailboxUploadWorker(ioExecutor, db,
-				clock, taskScheduler, eventBus, connectivityChecker,
-				mailboxApiCaller, mailboxApi, mailboxFileManager,
-				properties, folderId, contactId);
-		eventBus.addListener(worker);
-		return worker;
-	}
-
-	@Override
-	public MailboxWorker createDownloadWorkerForContactMailbox(
-			ConnectivityChecker connectivityChecker,
-			TorReachabilityMonitor reachabilityMonitor,
-			MailboxProperties properties) {
-		return new ContactMailboxDownloadWorker(connectivityChecker,
-				reachabilityMonitor, mailboxApiCaller, mailboxApi,
-				mailboxFileManager, properties);
-	}
-
-	@Override
-	public MailboxWorker createDownloadWorkerForOwnMailbox(
-			ConnectivityChecker connectivityChecker,
-			TorReachabilityMonitor reachabilityMonitor,
-			MailboxProperties properties) {
-		// TODO
-		throw new UnsupportedOperationException();
-	}
-}

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

@@ -4,13 +4,11 @@ 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.mailbox.MailboxVersion;
 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.List;
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.ThreadSafe;
@@ -57,12 +55,11 @@ class OwnMailboxConnectivityChecker extends ConnectivityCheckerImpl {
 	private boolean checkConnectivityAndStoreResult(
 			MailboxProperties properties) throws DbException {
 		try {
-			List<MailboxVersion> serverSupports =
-					mailboxApi.getServerSupports(properties);
+			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, serverSupports));
+					.recordSuccessfulConnection(txn, now));
 			// Call the observers and cache the result
 			onConnectivityCheckSucceeded(now);
 			return false; // Don't retry

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

@@ -1,369 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
-import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.NoSuchContactException;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventExecutor;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-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.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.mailbox.ConnectivityChecker.ConnectivityObserver;
-import org.briarproject.bramble.mailbox.MailboxApi.ApiException;
-import org.briarproject.bramble.mailbox.MailboxApi.MailboxContact;
-import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@ThreadSafe
-@NotNullByDefault
-class OwnMailboxContactListWorker
-		implements MailboxWorker, ConnectivityObserver, EventListener {
-
-	/**
-	 * When the worker is started it waits for a connectivity check, then
-	 * fetches the remote contact list and compares it to the local contact
-	 * list.
-	 * <p>
-	 * Any contacts that are missing from the remote list are added to the
-	 * mailbox's contact list, while any contacts that are missing from the
-	 * local list are removed from the mailbox's contact list.
-	 * <p>
-	 * Once the remote contact list has been brought up to date, the worker
-	 * waits for events indicating that contacts have been added or removed.
-	 * Each time an event is received, the worker updates the mailbox's
-	 * contact list and then goes back to waiting.
-	 */
-	private enum State {
-		CREATED,
-		CONNECTIVITY_CHECK,
-		FETCHING_CONTACT_LIST,
-		UPDATING_CONTACT_LIST,
-		WAITING_FOR_CHANGES,
-		DESTROYED
-	}
-
-	private static final Logger LOG =
-			getLogger(OwnMailboxContactListWorker.class.getName());
-
-	private final Executor ioExecutor;
-	private final DatabaseComponent db;
-	private final EventBus eventBus;
-	private final ConnectivityChecker connectivityChecker;
-	private final MailboxApiCaller mailboxApiCaller;
-	private final MailboxApi mailboxApi;
-	private final MailboxUpdateManager mailboxUpdateManager;
-	private final MailboxProperties mailboxProperties;
-	private final Object lock = new Object();
-
-	@GuardedBy("lock")
-	private State state = State.CREATED;
-
-	@GuardedBy("lock")
-	@Nullable
-	private Cancellable apiCall = null;
-
-	/**
-	 * A queue of updates waiting to be applied to the remote contact list.
-	 */
-	@GuardedBy("lock")
-	private final Queue<Update> updates = new LinkedList<>();
-
-	OwnMailboxContactListWorker(@IoExecutor Executor ioExecutor,
-			DatabaseComponent db,
-			EventBus eventBus,
-			ConnectivityChecker connectivityChecker,
-			MailboxApiCaller mailboxApiCaller,
-			MailboxApi mailboxApi,
-			MailboxUpdateManager mailboxUpdateManager,
-			MailboxProperties mailboxProperties) {
-		if (!mailboxProperties.isOwner()) throw new IllegalArgumentException();
-		this.ioExecutor = ioExecutor;
-		this.db = db;
-		this.connectivityChecker = connectivityChecker;
-		this.mailboxApiCaller = mailboxApiCaller;
-		this.mailboxApi = mailboxApi;
-		this.mailboxUpdateManager = mailboxUpdateManager;
-		this.mailboxProperties = mailboxProperties;
-		this.eventBus = eventBus;
-	}
-
-	@Override
-	public void start() {
-		LOG.info("Started");
-		synchronized (lock) {
-			if (state != State.CREATED) return;
-			state = State.CONNECTIVITY_CHECK;
-		}
-		// Avoid leaking observer in case destroy() is called concurrently
-		// before observer is added
-		connectivityChecker.checkConnectivity(mailboxProperties, this);
-		boolean destroyed;
-		synchronized (lock) {
-			destroyed = state == State.DESTROYED;
-		}
-		if (destroyed) connectivityChecker.removeObserver(this);
-	}
-
-	@Override
-	public void destroy() {
-		LOG.info("Destroyed");
-		Cancellable apiCall;
-		synchronized (lock) {
-			state = State.DESTROYED;
-			apiCall = this.apiCall;
-			this.apiCall = null;
-		}
-		if (apiCall != null) apiCall.cancel();
-		connectivityChecker.removeObserver(this);
-		eventBus.removeListener(this);
-	}
-
-	@Override
-	public void onConnectivityCheckSucceeded() {
-		LOG.info("Connectivity check succeeded");
-		synchronized (lock) {
-			if (state != State.CONNECTIVITY_CHECK) return;
-			state = State.FETCHING_CONTACT_LIST;
-			apiCall = mailboxApiCaller.retryWithBackoff(
-					new SimpleApiCall(this::apiCallFetchContactList));
-		}
-	}
-
-	@IoExecutor
-	private void apiCallFetchContactList() throws IOException, ApiException {
-		synchronized (lock) {
-			if (state != State.FETCHING_CONTACT_LIST) return;
-		}
-		LOG.info("Fetching remote contact list");
-		Collection<ContactId> remote =
-				mailboxApi.getContacts(mailboxProperties);
-		ioExecutor.execute(() -> loadLocalContactList(remote));
-	}
-
-	@IoExecutor
-	private void loadLocalContactList(Collection<ContactId> remote) {
-		synchronized (lock) {
-			if (state != State.FETCHING_CONTACT_LIST) return;
-			apiCall = null;
-		}
-		LOG.info("Loading local contact list");
-		try {
-			db.transaction(true, txn -> {
-				Collection<Contact> local = db.getContacts(txn);
-				// Handle the result on the event executor to avoid races with
-				// incoming events
-				txn.attach(() -> reconcileContactLists(local, remote));
-			});
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-
-	@EventExecutor
-	private void reconcileContactLists(Collection<Contact> local,
-			Collection<ContactId> remote) {
-		Set<ContactId> localIds = new HashSet<>();
-		for (Contact c : local) localIds.add(c.getId());
-		remote = new HashSet<>(remote);
-		synchronized (lock) {
-			if (state != State.FETCHING_CONTACT_LIST) return;
-			for (ContactId c : localIds) {
-				if (!remote.contains(c)) updates.add(new Update(true, c));
-			}
-			for (ContactId c : remote) {
-				if (!localIds.contains(c)) updates.add(new Update(false, c));
-			}
-			if (updates.isEmpty()) {
-				LOG.info("Contact list is up to date");
-				state = State.WAITING_FOR_CHANGES;
-			} else {
-				if (LOG.isLoggable(INFO)) {
-					LOG.info(updates.size() + " updates to apply");
-				}
-				state = State.UPDATING_CONTACT_LIST;
-				ioExecutor.execute(this::updateContactList);
-			}
-		}
-	}
-
-	@IoExecutor
-	private void updateContactList() {
-		Update update;
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST) return;
-			update = updates.poll();
-			if (update == null) {
-				LOG.info("No more updates to process");
-				state = State.WAITING_FOR_CHANGES;
-				apiCall = null;
-				return;
-			}
-		}
-		if (update.add) loadMailboxProperties(update.contactId);
-		else removeContact(update.contactId);
-	}
-
-	@IoExecutor
-	private void loadMailboxProperties(ContactId c) {
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST) return;
-		}
-		LOG.info("Loading mailbox properties for contact");
-		try {
-			MailboxUpdate mailboxUpdate = db.transactionWithResult(true, txn ->
-					mailboxUpdateManager.getLocalUpdate(txn, c));
-			if (mailboxUpdate instanceof MailboxUpdateWithMailbox) {
-				addContact(c, (MailboxUpdateWithMailbox) mailboxUpdate);
-			} else {
-				// Our own mailbox was concurrently unpaired. This worker will
-				// be destroyed soon, so we can stop here
-				LOG.info("Own mailbox was unpaired");
-			}
-		} catch (NoSuchContactException e) {
-			// Contact was removed concurrently. Move on to the next update.
-			// Later we may process a removal update for this contact, which
-			// was never added to the mailbox's contact list. The removal API
-			// call should fail safely with a TolerableFailureException
-			LOG.info("No such contact");
-			updateContactList();
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-
-	@IoExecutor
-	private void addContact(ContactId c, MailboxUpdateWithMailbox withMailbox) {
-		MailboxProperties props = withMailbox.getMailboxProperties();
-		MailboxContact contact = new MailboxContact(c, props.getAuthToken(),
-				requireNonNull(props.getInboxId()),
-				requireNonNull(props.getOutboxId()));
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST) return;
-			apiCall = mailboxApiCaller.retryWithBackoff(new SimpleApiCall(() ->
-					apiCallAddContact(contact)));
-		}
-	}
-
-	@IoExecutor
-	private void apiCallAddContact(MailboxContact contact)
-			throws IOException, ApiException, TolerableFailureException {
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST) return;
-		}
-		LOG.info("Adding contact to remote contact list");
-		mailboxApi.addContact(mailboxProperties, contact);
-		updateContactList();
-	}
-
-	@IoExecutor
-	private void removeContact(ContactId c) {
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST) return;
-			apiCall = mailboxApiCaller.retryWithBackoff(new SimpleApiCall(() ->
-					apiCallRemoveContact(c)));
-		}
-	}
-
-	@IoExecutor
-	private void apiCallRemoveContact(ContactId c)
-			throws IOException, ApiException {
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST) return;
-		}
-		LOG.info("Removing contact from remote contact list");
-		try {
-			mailboxApi.deleteContact(mailboxProperties, c);
-		} catch (TolerableFailureException e) {
-			// Catch this so we can continue to the next update
-			logException(LOG, INFO, e);
-		}
-		updateContactList();
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof ContactAddedEvent) {
-			LOG.info("Contact added");
-			onContactAdded(((ContactAddedEvent) e).getContactId());
-		} else if (e instanceof ContactRemovedEvent) {
-			LOG.info("Contact removed");
-			onContactRemoved(((ContactRemovedEvent) e).getContactId());
-		}
-	}
-
-	@EventExecutor
-	private void onContactAdded(ContactId c) {
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST &&
-					state != State.WAITING_FOR_CHANGES) {
-				return;
-			}
-			updates.add(new Update(true, c));
-			if (state == State.WAITING_FOR_CHANGES) {
-				state = State.UPDATING_CONTACT_LIST;
-				ioExecutor.execute(this::updateContactList);
-			}
-		}
-	}
-
-	@EventExecutor
-	private void onContactRemoved(ContactId c) {
-		synchronized (lock) {
-			if (state != State.UPDATING_CONTACT_LIST &&
-					state != State.WAITING_FOR_CHANGES) {
-				return;
-			}
-			updates.add(new Update(false, c));
-			if (state == State.WAITING_FOR_CHANGES) {
-				state = State.UPDATING_CONTACT_LIST;
-				ioExecutor.execute(this::updateContactList);
-			}
-		}
-	}
-
-	/**
-	 * An update that should be applied to the remote contact list.
-	 */
-	private static class Update {
-
-		/**
-		 * True if the contact should be added, false if the contact should be
-		 * removed.
-		 */
-		private final boolean add;
-		private final ContactId contactId;
-
-		private Update(boolean add, ContactId contactId) {
-			this.add = add;
-			this.contactId = contactId;
-		}
-	}
-}

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

@@ -16,20 +16,17 @@ import static org.briarproject.bramble.util.LogUtils.logException;
  * Convenience class for making simple API calls that don't return values.
  */
 @NotNullByDefault
-class SimpleApiCall implements ApiCall {
+public abstract class SimpleApiCall implements ApiCall {
 
 	private static final Logger LOG = getLogger(SimpleApiCall.class.getName());
 
-	private final Attempt attempt;
-
-	SimpleApiCall(Attempt attempt) {
-		this.attempt = attempt;
-	}
+	abstract void tryToCallApi()
+			throws IOException, ApiException, TolerableFailureException;
 
 	@Override
 	public boolean callApi() {
 		try {
-			attempt.tryToCallApi();
+			tryToCallApi();
 			return false; // Succeeded, don't retry
 		} catch (IOException | ApiException e) {
 			logException(LOG, WARNING, e);
@@ -39,17 +36,4 @@ class SimpleApiCall implements ApiCall {
 			return false; // Failed tolerably, don't retry
 		}
 	}
-
-	interface Attempt {
-
-		/**
-		 * Makes a single attempt to call an API endpoint. If this method
-		 * throws an {@link IOException} or an {@link ApiException}, the call
-		 * will be retried. If it throws a {@link TolerableFailureException}
-		 * or returns without throwing an exception, the call will not be
-		 * retried.
-		 */
-		void tryToCallApi()
-				throws IOException, ApiException, TolerableFailureException;
-	}
 }

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

@@ -38,12 +38,6 @@ interface TorReachabilityMonitor {
 	 */
 	void addOneShotObserver(TorReachabilityObserver o);
 
-	/**
-	 * Removes an observer that was added via
-	 * {@link #addOneShotObserver(TorReachabilityObserver)}.
-	 */
-	void removeObserver(TorReachabilityObserver o);
-
 	interface TorReachabilityObserver {
 
 		void onTorReachable();

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

@@ -87,14 +87,6 @@ class TorReachabilityMonitorImpl
 		if (callNow) o.onTorReachable();
 	}
 
-	@Override
-	public void removeObserver(TorReachabilityObserver o) {
-		synchronized (lock) {
-			if (destroyed) return;
-			observers.remove(o);
-		}
-	}
-
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof TransportActiveEvent) {

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

@@ -1,17 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * An interface for converting an onion address to an HTTP URL, allowing the
- * conversion to be customised for integration tests.
- */
-@NotNullByDefault
-interface UrlConverter {
-
-   /**
-    * Converts a raw onion address, excluding the .onion suffix, into an
-    * HTTP URL.
-    */
-   String convertOnionToBaseUrl(String onion);
-}

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

@@ -1,18 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.inject.Inject;
-
-@NotNullByDefault
-class UrlConverterImpl implements UrlConverter {
-
-	@Inject
-	UrlConverterImpl() {
-	}
-
-	@Override
-	public String convertOnionToBaseUrl(String onion) {
-		return "http://" + onion + ".onion";
-	}
-}

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

@@ -427,13 +427,7 @@ abstract class AbstractBluetoothPlugin<S, SS> implements BluetoothPlugin,
 		BdfList descriptor = new BdfList();
 		descriptor.add(TRANSPORT_ID_BLUETOOTH);
 		String address = getBluetoothAddress();
-		if (address != null) {
-			try {
-				descriptor.add(macToBytes(address));
-			} catch (FormatException e) {
-				throw new RuntimeException();
-			}
-		}
+		if (address != null) descriptor.add(macToBytes(address));
 		return new BluetoothKeyAgreementListener(descriptor, ss);
 	}
 

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

@@ -9,12 +9,14 @@ import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import static java.util.concurrent.TimeUnit.DAYS;
 import static org.briarproject.bramble.api.mailbox.MailboxConstants.ID;
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.MAX_LATENCY;
 
 @NotNullByDefault
 public class MailboxPluginFactory implements SimplexPluginFactory {
 
+	private static final long MAX_LATENCY = DAYS.toMillis(14);
+
 	@Inject
 	MailboxPluginFactory() {
 	}

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

@@ -106,8 +106,7 @@ class RemovableDriveManagerImpl
 	@Override
 	public boolean isWriterTaskNeeded(ContactId c) throws DbException {
 		return db.transactionWithResult(true, txn ->
-				db.containsAcksToSend(txn, c) ||
-						db.containsMessagesToSend(txn, c, MAX_LATENCY, true));
+				db.containsAnythingToSend(txn, c, MAX_LATENCY, true));
 	}
 
 	@Override

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

@@ -285,7 +285,7 @@ class LanTcpPlugin extends TcpPlugin {
 				if (ip.length == 16) addrs.add(InetAddress.getByAddress(ip));
 			}
 			return addrs;
-		} catch (FormatException | UnknownHostException e) {
+		} catch (IllegalArgumentException | UnknownHostException e) {
 			return emptyList();
 		}
 	}

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

@@ -27,7 +27,7 @@ public interface CircumventionProvider {
 	 * Countries where 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 #DPI_BRIDGES}.
+	 * {@link #MEEK_BRIDGES}.
 	 */
 	String[] BRIDGES = {"BY", "CN", "EG", "IR", "RU", "TM", "VE"};
 
@@ -44,10 +44,10 @@ public interface CircumventionProvider {
 	String[] NON_DEFAULT_BRIDGES = {"BY", "RU", "TM"};
 
 	/**
-	 * Countries where vanilla bridges are blocked via DPI but non-default
-	 * obfs4 bridges and meek may work. Should be a subset of {@link #BRIDGES}.
+	 * Countries where obfs4 and vanilla bridges won't work and meek is needed.
+	 * Should be a subset of {@link #BRIDGES}.
 	 */
-	String[] DPI_BRIDGES = {"CN", "IR"};
+	String[] MEEK_BRIDGES = {"CN", "IR"};
 
 	/**
 	 * Returns true if vanilla Tor connections are blocked in the given country.

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

@@ -14,6 +14,7 @@ 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;
@@ -34,8 +35,8 @@ class CircumventionProviderImpl implements CircumventionProvider {
 			new HashSet<>(asList(DEFAULT_BRIDGES));
 	private static final Set<String> NON_DEFAULT_BRIDGE_COUNTRIES =
 			new HashSet<>(asList(NON_DEFAULT_BRIDGES));
-	private static final Set<String> DPI_COUNTRIES =
-			new HashSet<>(asList(DPI_BRIDGES));
+	private static final Set<String> MEEK_COUNTRIES =
+			new HashSet<>(asList(MEEK_BRIDGES));
 
 	@Inject
 	CircumventionProviderImpl() {
@@ -57,8 +58,8 @@ class CircumventionProviderImpl implements CircumventionProvider {
 			return asList(DEFAULT_OBFS4, VANILLA);
 		} else if (NON_DEFAULT_BRIDGE_COUNTRIES.contains(countryCode)) {
 			return asList(NON_DEFAULT_OBFS4, VANILLA);
-		} else if (DPI_COUNTRIES.contains(countryCode)) {
-			return asList(NON_DEFAULT_OBFS4, MEEK);
+		} else if (MEEK_COUNTRIES.contains(countryCode)) {
+			return singletonList(MEEK);
 		} else {
 			return asList(DEFAULT_OBFS4, VANILLA);
 		}

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

@@ -107,7 +107,7 @@ import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 @ParametersNotNullByDefault
 abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
-	protected static final Logger LOG = getLogger(TorPlugin.class.getName());
+	private static final Logger LOG = getLogger(TorPlugin.class.getName());
 
 	private static final String[] EVENTS = {
 			"CIRC",
@@ -124,8 +124,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final int COOKIE_POLLING_INTERVAL_MS = 200;
 	private static final Pattern ONION_V3 = Pattern.compile("[a-z2-7]{56}");
 
-	protected final Executor ioExecutor;
-	private final Executor wakefulIoExecutor;
+	private final Executor ioExecutor, wakefulIoExecutor;
 	private final Executor connectionStatusExecutor;
 	private final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
@@ -255,15 +254,34 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		Map<String, String> env = pb.environment();
 		env.put("HOME", torDirectory.getAbsolutePath());
 		pb.directory(torDirectory);
-		pb.redirectErrorStream(true);
 		try {
 			torProcess = pb.start();
 		} catch (SecurityException | IOException e) {
 			throw new PluginException(e);
 		}
+		// Log the process's standard output until it detaches
+		if (LOG.isLoggable(INFO)) {
+			Scanner stdout = new Scanner(torProcess.getInputStream());
+			Scanner stderr = new Scanner(torProcess.getErrorStream());
+			while (stdout.hasNextLine() || stderr.hasNextLine()) {
+				if (stdout.hasNextLine()) {
+					LOG.info(stdout.nextLine());
+				}
+				if (stderr.hasNextLine()) {
+					LOG.info(stderr.nextLine());
+				}
+			}
+			stdout.close();
+			stderr.close();
+		}
 		try {
-			// Wait for the Tor process to start
-			waitForTorToStart(torProcess);
+			// Wait for the process to detach or exit
+			int exit = torProcess.waitFor();
+			if (exit != 0) {
+				if (LOG.isLoggable(WARNING))
+					LOG.warning("Tor exited with value " + exit);
+				throw new PluginException();
+			}
 			// Wait for the auth cookie file to be created/updated
 			long start = clock.currentTimeMillis();
 			while (cookieFile.length() < 32) {
@@ -379,7 +397,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		return zin;
 	}
 
-	private static void append(StringBuilder strb, String name, Object value) {
+	private static void append(StringBuilder strb, String name, int value) {
 		strb.append(name);
 		strb.append(" ");
 		strb.append(value);
@@ -387,17 +405,13 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private InputStream getConfigInputStream() {
-		File dataDirectory = new File(torDirectory, ".tor");
 		StringBuilder strb = new StringBuilder();
 		append(strb, "ControlPort", torControlPort);
 		append(strb, "CookieAuthentication", 1);
-		append(strb, "DataDirectory", dataDirectory.getAbsolutePath());
 		append(strb, "DisableNetwork", 1);
 		append(strb, "RunAsDaemon", 1);
 		append(strb, "SafeSocks", 1);
 		append(strb, "SocksPort", torSocksPort);
-		strb.append("GeoIPFile\n");
-		strb.append("GeoIPv6File\n");
 		//noinspection CharsetObjectCanBeUsed
 		return new ByteArrayInputStream(
 				strb.toString().getBytes(Charset.forName("UTF-8")));
@@ -428,23 +442,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	protected void waitForTorToStart(Process torProcess)
-			throws InterruptedException, PluginException {
-		Scanner stdout = new Scanner(torProcess.getInputStream());
-		// Log the first line of stdout (contains Tor and library versions)
-		if (stdout.hasNextLine()) LOG.info(stdout.nextLine());
-		// Read the process's stdout (and redirected stderr) until it detaches
-		while (stdout.hasNextLine()) stdout.nextLine();
-		stdout.close();
-		// Wait for the process to detach or exit
-		int exit = torProcess.waitFor();
-		if (exit != 0) {
-			if (LOG.isLoggable(WARNING))
-				LOG.warning("Tor exited with value " + exit);
-			throw new PluginException();
-		}
-	}
-
 	private void bind() {
 		ioExecutor.execute(() -> {
 			// If there's already a port number stored in config, reuse it

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

@@ -50,7 +50,6 @@ 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.sync.Group.Visibility.SHARED;
 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;
@@ -236,10 +235,8 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 			generateOffer();
 		} else if (e instanceof GroupVisibilityUpdatedEvent) {
 			GroupVisibilityUpdatedEvent g = (GroupVisibilityUpdatedEvent) e;
-			if (g.getVisibility() == SHARED &&
-					g.getAffectedContacts().contains(contactId)) {
+			if (g.getAffectedContacts().contains(contactId))
 				generateOffer();
-			}
 		} else if (e instanceof MessageRequestedEvent) {
 			if (((MessageRequestedEvent) e).getContactId().equals(contactId))
 				generateBatch();
@@ -313,8 +310,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 							Collection<Message> batch =
 									db.generateRequestedBatch(txn, contactId,
 											BATCH_CAPACITY, maxLatency);
-							setNextSendTime(db.getNextSendTime(txn, contactId,
-									maxLatency));
+							setNextSendTime(db.getNextSendTime(txn, contactId));
 							return batch;
 						});
 				if (LOG.isLoggable(INFO))
@@ -357,8 +353,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 				Offer o = db.transactionWithNullableResult(false, txn -> {
 					Offer offer = db.generateOffer(txn, contactId,
 							MAX_MESSAGE_IDS, maxLatency);
-					setNextSendTime(db.getNextSendTime(txn, contactId,
-							maxLatency));
+					setNextSendTime(db.getNextSendTime(txn, contactId));
 					return offer;
 				});
 				if (LOG.isLoggable(INFO))

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

@@ -7,9 +7,9 @@ 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.Ack;
+import org.briarproject.bramble.api.sync.DeferredSendHandler;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 import org.briarproject.bramble.api.sync.SyncRecordWriter;
 import org.briarproject.bramble.api.transport.StreamWriter;
 
@@ -29,7 +29,7 @@ import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LEN
 
 /**
  * A {@link SimplexOutgoingSession} for sending and acking messages via a
- * mailbox. The session uses a {@link OutgoingSessionRecord} to record the IDs
+ * mailbox. The session uses a {@link DeferredSendHandler} to record the IDs
  * of the messages sent and acked during the session so that they can be
  * recorded in the DB as sent or acked after the file has been successfully
  * uploaded to the mailbox.
@@ -41,7 +41,7 @@ class MailboxOutgoingSession extends SimplexOutgoingSession {
 	private static final Logger LOG =
 			getLogger(MailboxOutgoingSession.class.getName());
 
-	private final OutgoingSessionRecord sessionRecord;
+	private final DeferredSendHandler deferredSendHandler;
 	private final long initialCapacity;
 
 	MailboxOutgoingSession(DatabaseComponent db,
@@ -51,11 +51,11 @@ class MailboxOutgoingSession extends SimplexOutgoingSession {
 			long maxLatency,
 			StreamWriter streamWriter,
 			SyncRecordWriter recordWriter,
-			OutgoingSessionRecord sessionRecord,
+			DeferredSendHandler deferredSendHandler,
 			long capacity) {
 		super(db, eventBus, contactId, transportId, maxLatency, streamWriter,
 				recordWriter);
-		this.sessionRecord = sessionRecord;
+		this.deferredSendHandler = deferredSendHandler;
 		this.initialCapacity = capacity;
 	}
 
@@ -65,7 +65,7 @@ class MailboxOutgoingSession extends SimplexOutgoingSession {
 			Collection<MessageId> idsToAck = loadMessageIdsToAck();
 			if (idsToAck.isEmpty()) break;
 			recordWriter.writeAck(new Ack(idsToAck));
-			sessionRecord.onAckSent(idsToAck);
+			deferredSendHandler.onAckSent(idsToAck);
 			LOG.info("Sent ack");
 		}
 	}
@@ -96,7 +96,7 @@ class MailboxOutgoingSession extends SimplexOutgoingSession {
 					db.getMessageToSend(txn, contactId, m, maxLatency, false));
 			if (message == null) continue; // No longer shared
 			recordWriter.writeMessage(message);
-			sessionRecord.onMessageSent(m);
+			deferredSendHandler.onMessageSent(m);
 			LOG.info("Sent message");
 		}
 	}

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

@@ -6,7 +6,6 @@ import org.briarproject.bramble.api.db.DatabaseExecutor;
 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.OutgoingSessionRecord;
 import org.briarproject.bramble.api.sync.Priority;
 import org.briarproject.bramble.api.sync.PriorityHandler;
 import org.briarproject.bramble.api.sync.SyncRecordReader;
@@ -26,8 +25,6 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.MAX_FILE_PAYLOAD_BYTES;
-
 @Immutable
 @NotNullByDefault
 class SyncSessionFactoryImpl implements SyncSessionFactory {
@@ -76,18 +73,6 @@ class SyncSessionFactoryImpl implements SyncSessionFactory {
 		}
 	}
 
-	@Override
-	public SyncSession createSimplexOutgoingSession(ContactId c, TransportId t,
-			long maxLatency, StreamWriter streamWriter,
-			OutgoingSessionRecord sessionRecord) {
-		OutputStream out = streamWriter.getOutputStream();
-		SyncRecordWriter recordWriter =
-				recordWriterFactory.createRecordWriter(out);
-		return new MailboxOutgoingSession(db, eventBus, c, t, maxLatency,
-				streamWriter, recordWriter, sessionRecord,
-				MAX_FILE_PAYLOAD_BYTES);
-	}
-
 	@Override
 	public SyncSession createDuplexOutgoingSession(ContactId c, TransportId t,
 			long maxLatency, int maxIdleTime, StreamWriter streamWriter,

bramble-core/src/main/resources/bridges

@@ -15,19 +15,16 @@ n Bridge obfs4 46.226.107.197:10300 A38FD6BDFD902882F5F5B9B7CCC95602A20B0BC4 cer
 n Bridge obfs4 185.181.11.86:443 A961609729E7FDF520B4E81F1F1B8FA1045285C3 cert=e5faG9Zk4Ni+e7z2YgGfevyKPQlMvkVGi4ublSsHYjaBovKeNXpOhbeFxzbZZoAzxAoGUQ iat-mode=0
 n Bridge obfs4 85.242.211.221:8042 A36A938DD7FDB8BACC846BA326EE0BA0D89A9252 cert=1AN6Pt1eFca3Y/WYD2TGAU3Al9cO4eouXE9SX63s66Z/ks3tVmgQ5GeXi1B5DOvx6Il7Zw iat-mode=0
 n Bridge obfs4 74.104.165.202:9002 EF432018A6AA5D970B2F84E39CD30A147030141C cert=PhppfUusY85dHGvWtGTybZ1fED4DtbHmALkNMIOIYrAz1B4xN7/2a5gyiZe1epju1BOHVg iat-mode=0
+n Bridge obfs4 70.34.242.31:443 7F026956402CDFF4BCBA8E11EE9C50E3FE0A2B72 cert=hP/KU7JATSfWH3HwS5Er/YLT0J+bRO3+s2fWx2yirrgf37EyrWvm/BQshoNje8WfUm6CBw iat-mode=0
 n Bridge obfs4 93.95.226.151:41185 460B0CFFC0CF1D965F3DE064E08BA1915E7C916A cert=inluPzp5Jp5OzZar1eQb4dcQ/YlAj/v0kHAUCoCr3rmLt03+pVuVTjoH4mRy4+acXpn+Gw iat-mode=0
 n Bridge obfs4 120.29.217.52:5223 40FE3DB9800272F9CDC76422F8ED7883280EE96D cert=/71PS4l8c/XJ4DIItlH9xMqNvPFg2RUTrHvPlQWh48u5et8h/yyyjCcYphUadDsfBWpaGQ iat-mode=0
+n Bridge obfs4 83.97.179.29:1199 D83068BFAA28E71DB024B786E1E803BE14257127 cert=IduGtt05tM59Xmvo0oVNWgIRgY4OGPJjFP+y2oa6RMDHQBL/GRyFOOgX70iiazNAIJNkPw iat-mode=0
+n Bridge obfs4 207.181.244.13:40132 37FE8D782F5DD2BAEEDAAB8257B701344676B6DD cert=f5Hbfn3ToMzH170cV8DfLly3vRynveidfOfDcbradIDtbLDX15V2yQ8eEH2CPKQJmQR2Hg iat-mode=0
 n Bridge obfs4 76.255.201.112:8888 96CF36C2ECCFB7376AB6BE905BECD2C2AE8AEFCD cert=+q0pjaiM0JMqHL/BKqCRD+pjflaw/S406eUDF7CnFgamvQW3l2HVLJhQ6uX9P8zff0PLGg iat-mode=0
 n Bridge obfs4 65.108.159.114:14174 E1AD374BA9F34BD98862D128AC54D40C7DC138AE cert=YMkxMSBN2OOd99AkJpFaEUyKkdqZgJt9oVJEgO1QnT37n/Vc2yR4nhx4k4VkPLfEP1f4eg iat-mode=0
 n Bridge obfs4 185.177.207.138:8443 53716FE26F23C8C6A71A2BC5D9D8DC64747278C7 cert=6jcYVilMEzxdsWghSrQFpYYJlkkir/GPIXw/EnddUK3S8ToVpMG8u1SwMOEdEs735RrMHw iat-mode=0
 n Bridge obfs4 176.123.2.253:1933 B855D141CE6C4DE0F7EA4AAED83EBA8373FA8191 cert=1rOoSaRagc6PPR//paIl+ukv1N+xWKCdBXMFxK0k/moEwH0lk5bURBrUDzIX35fVzaiicQ iat-mode=0
-n Bridge obfs4 5.252.176.61:9418 3E61130100AD827AB9CB33DAC052D9BC49A39509 cert=/aMyBPnKbQFISithD3i1KHUdpWeMpWG3SvUpq1YWCf2EQohFxQfw+646gW1knm4BI/DLRA iat-mode=0
-n Bridge obfs4 202.61.224.111:6902 A4F91299763DB925AE3BD29A0FC1A9821E5D9BAE cert=NBKm2MJ83wMvYShkqpD5RrbDtW5YpIZrFNnMw7Dj1XOM3plU60Bh4eziaQXe8fGtb8ZqKg iat-mode=0
-n Bridge obfs4 87.121.72.109:9002 C8081D4731C953FA4AE166946E72B29153351E34 cert=bikAqxKV6Ch5gFCBTdPI28VeShYa1ZgkLmvc7YZNLWFsFZoaCULL/3AQKjpIfvSiJs5jGQ iat-mode=0
-n Bridge obfs4 172.104.17.96:17900 B6B37AC96E163D0A5ECE55826D17B50B70F0A7F8 cert=gUz7svhPxoALgeN4lMYrXK7NBnaDqwu6SKRJOhaO9IIMBpnB8UhMCMKzzMho3b0RxWzBVg iat-mode=0
-n Bridge obfs4 70.34.249.113:443 F441B16ABB1055794C2CE01821FC05047B2C8CFC cert=MauLNoyq8EwjY4Qe0oASYzs2hXdSjNgy+BtP9oo1naHhRsyKTtAZzeNv08RnzWjMJrTwcg iat-mode=0
 v Bridge 135.181.113.164:54444 74AF4CCA614C454B7D3E81FF8BACD78CEBC7D7DE
 v Bridge 92.243.15.235:9001 477EAD3C04036B48235F1F27FC91420A286A4B7F
 v Bridge 77.96.91.103:443 ED000A75B79A58F1D83A4D1675C2A9395B71BE8E
-v Bridge 213.108.108.145:17674 A39C0FE47963B6E8CFE9815549864DE544935A31
-m Bridge meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
+m Bridge meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.connection;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
 import org.briarproject.bramble.api.connection.InterruptibleConnection;
 import org.briarproject.bramble.api.contact.ContactId;
@@ -58,10 +57,6 @@ public class ConnectionRegistryImplTest extends BrambleMockTestCase {
 	private final Priority high =
 			new Priority(fromHexString("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"));
 
-	public ConnectionRegistryImplTest() throws FormatException {
-		// required for throws declaration
-	}
-
 	@Test
 	public void testRegisterMultipleConnections() {
 		context.checking(new Expectations() {{

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

@@ -17,6 +17,7 @@ import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.transport.KeyManager;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.DbExpectations;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Collection;
@@ -62,9 +63,13 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	private final long timestamp = System.currentTimeMillis();
 	private final boolean alice = new Random().nextBoolean();
 
-	private final ContactManagerImpl contactManager =
-			new ContactManagerImpl(db, keyManager, identityManager,
-					pendingContactFactory);
+	private ContactManagerImpl contactManager;
+
+	@Before
+	public void setUp() {
+		contactManager = new ContactManagerImpl(db, keyManager,
+				identityManager, pendingContactFactory);
+	}
 
 	@Test
 	public void testAddContact() throws Exception {

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

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.crypto;
 
 import org.bouncycastle.crypto.digests.Blake2bDigest;
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.util.StringUtils;
 import org.junit.Test;
@@ -48,7 +47,7 @@ public class Blake2bDigestTest extends BrambleTestCase {
 	};
 
 	@Test
-	public void testDigestWithKeyedTestVectors() throws FormatException {
+	public void testDigestWithKeyedTestVectors() {
 		for (String[] keyedTestVector : KEYED_TEST_VECTORS) {
 			byte[] input = StringUtils.fromHexString(keyedTestVector[0]);
 			byte[] key = StringUtils.fromHexString(keyedTestVector[1]);
@@ -64,8 +63,7 @@ public class Blake2bDigestTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testDigestWithKeyedTestVectorsAndRandomUpdate()
-			throws FormatException {
+	public void testDigestWithKeyedTestVectorsAndRandomUpdate() {
 		Random random = new Random();
 		for (int i = 0; i < 100; i++) {
 			for (String[] keyedTestVector : KEYED_TEST_VECTORS) {
@@ -140,7 +138,7 @@ public class Blake2bDigestTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void runSelfTest() throws FormatException {
+	public void runSelfTest() {
 		Blake2bDigest testDigest = new Blake2bDigest(256);
 		byte[] md = new byte[64];
 

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.crypto.AgreementPublicKey;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
@@ -84,7 +83,7 @@ public class KeyAgreementTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testRfc7748TestVector() throws FormatException {
+	public void testRfc7748TestVector() {
 		byte[] aPriv = parsePrivateKey(ALICE_PRIVATE);
 		byte[] aPub = fromHexString(ALICE_PUBLIC);
 		byte[] bPriv = parsePrivateKey(BOB_PRIVATE);
@@ -98,8 +97,7 @@ public class KeyAgreementTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testDerivesSameSharedSecretFromEquivalentPublicKey()
-			throws FormatException {
+	public void testDerivesSameSharedSecretFromEquivalentPublicKey() {
 		byte[] aPub = fromHexString(ALICE_PUBLIC);
 		byte[] bPriv = parsePrivateKey(BOB_PRIVATE);
 		byte[] sharedSecret = fromHexString(SHARED_SECRET);
@@ -170,7 +168,7 @@ public class KeyAgreementTest extends BrambleTestCase {
 		return crypto.deriveSharedSecret(label, publicKey, keyPair, inputs);
 	}
 
-	private byte[] parsePrivateKey(String hex) throws FormatException {
+	private byte[] parsePrivateKey(String hex) {
 		// Private keys need to be clamped because curve25519-java does the
 		// clamping at key generation time, not multiplication time
 		return AgreementKeyParser.clamp(fromHexString(hex));

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.util.StringUtils;
@@ -16,11 +15,11 @@ public class XSalsa20Poly1305AuthenticatedCipherTest extends BrambleTestCase {
 
 	// Test vectors from the NaCl paper
 	// http://cr.yp.to/highspeed/naclcrypto-20090310.pdf
-	private final byte[] TEST_KEY = StringUtils.fromHexString(
+	private static final byte[] TEST_KEY = StringUtils.fromHexString(
 			"1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389");
-	private final byte[] TEST_IV = StringUtils.fromHexString(
+	private static final byte[] TEST_IV = StringUtils.fromHexString(
 			"69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37");
-	private final byte[] TEST_PLAINTEXT = StringUtils.fromHexString(
+	private static final byte[] TEST_PLAINTEXT = StringUtils.fromHexString(
 					"be075fc53c81f2d5cf141316" +
 					"ebeb0c7b5228c52a4c62cbd4" +
 					"4b66849b64244ffce5ecbaaf" +
@@ -32,7 +31,7 @@ public class XSalsa20Poly1305AuthenticatedCipherTest extends BrambleTestCase {
 					"048977eb48f59ffd4924ca1c" +
 					"60902e52f0a089bc76897040" +
 					"e082f937763848645e0705");
-	private final byte[] TEST_CIPHERTEXT = StringUtils.fromHexString(
+	private static final byte[] TEST_CIPHERTEXT = StringUtils.fromHexString(
 					"f3ffc7703f9400e52a7dfb4b" +
 					"3d3305d98e993b9f48681273" +
 					"c29650ba32fc76ce48332ea7" +
@@ -47,10 +46,6 @@ public class XSalsa20Poly1305AuthenticatedCipherTest extends BrambleTestCase {
 					"a43d14a6599b1f654cb45a74" +
 					"e355a5");
 
-	public XSalsa20Poly1305AuthenticatedCipherTest() throws FormatException {
-		// required for throws declaration
-	}
-
 	@Test
 	public void testEncrypt() throws Exception {
 		SecretKey k = new SecretKey(TEST_KEY);

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

@@ -618,12 +618,11 @@ public class BdfReaderImplTest extends BrambleTestCase {
 		r.readDictionary();
 	}
 
-	private void setContents(String hex) throws FormatException {
+	private void setContents(String hex) {
 		setContents(hex, DEFAULT_MAX_BUFFER_SIZE);
 	}
 
-	private void setContents(String hex, int maxBufferSize)
-			throws FormatException {
+	private void setContents(String hex, int maxBufferSize) {
 		ByteArrayInputStream in = new ByteArrayInputStream(fromHexString(hex));
 		r = new BdfReaderImpl(in, DEFAULT_NESTED_LIMIT, maxBufferSize);
 	}

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

@@ -2,6 +2,7 @@ package org.briarproject.bramble.data;
 
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.util.StringUtils;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
@@ -16,8 +17,14 @@ import static org.junit.Assert.assertArrayEquals;
 
 public class BdfWriterImplTest extends BrambleTestCase {
 
-	private final ByteArrayOutputStream out = new ByteArrayOutputStream();
-	private final BdfWriterImpl w = new BdfWriterImpl(out);
+	private ByteArrayOutputStream out = null;
+	private BdfWriterImpl w = null;
+
+	@Before
+	public void setUp() {
+		out = new ByteArrayOutputStream();
+		w = new BdfWriterImpl(out);
+	}
 
 	@Test
 	public void testWriteNull() throws IOException {

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

@@ -303,11 +303,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			throws Exception {
 		context.checking(new Expectations() {{
 			// Check whether the contact is in the DB (which it's not)
-			exactly(27).of(database).startTransaction();
+			exactly(25).of(database).startTransaction();
 			will(returnValue(txn));
-			exactly(27).of(database).containsContact(txn, contactId);
+			exactly(25).of(database).containsContact(txn, contactId);
 			will(returnValue(false));
-			exactly(27).of(database).abortTransaction(txn);
+			exactly(25).of(database).abortTransaction(txn);
 		}});
 		DatabaseComponent db = createDatabaseComponent(database, eventBus,
 				eventExecutor, shutdownManager);
@@ -321,23 +321,6 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			// Expected
 		}
 
-		try {
-			db.transaction(true, transaction ->
-					db.containsAcksToSend(transaction, contactId));
-			fail();
-		} catch (NoSuchContactException expected) {
-			// Expected
-		}
-
-		try {
-			db.transaction(true, transaction ->
-					db.containsMessagesToSend(transaction, contactId,
-							123, true));
-			fail();
-		} catch (NoSuchContactException expected) {
-			// Expected
-		}
-
 		try {
 			db.transaction(false, transaction ->
 					db.generateAck(transaction, contactId, 123));

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

@@ -378,9 +378,9 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// Initially there should be nothing to send
 		assertFalse(
-				db.containsMessagesToSend(txn, contactId, MAX_LATENCY, false));
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, false));
 		assertFalse(
-				db.containsMessagesToSend(txn, contactId, MAX_LATENCY, true));
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, true));
 
 		// Add some messages to ack
 		Message message1 = getMessage(groupId);
@@ -389,7 +389,10 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.addMessage(txn, message1, DELIVERED, true, false, contactId);
 
 		// Both message IDs should be returned
-		assertTrue(db.containsAcksToSend(txn, contactId));
+		assertTrue(
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, false));
+		assertTrue(
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, true));
 		Collection<MessageId> ids = db.getMessagesToAck(txn, contactId, 1234);
 		assertEquals(asList(messageId, messageId1), ids);
 
@@ -397,7 +400,10 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.lowerAckFlag(txn, contactId, asList(messageId, messageId1));
 
 		// No message IDs should be returned
-		assertFalse(db.containsAcksToSend(txn, contactId));
+		assertFalse(
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, false));
+		assertFalse(
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, true));
 		assertEquals(emptyList(), db.getMessagesToAck(txn, contactId, 1234));
 
 		// Raise the ack flag again
@@ -405,7 +411,10 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.raiseAckFlag(txn, contactId, messageId1);
 
 		// Both message IDs should be returned
-		assertTrue(db.containsAcksToSend(txn, contactId));
+		assertTrue(
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, false));
+		assertTrue(
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, true));
 		ids = db.getMessagesToAck(txn, contactId, 1234);
 		assertEquals(asList(messageId, messageId1), ids);
 
@@ -2020,51 +2029,37 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.addMessage(txn, message, UNKNOWN, false, false, null);
 
 		// There should be no messages to send
-		assertEquals(Long.MAX_VALUE,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(Long.MAX_VALUE, db.getNextSendTime(txn, contactId));
 
 		// Share the group with the contact - still no messages to send
 		db.addGroupVisibility(txn, contactId, groupId, true);
-		assertEquals(Long.MAX_VALUE,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(Long.MAX_VALUE, db.getNextSendTime(txn, contactId));
 
 		// Set the message's state to DELIVERED - still no messages to send
 		db.setMessageState(txn, messageId, DELIVERED);
-		assertEquals(Long.MAX_VALUE,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(Long.MAX_VALUE, db.getNextSendTime(txn, contactId));
 
 		// Share the message - now it should be sendable immediately
 		db.setMessageShared(txn, messageId, true);
-		assertEquals(0, db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(0, db.getNextSendTime(txn, contactId));
 
 		// Mark the message as requested - it should still be sendable
 		db.raiseRequestedFlag(txn, contactId, messageId);
-		assertEquals(0, db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(0, db.getNextSendTime(txn, contactId));
 
 		// Update the message's expiry time as though we sent it - now the
 		// message should be sendable after one round-trip
-		db.updateRetransmissionData(txn, contactId, messageId, MAX_LATENCY);
-		assertEquals(now + MAX_LATENCY * 2,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
-
-		// The message should be sendable immediately over a transport with
-		// lower latency
-		assertEquals(0L, db.getNextSendTime(txn, contactId, MAX_LATENCY - 1));
+		db.updateRetransmissionData(txn, contactId, messageId, 1000);
+		assertEquals(now + 2000, db.getNextSendTime(txn, contactId));
 
 		// Update the message's expiry time again - now it should be sendable
 		// after two round-trips
-		db.updateRetransmissionData(txn, contactId, messageId, MAX_LATENCY);
-		assertEquals(now + MAX_LATENCY * 4,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
-
-		// The message should be sendable immediately over a transport with
-		// lower latency
-		assertEquals(0L, db.getNextSendTime(txn, contactId, MAX_LATENCY - 1));
+		db.updateRetransmissionData(txn, contactId, messageId, 1000);
+		assertEquals(now + 4000, db.getNextSendTime(txn, contactId));
 
 		// Delete the message - there should be no messages to send
 		db.deleteMessage(txn, messageId);
-		assertEquals(Long.MAX_VALUE,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(Long.MAX_VALUE, db.getNextSendTime(txn, contactId));
 
 		db.commitTransaction(txn);
 		db.close();
@@ -2129,8 +2124,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.updateRetransmissionData(txn, contactId, messageId, MAX_LATENCY);
 
 		// The message should expire after 2 * MAX_LATENCY
-		assertEquals(now + MAX_LATENCY * 2,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(now + MAX_LATENCY * 2, db.getNextSendTime(txn, contactId));
 
 		// Time: now + MAX_LATENCY * 2 - 1
 		// The message should not yet be sendable
@@ -2173,8 +2167,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.updateRetransmissionData(txn, contactId, messageId, MAX_LATENCY);
 
 		// The message should expire after 2 * MAX_LATENCY
-		assertEquals(now + MAX_LATENCY * 2,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(now + MAX_LATENCY * 2, db.getNextSendTime(txn, contactId));
 
 		// The message should not be sendable via the same transport
 		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
@@ -2221,8 +2214,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.updateRetransmissionData(txn, contactId, messageId, MAX_LATENCY);
 
 		// The message should expire after 2 * MAX_LATENCY
-		assertEquals(now + MAX_LATENCY * 2,
-				db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		assertEquals(now + MAX_LATENCY * 2, db.getNextSendTime(txn, contactId));
 
 		// Time: now + MAX_LATENCY * 2 - 1
 		// The message should not yet be sendable
@@ -2233,8 +2225,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		// Reset the retransmission times
 		db.resetUnackedMessagesToSend(txn, contactId);
 
-		// The message should be sendable immediately
-		assertEquals(0, db.getNextSendTime(txn, contactId, MAX_LATENCY));
+		// The message should have infinitely short expiry
+		assertEquals(0, db.getNextSendTime(txn, contactId));
 
 		// The message should be sendable
 		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
@@ -2587,7 +2579,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	private void assertNothingToSendLazily(Database<Connection> db,
 			Connection txn) throws Exception {
 		assertFalse(
-				db.containsMessagesToSend(txn, contactId, MAX_LATENCY, false));
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, false));
 		Collection<MessageId> ids =
 				db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
@@ -2598,7 +2590,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	private void assertOneMessageToSendLazily(Database<Connection> db,
 			Connection txn) throws Exception {
 		assertTrue(
-				db.containsMessagesToSend(txn, contactId, MAX_LATENCY, false));
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, false));
 		Collection<MessageId> ids =
 				db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
@@ -2609,7 +2601,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	private void assertNothingToSendEagerly(Database<Connection> db,
 			Connection txn) throws Exception {
 		assertFalse(
-				db.containsMessagesToSend(txn, contactId, MAX_LATENCY, true));
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, true));
 		Collection<MessageId> unacked =
 				db.getUnackedMessagesToSend(txn, contactId);
 		assertTrue(unacked.isEmpty());
@@ -2619,7 +2611,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	private void assertOneMessageToSendEagerly(Database<Connection> db,
 			Connection txn) throws Exception {
 		assertTrue(
-				db.containsMessagesToSend(txn, contactId, MAX_LATENCY, true));
+				db.containsAnythingToSend(txn, contactId, MAX_LATENCY, true));
 		Collection<MessageId> unacked =
 				db.getUnackedMessagesToSend(txn, contactId);
 		assertEquals(singletonList(messageId), unacked);

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

@@ -14,6 +14,7 @@ import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.DbExpectations;
 import org.jmock.Expectations;
+import org.junit.Before;
 import org.junit.Test;
 
 import static java.util.Collections.singletonList;
@@ -40,8 +41,13 @@ public class IdentityManagerImplTest extends BrambleMockTestCase {
 	private final KeyPair handshakeKeyPair =
 			new KeyPair(handshakePublicKey, handshakePrivateKey);
 
-	private final IdentityManagerImpl identityManager =
-			new IdentityManagerImpl(db, crypto, authorFactory, clock);
+	private IdentityManagerImpl identityManager;
+
+	@Before
+	public void setUp() {
+		identityManager =
+				new IdentityManagerImpl(db, crypto, authorFactory, clock);
+	}
 
 	@Test
 	public void testOpenDatabaseIdentityRegistered() throws Exception {

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

@@ -10,6 +10,7 @@ import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.DbExpectations;
 import org.jmock.Expectations;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -33,8 +34,12 @@ public class LifecycleManagerImplTest extends BrambleMockTestCase {
 
 	private final SecretKey dbKey = getSecretKey();
 
-	private final LifecycleManagerImpl lifecycleManager =
-			new LifecycleManagerImpl(db, eventBus, clock);
+	private LifecycleManagerImpl lifecycleManager;
+
+	@Before
+	public void setUp() {
+		lifecycleManager = new LifecycleManagerImpl(db, eventBus, clock);
+	}
 
 	@Test
 	public void testOpenDatabaseHooksAreCalledAtStartup() throws Exception {

bramble-core/src/test/java/org/briarproject/bramble/mailbox/ConnectivityCheckerImplTest.java

@@ -187,32 +187,6 @@ public class ConnectivityCheckerImplTest extends BrambleMockTestCase {
 		checker.onConnectivityCheckSucceeded(now);
 	}
 
-	@Test
-	public void testCheckIsCancelledWhenObserverIsRemoved() {
-		ConnectivityCheckerImpl checker = createChecker();
-
-		// When checkConnectivity() is called a check should be started
-		context.checking(new Expectations() {{
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(mailboxApiCaller).retryWithBackoff(apiCall);
-			will(returnValue(task));
-		}});
-
-		checker.checkConnectivity(properties, observer1);
-
-		// When the observer is removed the check should be cancelled
-		context.checking(new Expectations() {{
-			oneOf(task).cancel();
-		}});
-
-		checker.removeObserver(observer1);
-
-		// If the check runs anyway (cancellation came too late) the observer
-		// should not be called
-		checker.onConnectivityCheckSucceeded(now);
-	}
-
 	private ConnectivityCheckerImpl createChecker() {
 
 		return new ConnectivityCheckerImpl(clock, mailboxApiCaller) {

bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxClientTest.java

@@ -1,131 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.jmock.Expectations;
-import org.junit.Test;
-
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.bramble.test.TestUtils.getContactId;
-import static org.briarproject.bramble.test.TestUtils.getMailboxProperties;
-
-public class ContactMailboxClientTest extends BrambleMockTestCase {
-
-	private final MailboxWorkerFactory workerFactory =
-			context.mock(MailboxWorkerFactory.class);
-	private final ConnectivityChecker connectivityChecker =
-			context.mock(ConnectivityChecker.class);
-	private final TorReachabilityMonitor reachabilityMonitor =
-			context.mock(TorReachabilityMonitor.class);
-	private final MailboxWorker uploadWorker =
-			context.mock(MailboxWorker.class, "uploadWorker");
-	private final MailboxWorker downloadWorker =
-			context.mock(MailboxWorker.class, "downloadWorker");
-
-	private final MailboxProperties properties =
-			getMailboxProperties(false, CLIENT_SUPPORTS);
-	private final MailboxFolderId inboxId =
-			requireNonNull(properties.getInboxId());
-	private final MailboxFolderId outboxId =
-			requireNonNull(properties.getOutboxId());
-	private final ContactId contactId = getContactId();
-
-	private final ContactMailboxClient client =
-			new ContactMailboxClient(workerFactory, connectivityChecker,
-					reachabilityMonitor);
-
-	@Test
-	public void testStartAndDestroyWithNoContactsAssigned() {
-		client.start();
-		client.destroy();
-	}
-
-	@Test
-	public void testAssignContactForUploadAndDestroyClient() {
-		client.start();
-
-		// When the contact is assigned, the worker should be created and
-		// started
-		expectCreateAndStartUploadWorker();
-		client.assignContactForUpload(contactId, properties, outboxId);
-
-		// When the client is destroyed, the worker should be destroyed
-		expectDestroyWorker(uploadWorker);
-		client.destroy();
-	}
-
-	@Test
-	public void testAssignAndDeassignContactForUpload() {
-		client.start();
-
-		// When the contact is assigned, the worker should be created and
-		// started
-		expectCreateAndStartUploadWorker();
-		client.assignContactForUpload(contactId, properties, outboxId);
-
-		// When the contact is deassigned, the worker should be destroyed
-		expectDestroyWorker(uploadWorker);
-		client.deassignContactForUpload(contactId);
-		context.assertIsSatisfied();
-
-		client.destroy();
-	}
-
-	@Test
-	public void assignContactForDownloadAndDestroyClient() {
-		client.start();
-
-		// When the contact is assigned, the worker should be created and
-		// started
-		expectCreateAndStartDownloadWorker();
-		client.assignContactForDownload(contactId, properties, inboxId);
-
-		// When the client is destroyed, the worker should be destroyed
-		expectDestroyWorker(downloadWorker);
-		client.destroy();
-	}
-
-	@Test
-	public void assignAndDeassignContactForDownload() {
-		client.start();
-
-		// When the contact is assigned, the worker should be created and
-		// started
-		expectCreateAndStartDownloadWorker();
-		client.assignContactForDownload(contactId, properties, inboxId);
-
-		// When the contact is deassigned, the worker should be destroyed
-		expectDestroyWorker(downloadWorker);
-		client.deassignContactForDownload(contactId);
-		context.assertIsSatisfied();
-
-		client.destroy();
-	}
-
-	private void expectCreateAndStartUploadWorker() {
-		context.checking(new Expectations() {{
-			oneOf(workerFactory).createUploadWorker(connectivityChecker,
-					properties, outboxId, contactId);
-			will(returnValue(uploadWorker));
-			oneOf(uploadWorker).start();
-		}});
-	}
-
-	private void expectCreateAndStartDownloadWorker() {
-		context.checking(new Expectations() {{
-			oneOf(workerFactory).createDownloadWorkerForContactMailbox(
-					connectivityChecker, reachabilityMonitor, properties);
-			will(returnValue(downloadWorker));
-			oneOf(downloadWorker).start();
-		}});
-	}
-
-	private void expectDestroyWorker(MailboxWorker worker) {
-		context.checking(new Expectations() {{
-			oneOf(worker).destroy();
-		}});
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxDownloadWorkerTest.java

@@ -1,239 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.mailbox.MailboxFileId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.mailbox.MailboxApi.MailboxFile;
-import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
-import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.briarproject.bramble.test.CaptureArgumentAction;
-import org.jmock.Expectations;
-import org.jmock.lib.action.DoAllAction;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.File;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
-import static org.briarproject.bramble.test.TestUtils.getMailboxProperties;
-import static org.briarproject.bramble.test.TestUtils.getRandomId;
-import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
-import static org.junit.Assert.assertFalse;
-
-public class ContactMailboxDownloadWorkerTest extends BrambleMockTestCase {
-
-	private final ConnectivityChecker connectivityChecker =
-			context.mock(ConnectivityChecker.class);
-	private final TorReachabilityMonitor torReachabilityMonitor =
-			context.mock(TorReachabilityMonitor.class);
-	private final MailboxApiCaller mailboxApiCaller =
-			context.mock(MailboxApiCaller.class);
-	private final MailboxApi mailboxApi = context.mock(MailboxApi.class);
-	private final MailboxFileManager mailboxFileManager =
-			context.mock(MailboxFileManager.class);
-	private final Cancellable apiCall = context.mock(Cancellable.class);
-
-	private final MailboxProperties mailboxProperties =
-			getMailboxProperties(false, CLIENT_SUPPORTS);
-	private final long now = System.currentTimeMillis();
-	private final MailboxFile file1 =
-			new MailboxFile(new MailboxFileId(getRandomId()), now - 1);
-	private final MailboxFile file2 =
-			new MailboxFile(new MailboxFileId(getRandomId()), now);
-	private final List<MailboxFile> files = asList(file1, file2);
-
-	private File testDir, tempFile;
-	private ContactMailboxDownloadWorker worker;
-
-	@Before
-	public void setUp() {
-		testDir = getTestDirectory();
-		tempFile = new File(testDir, "temp");
-		worker = new ContactMailboxDownloadWorker(connectivityChecker,
-				torReachabilityMonitor, mailboxApiCaller, mailboxApi,
-				mailboxFileManager, mailboxProperties);
-	}
-
-	@After
-	public void tearDown() {
-		deleteTestDirectory(testDir);
-	}
-
-	@Test
-	public void testChecksConnectivityWhenStartedAndRemovesObserverWhenDestroyed() {
-		// When the worker is started it should start a connectivity check
-		context.checking(new Expectations() {{
-			oneOf(connectivityChecker).checkConnectivity(
-					with(mailboxProperties), with(worker));
-		}});
-
-		worker.start();
-
-		// When the worker is destroyed it should remove the connectivity
-		// and reachability observers
-		context.checking(new Expectations() {{
-			oneOf(connectivityChecker).removeObserver(worker);
-			oneOf(torReachabilityMonitor).removeObserver(worker);
-		}});
-
-		worker.destroy();
-	}
-
-	@Test
-	public void testDownloadsFilesWhenConnectivityCheckSucceeds()
-			throws Exception {
-		// When the worker is started it should start a connectivity check
-		context.checking(new Expectations() {{
-			oneOf(connectivityChecker).checkConnectivity(
-					with(mailboxProperties), with(worker));
-		}});
-
-		worker.start();
-
-		// When the connectivity check succeeds, a list-inbox task should be
-		// started for the first download cycle
-		AtomicReference<ApiCall> listTask = new AtomicReference<>();
-		context.checking(new Expectations() {{
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(listTask, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		worker.onConnectivityCheckSucceeded();
-
-		// When the list-inbox tasks runs and finds some files to download,
-		// it should start a download task for the first file
-		AtomicReference<ApiCall> downloadTask = new AtomicReference<>();
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).getFiles(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()));
-			will(returnValue(files));
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(downloadTask, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		assertFalse(listTask.get().callApi());
-
-		// When the first download task runs it should download the file to the
-		// location provided by the file manager and start a delete task
-		AtomicReference<ApiCall> deleteTask = new AtomicReference<>();
-		context.checking(new Expectations() {{
-			oneOf(mailboxFileManager).createTempFileForDownload();
-			will(returnValue(tempFile));
-			oneOf(mailboxApi).getFile(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()),
-					file1.name, tempFile);
-			oneOf(mailboxFileManager).handleDownloadedFile(tempFile);
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(deleteTask, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		assertFalse(downloadTask.get().callApi());
-
-		// When the first delete task runs it should delete the file, ignore
-		// the tolerable failure, and start a download task for the next file
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).deleteFile(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()), file1.name);
-			will(throwException(new TolerableFailureException()));
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(downloadTask, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		assertFalse(deleteTask.get().callApi());
-
-		// When the second download task runs it should download the file to
-		// the location provided by the file manager and start a delete task
-		context.checking(new Expectations() {{
-			oneOf(mailboxFileManager).createTempFileForDownload();
-			will(returnValue(tempFile));
-			oneOf(mailboxApi).getFile(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()),
-					file2.name, tempFile);
-			oneOf(mailboxFileManager).handleDownloadedFile(tempFile);
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(deleteTask, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		assertFalse(downloadTask.get().callApi());
-
-		// When the second delete task runs it should delete the file and
-		// start a list-inbox task to check for files that may have arrived
-		// since the first download cycle started
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).deleteFile(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()), file2.name);
-			will(throwException(new TolerableFailureException()));
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(listTask, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		assertFalse(deleteTask.get().callApi());
-
-		// When the list-inbox tasks runs and finds no more files to download,
-		// it should add a Tor reachability observer
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).getFiles(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()));
-			will(returnValue(emptyList()));
-			oneOf(torReachabilityMonitor).addOneShotObserver(worker);
-		}});
-
-		assertFalse(listTask.get().callApi());
-
-		// When the reachability observer is called, a list-inbox task should
-		// be started for the second download cycle
-		context.checking(new Expectations() {{
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(listTask, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		worker.onTorReachable();
-
-		// When the list-inbox tasks runs and finds no more files to download,
-		// it should finish the second download cycle
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).getFiles(mailboxProperties,
-					requireNonNull(mailboxProperties.getInboxId()));
-			will(returnValue(emptyList()));
-		}});
-
-		assertFalse(listTask.get().callApi());
-
-		// When the worker is destroyed it should remove the connectivity
-		// and reachability observers
-		context.checking(new Expectations() {{
-			oneOf(connectivityChecker).removeObserver(worker);
-			oneOf(torReachabilityMonitor).removeObserver(worker);
-		}});
-
-		worker.destroy();
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxApiTest.java

@@ -68,10 +68,7 @@ public class MailboxApiTest extends BrambleTestCase {
 					return client;
 				}
 			};
-	// We aren't using a real onion address, so use the given address verbatim
-	private final UrlConverter urlConverter = onion -> onion;
-	private final MailboxApiImpl api = new MailboxApiImpl(httpClientProvider,
-			urlConverter);
+	private final MailboxApiImpl api = new MailboxApiImpl(httpClientProvider);
 
 	private final MailboxAuthToken token = new MailboxAuthToken(getRandomId());
 	private final MailboxAuthToken token2 = new MailboxAuthToken(getRandomId());

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxFileManagerImplTest.java

@@ -2,20 +2,16 @@ package org.briarproject.bramble.mailbox;
 
 import org.briarproject.bramble.api.connection.ConnectionManager;
 import org.briarproject.bramble.api.connection.ConnectionManager.TagController;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState;
 import org.briarproject.bramble.api.plugin.PluginManager;
 import org.briarproject.bramble.api.plugin.TransportConnectionReader;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
 import org.briarproject.bramble.api.plugin.event.TransportActiveEvent;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin;
 import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.CaptureArgumentAction;
-import org.briarproject.bramble.test.ConsumeArgumentAction;
 import org.briarproject.bramble.test.RunAction;
 import org.jmock.Expectations;
 import org.jmock.lib.action.DoAllAction;
@@ -24,7 +20,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -33,14 +28,11 @@ import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleS
 import static org.briarproject.bramble.api.mailbox.MailboxConstants.ID;
 import static org.briarproject.bramble.api.plugin.file.FileConstants.PROP_PATH;
 import static org.briarproject.bramble.mailbox.MailboxFileManagerImpl.DOWNLOAD_DIR_NAME;
-import static org.briarproject.bramble.mailbox.MailboxFileManagerImpl.UPLOAD_DIR_NAME;
 import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
-import static org.briarproject.bramble.test.TestUtils.getContactId;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 
@@ -55,10 +47,6 @@ public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 	private final SimplexPlugin plugin = context.mock(SimplexPlugin.class);
 	private final TransportConnectionReader transportConnectionReader =
 			context.mock(TransportConnectionReader.class);
-	private final TransportConnectionWriter transportConnectionWriter =
-			context.mock(TransportConnectionWriter.class);
-
-	private final ContactId contactId = getContactId();
 
 	private File mailboxDir;
 	private MailboxFileManagerImpl manager;
@@ -77,25 +65,17 @@ public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testHandlesOrphanedFilesAtStartup() throws Exception {
-		// Create an orphaned upload, left behind at the previous shutdown
-		File uploadDir = new File(mailboxDir, UPLOAD_DIR_NAME);
-		//noinspection ResultOfMethodCallIgnored
-		uploadDir.mkdirs();
-		File orphanedUpload = new File(uploadDir, "orphan");
-		assertTrue(orphanedUpload.createNewFile());
-
-		// Create an orphaned download, left behind at the previous shutdown
+		// Create an orphaned file, left behind at the previous shutdown
 		File downloadDir = new File(mailboxDir, DOWNLOAD_DIR_NAME);
 		//noinspection ResultOfMethodCallIgnored
 		downloadDir.mkdirs();
-		File orphanedDownload = new File(downloadDir, "orphan");
-		assertTrue(orphanedDownload.createNewFile());
+		File orphan = new File(downloadDir, "orphan");
+		assertTrue(orphan.createNewFile());
 
 		TransportProperties props = new TransportProperties();
-		props.put(PROP_PATH, orphanedDownload.getAbsolutePath());
+		props.put(PROP_PATH, orphan.getAbsolutePath());
 
-		// When the plugin becomes active the orphaned upload should be deleted
-		// and the orphaned download should be handled
+		// When the plugin becomes active the orphaned file should be handled
 		context.checking(new Expectations() {{
 			oneOf(ioExecutor).execute(with(any(Runnable.class)));
 			will(new RunAction());
@@ -110,12 +90,10 @@ public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 		}});
 
 		manager.eventOccurred(new TransportActiveEvent(ID));
-
-		assertFalse(orphanedUpload.exists());
 	}
 
 	@Test
-	public void testDeletesDownloadedFileWhenReadSucceeds() throws Exception {
+	public void testDeletesFileWhenReadSucceeds() throws Exception {
 		expectCheckForOrphans();
 		manager.eventOccurred(new TransportActiveEvent(ID));
 
@@ -124,7 +102,7 @@ public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 				new AtomicReference<>(null);
 		AtomicReference<TagController> controller = new AtomicReference<>(null);
 
-		expectPassDownloadedFileToConnectionManager(f, reader, controller);
+		expectPassFileToConnectionManager(f, reader, controller);
 		manager.handleDownloadedFile(f);
 
 		// The read is successful, so the tag controller should allow the tag
@@ -139,117 +117,29 @@ public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 	}
 
 	@Test
-	public void testDeletesDownloadedFileWhenTagIsNotRecognised()
-			throws Exception {
-		testDeletesDownloadedFile(false, RUNNING, false);
+	public void testDeletesFileWhenTagIsNotRecognised() throws Exception {
+		testDeletesFile(false, RUNNING, false);
 	}
 
 	@Test
-	public void testDeletesDownloadedFileWhenReadFails() throws Exception {
-		testDeletesDownloadedFile(true, RUNNING, false);
+	public void testDeletesFileWhenReadFails() throws Exception {
+		testDeletesFile(true, RUNNING, false);
 	}
 
 	@Test
-	public void testDoesNotDeleteDownloadedFileWhenTagIsNotRecognisedAtShutdown()
+	public void testDoesNotDeleteFileWhenTagIsNotRecognisedAtShutdown()
 			throws Exception {
-		testDeletesDownloadedFile(false, STOPPING, true);
+		testDeletesFile(false, STOPPING, true);
 	}
 
 	@Test
-	public void testDoesNotDeleteDownloadedFileWhenReadFailsAtShutdown()
+	public void testDoesNotDeleteFileWhenReadFailsAtShutdown()
 			throws Exception {
-		testDeletesDownloadedFile(true, STOPPING, true);
+		testDeletesFile(true, STOPPING, true);
 	}
 
-	@Test(expected = IOException.class)
-	public void testThrowsExceptionIfPluginFailsToCreateWriter()
-			throws Exception {
-		OutgoingSessionRecord sessionRecord = new OutgoingSessionRecord();
-
-		expectCheckForOrphans();
-		manager.eventOccurred(new TransportActiveEvent(ID));
-
-		context.checking(new Expectations() {{
-			oneOf(pluginManager).getPlugin(ID);
-			will(returnValue(plugin));
-			oneOf(plugin).createWriter(with(any(TransportProperties.class)));
-			will(returnValue(null));
-		}});
-
-		manager.createAndWriteTempFileForUpload(contactId, sessionRecord);
-	}
-
-	@Test(expected = IOException.class)
-	public void testThrowsExceptionIfSessionFailsWithException()
-			throws Exception {
-		OutgoingSessionRecord sessionRecord = new OutgoingSessionRecord();
-
-		expectCheckForOrphans();
-		manager.eventOccurred(new TransportActiveEvent(ID));
-
-		context.checking(new Expectations() {{
-			oneOf(pluginManager).getPlugin(ID);
-			will(returnValue(plugin));
-			oneOf(plugin).createWriter(with(any(TransportProperties.class)));
-			will(returnValue(transportConnectionWriter));
-			oneOf(transportConnectionWriter).dispose(true);
-			oneOf(connectionManager).manageOutgoingConnection(with(contactId),
-					with(ID), with(any(TransportConnectionWriter.class)),
-					with(sessionRecord));
-			// The session fails with an exception. We need to use an action
-			// for this, as createAndWriteTempFileForUpload() waits for it to
-			// happen before returning
-			will(new ConsumeArgumentAction<>(TransportConnectionWriter.class, 2,
-					writer -> {
-						try {
-							writer.dispose(true);
-						} catch (IOException e) {
-							fail();
-						}
-					}
-			));
-		}});
-
-		manager.createAndWriteTempFileForUpload(contactId, sessionRecord);
-	}
-
-	@Test
-	public void testReturnsFileIfSessionSucceeds() throws Exception {
-		OutgoingSessionRecord sessionRecord = new OutgoingSessionRecord();
-
-		expectCheckForOrphans();
-		manager.eventOccurred(new TransportActiveEvent(ID));
-
-		context.checking(new Expectations() {{
-			oneOf(pluginManager).getPlugin(ID);
-			will(returnValue(plugin));
-			oneOf(plugin).createWriter(with(any(TransportProperties.class)));
-			will(returnValue(transportConnectionWriter));
-			oneOf(transportConnectionWriter).dispose(false);
-			oneOf(connectionManager).manageOutgoingConnection(with(contactId),
-					with(ID), with(any(TransportConnectionWriter.class)),
-					with(sessionRecord));
-			// The session succeeds. We need to use an action for this, as
-			// createAndWriteTempFileForUpload() waits for it to happen before
-			// returning
-			will(new ConsumeArgumentAction<>(TransportConnectionWriter.class, 2,
-					writer -> {
-						try {
-							writer.dispose(false);
-						} catch (IOException e) {
-							fail();
-						}
-					}
-			));
-		}});
-
-		File f = manager.createAndWriteTempFileForUpload(contactId,
-				sessionRecord);
-		assertTrue(f.exists());
-	}
-
-	private void testDeletesDownloadedFile(boolean recognised,
-			LifecycleState state, boolean fileExists) throws Exception {
+	private void testDeletesFile(boolean recognised, LifecycleState state,
+			boolean fileExists) throws Exception {
 		expectCheckForOrphans();
 		manager.eventOccurred(new TransportActiveEvent(ID));
 
@@ -258,7 +148,7 @@ public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 				new AtomicReference<>(null);
 		AtomicReference<TagController> controller = new AtomicReference<>(null);
 
-		expectPassDownloadedFileToConnectionManager(f, reader, controller);
+		expectPassFileToConnectionManager(f, reader, controller);
 		manager.handleDownloadedFile(f);
 
 		context.checking(new Expectations() {{
@@ -279,7 +169,7 @@ public class MailboxFileManagerImplTest extends BrambleMockTestCase {
 		}});
 	}
 
-	private void expectPassDownloadedFileToConnectionManager(File f,
+	private void expectPassFileToConnectionManager(File f,
 			AtomicReference<TransportConnectionReader> reader,
 			AtomicReference<TagController> controller) {
 		TransportProperties props = new TransportProperties();

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxIntegrationTest.java

@@ -49,8 +49,8 @@ public class MailboxIntegrationTest extends BrambleTestCase {
 	@Rule
 	public TemporaryFolder folder = new TemporaryFolder();
 
-	private static final String URL_BASE = "http://127.0.0.1:8000";
-	private static final MailboxAuthToken SETUP_TOKEN;
+	private final static String URL_BASE = "http://127.0.0.1:8000";
+	private final static MailboxAuthToken SETUP_TOKEN;
 
 	static {
 		try {
@@ -74,10 +74,8 @@ public class MailboxIntegrationTest extends BrambleTestCase {
 					return client;
 				}
 			};
-	// We aren't using a real onion address, so use the given address verbatim
-	private static final UrlConverter urlConverter = onion -> onion;
-	private static final MailboxApiImpl api =
-			new MailboxApiImpl(httpClientProvider, urlConverter);
+	private final static MailboxApiImpl api =
+			new MailboxApiImpl(httpClientProvider);
 	// needs to be static to keep values across different tests
 	private static MailboxProperties ownerProperties;
 
@@ -123,7 +121,7 @@ public class MailboxIntegrationTest extends BrambleTestCase {
 		ContactId contactId = new ContactId(1);
 		MailboxContact contact = getMailboxContact(contactId);
 		MailboxProperties contactProperties = new MailboxProperties(
-				ownerProperties.getOnion(), contact.token,
+				ownerProperties.getBaseUrl(), contact.token,
 				new ArrayList<>(), contact.inboxId, contact.outboxId);
 		api.addContact(ownerProperties, contact);
 
@@ -169,7 +167,7 @@ public class MailboxIntegrationTest extends BrambleTestCase {
 		ContactId contactId = new ContactId(1);
 		MailboxContact contact = getMailboxContact(contactId);
 		MailboxProperties contactProperties = new MailboxProperties(
-				ownerProperties.getOnion(), contact.token,
+				ownerProperties.getBaseUrl(), contact.token,
 				new ArrayList<>(), contact.inboxId, contact.outboxId);
 		api.addContact(ownerProperties, contact);
 

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxManagerImplTest.java

@@ -1,128 +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.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxSettingsManager;
-import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.briarproject.bramble.test.DbExpectations;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Random;
-import java.util.concurrent.Executor;
-
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS;
-import static org.briarproject.bramble.test.TestUtils.getMailboxProperties;
-import static org.briarproject.bramble.test.TestUtils.hasEvent;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class MailboxManagerImplTest extends BrambleMockTestCase {
-
-	private final Executor ioExecutor = context.mock(Executor.class);
-	private final MailboxApi api = context.mock(MailboxApi.class);
-	private final TransactionManager db =
-			context.mock(TransactionManager.class);
-	private final MailboxSettingsManager mailboxSettingsManager =
-			context.mock(MailboxSettingsManager.class);
-	private final MailboxPairingTaskFactory pairingTaskFactory =
-			context.mock(MailboxPairingTaskFactory.class);
-	private final Clock clock =
-			context.mock(Clock.class);
-
-	private final MailboxManagerImpl manager = new MailboxManagerImpl(
-			ioExecutor, api, db, mailboxSettingsManager, pairingTaskFactory,
-			clock);
-
-	@Test
-	public void testDbExceptionDoesNotRecordFailure() throws Exception {
-		Transaction txn = new Transaction(null, true);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transactionWithNullableResult(with(true),
-					withNullableDbCallable(txn));
-			oneOf(mailboxSettingsManager).getOwnMailboxProperties(txn);
-			will(throwException(new DbException()));
-		}});
-
-		assertFalse(manager.checkConnection());
-		assertFalse(hasEvent(txn, OwnMailboxConnectionStatusEvent.class));
-	}
-
-	@Test
-	public void testIOExceptionDoesRecordFailure() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, false);
-		MailboxProperties props = getMailboxProperties(true, CLIENT_SUPPORTS);
-		long now = new Random().nextLong();
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transactionWithNullableResult(with(true),
-					withNullableDbCallable(txn));
-			oneOf(mailboxSettingsManager).getOwnMailboxProperties(txn);
-			will(returnValue(props));
-			oneOf(api).getServerSupports(props);
-			will(throwException(new IOException()));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(db).transaction(with(false), withDbRunnable(txn2));
-			oneOf(mailboxSettingsManager)
-					.recordFailedConnectionAttempt(txn2, now);
-		}});
-
-		assertFalse(manager.checkConnection());
-	}
-
-	@Test
-	public void testApiExceptionDoesRecordFailure() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, false);
-		MailboxProperties props = getMailboxProperties(true, CLIENT_SUPPORTS);
-		long now = new Random().nextLong();
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transactionWithNullableResult(with(true),
-					withNullableDbCallable(txn));
-			oneOf(mailboxSettingsManager).getOwnMailboxProperties(txn);
-			will(returnValue(props));
-			oneOf(api).getServerSupports(props);
-			will(throwException(new MailboxApi.ApiException()));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(db).transaction(with(false), withDbRunnable(txn2));
-			oneOf(mailboxSettingsManager)
-					.recordFailedConnectionAttempt(txn2, now);
-		}});
-
-		assertFalse(manager.checkConnection());
-	}
-
-	@Test
-	public void testConnectionSuccess() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Transaction txn2 = new Transaction(null, false);
-		MailboxProperties props = getMailboxProperties(true, CLIENT_SUPPORTS);
-		long now = new Random().nextLong();
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transactionWithNullableResult(with(true),
-					withNullableDbCallable(txn));
-			oneOf(mailboxSettingsManager).getOwnMailboxProperties(txn);
-			will(returnValue(props));
-			oneOf(api).getServerSupports(props);
-			will(returnValue(CLIENT_SUPPORTS));
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(db).transaction(with(false), withDbRunnable(txn2));
-			oneOf(mailboxSettingsManager)
-					.recordSuccessfulConnection(txn2, now, CLIENT_SUPPORTS);
-		}});
-
-		assertTrue(manager.checkConnection());
-	}
-
-}

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java

@@ -13,6 +13,7 @@ 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.mailbox.MailboxVersion;
+import org.briarproject.bramble.api.mailbox.event.OwnMailboxConnectionStatusEvent;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.DbExpectations;
@@ -32,6 +33,7 @@ import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.test.TestUtils.getContact;
 import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
+import static org.briarproject.bramble.test.TestUtils.hasEvent;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -55,6 +57,7 @@ public class MailboxPairingTaskImplTest extends BrambleMockTestCase {
 
 	private final String onion = getRandomString(56);
 	private final byte[] onionBytes = getRandomBytes(32);
+	private final String baseUrl = "http://" + onion + ".onion"; // TODO
 	private final MailboxAuthToken setupToken =
 			new MailboxAuthToken(getRandomId());
 	private final MailboxAuthToken ownerToken =
@@ -62,9 +65,9 @@ public class MailboxPairingTaskImplTest extends BrambleMockTestCase {
 	private final String validPayload = getValidPayload();
 	private final long time = System.currentTimeMillis();
 	private final MailboxProperties setupProperties = new MailboxProperties(
-			onion, setupToken, new ArrayList<>());
+			baseUrl, setupToken, new ArrayList<>());
 	private final MailboxProperties ownerProperties = new MailboxProperties(
-			onion, ownerToken, new ArrayList<>());
+			baseUrl, ownerToken, new ArrayList<>());
 
 	@Test
 	public void testInitialQrCodeReceivedState() {
@@ -135,6 +138,7 @@ public class MailboxPairingTaskImplTest extends BrambleMockTestCase {
 			i.getAndIncrement();
 		});
 		task.run();
+		hasEvent(txn, OwnMailboxConnectionStatusEvent.class);
 	}
 
 	@Test
@@ -206,7 +210,7 @@ public class MailboxPairingTaskImplTest extends BrambleMockTestCase {
 	private PredicateMatcher<MailboxProperties> matches(MailboxProperties p2) {
 		return new PredicateMatcher<>(MailboxProperties.class, p1 ->
 				p1.getAuthToken().equals(p2.getAuthToken()) &&
-						p1.getOnion().equals(p2.getOnion()) &&
+						p1.getBaseUrl().equals(p2.getBaseUrl()) &&
 						p1.isOwner() == p2.isOwner() &&
 						p1.getServerSupports().equals(p2.getServerSupports()));
 	}

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java

@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Random;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.mailbox.MailboxSettingsManagerImpl.SETTINGS_KEY_ATTEMPTS;
 import static org.briarproject.bramble.mailbox.MailboxSettingsManagerImpl.SETTINGS_KEY_LAST_ATTEMPT;
 import static org.briarproject.bramble.mailbox.MailboxSettingsManagerImpl.SETTINGS_KEY_LAST_SUCCESS;
@@ -84,7 +83,7 @@ public class MailboxSettingsManagerImplTest extends BrambleMockTestCase {
 
 		MailboxProperties properties = manager.getOwnMailboxProperties(txn);
 		assertNotNull(properties);
-		assertEquals(onion, properties.getOnion());
+		assertEquals(onion, properties.getBaseUrl());
 		assertEquals(token, properties.getAuthToken());
 		assertEquals(serverSupports, properties.getServerSupports());
 		assertTrue(properties.isOwner());
@@ -163,28 +162,6 @@ public class MailboxSettingsManagerImplTest extends BrambleMockTestCase {
 		}});
 
 		manager.recordSuccessfulConnection(txn, now);
-		assertTrue(hasEvent(txn, OwnMailboxConnectionStatusEvent.class));
-	}
-
-	@Test
-	public void testRecordsSuccessWithVersions() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		List<MailboxVersion> versions = singletonList(new MailboxVersion(2, 1));
-		Settings expectedSettings = new Settings();
-		expectedSettings.putLong(SETTINGS_KEY_LAST_ATTEMPT, now);
-		expectedSettings.putLong(SETTINGS_KEY_LAST_SUCCESS, now);
-		expectedSettings.putInt(SETTINGS_KEY_ATTEMPTS, 0);
-		expectedSettings.putInt(SETTINGS_KEY_SERVER_SUPPORTS, 0);
-		int[] newVersionsInts = {2, 1};
-		expectedSettings
-				.putIntArray(SETTINGS_KEY_SERVER_SUPPORTS, newVersionsInts);
-
-		context.checking(new Expectations() {{
-			oneOf(settingsManager).mergeSettings(txn, expectedSettings,
-					SETTINGS_NAMESPACE);
-		}});
-
-		manager.recordSuccessfulConnection(txn, now, versions);
 		hasEvent(txn, OwnMailboxConnectionStatusEvent.class);
 	}
 

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxUpdateManagerImplTest.java

@@ -109,7 +109,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 		updateNoMailbox = new MailboxUpdate(someClientSupportsList);
 
 		updateProps = getMailboxProperties(false, someServerSupportsList);
-		ownProps = new MailboxProperties(updateProps.getOnion(),
+		ownProps = new MailboxProperties(updateProps.getBaseUrl(),
 				updateProps.getAuthToken(), someServerSupportsList);
 		updateWithMailbox = new MailboxUpdateWithMailbox(someClientSupportsList,
 				updateProps);
@@ -170,7 +170,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(messageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 1, someClientSupports,
-					emptyServerSupports, emptyPropsDict);
+					emptyServerSupports, emptyPropsDict, true);
 
 			oneOf(clientHelper).mergeGroupMetadata(txn, localGroup.getId(),
 					sentDict);
@@ -225,7 +225,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(messageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 1, someClientSupports,
-					someServerSupports, propsDict);
+					someServerSupports, propsDict, true);
 
 			oneOf(clientHelper).mergeGroupMetadata(txn, localGroup.getId(),
 					sentDict);
@@ -276,7 +276,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(emptyMessageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 1, someClientSupports,
-					emptyServerSupports, emptyPropsDict);
+					emptyServerSupports, emptyPropsDict, true);
 
 			oneOf(clientHelper).mergeGroupMetadata(txn, localGroup.getId(),
 					sentDict);
@@ -341,7 +341,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(emptyMessageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 1, someClientSupports,
-					emptyServerSupports, emptyPropsDict);
+					emptyServerSupports, emptyPropsDict, true);
 
 			oneOf(clientHelper).mergeGroupMetadata(txn, localGroup.getId(),
 					sentDict);
@@ -400,7 +400,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(messageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 2,
-					newerClientSupports, someServerSupports, propsDict);
+					newerClientSupports, someServerSupports, propsDict, true);
 			oneOf(db).removeMessage(txn, messageId);
 
 			oneOf(clientHelper).mergeGroupMetadata(txn, localGroup.getId(),
@@ -441,7 +441,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(messageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 1, someClientSupports,
-					emptyServerSupports, emptyPropsDict);
+					emptyServerSupports, emptyPropsDict, true);
 		}});
 
 		MailboxUpdateManagerImpl t = createInstance(someClientSupportsList);
@@ -484,7 +484,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(messageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 1, someClientSupports,
-					someServerSupports, propsDict);
+					someServerSupports, propsDict, true);
 		}});
 
 		MailboxUpdateManagerImpl t = createInstance(someClientSupportsList);
@@ -674,7 +674,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(messageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 2, someClientSupports,
-					someServerSupports, propsDict);
+					someServerSupports, propsDict, true);
 			oneOf(db).removeMessage(txn, latestId);
 		}});
 
@@ -712,7 +712,7 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 					contactGroup.getId());
 			will(returnValue(messageMetadata));
 			expectStoreMessage(txn, contactGroup.getId(), 2, someClientSupports,
-					emptyServerSupports, emptyPropsDict);
+					emptyServerSupports, emptyPropsDict, true);
 			oneOf(db).removeMessage(txn, latestId);
 		}});
 
@@ -890,14 +890,15 @@ public class MailboxUpdateManagerImplTest extends BrambleMockTestCase {
 
 	private void expectStoreMessage(Transaction txn, GroupId g,
 			long version, BdfList clientSupports, BdfList serverSupports,
-			BdfDictionary properties) throws Exception {
+			BdfDictionary properties, boolean local)
+			throws Exception {
 		BdfList body = BdfList.of(version, clientSupports, serverSupports,
 				properties);
 		Message message = getMessage(g);
 		long timestamp = message.getTimestamp();
 		BdfDictionary meta = BdfDictionary.of(
 				new BdfEntry(MSG_KEY_VERSION, version),
-				new BdfEntry(MSG_KEY_LOCAL, true)
+				new BdfEntry(MSG_KEY_LOCAL, local)
 		);
 
 		context.checking(new Expectations() {{

bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxUploadWorkerTest.java

@@ -1,465 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.mailbox.MailboxFolderId;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
-import org.briarproject.bramble.api.sync.event.MessageSharedEvent;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.briarproject.bramble.test.CaptureArgumentAction;
-import org.briarproject.bramble.test.ConsumeArgumentAction;
-import org.briarproject.bramble.test.DbExpectations;
-import org.briarproject.bramble.test.RunAction;
-import org.jmock.Expectations;
-import org.jmock.lib.action.DoAllAction;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS;
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.MAX_LATENCY;
-import static org.briarproject.bramble.mailbox.MailboxUploadWorker.CHECK_DELAY_MS;
-import static org.briarproject.bramble.mailbox.MailboxUploadWorker.RETRY_DELAY_MS;
-import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
-import static org.briarproject.bramble.test.TestUtils.getContactId;
-import static org.briarproject.bramble.test.TestUtils.getMailboxProperties;
-import static org.briarproject.bramble.test.TestUtils.getRandomId;
-import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class MailboxUploadWorkerTest extends BrambleMockTestCase {
-
-	private final Executor ioExecutor = context.mock(Executor.class);
-	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
-	private final Clock clock = context.mock(Clock.class);
-	private final TaskScheduler taskScheduler =
-			context.mock(TaskScheduler.class);
-	private final EventBus eventBus = context.mock(EventBus.class);
-	private final ConnectivityChecker connectivityChecker =
-			context.mock(ConnectivityChecker.class);
-	private final MailboxApiCaller mailboxApiCaller =
-			context.mock(MailboxApiCaller.class);
-	private final MailboxApi mailboxApi = context.mock(MailboxApi.class);
-	private final MailboxFileManager mailboxFileManager =
-			context.mock(MailboxFileManager.class);
-	private final Cancellable apiCall =
-			context.mock(Cancellable.class, "apiCall");
-	private final Cancellable wakeupTask =
-			context.mock(Cancellable.class, "wakeupTask");
-	private final Cancellable checkTask =
-			context.mock(Cancellable.class, "checkTask");
-
-	private final MailboxProperties mailboxProperties =
-			getMailboxProperties(false, CLIENT_SUPPORTS);
-	private final long now = System.currentTimeMillis();
-	private final MailboxFolderId folderId = new MailboxFolderId(getRandomId());
-	private final ContactId contactId = getContactId();
-	private final MessageId ackedId = new MessageId(getRandomId());
-	private final MessageId sentId = new MessageId(getRandomId());
-	private final MessageId newMessageId = new MessageId(getRandomId());
-
-	private File testDir, tempFile;
-	private MailboxUploadWorker worker;
-
-	@Before
-	public void setUp() {
-		testDir = getTestDirectory();
-		tempFile = new File(testDir, "temp");
-		worker = new MailboxUploadWorker(ioExecutor, db, clock, taskScheduler,
-				eventBus, connectivityChecker, mailboxApiCaller, mailboxApi,
-				mailboxFileManager, mailboxProperties, folderId, contactId);
-	}
-
-	@After
-	public void tearDown() {
-		deleteTestDirectory(testDir);
-	}
-
-	@Test
-	public void testChecksForDataWhenStartedAndRemovesObserverWhenDestroyed()
-			throws Exception {
-		// When the worker is started it should check for data to send
-		expectRunTaskOnIoExecutor();
-		expectCheckForDataToSendNoDataWaiting();
-
-		worker.start();
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-	}
-
-	@Test
-	public void testChecksConnectivityWhenStartedIfDataIsReady()
-			throws Exception {
-		Transaction recordTxn = new Transaction(null, false);
-
-		// When the worker is started it should check for data to send. As
-		// there's data ready to send immediately, the worker should start a
-		// connectivity check
-		expectRunTaskOnIoExecutor();
-		expectCheckForDataToSendAndStartConnectivityCheck();
-
-		worker.start();
-
-		// Create the temporary file so we can test that it gets deleted
-		assertTrue(testDir.mkdirs());
-		assertTrue(tempFile.createNewFile());
-
-		// When the connectivity check succeeds, the worker should write a file
-		// and start an upload task
-		expectRunTaskOnIoExecutor();
-		AtomicReference<ApiCall> upload = new AtomicReference<>();
-		context.checking(new Expectations() {{
-			oneOf(mailboxFileManager).createAndWriteTempFileForUpload(
-					with(contactId), with(any(OutgoingSessionRecord.class)));
-			will(new DoAllAction(
-					// Record some IDs as acked and sent
-					new ConsumeArgumentAction<>(OutgoingSessionRecord.class, 1,
-							record -> {
-								record.onAckSent(singletonList(ackedId));
-								record.onMessageSent(sentId);
-							}),
-					returnValue(tempFile)
-			));
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(upload, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		worker.onConnectivityCheckSucceeded();
-
-		// When the upload task runs, it should upload the file, record
-		// the acked/sent messages in the DB, and check for more data to send
-		context.checking(new DbExpectations() {{
-			oneOf(mailboxApi).addFile(mailboxProperties, folderId, tempFile);
-			oneOf(db).transaction(with(false), withDbRunnable(recordTxn));
-			oneOf(db).setAckSent(recordTxn, contactId, singletonList(ackedId));
-			oneOf(db).setMessagesSent(recordTxn, contactId,
-					singletonList(sentId), MAX_LATENCY);
-		}});
-		expectCheckForDataToSendNoDataWaiting();
-
-		assertFalse(upload.get().callApi());
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-
-		// The file should have been deleted
-		assertFalse(tempFile.exists());
-	}
-
-	@Test
-	public void testCancelsApiCallWhenDestroyed() throws Exception {
-		// When the worker is started it should check for data to send. As
-		// there's data ready to send immediately, the worker should start a
-		// connectivity check
-		expectRunTaskOnIoExecutor();
-		expectCheckForDataToSendAndStartConnectivityCheck();
-
-		worker.start();
-
-		// Create the temporary file so we can test that it gets deleted
-		assertTrue(testDir.mkdirs());
-		assertTrue(tempFile.createNewFile());
-
-		// When the connectivity check succeeds, the worker should write a file
-		// and start an upload task
-		expectRunTaskOnIoExecutor();
-		AtomicReference<ApiCall> upload = new AtomicReference<>();
-		context.checking(new Expectations() {{
-			oneOf(mailboxFileManager).createAndWriteTempFileForUpload(
-					with(contactId), with(any(OutgoingSessionRecord.class)));
-			will(new DoAllAction(
-					// Record some IDs as acked and sent
-					new ConsumeArgumentAction<>(OutgoingSessionRecord.class, 1,
-							record -> {
-								record.onAckSent(singletonList(ackedId));
-								record.onMessageSent(sentId);
-							}),
-					returnValue(tempFile)
-			));
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(upload, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-
-		worker.onConnectivityCheckSucceeded();
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener and cancel the upload task
-		context.checking(new Expectations() {{
-			oneOf(apiCall).cancel();
-		}});
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-
-		// The file should have been deleted
-		assertFalse(tempFile.exists());
-
-		// If the upload task runs anyway (cancellation came too late), it
-		// should return early when it finds the state has changed
-		assertFalse(upload.get().callApi());
-	}
-
-	@Test
-	public void testSchedulesWakeupWhenStartedIfDataIsNotReady()
-			throws Exception {
-		// When the worker is started it should check for data to send. As
-		// the data isn't ready to send immediately, the worker should
-		// schedule a wakeup
-		expectRunTaskOnIoExecutor();
-		AtomicReference<Runnable> wakeup = new AtomicReference<>();
-		expectCheckForDataToSendAndScheduleWakeup(wakeup);
-
-		worker.start();
-
-		// When the wakeup task runs it should check for data to send
-		expectCheckForDataToSendNoDataWaiting();
-
-		wakeup.get().run();
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-	}
-
-	@Test
-	public void testCancelsWakeupIfDestroyedBeforeWakingUp() throws Exception {
-		// When the worker is started it should check for data to send. As
-		// the data isn't ready to send immediately, the worker should
-		// schedule a wakeup
-		expectRunTaskOnIoExecutor();
-		AtomicReference<Runnable> wakeup = new AtomicReference<>();
-		expectCheckForDataToSendAndScheduleWakeup(wakeup);
-
-		worker.start();
-
-		// When the worker is destroyed it should cancel the wakeup and
-		// remove the connectivity observer and event listener
-		context.checking(new Expectations() {{
-			oneOf(wakeupTask).cancel();
-		}});
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-
-		// If the wakeup task runs anyway (cancellation came too late), it
-		// should return early without doing anything
-		wakeup.get().run();
-	}
-
-	@Test
-	public void testCancelsWakeupIfEventIsReceivedBeforeWakingUp()
-			throws Exception {
-		// When the worker is started it should check for data to send. As
-		// the data isn't ready to send immediately, the worker should
-		// schedule a wakeup
-		expectRunTaskOnIoExecutor();
-		AtomicReference<Runnable> wakeup = new AtomicReference<>();
-		expectCheckForDataToSendAndScheduleWakeup(wakeup);
-
-		worker.start();
-
-		// Before the wakeup task runs, the worker receives an event that
-		// indicates new data may be available. The worker should cancel the
-		// wakeup task and schedule a check for new data after a short delay
-		AtomicReference<Runnable> check = new AtomicReference<>();
-		expectScheduleCheck(check, CHECK_DELAY_MS);
-		context.checking(new Expectations() {{
-			oneOf(wakeupTask).cancel();
-		}});
-
-		worker.eventOccurred(new MessageSharedEvent(newMessageId));
-
-		// If the wakeup task runs anyway (cancellation came too late), it
-		// should return early when it finds the state has changed
-		wakeup.get().run();
-
-		// Before the check task runs, the worker receives another event that
-		// indicates new data may be available. The event should be ignored,
-		// as a check for new data has already been scheduled
-		worker.eventOccurred(new MessageSharedEvent(newMessageId));
-
-		// When the check task runs, it should check for new data
-		expectCheckForDataToSendNoDataWaiting();
-
-		check.get().run();
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-	}
-
-	@Test
-	public void testCancelsCheckWhenDestroyed() throws Exception {
-		// When the worker is started it should check for data to send
-		expectRunTaskOnIoExecutor();
-		expectCheckForDataToSendNoDataWaiting();
-
-		worker.start();
-
-		// The worker receives an event that indicates new data may be
-		// available. The worker should schedule a check for new data after
-		// a short delay
-		AtomicReference<Runnable> check = new AtomicReference<>();
-		expectScheduleCheck(check, CHECK_DELAY_MS);
-
-		worker.eventOccurred(new MessageSharedEvent(newMessageId));
-
-		// When the worker is destroyed it should cancel the check and
-		// remove the connectivity observer and event listener
-		context.checking(new Expectations() {{
-			oneOf(checkTask).cancel();
-		}});
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-
-		// If the check runs anyway (cancellation came too late), it should
-		// return early when it finds the state has changed
-		check.get().run();
-	}
-
-	@Test
-	public void testRetriesAfterDelayIfExceptionOccursWhileWritingFile()
-			throws Exception {
-		// When the worker is started it should check for data to send. As
-		// there's data ready to send immediately, the worker should start a
-		// connectivity check
-		expectRunTaskOnIoExecutor();
-		expectCheckForDataToSendAndStartConnectivityCheck();
-
-		worker.start();
-
-		// When the connectivity check succeeds, the worker should try to
-		// write a file. This fails with an exception, so the worker should
-		// retry by scheduling a check for new data after a short delay
-		expectRunTaskOnIoExecutor();
-		AtomicReference<Runnable> check = new AtomicReference<>();
-		context.checking(new Expectations() {{
-			oneOf(mailboxFileManager).createAndWriteTempFileForUpload(
-					with(contactId), with(any(OutgoingSessionRecord.class)));
-			will(throwException(new IOException())); // Oh noes!
-		}});
-		expectScheduleCheck(check, RETRY_DELAY_MS);
-
-		worker.onConnectivityCheckSucceeded();
-
-		// When the check task runs it should check for new data
-		expectCheckForDataToSendNoDataWaiting();
-
-		check.get().run();
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveObserverAndListener();
-
-		worker.destroy();
-	}
-
-	private void expectRunTaskOnIoExecutor() {
-		context.checking(new Expectations() {{
-			oneOf(ioExecutor).execute(with(any(Runnable.class)));
-			will(new RunAction());
-		}});
-	}
-
-	private void expectCheckForDataToSendNoDataWaiting() throws Exception {
-		Transaction txn = new Transaction(null, true);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(true), withDbRunnable(txn));
-			oneOf(db).containsAcksToSend(txn, contactId);
-			will(returnValue(false));
-			oneOf(db).getNextSendTime(txn, contactId, MAX_LATENCY);
-			will(returnValue(Long.MAX_VALUE)); // No data waiting
-		}});
-	}
-
-	private void expectCheckForDataToSendAndScheduleWakeup(
-			AtomicReference<Runnable> wakeup) throws Exception {
-		Transaction txn = new Transaction(null, true);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(true), withDbRunnable(txn));
-			oneOf(db).containsAcksToSend(txn, contactId);
-			will(returnValue(false));
-			oneOf(db).getNextSendTime(txn, contactId, MAX_LATENCY);
-			will(returnValue(now + 1234L)); // Data waiting but not ready
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(taskScheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with(1234L), with(MILLISECONDS));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(wakeup, Runnable.class, 0),
-					returnValue(wakeupTask)
-			));
-		}});
-	}
-
-	private void expectCheckForDataToSendAndStartConnectivityCheck()
-			throws Exception {
-		Transaction txn = new Transaction(null, true);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(true), withDbRunnable(txn));
-			oneOf(db).containsAcksToSend(txn, contactId);
-			will(returnValue(false));
-			oneOf(db).getNextSendTime(txn, contactId, MAX_LATENCY);
-			will(returnValue(0L)); // Data ready to send
-			oneOf(clock).currentTimeMillis();
-			will(returnValue(now));
-			oneOf(connectivityChecker).checkConnectivity(mailboxProperties,
-					worker);
-		}});
-	}
-
-	private void expectScheduleCheck(AtomicReference<Runnable> check,
-			long delay) {
-		context.checking(new Expectations() {{
-			oneOf(taskScheduler).schedule(with(any(Runnable.class)),
-					with(ioExecutor), with(delay), with(MILLISECONDS));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(check, Runnable.class, 0),
-					returnValue(checkTask)
-			));
-		}});
-	}
-
-	private void expectRemoveObserverAndListener() {
-		context.checking(new Expectations() {{
-			oneOf(connectivityChecker).removeObserver(worker);
-			oneOf(eventBus).removeListener(worker);
-		}});
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxConnectivityCheckerTest.java

@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.db.Transaction;
 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.mailbox.MailboxVersion;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.mailbox.ConnectivityChecker.ConnectivityObserver;
 import org.briarproject.bramble.test.BrambleMockTestCase;
@@ -16,10 +15,8 @@ import org.jmock.lib.action.DoAllAction;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS;
 import static org.briarproject.bramble.test.TestUtils.getMailboxProperties;
 import static org.junit.Assert.assertFalse;
@@ -42,8 +39,6 @@ public class OwnMailboxConnectivityCheckerTest extends BrambleMockTestCase {
 	private final MailboxProperties properties =
 			getMailboxProperties(true, CLIENT_SUPPORTS);
 	private final long now = System.currentTimeMillis();
-	private final List<MailboxVersion> serverSupports =
-			singletonList(new MailboxVersion(123, 456));
 
 	@Test
 	public void testObserverIsCalledWhenCheckSucceeds() throws Exception {
@@ -67,13 +62,12 @@ public class OwnMailboxConnectivityCheckerTest extends BrambleMockTestCase {
 		// When the check succeeds, the success should be recorded in the DB
 		// and the observer should be called
 		context.checking(new DbExpectations() {{
-			oneOf(mailboxApi).getServerSupports(properties);
-			will(returnValue(serverSupports));
+			oneOf(mailboxApi).checkStatus(properties);
+			will(returnValue(true));
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
 			oneOf(db).transaction(with(false), withDbRunnable(txn));
-			oneOf(mailboxSettingsManager).recordSuccessfulConnection(txn, now,
-					serverSupports);
+			oneOf(mailboxSettingsManager).recordSuccessfulConnection(txn, now);
 			oneOf(observer).onConnectivityCheckSucceeded();
 		}});
 
@@ -103,7 +97,7 @@ public class OwnMailboxConnectivityCheckerTest extends BrambleMockTestCase {
 		// When the check fails, the failure should be recorded in the DB and
 		// the observer should not be called
 		context.checking(new DbExpectations() {{
-			oneOf(mailboxApi).getServerSupports(properties);
+			oneOf(mailboxApi).checkStatus(properties);
 			will(throwException(new IOException()));
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));

bramble-core/src/test/java/org/briarproject/bramble/mailbox/OwnMailboxContactListWorkerTest.java

@@ -1,406 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
-import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.NoSuchContactException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.mailbox.MailboxProperties;
-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.mailbox.MailboxApi.MailboxContact;
-import org.briarproject.bramble.mailbox.MailboxApi.TolerableFailureException;
-import org.briarproject.bramble.test.BrambleMockTestCase;
-import org.briarproject.bramble.test.CaptureArgumentAction;
-import org.briarproject.bramble.test.DbExpectations;
-import org.briarproject.bramble.test.RunAction;
-import org.jmock.Expectations;
-import org.jmock.lib.action.DoAllAction;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.briarproject.bramble.api.mailbox.MailboxConstants.CLIENT_SUPPORTS;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.bramble.test.TestUtils.getContact;
-import static org.briarproject.bramble.test.TestUtils.getMailboxProperties;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-public class OwnMailboxContactListWorkerTest extends BrambleMockTestCase {
-
-	private final Executor ioExecutor = context.mock(Executor.class);
-	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
-	private final EventBus eventBus = context.mock(EventBus.class);
-	private final ConnectivityChecker connectivityChecker =
-			context.mock(ConnectivityChecker.class);
-	private final MailboxApiCaller mailboxApiCaller =
-			context.mock(MailboxApiCaller.class);
-	private final MailboxApi mailboxApi = context.mock(MailboxApi.class);
-	private final MailboxUpdateManager mailboxUpdateManager =
-			context.mock(MailboxUpdateManager.class);
-	private final Cancellable apiCall = context.mock(Cancellable.class);
-
-	private final MailboxProperties mailboxProperties =
-			getMailboxProperties(true, CLIENT_SUPPORTS);
-	private final Contact contact1 = getContact(), contact2 = getContact();
-	private final MailboxProperties contactProperties1 =
-			getMailboxProperties(false, CLIENT_SUPPORTS);
-	private final MailboxProperties contactProperties2 =
-			getMailboxProperties(false, CLIENT_SUPPORTS);
-	private final MailboxUpdateWithMailbox update1 =
-			new MailboxUpdateWithMailbox(CLIENT_SUPPORTS, contactProperties1);
-	private final MailboxUpdateWithMailbox update2 =
-			new MailboxUpdateWithMailbox(CLIENT_SUPPORTS, contactProperties2);
-
-	private final OwnMailboxContactListWorker worker =
-			new OwnMailboxContactListWorker(ioExecutor, db, eventBus,
-					connectivityChecker, mailboxApiCaller, mailboxApi,
-					mailboxUpdateManager, mailboxProperties);
-
-	@Test
-	public void testChecksConnectivityWhenStartedAndRemovesObserverWhenDestroyed() {
-		// When the worker is started it should start a connectivity check
-		expectStartConnectivityCheck();
-
-		worker.start();
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveConnectivityObserverAndEventListener();
-
-		worker.destroy();
-	}
-
-	@Test
-	public void testUpdatesContactListWhenConnectivityCheckSucceeds()
-			throws Exception {
-		// When the worker is started it should start a connectivity check
-		expectStartConnectivityCheck();
-
-		worker.start();
-
-		// When the connectivity check succeeds, the worker should start a
-		// task to fetch the remote contact list
-		AtomicReference<ApiCall> fetchList = new AtomicReference<>();
-		expectStartTaskToFetchRemoteContactList(fetchList);
-
-		worker.onConnectivityCheckSucceeded();
-
-		// When the fetch task runs it should fetch the remote contact list,
-		// load the local contact list, and find the differences. Contact 2
-		// needs to be added and contact 1 needs to be removed. The worker
-		// should load the mailbox update for contact 2 and start a task to
-		// add contact 2 to the mailbox
-		expectFetchRemoteContactList(singletonList(contact1.getId()));
-		expectRunTaskOnIoExecutor();
-		expectLoadLocalContactList(singletonList(contact2));
-		expectRunTaskOnIoExecutor();
-		expectLoadMailboxUpdate(contact2, update2);
-		AtomicReference<ApiCall> addContact = new AtomicReference<>();
-		expectStartTaskToAddContact(addContact);
-
-		assertFalse(fetchList.get().callApi());
-
-		// When the add-contact task runs it should add contact 2 to the
-		// mailbox, then continue with the next update
-		AtomicReference<MailboxContact> added = new AtomicReference<>();
-		expectAddContactToMailbox(added);
-		AtomicReference<ApiCall> removeContact = new AtomicReference<>();
-		expectStartTaskToRemoveContact(removeContact);
-
-		assertFalse(addContact.get().callApi());
-
-		// Check that the added contact has the expected properties
-		MailboxContact expected = new MailboxContact(contact2.getId(),
-				contactProperties2.getAuthToken(),
-				requireNonNull(contactProperties2.getInboxId()),
-				requireNonNull(contactProperties2.getOutboxId()));
-		assertMailboxContactEquals(expected, added.get());
-
-		// When the remove-contact task runs it should remove contact 1 from
-		// the mailbox
-		expectRemoveContactFromMailbox(contact1);
-
-		assertFalse(removeContact.get().callApi());
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveConnectivityObserverAndEventListener();
-
-		worker.destroy();
-	}
-
-	@Test
-	public void testHandlesEventsAfterMakingInitialUpdates() throws Exception {
-		// When the worker is started it should start a connectivity check
-		expectStartConnectivityCheck();
-
-		worker.start();
-
-		// When the connectivity check succeeds, the worker should start a
-		// task to fetch the remote contact list
-		AtomicReference<ApiCall> fetchList = new AtomicReference<>();
-		expectStartTaskToFetchRemoteContactList(fetchList);
-
-		worker.onConnectivityCheckSucceeded();
-
-		// When the fetch task runs it should fetch the remote contact list,
-		// load the local contact list, and find the differences. The lists
-		// are the same, so the worker should wait for changes
-		expectFetchRemoteContactList(emptyList());
-		expectRunTaskOnIoExecutor();
-		expectLoadLocalContactList(emptyList());
-
-		assertFalse(fetchList.get().callApi());
-
-		// When a contact is added, the worker should load the contact's
-		// mailbox update and start a task to add the contact to the mailbox
-		expectRunTaskOnIoExecutor();
-		expectLoadMailboxUpdate(contact1, update1);
-		AtomicReference<ApiCall> addContact = new AtomicReference<>();
-		expectStartTaskToAddContact(addContact);
-
-		worker.eventOccurred(new ContactAddedEvent(contact1.getId(), true));
-
-		// When the add-contact task runs it should add contact 1 to the
-		// mailbox
-		AtomicReference<MailboxContact> added = new AtomicReference<>();
-		expectAddContactToMailbox(added);
-
-		assertFalse(addContact.get().callApi());
-
-		// Check that the added contact has the expected properties
-		MailboxContact expected = new MailboxContact(contact1.getId(),
-				contactProperties1.getAuthToken(),
-				requireNonNull(contactProperties1.getInboxId()),
-				requireNonNull(contactProperties1.getOutboxId()));
-		assertMailboxContactEquals(expected, added.get());
-
-		// When the contact is removed again, the worker should start a task
-		// to remove the contact from the mailbox
-		expectRunTaskOnIoExecutor();
-		AtomicReference<ApiCall> removeContact = new AtomicReference<>();
-		expectStartTaskToRemoveContact(removeContact);
-
-		worker.eventOccurred(new ContactRemovedEvent(contact1.getId()));
-
-		// When the remove-contact task runs it should remove the contact from
-		// the mailbox
-		expectRemoveContactFromMailbox(contact1);
-
-		assertFalse(removeContact.get().callApi());
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveConnectivityObserverAndEventListener();
-
-		worker.destroy();
-	}
-
-
-	@Test
-	public void testHandlesNoSuchContactException() throws Exception {
-		// When the worker is started it should start a connectivity check
-		expectStartConnectivityCheck();
-
-		worker.start();
-
-		// When the connectivity check succeeds, the worker should start a
-		// task to fetch the remote contact list
-		AtomicReference<ApiCall> fetchList = new AtomicReference<>();
-		expectStartTaskToFetchRemoteContactList(fetchList);
-
-		worker.onConnectivityCheckSucceeded();
-
-		// When the fetch task runs it should fetch the remote contact list,
-		// load the local contact list, and find the differences. Contact 1
-		// needs to be added, so the worker should submit a task to the
-		// IO executor to load the contact's mailbox update
-		expectFetchRemoteContactList(emptyList());
-		expectRunTaskOnIoExecutor();
-		expectLoadLocalContactList(singletonList(contact1));
-		AtomicReference<Runnable> loadUpdate = new AtomicReference<>();
-		context.checking(new Expectations() {{
-			oneOf(ioExecutor).execute(with(any(Runnable.class)));
-			will(new CaptureArgumentAction<>(loadUpdate, Runnable.class, 0));
-		}});
-
-		assertFalse(fetchList.get().callApi());
-
-		// Before the contact's mailbox update can be loaded, the contact
-		// is removed
-		worker.eventOccurred(new ContactRemovedEvent(contact1.getId()));
-
-		// When the load-update task runs, a NoSuchContactException is thrown.
-		// The worker should abandon adding the contact and move on to the
-		// next update, which is the removal of the same contact. The worker
-		// should start a task to remove the contact from the mailbox
-		Transaction txn = new Transaction(null, false);
-		context.checking(new DbExpectations() {{
-			oneOf(db).transactionWithResult(with(true), withDbCallable(txn));
-			oneOf(mailboxUpdateManager).getLocalUpdate(txn, contact1.getId());
-			will(throwException(new NoSuchContactException()));
-		}});
-		AtomicReference<ApiCall> removeContact = new AtomicReference<>();
-		expectStartTaskToRemoveContact(removeContact);
-
-		loadUpdate.get().run();
-
-		// When the remove-contact task runs it should remove the contact from
-		// the mailbox. The contact was never added, so the call throws a
-		// TolerableFailureException
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).deleteContact(mailboxProperties,
-					contact1.getId());
-			will(throwException(new TolerableFailureException()));
-		}});
-
-		assertFalse(removeContact.get().callApi());
-
-		// When the worker is destroyed it should remove the connectivity
-		// observer and event listener
-		expectRemoveConnectivityObserverAndEventListener();
-
-		worker.destroy();
-	}
-
-	@Test
-	public void testCancelsApiCallWhenDestroyed() {
-		// When the worker is started it should start a connectivity check
-		expectStartConnectivityCheck();
-
-		worker.start();
-
-		// When the connectivity check succeeds, the worker should start a
-		// task to fetch the remote contact list
-		AtomicReference<ApiCall> fetchList = new AtomicReference<>();
-		expectStartTaskToFetchRemoteContactList(fetchList);
-
-		worker.onConnectivityCheckSucceeded();
-
-		// The worker is destroyed before the task runs. The worker should
-		// cancel the task remove the connectivity observer and event listener
-		context.checking(new Expectations() {{
-			oneOf(apiCall).cancel();
-		}});
-		expectRemoveConnectivityObserverAndEventListener();
-
-		worker.destroy();
-	}
-
-	private void expectStartConnectivityCheck() {
-		context.checking(new Expectations() {{
-			oneOf(connectivityChecker).checkConnectivity(
-					with(mailboxProperties), with(worker));
-		}});
-	}
-
-	private void expectRemoveConnectivityObserverAndEventListener() {
-		context.checking(new Expectations() {{
-			oneOf(connectivityChecker).removeObserver(worker);
-			oneOf(eventBus).removeListener(worker);
-		}});
-	}
-
-	private void expectStartTaskToFetchRemoteContactList(
-			AtomicReference<ApiCall> task) {
-		context.checking(new Expectations() {{
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(task, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-	}
-
-	private void expectFetchRemoteContactList(List<ContactId> remote)
-			throws Exception {
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).getContacts(mailboxProperties);
-			will(returnValue(remote));
-		}});
-	}
-
-	private void expectLoadLocalContactList(List<Contact> local)
-			throws Exception {
-		Transaction txn = new Transaction(null, true);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(true), withDbRunnable(txn));
-			oneOf(db).getContacts(txn);
-			will(returnValue(local));
-		}});
-	}
-
-	private void expectLoadMailboxUpdate(Contact c, MailboxUpdate update)
-			throws Exception {
-		Transaction txn = new Transaction(null, true);
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transactionWithResult(with(true),
-					withDbCallable(txn));
-			oneOf(mailboxUpdateManager).getLocalUpdate(txn, c.getId());
-			will(returnValue(update));
-		}});
-	}
-
-	private void expectStartTaskToAddContact(AtomicReference<ApiCall> task) {
-		context.checking(new Expectations() {{
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(task, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-	}
-
-	private void expectAddContactToMailbox(
-			AtomicReference<MailboxContact> added) throws Exception {
-		context.checking(new DbExpectations() {{
-			oneOf(mailboxApi).addContact(with(mailboxProperties),
-					with(any(MailboxContact.class)));
-			will(new CaptureArgumentAction<>(added, MailboxContact.class, 1));
-		}});
-	}
-
-	private void expectStartTaskToRemoveContact(AtomicReference<ApiCall> task) {
-		context.checking(new DbExpectations() {{
-			oneOf(mailboxApiCaller).retryWithBackoff(with(any(ApiCall.class)));
-			will(new DoAllAction(
-					new CaptureArgumentAction<>(task, ApiCall.class, 0),
-					returnValue(apiCall)
-			));
-		}});
-	}
-
-	private void expectRemoveContactFromMailbox(Contact c) throws Exception {
-		context.checking(new Expectations() {{
-			oneOf(mailboxApi).deleteContact(mailboxProperties, c.getId());
-		}});
-	}
-
-	private void expectRunTaskOnIoExecutor() {
-		context.checking(new Expectations() {{
-			oneOf(ioExecutor).execute(with(any(Runnable.class)));
-			will(new RunAction());
-		}});
-	}
-
-	private void assertMailboxContactEquals(MailboxContact expected,
-			MailboxContact actual) {
-		assertEquals(expected.contactId, actual.contactId);
-		assertEquals(expected.token, actual.token);
-		assertEquals(expected.inboxId, actual.inboxId);
-		assertEquals(expected.outboxId, actual.outboxId);
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/mailbox/TorReachabilityMonitorImplTest.java

@@ -12,6 +12,7 @@ import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.CaptureArgumentAction;
 import org.jmock.Expectations;
 import org.jmock.lib.action.DoAllAction;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.concurrent.Executor;
@@ -37,9 +38,13 @@ public class TorReachabilityMonitorImplTest extends BrambleMockTestCase {
 	private final TorReachabilityObserver observer =
 			context.mock(TorReachabilityObserver.class);
 
-	private final TorReachabilityMonitorImpl monitor =
-			new TorReachabilityMonitorImpl(ioExecutor, taskScheduler,
-					pluginManager, eventBus);
+	private TorReachabilityMonitorImpl monitor;
+
+	@Before
+	public void setUp() {
+		monitor = new TorReachabilityMonitorImpl(ioExecutor, taskScheduler,
+				pluginManager, eventBus);
+	}
 
 	@Test
 	public void testSchedulesTaskWhenStartedIfTorIsActive() {

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

@@ -26,6 +26,7 @@ import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.bramble.test.RunAction;
 import org.jmock.Expectations;
 import org.jmock.imposters.ByteBuddyClassImposteriser;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.security.SecureRandom;
@@ -58,18 +59,22 @@ public class PollerImplTest extends BrambleMockTestCase {
 	private final SecureRandom random;
 
 	private final Executor ioExecutor = new ImmediateExecutor();
+	private final Executor wakefulIoExecutor = new ImmediateExecutor();
 	private final TransportId transportId = getTransportId();
 	private final ContactId contactId = getContactId();
 	private final TransportProperties properties = new TransportProperties();
 	private final int pollingInterval = 60 * 1000;
 	private final long now = System.currentTimeMillis();
 
-	private final PollerImpl poller;
+	private PollerImpl poller;
 
 	public PollerImplTest() {
 		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		random = context.mock(SecureRandom.class);
-		Executor wakefulIoExecutor = new ImmediateExecutor();
+	}
+
+	@Before
+	public void setUp() {
 		poller = new PollerImpl(ioExecutor, wakefulIoExecutor, scheduler,
 				connectionManager, connectionRegistry, pluginManager,
 				transportPropertyManager, random, clock);

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

@@ -12,6 +12,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.test.BrambleTestCase;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -45,11 +46,13 @@ public class LanTcpPluginTest extends BrambleTestCase {
 
 	private final Backoff backoff = new TestBackoff();
 	private final ExecutorService ioExecutor = newCachedThreadPool();
-	private final Callback callback = new Callback();
 
-	private final LanTcpPlugin plugin;
+	private Callback callback = null;
+	private LanTcpPlugin plugin = null;
 
-	public LanTcpPluginTest() {
+	@Before
+	public void setUp() {
+		callback = new Callback();
 		plugin = new LanTcpPlugin(ioExecutor, ioExecutor, backoff, callback,
 				0, 0, 1000) {
 			@Override

bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/CircumventionProviderTest.java

@@ -7,6 +7,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BLOCKED;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BRIDGES;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4;
@@ -14,7 +15,7 @@ import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeTy
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DEFAULT_BRIDGES;
-import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DPI_BRIDGES;
+import static org.briarproject.bramble.plugin.tor.CircumventionProvider.MEEK_BRIDGES;
 import static org.briarproject.bramble.plugin.tor.CircumventionProvider.NON_DEFAULT_BRIDGES;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -31,18 +32,18 @@ public class CircumventionProviderTest extends BrambleTestCase {
 		Set<String> defaultBridges = new HashSet<>(asList(DEFAULT_BRIDGES));
 		Set<String> nonDefaultBridges =
 				new HashSet<>(asList(NON_DEFAULT_BRIDGES));
-		Set<String> dpiBridges = new HashSet<>(asList(DPI_BRIDGES));
+		Set<String> meekBridges = new HashSet<>(asList(MEEK_BRIDGES));
 		// BRIDGES should be a subset of BLOCKED
 		assertTrue(blocked.containsAll(bridges));
 		// BRIDGES should be the union of the bridge type sets
 		Set<String> union = new HashSet<>(defaultBridges);
 		union.addAll(nonDefaultBridges);
-		union.addAll(dpiBridges);
+		union.addAll(meekBridges);
 		assertEquals(bridges, union);
 		// The bridge type sets should not overlap
 		assertEmptyIntersection(defaultBridges, nonDefaultBridges);
-		assertEmptyIntersection(defaultBridges, dpiBridges);
-		assertEmptyIntersection(nonDefaultBridges, dpiBridges);
+		assertEmptyIntersection(defaultBridges, meekBridges);
+		assertEmptyIntersection(nonDefaultBridges, meekBridges);
 	}
 
 	@Test
@@ -55,8 +56,8 @@ public class CircumventionProviderTest extends BrambleTestCase {
 			assertEquals(asList(NON_DEFAULT_OBFS4, VANILLA),
 					provider.getSuitableBridgeTypes(country));
 		}
-		for (String country : DPI_BRIDGES) {
-			assertEquals(asList(NON_DEFAULT_OBFS4, MEEK),
+		for (String country : MEEK_BRIDGES) {
+			assertEquals(singletonList(MEEK),
 					provider.getSuitableBridgeTypes(country));
 		}
 		assertEquals(asList(DEFAULT_OBFS4, VANILLA),

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

@@ -34,6 +34,7 @@ import org.briarproject.bramble.test.DbExpectations;
 import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.bramble.test.PredicateMatcher;
 import org.jmock.Expectations;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Random;
@@ -92,10 +93,14 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 			getTransportProperties(3);
 	private final boolean alice = new Random().nextBoolean();
 
-	private final RendezvousPollerImpl rendezvousPoller =
-			new RendezvousPollerImpl(ioExecutor, scheduler, db,
-					identityManager, transportCrypto, rendezvousCrypto,
-					pluginManager, connectionManager, eventBus, clock);
+	private RendezvousPollerImpl rendezvousPoller;
+
+	@Before
+	public void setUp() {
+		rendezvousPoller = new RendezvousPollerImpl(ioExecutor, scheduler, db,
+				identityManager, transportCrypto, rendezvousCrypto,
+				pluginManager, connectionManager, eventBus, clock);
+	}
 
 	@Test
 	public void testAddsPendingContactsAndSchedulesPollingAtStartup()

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

@@ -6,10 +6,10 @@ import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.sync.Ack;
+import org.briarproject.bramble.api.sync.DeferredSendHandler;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
 import org.briarproject.bramble.api.sync.SyncRecordWriter;
 import org.briarproject.bramble.api.sync.Versions;
 import org.briarproject.bramble.api.transport.StreamWriter;
@@ -30,7 +30,6 @@ import static org.briarproject.bramble.test.TestUtils.getContactId;
 import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
-import static org.junit.Assert.assertEquals;
 
 public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 
@@ -41,6 +40,8 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 	private final StreamWriter streamWriter = context.mock(StreamWriter.class);
 	private final SyncRecordWriter recordWriter =
 			context.mock(SyncRecordWriter.class);
+	private final DeferredSendHandler deferredSendHandler =
+			context.mock(DeferredSendHandler.class);
 
 	private final ContactId contactId = getContactId();
 	private final TransportId transportId = getTransportId();
@@ -52,10 +53,9 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 
 	@Test
 	public void testNothingToSend() throws Exception {
-		OutgoingSessionRecord sessionRecord = new OutgoingSessionRecord();
 		MailboxOutgoingSession session = new MailboxOutgoingSession(db,
 				eventBus, contactId, transportId, MAX_LATENCY,
-				streamWriter, recordWriter, sessionRecord,
+				streamWriter, recordWriter, deferredSendHandler,
 				MAX_FILE_PAYLOAD_BYTES);
 
 		Transaction noAckIdTxn = new Transaction(null, true);
@@ -92,17 +92,13 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 		}});
 
 		session.run();
-
-		assertEquals(emptyList(), sessionRecord.getAckedIds());
-		assertEquals(emptyList(), sessionRecord.getSentIds());
 	}
 
 	@Test
 	public void testSomethingToSend() throws Exception {
-		OutgoingSessionRecord sessionRecord = new OutgoingSessionRecord();
 		MailboxOutgoingSession session = new MailboxOutgoingSession(db,
 				eventBus, contactId, transportId, MAX_LATENCY,
-				streamWriter, recordWriter, sessionRecord,
+				streamWriter, recordWriter, deferredSendHandler,
 				MAX_FILE_PAYLOAD_BYTES);
 
 		Transaction ackIdTxn = new Transaction(null, true);
@@ -131,6 +127,8 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 			oneOf(recordWriter).getBytesWritten();
 			will(returnValue((long) versionRecordBytes));
 			oneOf(recordWriter).writeAck(with(any(Ack.class)));
+			oneOf(deferredSendHandler)
+					.onAckSent(singletonList(message.getId()));
 			// No more messages to ack
 			oneOf(db).transactionWithResult(with(true),
 					withDbCallable(noAckIdTxn));
@@ -152,6 +150,7 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 					MAX_LATENCY, false);
 			will(returnValue(message1));
 			oneOf(recordWriter).writeMessage(message1);
+			oneOf(deferredSendHandler).onMessageSent(message1.getId());
 			// Send the end of stream marker
 			oneOf(streamWriter).sendEndOfStream();
 			// Remove listener
@@ -159,11 +158,6 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 		}});
 
 		session.run();
-
-		assertEquals(singletonList(message.getId()),
-				sessionRecord.getAckedIds());
-		assertEquals(singletonList(message1.getId()),
-				sessionRecord.getSentIds());
 	}
 
 	@Test
@@ -173,10 +167,9 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 		long capacity = RECORD_HEADER_BYTES + MessageId.LENGTH * MAX_MESSAGE_IDS
 				+ RECORD_HEADER_BYTES + MessageId.LENGTH + MessageId.LENGTH - 1;
 
-		OutgoingSessionRecord sessionRecord = new OutgoingSessionRecord();
 		MailboxOutgoingSession session = new MailboxOutgoingSession(db,
 				eventBus, contactId, transportId, MAX_LATENCY,
-				streamWriter, recordWriter, sessionRecord, capacity);
+				streamWriter, recordWriter, deferredSendHandler, capacity);
 
 		Transaction ackIdTxn1 = new Transaction(null, true);
 		Transaction ackIdTxn2 = new Transaction(null, true);
@@ -191,9 +184,6 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 		}
 		List<MessageId> idsInSecondAck =
 				singletonList(new MessageId(getRandomId()));
-		List<MessageId> allIds = new ArrayList<>(MAX_MESSAGE_IDS + 1);
-		allIds.addAll(idsInFirstAck);
-		allIds.addAll(idsInSecondAck);
 
 		context.checking(new DbExpectations() {{
 			// Add listener
@@ -210,6 +200,7 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 			will(returnValue(idsInFirstAck));
 			// Send the first ack record
 			oneOf(recordWriter).writeAck(with(any(Ack.class)));
+			oneOf(deferredSendHandler).onAckSent(idsInFirstAck);
 			// Calculate remaining capacity for acks
 			oneOf(recordWriter).getBytesWritten();
 			will(returnValue((long) versionRecordBytes + firstAckRecordBytes));
@@ -220,6 +211,7 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 			will(returnValue(idsInSecondAck));
 			// Send the second ack record
 			oneOf(recordWriter).writeAck(with(any(Ack.class)));
+			oneOf(deferredSendHandler).onAckSent(idsInSecondAck);
 			// Not enough capacity left for another ack
 			oneOf(recordWriter).getBytesWritten();
 			will(returnValue((long) versionRecordBytes + firstAckRecordBytes
@@ -235,8 +227,5 @@ public class MailboxOutgoingSessionTest extends BrambleMockTestCase {
 		}});
 
 		session.run();
-
-		assertEquals(allIds, sessionRecord.getAckedIds());
-		assertEquals(emptyList(), sessionRecord.getSentIds());
 	}
 }

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

@@ -14,6 +14,7 @@ import org.briarproject.bramble.api.sync.SyncRecordReader;
 import org.briarproject.bramble.api.sync.Versions;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.jmock.Expectations;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
@@ -43,8 +44,12 @@ public class SyncRecordReaderImplTest extends BrambleMockTestCase {
 			context.mock(MessageFactory.class);
 	private final RecordReader recordReader = context.mock(RecordReader.class);
 
-	private final SyncRecordReader reader =
-			new SyncRecordReaderImpl(messageFactory, recordReader);
+	private SyncRecordReader reader;
+
+	@Before
+	public void setUp() {
+		reader = new SyncRecordReaderImpl(messageFactory, recordReader);
+	}
 
 	@Test
 	public void testNoFormatExceptionIfAckIsMaximumSize() throws Exception {

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

@@ -20,6 +20,7 @@ import org.briarproject.bramble.api.sync.validation.MessageValidator;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.DbExpectations;
 import org.briarproject.bramble.test.ImmediateExecutor;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.LinkedHashMap;
@@ -69,10 +70,11 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	private final MessageContext validResultWithDependencies =
 			new MessageContext(metadata, singletonList(messageId1));
 
-	private final ValidationManagerImpl vm =
-			new ValidationManagerImpl(db, dbExecutor, validationExecutor);
+	private ValidationManagerImpl vm;
 
-	public ValidationManagerImplTest() {
+	@Before
+	public void setUp() {
+		vm = new ValidationManagerImpl(db, dbExecutor, validationExecutor);
 		vm.registerMessageValidator(clientId, majorVersion, validator);
 		vm.registerIncomingMessageHook(clientId, majorVersion, hook);
 	}

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

@@ -1,32 +0,0 @@
-package org.briarproject.bramble.test;
-
-import org.briarproject.bramble.api.Consumer;
-import org.hamcrest.Description;
-import org.jmock.api.Action;
-import org.jmock.api.Invocation;
-
-public class ConsumeArgumentAction<T> implements Action {
-
-	private final Class<T> capturedClass;
-	private final int index;
-	private final Consumer<T> consumer;
-
-	public ConsumeArgumentAction(Class<T> capturedClass, int index,
-			Consumer<T> consumer) {
-		this.capturedClass = capturedClass;
-		this.index = index;
-		this.consumer = consumer;
-	}
-
-	@Override
-	public Object invoke(Invocation invocation) {
-		consumer.accept(capturedClass.cast(invocation.getParameter(index)));
-		return null;
-	}
-
-	@Override
-	public void describeTo(Description description) {
-		description.appendText("passes an argument to a consumer");
-	}
-
-}

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

@@ -22,6 +22,7 @@ import org.hamcrest.Description;
 import org.jmock.Expectations;
 import org.jmock.api.Action;
 import org.jmock.api.Invocation;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -71,9 +72,13 @@ public class TransportKeyManagerImplTest extends BrambleMockTestCase {
 	private final SecretKey rootKey = getSecretKey();
 	private final Random random = new Random();
 
-	private final TransportKeyManager transportKeyManager =
-			new TransportKeyManagerImpl(db, transportCrypto, dbExecutor,
-					scheduler, clock, transportId, maxLatency);
+	private TransportKeyManager transportKeyManager;
+
+	@Before
+	public void setUp() {
+		transportKeyManager = new TransportKeyManagerImpl(db, transportCrypto,
+				dbExecutor, scheduler, clock, transportId, maxLatency);
+	}
 
 	@Test
 	public void testKeysAreUpdatedAtStartup() throws Exception {

bramble-core/src/test/java/org/briarproject/bramble/util/ByteUtilsTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.util;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.junit.Test;
 
@@ -12,7 +11,7 @@ import static org.junit.Assert.fail;
 public class ByteUtilsTest extends BrambleTestCase {
 
 	@Test
-	public void testReadUint16() throws FormatException {
+	public void testReadUint16() {
 		byte[] b = StringUtils.fromHexString("00000000");
 		assertEquals(0, ByteUtils.readUint16(b, 1));
 		b = StringUtils.fromHexString("00000100");
@@ -34,7 +33,7 @@ public class ByteUtilsTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testReadUint32() throws FormatException {
+	public void testReadUint32() {
 		byte[] b = StringUtils.fromHexString("000000000000");
 		assertEquals(0, ByteUtils.readUint32(b, 1));
 		b = StringUtils.fromHexString("000000000100");
@@ -56,7 +55,7 @@ public class ByteUtilsTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testReadUint64() throws FormatException {
+	public void testReadUint64() {
 		byte[] b = StringUtils.fromHexString("00000000000000000000");
 		assertEquals(0L, ByteUtils.readUint64(b, 1));
 		b = StringUtils.fromHexString("00000000000000000100");

bramble-core/src/test/java/org/briarproject/bramble/util/StringUtilsTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.util;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.junit.Test;
 
@@ -25,19 +24,18 @@ public class StringUtilsTest extends BrambleTestCase {
 		assertEquals("", StringUtils.toHexString(new byte[0]));
 	}
 
-	@Test(expected = FormatException.class)
-	public void testFromHexStringRejectsInvalidLength() throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testFromHexStringRejectsInvalidLength() {
 		StringUtils.fromHexString("12345");
 	}
 
-	@Test(expected = FormatException.class)
-	public void testFromHexStringRejectsInvalidCharacter()
-			throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testFromHexStringRejectsInvalidCharacter() {
 		StringUtils.fromHexString("ABCDEFGH");
 	}
 
 	@Test
-	public void testFromHexStringUppercase() throws FormatException {
+	public void testFromHexStringUppercase() {
 		String s = "000102037F800A0B0C0D0EFF";
 		byte[] expected = new byte[] {
 				0x00, 0x01, 0x02, 0x03, 0x7F, (byte) 0x80,
@@ -47,7 +45,7 @@ public class StringUtilsTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testFromHexStringLowercase() throws FormatException {
+	public void testFromHexStringLowercase() {
 		String s = "000102037f800a0b0c0d0eff";
 		byte[] expected = new byte[] {
 				0x00, 0x01, 0x02, 0x03, 0x7F, (byte) 0x80,
@@ -57,7 +55,7 @@ public class StringUtilsTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testFromHexStringEmptyInput() throws FormatException {
+	public void testFromHexStringEmptyInput() {
 		assertArrayEquals(new byte[0], StringUtils.fromHexString(""));
 	}
 
@@ -176,52 +174,52 @@ public class StringUtilsTest extends BrambleTestCase {
 		assertEquals("", StringUtils.truncateUtf8("", 123));
 	}
 
-	@Test(expected = FormatException.class)
-	public void testMacToBytesRejectsShortMac() throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testMacToBytesRejectsShortMac() {
 		StringUtils.macToBytes("00:00:00:00:00");
 	}
 
-	@Test(expected = FormatException.class)
-	public void testMacToBytesRejectsLongMac() throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testMacToBytesRejectsLongMac() {
 		StringUtils.macToBytes("00:00:00:00:00:00:00");
 	}
 
-	@Test(expected = FormatException.class)
-	public void testMacToBytesRejectsInvalidCharacter() throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testMacToBytesRejectsInvalidCharacter() {
 		StringUtils.macToBytes("00:00:00:00:00:0g");
 	}
 
-	@Test(expected = FormatException.class)
-	public void testMacToBytesRejectsInvalidFormat() throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testMacToBytesRejectsInvalidFormat() {
 		StringUtils.macToBytes("0:000:00:00:00:00");
 	}
 
 	@Test
-	public void testMacToBytesUpperCase() throws FormatException {
+	public void testMacToBytesUpperCase() {
 		byte[] expected = new byte[] {0x0A, 0x1B, 0x2C, 0x3D, 0x4E, 0x5F};
 		String mac = "0A:1B:2C:3D:4E:5F";
 		assertArrayEquals(expected, StringUtils.macToBytes(mac));
 	}
 
 	@Test
-	public void testMacToBytesLowerCase() throws FormatException {
+	public void testMacToBytesLowerCase() {
 		byte[] expected = new byte[] {0x0A, 0x1B, 0x2C, 0x3D, 0x4E, 0x5F};
 		String mac = "0a:1b:2c:3d:4e:5f";
 		assertArrayEquals(expected, StringUtils.macToBytes(mac));
 	}
 
-	@Test(expected = FormatException.class)
-	public void testMacToStringRejectsShortMac() throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testMacToStringRejectsShortMac() {
 		StringUtils.macToString(new byte[5]);
 	}
 
-	@Test(expected = FormatException.class)
-	public void testMacToStringRejectsLongMac() throws FormatException {
+	@Test(expected = IllegalArgumentException.class)
+	public void testMacToStringRejectsLongMac() {
 		StringUtils.macToString(new byte[7]);
 	}
 
 	@Test
-	public void testMacToString() throws FormatException {
+	public void testMacToString() {
 		byte[] mac = new byte[] {0x0a, 0x1b, 0x2c, 0x3d, 0x4e, 0x5f};
 		String expected = "0A:1B:2C:3D:4E:5F";
 		assertEquals(expected, StringUtils.macToString(mac));

bramble-java/build.gradle

@@ -18,9 +18,7 @@ dependencies {
 	implementation "net.java.dev.jna:jna:$jna_version"
 	implementation "net.java.dev.jna:jna-platform:$jna_version"
 	tor "org.briarproject:tor-linux:$tor_version"
-	tor "org.briarproject:tor-windows:$tor_version"
 	tor "org.briarproject:obfs4proxy-linux:$obfs4proxy_version"
-	tor "org.briarproject:obfs4proxy-windows:$obfs4proxy_version"
 
 	annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
 

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

@@ -1,97 +0,0 @@
-package org.briarproject.bramble.plugin.tor;
-
-import com.sun.jna.platform.win32.Kernel32;
-
-import org.briarproject.bramble.api.battery.BatteryManager;
-import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.PluginCallback;
-import org.briarproject.bramble.api.plugin.PluginException;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.ResourceProvider;
-
-import java.io.File;
-import java.util.Scanner;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-
-import javax.net.SocketFactory;
-
-import static java.util.logging.Level.INFO;
-
-@NotNullByDefault
-class WindowsTorPlugin extends JavaTorPlugin {
-
-	WindowsTorPlugin(Executor ioExecutor,
-			Executor wakefulIoExecutor,
-			NetworkManager networkManager,
-			LocationUtils locationUtils,
-			SocketFactory torSocketFactory,
-			Clock clock,
-			ResourceProvider resourceProvider,
-			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager,
-			Backoff backoff,
-			TorRendezvousCrypto torRendezvousCrypto,
-			PluginCallback callback,
-			String architecture,
-			long maxLatency,
-			int maxIdleTime,
-			File torDirectory,
-			int torSocksPort,
-			int torControlPort) {
-		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
-				torSocketFactory, clock, resourceProvider,
-				circumventionProvider, batteryManager, backoff,
-				torRendezvousCrypto, callback, architecture,
-				maxLatency, maxIdleTime, torDirectory, torSocksPort,
-				torControlPort);
-	}
-
-	@Override
-	protected int getProcessId() {
-		return Kernel32.INSTANCE.GetCurrentProcessId();
-	}
-
-	@Override
-	protected void waitForTorToStart(Process torProcess)
-			throws InterruptedException, PluginException {
-		// On Windows the RunAsDaemon option has no effect, so Tor won't detach.
-		// Wait for the control port to be opened, then continue to read its
-		// stdout and stderr in a background thread until it exits.
-		BlockingQueue<Boolean> success = new ArrayBlockingQueue<>(1);
-		ioExecutor.execute(() -> {
-			boolean started = false;
-			// Read the process's stdout (and redirected stderr)
-			Scanner stdout = new Scanner(torProcess.getInputStream());
-			// Log the first line of stdout (contains Tor and library versions)
-			if (stdout.hasNextLine()) LOG.info(stdout.nextLine());
-			// Startup has succeeded when the control port is open
-			while (stdout.hasNextLine()) {
-				String line = stdout.nextLine();
-				if (!started && line.contains("Opened Control listener")) {
-					success.add(true);
-					started = true;
-				}
-			}
-			stdout.close();
-			// If the control port wasn't opened, startup has failed
-			if (!started) success.add(false);
-			// Wait for the process to exit
-			try {
-				int exit = torProcess.waitFor();
-				if (LOG.isLoggable(INFO))
-					LOG.info("Tor exited with value " + exit);
-			} catch (InterruptedException e1) {
-				LOG.warning("Interrupted while waiting for Tor to exit");
-				Thread.currentThread().interrupt();
-			}
-		});
-		// Wait for the startup result
-		if (!success.take()) throw new PluginException();
-	}
-
-}