fixing the result handlers and orientation changes

.gitignore

@@ -21,5 +21,3 @@ local.properties
 .gradle
 build/
 *.iml
-.gitignore
-src/test/

bramble-android/build.gradle

@@ -1,104 +0,0 @@
-import de.undercouch.gradle.tasks.download.Download
-import de.undercouch.gradle.tasks.download.Verify
-
-apply plugin: 'com.android.library'
-apply plugin: 'witness'
-apply plugin: 'de.undercouch.download'
-
-android {
-	compileSdkVersion 23
-	buildToolsVersion "23.0.3"
-
-	defaultConfig {
-		minSdkVersion 14
-		targetSdkVersion 22
-		versionCode 1
-		versionName "1.0"
-		consumerProguardFiles 'proguard-rules.txt'
-	}
-
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_7
-		targetCompatibility JavaVersion.VERSION_1_7
-	}
-}
-
-dependencies {
-	compile project(':bramble-core')
-	compile fileTree(dir: 'libs', include: ['*.jar'])
-	provided 'javax.annotation:jsr250-api:1.0'
-}
-
-def torBinaryDir = 'src/main/res/raw'
-
-task downloadTorGeoIp(type: Download) {
-	src 'https://briarproject.org/build/geoip-2015-12-01.zip'
-	dest "$torBinaryDir/geoip.zip"
-	onlyIfNewer true
-}
-
-task downloadTorBinaryArm(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-arm.zip'
-	dest "$torBinaryDir/tor_arm.zip"
-	onlyIfNewer true
-}
-
-task downloadTorBinaryArmPie(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-arm-pie.zip'
-	dest "$torBinaryDir/tor_arm_pie.zip"
-	onlyIfNewer true
-}
-
-task downloadTorBinaryX86(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-x86.zip'
-	dest "$torBinaryDir/tor_x86.zip"
-	onlyIfNewer true
-}
-
-task downloadTorBinaryX86Pie(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-x86-pie.zip'
-	dest "$torBinaryDir/tor_x86_pie.zip"
-	onlyIfNewer true
-}
-
-task verifyTorGeoIp(type: Verify, dependsOn: 'downloadTorGeoIp') {
-	src "$torBinaryDir/geoip.zip"
-	algorithm 'SHA-256'
-	checksum '9bcdaf0a7ba0933735328d8ec466c25c25dbb459efc2bce9e55c774eabea5162'
-}
-
-task verifyTorBinaryArm(type: Verify, dependsOn: 'downloadTorBinaryArm') {
-	src "$torBinaryDir/tor_arm.zip"
-	algorithm 'SHA-256'
-	checksum '83272962eda701cd5d74d2418651c4ff0f0b1dff51f558a292d1a1c42bf12146'
-}
-
-task verifyTorBinaryArmPie(type: Verify, dependsOn: 'downloadTorBinaryArmPie') {
-	src "$torBinaryDir/tor_arm_pie.zip"
-	algorithm 'SHA-256'
-	checksum 'd0300d1e45de11ebb24ed62b9c492be9c2e88590b7822195ab38c7a76ffcf646'
-}
-
-task verifyTorBinaryX86(type: Verify, dependsOn: 'downloadTorBinaryX86') {
-	src "$torBinaryDir/tor_x86.zip"
-	algorithm 'SHA-256'
-	checksum 'b8813d97b01ee1b9c9a4233c1b9bbe9f9f6b494ae6f9cbd84de8a3911911615e'
-}
-
-task verifyTorBinaryX86Pie(type: Verify, dependsOn: 'downloadTorBinaryX86Pie') {
-	src "$torBinaryDir/tor_x86_pie.zip"
-	algorithm 'SHA-256'
-	checksum '9c66e765aa196dc089951a1b2140cc8290305c2fcbf365121f99e01a233baf4e'
-}
-
-project.afterEvaluate {
-	preBuild.dependsOn {
-		[
-				'verifyTorGeoIp',
-				'verifyTorBinaryArm',
-				'verifyTorBinaryArmPie',
-				'verifyTorBinaryX86',
-				'verifyTorBinaryX86Pie'
-		]
-	}
-}

bramble-android/proguard-rules.txt

@@ -1,15 +0,0 @@
--keep,includedescriptorclasses class org.briarproject.** { *; }
-
--keep class org.h2.** { *; }
--dontwarn org.h2.**
--dontnote org.h2.**
-
--keep class dagger.** { *; }
--dontwarn dagger.**
--dontnote dagger.**
-
--dontwarn sun.misc.Unsafe
--dontnote com.google.common.**
-
-# UPnP library isn't used
--dontwarn org.bitlet.weupnp.**

bramble-android/src/main/AndroidManifest.xml

@@ -1,24 +0,0 @@
-<manifest
-	package="org.briarproject.bramble"
-	xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<uses-feature android:name="android.hardware.bluetooth"/>
-
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-	<uses-permission android:name="android.permission.BLUETOOTH"/>
-	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.READ_LOGS"/>
-	<uses-permission android:name="android.permission.WAKE_LOCK"/>
-	<!-- Since API 23, this is needed to add contacts via Bluetooth -->
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-
-	<application
-		android:allowBackup="false"
-		android:label="@string/app_name"
-		android:supportsRtl="true">
-
-	</application>
-
-</manifest>

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

@@ -1,13 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.plugin.AndroidPluginModule;
-import org.briarproject.bramble.system.AndroidSystemModule;
-
-import dagger.Module;
-
-@Module(includes = {
-		AndroidPluginModule.class,
-		AndroidSystemModule.class
-})
-public class BrambleAndroidModule {
-}

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

@@ -1,33 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.SeedProvider;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidSystemModule {
-
-	@Provides
-	@Singleton
-	SeedProvider provideSeedProvider(Application app) {
-		return new AndroidSeedProvider(app);
-	}
-
-	@Provides
-	LocationUtils provideLocationUtils(Application app) {
-		return new AndroidLocationUtils(app);
-	}
-
-	@Provides
-	@Singleton
-	AndroidExecutor provideAndroidExecutor(Application app) {
-		return new AndroidExecutorImpl(app);
-	}
-}

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

@@ -1,70 +0,0 @@
-package org.briarproject.bramble.util;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.os.Build;
-import android.provider.Settings;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import static android.content.Context.MODE_PRIVATE;
-
-public class AndroidUtils {
-
-	// Fake Bluetooth address returned by BluetoothAdapter on API 23 and later
-	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
-
-	private static final String STORED_REPORTS = "dev-reports";
-
-	@SuppressWarnings("deprecation")
-	public static Collection<String> getSupportedArchitectures() {
-		List<String> abis = new ArrayList<>();
-		if (Build.VERSION.SDK_INT >= 21) {
-			abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS));
-		} else {
-			abis.add(Build.CPU_ABI);
-			if (Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2);
-		}
-		return abis;
-	}
-
-	public static String getBluetoothAddress(Context ctx,
-			BluetoothAdapter adapter) {
-		// Return the adapter's address if it's valid and not fake
-		String address = adapter.getAddress();
-		if (isValidBluetoothAddress(address)) return address;
-		// Return the address from settings if it's valid and not fake
-		address = Settings.Secure.getString(ctx.getContentResolver(),
-				"bluetooth_address");
-		if (isValidBluetoothAddress(address)) return address;
-		// Let the caller know we can't find the address
-		return "";
-	}
-
-	private static boolean isValidBluetoothAddress(String address) {
-		return !StringUtils.isNullOrEmpty(address)
-				&& BluetoothAdapter.checkBluetoothAddress(address)
-				&& !address.equals(FAKE_BLUETOOTH_ADDRESS);
-	}
-
-	public static void deleteAppData(Context ctx) {
-		File dataDir = new File(ctx.getApplicationInfo().dataDir);
-		File[] children = dataDir.listFiles();
-		if (children != null) {
-			for (File child : children) {
-				if (!child.getName().equals("lib"))
-					IoUtils.deleteFileOrDir(child);
-			}
-		}
-		// Recreate the cache dir as some OpenGL drivers expect it to exist
-		new File(dataDir, "cache").mkdir();
-	}
-
-	public static File getReportDir(Context ctx) {
-		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
-	}
-}

bramble-android/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-	<string name="app_name">Bramble</string>
-</resources>

bramble-api/build.gradle

@@ -1,41 +0,0 @@
-apply plugin: 'java'
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
-
-apply plugin: 'witness'
-
-dependencies {
-	compile "com.google.dagger:dagger:2.0.2"
-	compile 'com.google.dagger:dagger-compiler:2.0.2'
-	compile 'com.google.code.findbugs:jsr305:3.0.1'
-
-	testCompile 'junit:junit:4.12'
-	testCompile "org.jmock:jmock:2.8.1"
-	testCompile "org.jmock:jmock-junit4:2.8.1"
-	testCompile "org.jmock:jmock-legacy:2.8.1"
-	testCompile "org.hamcrest:hamcrest-library:1.3"
-	testCompile "org.hamcrest:hamcrest-core:1.3"
-}
-
-dependencyVerification {
-	verify = [
-			'com.google.dagger:dagger:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
-			'com.google.dagger:dagger-compiler:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
-			'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd',
-			'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-			'com.google.dagger:dagger-producers:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
-			'com.google.guava:guava:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
-	]
-}
-
-// needed to make test output available to bramble-core and briar-core
-configurations {
-	testOutput.extendsFrom(testCompile)
-}
-task jarTest(type: Jar, dependsOn: testClasses) {
-	from sourceSets.test.output
-	classifier = 'test'
-}
-artifacts {
-	testOutput jarTest
-}

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api;
-
-import java.io.IOException;
-
-/**
- * An exception that indicates an unrecoverable formatting error.
- */
-public class FormatException extends IOException {
-}

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

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

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

@@ -1,66 +0,0 @@
-package org.briarproject.bramble.api.client;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.data.MetadataEncoder;
-import org.briarproject.bramble.api.db.Metadata;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.InvalidMessageException;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.sync.MessageContext;
-import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator;
-import org.briarproject.bramble.api.system.Clock;
-
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
-import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
-
-@Immutable
-@NotNullByDefault
-public abstract class BdfMessageValidator implements MessageValidator {
-
-	protected static final Logger LOG =
-			Logger.getLogger(BdfMessageValidator.class.getName());
-
-	protected final ClientHelper clientHelper;
-	protected final MetadataEncoder metadataEncoder;
-	protected final Clock clock;
-
-	protected BdfMessageValidator(ClientHelper clientHelper,
-			MetadataEncoder metadataEncoder, Clock clock) {
-		this.clientHelper = clientHelper;
-		this.metadataEncoder = metadataEncoder;
-		this.clock = clock;
-	}
-
-	protected abstract BdfMessageContext validateMessage(Message m, Group g,
-			BdfList body) throws InvalidMessageException, FormatException;
-
-	@Override
-	public MessageContext validateMessage(Message m, Group g)
-			throws InvalidMessageException {
-		// Reject the message if it's too far in the future
-		long now = clock.currentTimeMillis();
-		if (m.getTimestamp() - now > MAX_CLOCK_DIFFERENCE) {
-			throw new InvalidMessageException(
-					"Timestamp is too far in the future");
-		}
-		byte[] raw = m.getRaw();
-		if (raw.length <= MESSAGE_HEADER_LENGTH) {
-			throw new InvalidMessageException("Message is too short");
-		}
-		try {
-			BdfList body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
-					raw.length - MESSAGE_HEADER_LENGTH);
-			BdfMessageContext result = validateMessage(m, g, body);
-			Metadata meta = metadataEncoder.encode(result.getDictionary());
-			return new MessageContext(meta, result.getDependencies());
-		} catch (FormatException e) {
-			throw new InvalidMessageException(e);
-		}
-	}
-}

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

@@ -1,29 +0,0 @@
-package org.briarproject.bramble.api.client;
-
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.ClientId;
-import org.briarproject.bramble.api.sync.Group;
-
-@NotNullByDefault
-public interface ContactGroupFactory {
-
-	/**
-	 * Creates a group that is not shared with any contacts.
-	 */
-	Group createLocalGroup(ClientId clientId);
-
-	/**
-	 * Creates a group for the given client to share with the given contact.
-	 */
-	Group createContactGroup(ClientId clientId, Contact contact);
-
-	/**
-	 * Creates a group for the given client to share between the given authors
-	 * identified by their AuthorIds.
-	 */
-	Group createContactGroup(ClientId clientId, AuthorId authorId1,
-			AuthorId authorId2);
-
-}

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

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface ContactExchangeListener {
-
-	void contactExchangeSucceeded(Author remoteAuthor);
-
-	/**
-	 * The exchange failed because the contact already exists.
-	 */
-	void duplicateContact(Author remoteAuthor);
-
-	/**
-	 * A general failure.
-	 */
-	void contactExchangeFailed();
-}

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

@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-
-/**
- * A task for conducting a contact information exchange with a remote peer.
- */
-@NotNullByDefault
-public interface ContactExchangeTask {
-
-	/**
-	 * Exchanges contact information with a remote peer.
-	 */
-	void startExchange(ContactExchangeListener listener,
-			LocalAuthor localAuthor, SecretKey masterSecret,
-			DuplexTransportConnection conn, TransportId transportId,
-			boolean alice);
-}

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

@@ -1,104 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collection;
-
-@NotNullByDefault
-public interface ContactManager {
-
-	/**
-	 * Registers a hook to be called whenever a contact is added.
-	 */
-	void registerAddContactHook(AddContactHook hook);
-
-	/**
-	 * Registers a hook to be called whenever a contact is removed.
-	 */
-	void registerRemoveContactHook(RemoveContactHook hook);
-
-	/**
-	 * Stores a contact within the given transaction associated with the given
-	 * local and remote pseudonyms, and returns an ID for the contact.
-	 */
-	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			SecretKey master, long timestamp, boolean alice, boolean verified,
-			boolean active) throws DbException;
-
-	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
-	 * and returns an ID for the contact.
-	 */
-	ContactId addContact(Author remote, AuthorId local,
-			SecretKey master, long timestamp, boolean alice, boolean verified,
-			boolean active) throws DbException;
-
-	/**
-	 * Returns the contact with the given ID.
-	 */
-	Contact getContact(ContactId c) throws DbException;
-
-	/**
-	 * Returns the contact with the given remoteAuthorId
-	 * that was added by the LocalAuthor with the given localAuthorId
-	 *
-	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
-	 */
-	Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
-			throws DbException;
-
-	/**
-	 * Returns the contact with the given remoteAuthorId
-	 * that was added by the LocalAuthor with the given localAuthorId
-	 *
-	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
-	 */
-	Contact getContact(Transaction txn, AuthorId remoteAuthorId,
-			AuthorId localAuthorId) throws DbException;
-
-	/**
-	 * Returns all active contacts.
-	 */
-	Collection<Contact> getActiveContacts() throws DbException;
-
-	/**
-	 * Removes a contact and all associated state.
-	 */
-	void removeContact(ContactId c) throws DbException;
-
-	/**
-	 * Removes a contact and all associated state.
-	 */
-	void removeContact(Transaction txn, ContactId c) throws DbException;
-
-	/**
-	 * Marks a contact as active or inactive.
-	 */
-	void setContactActive(Transaction txn, ContactId c, boolean active)
-			throws DbException;
-
-	/**
-	 * Return true if a contact with this name and public key already exists
-	 */
-	boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
-			AuthorId localAuthorId) throws DbException;
-
-	/**
-	 * Return true if a contact with this name and public key already exists
-	 */
-	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
-			throws DbException;
-
-	interface AddContactHook {
-		void addingContact(Transaction txn, Contact c) throws DbException;
-	}
-
-	interface RemoveContactHook {
-		void removingContact(Transaction txn, Contact c) throws DbException;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java

@@ -1,31 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is added.
- */
-@Immutable
-@NotNullByDefault
-public class ContactAddedEvent extends Event {
-
-	private final ContactId contactId;
-	private final boolean active;
-
-	public ContactAddedEvent(ContactId contactId, boolean active) {
-		this.contactId = contactId;
-		this.active = active;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is removed.
- */
-@Immutable
-@NotNullByDefault
-public class ContactRemovedEvent extends Event {
-
-	private final ContactId contactId;
-
-	public ContactRemovedEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java

@@ -1,31 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is marked active or inactive.
- */
-@Immutable
-@NotNullByDefault
-public class ContactStatusChangedEvent extends Event {
-
-	private final ContactId contactId;
-	private final boolean active;
-
-	public ContactStatusChangedEvent(ContactId contactId, boolean active) {
-		this.contactId = contactId;
-		this.active = active;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a contact is verified.
- */
-@Immutable
-@NotNullByDefault
-public class ContactVerifiedEvent extends Event {
-
-	private final ContactId contactId;
-
-	public ContactVerifiedEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-}

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

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * The private half of a public/private {@link KeyPair}.
- */
-@NotNullByDefault
-public interface PrivateKey {
-
-	/**
-	 * Returns the encoded representation of this key.
-	 */
-	byte[] getEncoded();
-}

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

@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * A deterministic pseudo-random number generator.
- */
-@NotNullByDefault
-public interface PseudoRandom {
-
-	byte[] nextBytes(int bytes);
-}

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

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * The public half of a public/private {@link KeyPair}.
- */
-@NotNullByDefault
-public interface PublicKey {
-
-	/**
-	 * Returns the encoded representation of this key.
-	 */
-	byte[] getEncoded();
-}

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

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface StreamEncrypter {
-
-	/**
-	 * Encrypts the given frame and writes it to the stream.
-	 */
-	void writeFrame(byte[] payload, int payloadLength, int paddingLength,
-			boolean finalFrame) throws IOException;
-
-	/**
-	 * Flushes the stream.
-	 */
-	void flush() throws IOException;
-}

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-public interface BdfWriterFactory {
-
-	BdfWriter createWriter(OutputStream out);
-}

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.db.Metadata;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface MetadataEncoder {
-
-	Metadata encode(BdfDictionary d) throws FormatException;
-}

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.db.Metadata;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface MetadataParser {
-
-	BdfDictionary parse(Metadata m) throws FormatException;
-}

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface ObjectReader<T> {
-
-	T readObject(BdfReader r) throws IOException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/event/Event.java

@@ -1,7 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-/**
- * An abstract superclass for events.
- */
-public abstract class Event {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java

@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface EventBus {
-
-	/**
-	 * Adds a listener to be notified when events occur.
-	 */
-	void addListener(EventListener l);
-
-	/**
-	 * Removes a listener.
-	 */
-	void removeListener(EventListener l);
-
-	/**
-	 * Notifies all listeners of an event.
-	 */
-	void broadcast(Event e);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java

@@ -1,16 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * An interface for receiving notifications when events occur.
- */
-@NotNullByDefault
-public interface EventListener {
-
-	/**
-	 * Called when an event is broadcast. Implementations of this method must
-	 * not block.
-	 */
-	void eventOccurred(Event e);
-}

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

@@ -1,38 +0,0 @@
-package org.briarproject.bramble.api.identity;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.identity.Author.Status;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface IdentityManager {
-
-	/**
-	 * Stores the local pseudonym.
-	 */
-	void registerLocalAuthor(LocalAuthor a) throws DbException;
-
-	/**
-	 * Returns the cached main local identity, non-blocking, or loads it from
-	 * the db, blocking
-	 */
-	LocalAuthor getLocalAuthor() throws DbException;
-
-	/**
-	 * Returns the cached main local identity, non-blocking, or loads it from
-	 * the db, blocking, within the given Transaction.
-	 */
-	LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
-
-	/**
-	 * Returns the trust-level status of the author
-	 */
-	Status getAuthorStatus(AuthorId a) throws DbException;
-
-	/**
-	 * Returns the trust-level status of the author
-	 */
-	Status getAuthorStatus(Transaction txn, AuthorId a) throws DbException;
-
-}

bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.identity.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a local pseudonym is added.
- */
-@Immutable
-@NotNullByDefault
-public class LocalAuthorAddedEvent extends Event {
-
-	private final AuthorId authorId;
-
-	public LocalAuthorAddedEvent(AuthorId authorId) {
-		this.authorId = authorId;
-	}
-
-	public AuthorId getAuthorId() {
-		return authorId;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.identity.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a local pseudonym is removed.
- */
-@Immutable
-@NotNullByDefault
-public class LocalAuthorRemovedEvent extends Event {
-
-	private final AuthorId authorId;
-
-	public LocalAuthorRemovedEvent(AuthorId authorId) {
-		this.authorId = authorId;
-	}
-
-	public AuthorId getAuthorId() {
-		return authorId;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/invitation/InvitationConstants.java

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.invitation;
-
-public interface InvitationConstants {
-
-	/**
-	 * The connection timeout in milliseconds.
-	 */
-	long CONNECTION_TIMEOUT = 60 * 1000;
-
-	/**
-	 * The confirmation timeout in milliseconds.
-	 */
-	long CONFIRMATION_TIMEOUT = 60 * 1000;
-
-	/**
-	 * The number of bits in an invitation or confirmation code. Codes must fit
-	 * into six decimal digits.
-	 */
-	int CODE_BITS = 19;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/invitation/InvitationTaskFactory.java

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.invitation;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * Creates tasks for exchanging invitations with remote peers.
- */
-@NotNullByDefault
-public interface InvitationTaskFactory {
-
-	/**
-	 * Creates a task using the given local and remote invitation codes.
-	 */
-	InvitationTask createTask(int localCode, int remoteCode);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java

@@ -1,36 +0,0 @@
-package org.briarproject.bramble.api.keyagreement;
-
-public interface KeyAgreementConstants {
-
-	/**
-	 * The current version of the BQP protocol.
-	 */
-	byte PROTOCOL_VERSION = 2;
-
-	/**
-	 * The length of the record header in bytes.
-	 */
-	int RECORD_HEADER_LENGTH = 4;
-
-	/**
-	 * The offset of the payload length in the record header, in bytes.
-	 */
-	int RECORD_HEADER_PAYLOAD_LENGTH_OFFSET = 2;
-
-	/**
-	 * The length of the BQP key commitment in bytes.
-	 */
-	int COMMIT_LENGTH = 16;
-
-	long CONNECTION_TIMEOUT = 20 * 1000; // Milliseconds
-
-	/**
-	 * The transport identifier for Bluetooth.
-	 */
-	int TRANSPORT_ID_BLUETOOTH = 0;
-
-	/**
-	 * The transport identifier for LAN.
-	 */
-	int TRANSPORT_ID_LAN = 1;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTaskFactory.java

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.keyagreement;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-/**
- * Manages tasks for conducting key agreements with remote peers.
- */
-@NotNullByDefault
-public interface KeyAgreementTaskFactory {
-
-	/**
-	 * Gets the current key agreement task.
-	 */
-	KeyAgreementTask createTask();
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/PayloadEncoder.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.keyagreement;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface PayloadEncoder {
-
-	byte[] encode(Payload p);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementAbortedEvent.java

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a BQP protocol aborts.
- */
-@Immutable
-@NotNullByDefault
-public class KeyAgreementAbortedEvent extends Event {
-
-	private final boolean remoteAborted;
-
-	public KeyAgreementAbortedEvent(boolean remoteAborted) {
-		this.remoteAborted = remoteAborted;
-	}
-
-	public boolean didRemoteAbort() {
-		return remoteAborted;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFailedEvent.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * An event that is broadcast when a BQP connection cannot be created.
- */
-public class KeyAgreementFailedEvent extends Event {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementFinishedEvent.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a BQP protocol completes.
- */
-@Immutable
-@NotNullByDefault
-public class KeyAgreementFinishedEvent extends Event {
-
-	private final KeyAgreementResult result;
-
-	public KeyAgreementFinishedEvent(KeyAgreementResult result) {
-		this.result = result;
-	}
-
-	public KeyAgreementResult getResult() {
-		return result;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementListeningEvent.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.keyagreement.Payload;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a BQP task is listening.
- */
-@Immutable
-@NotNullByDefault
-public class KeyAgreementListeningEvent extends Event {
-
-	private final Payload localPayload;
-
-	public KeyAgreementListeningEvent(Payload localPayload) {
-		this.localPayload = localPayload;
-	}
-
-	public Payload getLocalPayload() {
-		return localPayload;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementStartedEvent.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * An event that is broadcast when a BQP protocol completes.
- */
-public class KeyAgreementStartedEvent extends Event {
-}

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

@@ -1,74 +0,0 @@
-package org.briarproject.bramble.api.lifecycle;
-
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Client;
-
-import java.util.concurrent.ExecutorService;
-
-import javax.annotation.Nullable;
-
-/**
- * Manages the lifecycle of the app, starting {@link Client Clients}, starting
- * and stopping {@link Service Services}, shutting down
- * {@link ExecutorService ExecutorServices}, and opening and closing the
- * {@link DatabaseComponent}.
- */
-@NotNullByDefault
-public interface LifecycleManager {
-
-	/**
-	 * The result of calling {@link #startServices(String)}.
-	 */
-	enum StartResult {
-		ALREADY_RUNNING, DB_ERROR, SERVICE_ERROR, SUCCESS
-	}
-
-	/**
-	 * Registers a {@link Service} to be started and stopped.
-	 */
-	void registerService(Service s);
-
-	/**
-	 * Registers a {@link Client} to be started.
-	 */
-	void registerClient(Client c);
-
-	/**
-	 * Registers an {@link ExecutorService} to be shut down.
-	 */
-	void registerForShutdown(ExecutorService e);
-
-	/**
-	 * Opens the {@link DatabaseComponent}, optionally creates a local author
-	 * with the provided nickname, and starts any registered
-	 * {@link Client Clients} and {@link Service Services}.
-	 */
-	StartResult startServices(@Nullable String nickname);
-
-	/**
-	 * Stops any registered {@link Service Services}, shuts down any
-	 * registered {@link ExecutorService ExecutorServices}, and closes the
-	 * {@link DatabaseComponent}.
-	 */
-	void stopServices();
-
-	/**
-	 * Waits for the {@link DatabaseComponent} to be opened before returning.
-	 */
-	void waitForDatabase() throws InterruptedException;
-
-	/**
-	 * Waits for the {@link DatabaseComponent} to be opened and all registered
-	 * {@link Client Clients} and {@link Service Services} to start before
-	 * returning.
-	 */
-	void waitForStartup() throws InterruptedException;
-
-	/**
-	 * Waits for all registered {@link Service Services} to stop, all
-	 * registered {@link ExecutorService ExecutorServices} to shut down, and
-	 * the {@link DatabaseComponent} to be closed before returning.
-	 */
-	void waitForShutdown() throws InterruptedException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/event/ShutdownEvent.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.lifecycle.event;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * An event that is broadcast when the app is shutting down.
- */
-public class ShutdownEvent extends Event {
-}

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

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
-
-import java.util.Collection;
-
-@NotNullByDefault
-public interface PluginConfig {
-
-	Collection<DuplexPluginFactory> getDuplexFactories();
-
-	Collection<SimplexPluginFactory> getSimplexFactories();
-}

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

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-/**
- * An exception that indicates an error starting or stopping a {@link Plugin}.
- */
-public class PluginException extends Exception {
-
-	public PluginException() {
-		super();
-	}
-
-	public PluginException(Throwable cause) {
-		super(cause);
-	}
-}

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

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.plugin.duplex;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportConnectionReader;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
-
-/**
- * An interface for reading and writing data over a duplex transport. The
- * connection is not responsible for encrypting/decrypting or authenticating
- * the data.
- */
-@NotNullByDefault
-public interface DuplexTransportConnection {
-
-	/**
-	 * Returns a {@link TransportConnectionReader TransportConnectionReader}
-	 * for reading from the connection.
-	 */
-	TransportConnectionReader getReader();
-
-	/**
-	 * Returns a {@link TransportConnectionWriter TransportConnectionWriter}
-	 * for writing to the connection.
-	 */
-	TransportConnectionWriter getWriter();
-}

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.plugin.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a transport is disabled.
- */
-@Immutable
-@NotNullByDefault
-public class TransportDisabledEvent extends Event {
-
-	private final TransportId transportId;
-
-	public TransportDisabledEvent(TransportId transportId) {
-		this.transportId = transportId;
-	}
-
-	public TransportId getTransportId() {
-		return transportId;
-	}
-}

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.plugin.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.TransportId;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a transport is enabled.
- */
-@Immutable
-@NotNullByDefault
-public class TransportEnabledEvent extends Event {
-
-	private final TransportId transportId;
-
-	public TransportEnabledEvent(TransportId transportId) {
-		this.transportId = transportId;
-	}
-
-	public TransportId getTransportId() {
-		return transportId;
-	}
-}

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

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.plugin.simplex;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.PluginCallback;
-import org.briarproject.bramble.api.plugin.TransportConnectionReader;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
-
-/**
- * An interface for handling readers and writers created by a simplex transport
- * plugin.
- */
-@NotNullByDefault
-public interface SimplexPluginCallback extends PluginCallback {
-
-	void readerCreated(TransportConnectionReader r);
-
-	void writerCreated(ContactId c, TransportConnectionWriter w);
-}

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

@@ -1,14 +0,0 @@
-package org.briarproject.bramble.api.properties;
-
-public interface TransportPropertyConstants {
-
-	/**
-	 * The maximum number of properties per transport.
-	 */
-	int MAX_PROPERTIES_PER_TRANSPORT = 100;
-
-	/**
-	 * The maximum length of a property's key or value in UTF-8 bytes.
-	 */
-	int MAX_PROPERTY_LENGTH = 100;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReadHandler.java

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.reliability;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface ReadHandler {
-
-	void handleRead(byte[] b) throws IOException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/reliability/ReliabilityLayerFactory.java

@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.reliability;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface ReliabilityLayerFactory {
-
-	/**
-	 * Returns a reliability layer that writes to the given lower layer.
-	 */
-	ReliabilityLayer createReliabilityLayer(WriteHandler writeHandler);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/reliability/WriteHandler.java

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.reliability;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface WriteHandler {
-
-	void handleWrite(byte[] b) throws IOException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java

@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.reporting;
-
-import org.briarproject.bramble.api.crypto.PublicKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface DevConfig {
-
-	PublicKey getDevPublicKey();
-
-	String getDevOnionAddress();
-}

bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevReporter.java

@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.reporting;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-/**
- * A task for reporting back to the developers.
- */
-@NotNullByDefault
-public interface DevReporter {
-
-	/**
-	 * Stores an encrypted report on disk to be sent later.
-	 *
-	 * @param reportDir the directory where reports are stored.
-	 * @param report the report in the form expected by the server.
-	 * @throws FileNotFoundException if the report could not be written.
-	 */
-	void encryptReportToFile(File reportDir, String filename, String report)
-			throws FileNotFoundException;
-
-	/**
-	 * Sends any reports previously stored on disk.
-	 *
-	 * @param reportDir the directory where reports are stored.
-	 */
-	void sendReports(File reportDir);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/settings/Settings.java

@@ -1,6 +0,0 @@
-package org.briarproject.bramble.api.settings;
-
-import org.briarproject.bramble.api.StringMap;
-
-public class Settings extends StringMap {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.settings;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface SettingsManager {
-
-	/**
-	 * Returns all settings in the given namespace.
-	 */
-	Settings getSettings(String namespace) throws DbException;
-
-	/**
-	 * Merges the given settings with any existing settings in the given
-	 * namespace.
-	 */
-	void mergeSettings(Settings s, String namespace) throws DbException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.settings.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when one or more settings are updated.
- */
-@Immutable
-@NotNullByDefault
-public class SettingsUpdatedEvent extends Event {
-
-	private final String namespace;
-
-	public SettingsUpdatedEvent(String namespace) {
-		this.namespace = namespace;
-	}
-
-	public String getNamespace() {
-		return namespace;
-	}
-}

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

@@ -1,14 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface Client {
-
-	/**
-	 * Called at startup to create any local state needed by the client.
-	 */
-	void createLocalState(Transaction txn) throws DbException;
-}

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

@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface GroupFactory {
-
-	/**
-	 * Creates a group with the given client ID and descriptor.
-	 */
-	Group createGroup(ClientId c, byte[] descriptor);
-}

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.InputStream;
-
-@NotNullByDefault
-public interface RecordReaderFactory {
-
-	RecordReader createRecordReader(InputStream in);
-}

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

@@ -1,13 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-/**
- * Record types for the sync protocol.
- */
-public interface RecordTypes {
-
-	byte ACK = 0;
-	byte MESSAGE = 1;
-	byte OFFER = 2;
-	byte REQUEST = 3;
-
-}

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-public interface RecordWriterFactory {
-
-	RecordWriter createRecordWriter(OutputStream out);
-}

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

@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import java.util.Collection;
-
-/**
- * A record requesting one or more {@link Message Messages} from the recipient.
- */
-public class Request {
-
-	private final Collection<MessageId> requested;
-
-	public Request(Collection<MessageId> requested) {
-		this.requested = requested;
-	}
-
-	/**
-	 * Returns the identifiers of the requested messages.
-	 */
-	public Collection<MessageId> getMessageIds() {
-		return requested;
-	}
-}

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

@@ -1,44 +0,0 @@
-package org.briarproject.bramble.api.sync;
-
-import org.briarproject.bramble.api.UniqueId;
-
-public interface SyncConstants {
-
-	/**
-	 * The current version of the sync protocol.
-	 */
-	byte PROTOCOL_VERSION = 0;
-
-	/**
-	 * The length of the record header in bytes.
-	 */
-	int RECORD_HEADER_LENGTH = 4;
-
-	/**
-	 * The maximum length of the record payload in bytes.
-	 */
-	int MAX_RECORD_PAYLOAD_LENGTH = 48 * 1024; // 48 KiB
-
-	/** The maximum length of a group descriptor in bytes. */
-	int MAX_GROUP_DESCRIPTOR_LENGTH = 16 * 1024; // 16 KiB
-
-	/**
-	 * The length of the message header in bytes.
-	 */
-	int MESSAGE_HEADER_LENGTH = UniqueId.LENGTH + 8;
-
-	/**
-	 * The maximum length of a message body in bytes.
-	 */
-	int MAX_MESSAGE_BODY_LENGTH = 32 * 1024; // 32 KiB
-
-	/**
-	 * The maximum length of a message in bytes.
-	 */
-	int MAX_MESSAGE_LENGTH = MESSAGE_HEADER_LENGTH + MAX_MESSAGE_BODY_LENGTH;
-
-	/**
-	 * The maximum number of message IDs in an ack, offer or request record.
-	 */
-	int MAX_MESSAGE_IDS = MAX_RECORD_PAYLOAD_LENGTH / UniqueId.LENGTH;
-}

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a group is added to the database.
- */
-@Immutable
-@NotNullByDefault
-public class GroupAddedEvent extends Event {
-
-	private final Group group;
-
-	public GroupAddedEvent(Group group) {
-		this.group = group;
-	}
-
-	public Group getGroup() {
-		return group;
-	}
-}

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a group is removed from the database.
- */
-@Immutable
-@NotNullByDefault
-public class GroupRemovedEvent extends Event {
-
-	private final Group group;
-
-	public GroupRemovedEvent(Group group) {
-		this.group = group;
-	}
-
-	public Group getGroup() {
-		return group;
-	}
-}

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

@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collection;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when the visibility of a group is updated.
- */
-@Immutable
-@NotNullByDefault
-public class GroupVisibilityUpdatedEvent extends Event {
-
-	private final Collection<ContactId> affected;
-
-	public GroupVisibilityUpdatedEvent(Collection<ContactId> affected) {
-		this.affected = affected;
-	}
-
-	/**
-	 * Returns the contacts affected by the update.
-	 */
-	public Collection<ContactId> getAffectedContacts() {
-		return affected;
-	}
-}

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

@@ -1,50 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.Message;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is added to the database.
- */
-@Immutable
-@NotNullByDefault
-public class MessageAddedEvent extends Event {
-
-	private final Message message;
-	@Nullable
-	private final ContactId contactId;
-
-	public MessageAddedEvent(Message message, @Nullable ContactId contactId) {
-		this.message = message;
-		this.contactId = contactId;
-	}
-
-	/**
-	 * Returns the message that was added.
-	 */
-	public Message getMessage() {
-		return message;
-	}
-
-	/**
-	 * Returns the ID of the group to which the message belongs.
-	 */
-	public GroupId getGroupId() {
-		return message.getGroupId();
-	}
-
-	/**
-	 * Returns the ID of the contact from which the message was received, or
-	 * null if the message was locally generated.
-	 */
-	@Nullable
-	public ContactId getContactId() {
-		return contactId;
-	}
-}

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is requested by a contact.
- */
-@Immutable
-@NotNullByDefault
-public class MessageRequestedEvent extends Event {
-
-	private final ContactId contactId;
-
-	public MessageRequestedEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-}

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is shared.
- */
-@Immutable
-@NotNullByDefault
-public class MessageSharedEvent extends Event {
-
-	private final MessageId messageId;
-
-	public MessageSharedEvent(MessageId message) {
-		this.messageId = message;
-	}
-
-	public MessageId getMessageId() {
-		return messageId;
-	}
-}

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

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message is received from, or offered by, a
- * contact and needs to be acknowledged.
- */
-@Immutable
-@NotNullByDefault
-public class MessageToAckEvent extends Event {
-
-	private final ContactId contactId;
-
-	public MessageToAckEvent(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-}

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

@@ -1,35 +0,0 @@
-package org.briarproject.bramble.api.sync.event;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-
-import java.util.Collection;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when messages are acked by a contact.
- */
-@Immutable
-@NotNullByDefault
-public class MessagesAckedEvent extends Event {
-
-	private final ContactId contactId;
-	private final Collection<MessageId> acked;
-
-	public MessagesAckedEvent(ContactId contactId,
-			Collection<MessageId> acked) {
-		this.contactId = contactId;
-		this.acked = acked;
-	}
-
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-	public Collection<MessageId> getMessageIds() {
-		return acked;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java

@@ -1,23 +0,0 @@
-package org.briarproject.bramble.api.transport;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.InputStream;
-
-@NotNullByDefault
-public interface StreamReaderFactory {
-
-	/**
-	 * Creates an {@link InputStream InputStream} for reading from a
-	 * transport stream.
-	 */
-	InputStream createStreamReader(InputStream in, StreamContext ctx);
-
-	/**
-	 * Creates an {@link InputStream InputStream} for reading from an
-	 * invitation stream.
-	 */
-	InputStream createInvitationStreamReader(InputStream in,
-			SecretKey headerKey);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java

@@ -1,23 +0,0 @@
-package org.briarproject.bramble.api.transport;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-public interface StreamWriterFactory {
-
-	/**
-	 * Creates an {@link OutputStream OutputStream} for writing to a
-	 * transport stream
-	 */
-	OutputStream createStreamWriter(OutputStream out, StreamContext ctx);
-
-	/**
-	 * Creates an {@link OutputStream OutputStream} for writing to an
-	 * invitation stream.
-	 */
-	OutputStream createInvitationStreamWriter(OutputStream out,
-			SecretKey headerKey);
-}

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

@@ -1,67 +0,0 @@
-package org.briarproject.bramble.util;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.data.BdfDictionary;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-
-@NotNullByDefault
-public class ValidationUtils {
-
-	public static void checkLength(@Nullable String s, int minLength,
-			int maxLength) throws FormatException {
-		if (s != null) {
-			int length = StringUtils.toUtf8(s).length;
-			if (length < minLength) throw new FormatException();
-			if (length > maxLength) throw new FormatException();
-		}
-	}
-
-	public static void checkLength(@Nullable String s, int length)
-			throws FormatException {
-		if (s != null && StringUtils.toUtf8(s).length != length)
-			throw new FormatException();
-	}
-
-	public static void checkLength(@Nullable byte[] b, int minLength,
-			int maxLength) throws FormatException {
-		if (b != null) {
-			if (b.length < minLength) throw new FormatException();
-			if (b.length > maxLength) throw new FormatException();
-		}
-	}
-
-	public static void checkLength(@Nullable byte[] b, int length)
-			throws FormatException {
-		if (b != null && b.length != length) throw new FormatException();
-	}
-
-	public static void checkSize(@Nullable BdfList list, int minSize,
-			int maxSize) throws FormatException {
-		if (list != null) {
-			if (list.size() < minSize) throw new FormatException();
-			if (list.size() > maxSize) throw new FormatException();
-		}
-	}
-
-	public static void checkSize(@Nullable BdfList list, int size)
-			throws FormatException {
-		if (list != null && list.size() != size) throw new FormatException();
-	}
-
-	public static void checkSize(@Nullable BdfDictionary dictionary,
-			int minSize, int maxSize) throws FormatException {
-		if (dictionary != null) {
-			if (dictionary.size() < minSize) throw new FormatException();
-			if (dictionary.size() > maxSize) throw new FormatException();
-		}
-	}
-
-	public static void checkSize(@Nullable BdfDictionary dictionary, int size)
-			throws FormatException {
-		if (dictionary != null && dictionary.size() != size)
-			throw new FormatException();
-	}
-}

bramble-core/build.gradle

@@ -1,37 +0,0 @@
-plugins {
-	id "java"
-	id "net.ltgt.apt" version "0.9"
-	id "idea"
-}
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
-
-apply plugin: 'witness'
-
-dependencies {
-	compile project(':bramble-api')
-	compile fileTree(dir: 'libs', include: '*.jar')
-	compile 'com.madgag.spongycastle:core:1.54.0.0'
-	compile 'com.h2database:h2:1.4.190'
-
-	testCompile project(path: ':bramble-api', configuration: 'testOutput')
-}
-
-dependencyVerification {
-	verify = [
-			'com.madgag.spongycastle:core:1e7fa4b19ccccd1011364ab838d0b4702470c178bbbdd94c5c90b2d4d749ea1e',
-			'com.h2database:h2:23ba495a07bbbb3bd6c3084d10a96dad7a23741b8b6d64b213459a784195a98c'
-	]
-}
-
-// needed to make test output available to bramble-j2se
-configurations {
-	testOutput.extendsFrom(testCompile)
-}
-task jarTest(type: Jar, dependsOn: testClasses) {
-	from sourceSets.test.output
-	classifier = 'test'
-}
-artifacts {
-	testOutput jarTest
-}

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

@@ -1,35 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.contact.ContactModule;
-import org.briarproject.bramble.crypto.CryptoModule;
-import org.briarproject.bramble.db.DatabaseExecutorModule;
-import org.briarproject.bramble.identity.IdentityModule;
-import org.briarproject.bramble.lifecycle.LifecycleModule;
-import org.briarproject.bramble.plugin.PluginModule;
-import org.briarproject.bramble.properties.PropertiesModule;
-import org.briarproject.bramble.sync.SyncModule;
-import org.briarproject.bramble.system.SystemModule;
-import org.briarproject.bramble.transport.TransportModule;
-
-public interface BrambleCoreEagerSingletons {
-
-	void inject(ContactModule.EagerSingletons init);
-
-	void inject(CryptoModule.EagerSingletons init);
-
-	void inject(DatabaseExecutorModule.EagerSingletons init);
-
-	void inject(IdentityModule.EagerSingletons init);
-
-	void inject(LifecycleModule.EagerSingletons init);
-
-	void inject(PluginModule.EagerSingletons init);
-
-	void inject(PropertiesModule.EagerSingletons init);
-
-	void inject(SyncModule.EagerSingletons init);
-
-	void inject(SystemModule.EagerSingletons init);
-
-	void inject(TransportModule.EagerSingletons init);
-}

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

@@ -1,61 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.client.ClientModule;
-import org.briarproject.bramble.contact.ContactModule;
-import org.briarproject.bramble.crypto.CryptoModule;
-import org.briarproject.bramble.data.DataModule;
-import org.briarproject.bramble.db.DatabaseExecutorModule;
-import org.briarproject.bramble.db.DatabaseModule;
-import org.briarproject.bramble.event.EventModule;
-import org.briarproject.bramble.identity.IdentityModule;
-import org.briarproject.bramble.invitation.InvitationModule;
-import org.briarproject.bramble.keyagreement.KeyAgreementModule;
-import org.briarproject.bramble.lifecycle.LifecycleModule;
-import org.briarproject.bramble.plugin.PluginModule;
-import org.briarproject.bramble.properties.PropertiesModule;
-import org.briarproject.bramble.reliability.ReliabilityModule;
-import org.briarproject.bramble.reporting.ReportingModule;
-import org.briarproject.bramble.settings.SettingsModule;
-import org.briarproject.bramble.socks.SocksModule;
-import org.briarproject.bramble.sync.SyncModule;
-import org.briarproject.bramble.system.SystemModule;
-import org.briarproject.bramble.transport.TransportModule;
-
-import dagger.Module;
-
-@Module(includes = {
-		ClientModule.class,
-		ContactModule.class,
-		CryptoModule.class,
-		DataModule.class,
-		DatabaseModule.class,
-		DatabaseExecutorModule.class,
-		EventModule.class,
-		IdentityModule.class,
-		InvitationModule.class,
-		KeyAgreementModule.class,
-		LifecycleModule.class,
-		PluginModule.class,
-		PropertiesModule.class,
-		ReliabilityModule.class,
-		ReportingModule.class,
-		SettingsModule.class,
-		SocksModule.class,
-		SyncModule.class,
-		SystemModule.class,
-		TransportModule.class
-})
-public class BrambleCoreModule {
-
-	public static void initEagerSingletons(BrambleCoreEagerSingletons c) {
-		c.inject(new ContactModule.EagerSingletons());
-		c.inject(new CryptoModule.EagerSingletons());
-		c.inject(new DatabaseExecutorModule.EagerSingletons());
-		c.inject(new IdentityModule.EagerSingletons());
-		c.inject(new LifecycleModule.EagerSingletons());
-		c.inject(new PluginModule.EagerSingletons());
-		c.inject(new SyncModule.EagerSingletons());
-		c.inject(new SystemModule.EagerSingletons());
-		c.inject(new TransportModule.EagerSingletons());
-	}
-}

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

@@ -1,36 +0,0 @@
-package org.briarproject.bramble.client;
-
-import org.briarproject.bramble.api.client.ClientHelper;
-import org.briarproject.bramble.api.client.ContactGroupFactory;
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.data.BdfReaderFactory;
-import org.briarproject.bramble.api.data.BdfWriterFactory;
-import org.briarproject.bramble.api.data.MetadataEncoder;
-import org.briarproject.bramble.api.data.MetadataParser;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.sync.GroupFactory;
-import org.briarproject.bramble.api.sync.MessageFactory;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class ClientModule {
-
-	@Provides
-	ClientHelper provideClientHelper(DatabaseComponent db,
-			MessageFactory messageFactory, BdfReaderFactory bdfReaderFactory,
-			BdfWriterFactory bdfWriterFactory, MetadataParser metadataParser,
-			MetadataEncoder metadataEncoder, CryptoComponent cryptoComponent) {
-		return new ClientHelperImpl(db, messageFactory, bdfReaderFactory,
-				bdfWriterFactory, metadataParser, metadataEncoder,
-				cryptoComponent);
-	}
-
-	@Provides
-	ContactGroupFactory provideContactGroupFactory(GroupFactory groupFactory,
-			ClientHelper clientHelper) {
-		return new ContactGroupFactoryImpl(groupFactory, clientHelper);
-	}
-
-}

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

@@ -1,46 +0,0 @@
-package org.briarproject.bramble.crypto;
-
-import org.briarproject.bramble.api.crypto.PrivateKey;
-import org.briarproject.bramble.api.crypto.PublicKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.security.GeneralSecurityException;
-
-@NotNullByDefault
-interface Signature {
-
-	/**
-	 * @see {@link java.security.Signature#initSign(java.security.PrivateKey)}
-	 */
-	void initSign(PrivateKey k) throws GeneralSecurityException;
-
-	/**
-	 * @see {@link java.security.Signature#initVerify(java.security.PublicKey)}
-	 */
-	void initVerify(PublicKey k) throws GeneralSecurityException;
-
-	/**
-	 * @see {@link java.security.Signature#update(byte)}
-	 */
-	void update(byte b);
-
-	/**
-	 * @see {@link java.security.Signature#update(byte[])}
-	 */
-	void update(byte[] b);
-
-	/**
-	 * @see {@link java.security.Signature#update(byte[], int, int)}
-	 */
-	void update(byte[] b, int off, int len);
-
-	/**
-	 * @see {@link java.security.Signature#sign()}
-	 */
-	byte[] sign();
-
-	/**
-	 * @see {@link java.security.Signature#verify(byte[])}
-	 */
-	boolean verify(byte[] signature);
-}

bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderFactoryImpl.java

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.data;
-
-import org.briarproject.bramble.api.data.BdfReader;
-import org.briarproject.bramble.api.data.BdfReaderFactory;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.InputStream;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.data.BdfReader.DEFAULT_NESTED_LIMIT;
-
-@Immutable
-@NotNullByDefault
-class BdfReaderFactoryImpl implements BdfReaderFactory {
-
-	@Override
-	public BdfReader createReader(InputStream in) {
-		return new BdfReaderImpl(in, DEFAULT_NESTED_LIMIT);
-	}
-
-	@Override
-	public BdfReader createReader(InputStream in, int nestedLimit) {
-		return new BdfReaderImpl(in, nestedLimit);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/data/BdfWriterFactoryImpl.java

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.data;
-
-import org.briarproject.bramble.api.data.BdfWriter;
-import org.briarproject.bramble.api.data.BdfWriterFactory;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.OutputStream;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-class BdfWriterFactoryImpl implements BdfWriterFactory {
-
-	@Override
-	public BdfWriter createWriter(OutputStream out) {
-		return new BdfWriterImpl(out);
-	}
-}

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.db;
-
-import java.sql.SQLException;
-
-/**
- * Thrown when the database is in an illegal state.
- */
-class DbStateException extends SQLException {
-}

bramble-core/src/main/java/org/briarproject/bramble/identity/AuthorReader.java

@@ -1,36 +0,0 @@
-package org.briarproject.bramble.identity;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.data.BdfReader;
-import org.briarproject.bramble.api.data.ObjectReader;
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.AuthorFactory;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-
-@Immutable
-@NotNullByDefault
-class AuthorReader implements ObjectReader<Author> {
-
-	private final AuthorFactory authorFactory;
-
-	AuthorReader(AuthorFactory authorFactory) {
-		this.authorFactory = authorFactory;
-	}
-
-	@Override
-	public Author readObject(BdfReader r) throws IOException {
-		r.readListStart();
-		String name = r.readString(MAX_AUTHOR_NAME_LENGTH);
-		if (name.length() == 0) throw new FormatException();
-		byte[] publicKey = r.readRaw(MAX_PUBLIC_KEY_LENGTH);
-		r.readListEnd();
-		return authorFactory.createAuthor(name, publicKey);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/invitation/InvitationModule.java

@@ -1,16 +0,0 @@
-package org.briarproject.bramble.invitation;
-
-import org.briarproject.bramble.api.invitation.InvitationTaskFactory;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class InvitationModule {
-
-	@Provides
-	InvitationTaskFactory provideInvitationTaskFactory(
-			InvitationTaskFactoryImpl invitationTaskFactory) {
-		return invitationTaskFactory;
-	}
-}

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

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.keyagreement;
-
-class AbortException extends Exception {
-
-	boolean receivedAbort;
-
-	AbortException() {
-		this(false);
-	}
-
-	AbortException(boolean receivedAbort) {
-		super();
-		this.receivedAbort = receivedAbort;
-	}
-
-	AbortException(Exception e) {
-		this(e, false);
-	}
-
-	private AbortException(Exception e, boolean receivedAbort) {
-		super(e);
-		this.receivedAbort = receivedAbort;
-	}
-}

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

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

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.plugin.tcp;
-
-import javax.annotation.Nullable;
-
-interface PortMapper {
-
-	@Nullable
-	MappingResult map(int port);
-}

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

@@ -1,58 +0,0 @@
-package org.briarproject.bramble.properties;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.client.BdfMessageContext;
-import org.briarproject.bramble.api.client.BdfMessageValidator;
-import org.briarproject.bramble.api.client.ClientHelper;
-import org.briarproject.bramble.api.data.BdfDictionary;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.data.MetadataEncoder;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.system.Clock;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.plugin.TransportId.MAX_TRANSPORT_ID_LENGTH;
-import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
-import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
-import static org.briarproject.bramble.util.ValidationUtils.checkLength;
-import static org.briarproject.bramble.util.ValidationUtils.checkSize;
-
-@Immutable
-@NotNullByDefault
-class TransportPropertyValidator extends BdfMessageValidator {
-
-	TransportPropertyValidator(ClientHelper clientHelper,
-			MetadataEncoder metadataEncoder, Clock clock) {
-		super(clientHelper, metadataEncoder, clock);
-	}
-
-	@Override
-	protected BdfMessageContext validateMessage(Message m, Group g,
-			BdfList body) throws FormatException {
-		// Transport ID, version, properties
-		checkSize(body, 3);
-		// Transport ID
-		String transportId = body.getString(0);
-		checkLength(transportId, 1, MAX_TRANSPORT_ID_LENGTH);
-		// Version
-		long version = body.getLong(1);
-		if (version < 0) throw new FormatException();
-		// Properties
-		BdfDictionary dictionary = body.getDictionary(2);
-		checkSize(dictionary, 0, MAX_PROPERTIES_PER_TRANSPORT);
-		for (String key : dictionary.keySet()) {
-			checkLength(key, 0, MAX_PROPERTY_LENGTH);
-			String value = dictionary.getString(key);
-			checkLength(value, 0, MAX_PROPERTY_LENGTH);
-		}
-		// Return the metadata
-		BdfDictionary meta = new BdfDictionary();
-		meta.put("transportId", transportId);
-		meta.put("version", version);
-		meta.put("local", false);
-		return new BdfMessageContext(meta);
-	}
-}

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

@@ -1,33 +0,0 @@
-package org.briarproject.bramble.reliability;
-
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.reliability.ReliabilityLayer;
-import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory;
-import org.briarproject.bramble.api.reliability.WriteHandler;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.system.SystemClock;
-
-import java.util.concurrent.Executor;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-@Immutable
-@NotNullByDefault
-class ReliabilityLayerFactoryImpl implements ReliabilityLayerFactory {
-
-	private final Executor ioExecutor;
-	private final Clock clock;
-
-	@Inject
-	ReliabilityLayerFactoryImpl(@IoExecutor Executor ioExecutor) {
-		this.ioExecutor = ioExecutor;
-		clock = new SystemClock();
-	}
-
-	@Override
-	public ReliabilityLayer createReliabilityLayer(WriteHandler writeHandler) {
-		return new ReliabilityLayerImpl(ioExecutor, clock, writeHandler);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/reporting/ReportingModule.java

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.reporting;
-
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.reporting.DevConfig;
-import org.briarproject.bramble.api.reporting.DevReporter;
-
-import javax.net.SocketFactory;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class ReportingModule {
-
-	@Provides
-	DevReporter provideDevReporter(CryptoComponent crypto,
-			DevConfig devConfig, SocketFactory torSocketFactory) {
-		return new DevReporterImpl(crypto, devConfig, torSocketFactory);
-	}
-}

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

@@ -1,31 +0,0 @@
-package org.briarproject.bramble.sync;
-
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.ClientId;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.GroupFactory;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.util.StringUtils;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-@Immutable
-@NotNullByDefault
-class GroupFactoryImpl implements GroupFactory {
-
-	private final CryptoComponent crypto;
-
-	@Inject
-	GroupFactoryImpl(CryptoComponent crypto) {
-		this.crypto = crypto;
-	}
-
-	@Override
-	public Group createGroup(ClientId c, byte[] descriptor) {
-		byte[] hash = crypto.hash(GroupId.LABEL,
-				StringUtils.toUtf8(c.getString()), descriptor);
-		return new Group(new GroupId(hash), c, descriptor);
-	}
-}

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

@@ -1,28 +0,0 @@
-package org.briarproject.bramble.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageFactory;
-import org.briarproject.bramble.api.sync.RecordReader;
-import org.briarproject.bramble.api.sync.RecordReaderFactory;
-
-import java.io.InputStream;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-@Immutable
-@NotNullByDefault
-class RecordReaderFactoryImpl implements RecordReaderFactory {
-
-	private final MessageFactory messageFactory;
-
-	@Inject
-	RecordReaderFactoryImpl(MessageFactory messageFactory) {
-		this.messageFactory = messageFactory;
-	}
-
-	@Override
-	public RecordReader createRecordReader(InputStream in) {
-		return new RecordReaderImpl(messageFactory, in);
-	}
-}

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

@@ -1,175 +0,0 @@
-package org.briarproject.bramble.sync;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Ack;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.bramble.api.sync.MessageFactory;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.Offer;
-import org.briarproject.bramble.api.sync.RecordReader;
-import org.briarproject.bramble.api.sync.Request;
-import org.briarproject.bramble.util.ByteUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-import static org.briarproject.bramble.api.sync.RecordTypes.ACK;
-import static org.briarproject.bramble.api.sync.RecordTypes.MESSAGE;
-import static org.briarproject.bramble.api.sync.RecordTypes.OFFER;
-import static org.briarproject.bramble.api.sync.RecordTypes.REQUEST;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_RECORD_PAYLOAD_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.PROTOCOL_VERSION;
-import static org.briarproject.bramble.api.sync.SyncConstants.RECORD_HEADER_LENGTH;
-
-@NotThreadSafe
-@NotNullByDefault
-class RecordReaderImpl implements RecordReader {
-
-	private enum State {BUFFER_EMPTY, BUFFER_FULL, EOF}
-
-	private final MessageFactory messageFactory;
-	private final InputStream in;
-	private final byte[] header, payload;
-
-	private State state = State.BUFFER_EMPTY;
-	private int payloadLength = 0;
-
-	RecordReaderImpl(MessageFactory messageFactory, InputStream in) {
-		this.messageFactory = messageFactory;
-		this.in = in;
-		header = new byte[RECORD_HEADER_LENGTH];
-		payload = new byte[MAX_RECORD_PAYLOAD_LENGTH];
-	}
-
-	private void readRecord() throws IOException {
-		if (state != State.BUFFER_EMPTY) throw new IllegalStateException();
-		while (true) {
-			// Read the header
-			int offset = 0;
-			while (offset < RECORD_HEADER_LENGTH) {
-				int read =
-						in.read(header, offset, RECORD_HEADER_LENGTH - offset);
-				if (read == -1) {
-					if (offset > 0) throw new FormatException();
-					state = State.EOF;
-					return;
-				}
-				offset += read;
-			}
-			byte version = header[0], type = header[1];
-			payloadLength = ByteUtils.readUint16(header, 2);
-			// Check the protocol version
-			if (version != PROTOCOL_VERSION) throw new FormatException();
-			// Check the payload length
-			if (payloadLength > MAX_RECORD_PAYLOAD_LENGTH)
-				throw new FormatException();
-			// Read the payload
-			offset = 0;
-			while (offset < payloadLength) {
-				int read = in.read(payload, offset, payloadLength - offset);
-				if (read == -1) throw new FormatException();
-				offset += read;
-			}
-			state = State.BUFFER_FULL;
-			// Return if this is a known record type, otherwise continue
-			if (type == ACK || type == MESSAGE || type == OFFER ||
-					type == REQUEST) {
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Returns true if there's another record available or false if we've
-	 * reached the end of the input stream.
-	 * <p>
-	 * If a record is available, it's been read into the buffer by the time
-	 * eof() returns, so the method that called eof() can access the record
-	 * from the buffer, for example to check its type or extract its payload.
-	 */
-	@Override
-	public boolean eof() throws IOException {
-		if (state == State.BUFFER_EMPTY) readRecord();
-		if (state == State.BUFFER_EMPTY) throw new IllegalStateException();
-		return state == State.EOF;
-	}
-
-	@Override
-	public boolean hasAck() throws IOException {
-		return !eof() && header[1] == ACK;
-	}
-
-	@Override
-	public Ack readAck() throws IOException {
-		if (!hasAck()) throw new FormatException();
-		return new Ack(readMessageIds());
-	}
-
-	private List<MessageId> readMessageIds() throws IOException {
-		if (payloadLength == 0) throw new FormatException();
-		if (payloadLength % UniqueId.LENGTH != 0) throw new FormatException();
-		List<MessageId> ids = new ArrayList<MessageId>();
-		for (int off = 0; off < payloadLength; off += UniqueId.LENGTH) {
-			byte[] id = new byte[UniqueId.LENGTH];
-			System.arraycopy(payload, off, id, 0, UniqueId.LENGTH);
-			ids.add(new MessageId(id));
-		}
-		state = State.BUFFER_EMPTY;
-		return ids;
-	}
-
-	@Override
-	public boolean hasMessage() throws IOException {
-		return !eof() && header[1] == MESSAGE;
-	}
-
-	@Override
-	public Message readMessage() throws IOException {
-		if (!hasMessage()) throw new FormatException();
-		if (payloadLength <= MESSAGE_HEADER_LENGTH) throw new FormatException();
-		// Group ID
-		byte[] id = new byte[UniqueId.LENGTH];
-		System.arraycopy(payload, 0, id, 0, UniqueId.LENGTH);
-		GroupId groupId = new GroupId(id);
-		// Timestamp
-		long timestamp = ByteUtils.readUint64(payload, UniqueId.LENGTH);
-		if (timestamp < 0) throw new FormatException();
-		// Body
-		byte[] body = new byte[payloadLength - MESSAGE_HEADER_LENGTH];
-		System.arraycopy(payload, MESSAGE_HEADER_LENGTH, body, 0,
-				payloadLength - MESSAGE_HEADER_LENGTH);
-		state = State.BUFFER_EMPTY;
-		return messageFactory.createMessage(groupId, timestamp, body);
-	}
-
-	@Override
-	public boolean hasOffer() throws IOException {
-		return !eof() && header[1] == OFFER;
-	}
-
-	@Override
-	public Offer readOffer() throws IOException {
-		if (!hasOffer()) throw new FormatException();
-		return new Offer(readMessageIds());
-	}
-
-	@Override
-	public boolean hasRequest() throws IOException {
-		return !eof() && header[1] == REQUEST;
-	}
-
-	@Override
-	public Request readRequest() throws IOException {
-		if (!hasRequest()) throw new FormatException();
-		return new Request(readMessageIds());
-	}
-
-}

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

@@ -1,16 +0,0 @@
-package org.briarproject.bramble.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.RecordWriter;
-import org.briarproject.bramble.api.sync.RecordWriterFactory;
-
-import java.io.OutputStream;
-
-@NotNullByDefault
-class RecordWriterFactoryImpl implements RecordWriterFactory {
-
-	@Override
-	public RecordWriter createRecordWriter(OutputStream out) {
-		return new RecordWriterImpl(out);
-	}
-}

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

@@ -1,81 +0,0 @@
-package org.briarproject.bramble.sync;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.Ack;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.Offer;
-import org.briarproject.bramble.api.sync.RecordTypes;
-import org.briarproject.bramble.api.sync.RecordWriter;
-import org.briarproject.bramble.api.sync.Request;
-import org.briarproject.bramble.util.ByteUtils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-import static org.briarproject.bramble.api.sync.RecordTypes.ACK;
-import static org.briarproject.bramble.api.sync.RecordTypes.OFFER;
-import static org.briarproject.bramble.api.sync.RecordTypes.REQUEST;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_RECORD_PAYLOAD_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.RECORD_HEADER_LENGTH;
-import static org.briarproject.bramble.api.sync.SyncConstants.PROTOCOL_VERSION;
-
-@NotThreadSafe
-@NotNullByDefault
-class RecordWriterImpl implements RecordWriter {
-
-	private final OutputStream out;
-	private final byte[] header;
-	private final ByteArrayOutputStream payload;
-
-	RecordWriterImpl(OutputStream out) {
-		this.out = out;
-		header = new byte[RECORD_HEADER_LENGTH];
-		header[0] = PROTOCOL_VERSION;
-		payload = new ByteArrayOutputStream(MAX_RECORD_PAYLOAD_LENGTH);
-	}
-
-	private void writeRecord(byte recordType) throws IOException {
-		header[1] = recordType;
-		ByteUtils.writeUint16(payload.size(), header, 2);
-		out.write(header);
-		payload.writeTo(out);
-		payload.reset();
-	}
-
-	@Override
-	public void writeAck(Ack a) throws IOException {
-		if (payload.size() != 0) throw new IllegalStateException();
-		for (MessageId m : a.getMessageIds()) payload.write(m.getBytes());
-		writeRecord(ACK);
-	}
-
-	@Override
-	public void writeMessage(byte[] raw) throws IOException {
-		header[1] = RecordTypes.MESSAGE;
-		ByteUtils.writeUint16(raw.length, header, 2);
-		out.write(header);
-		out.write(raw);
-	}
-
-	@Override
-	public void writeOffer(Offer o) throws IOException {
-		if (payload.size() != 0) throw new IllegalStateException();
-		for (MessageId m : o.getMessageIds()) payload.write(m.getBytes());
-		writeRecord(OFFER);
-	}
-
-	@Override
-	public void writeRequest(Request r) throws IOException {
-		if (payload.size() != 0) throw new IllegalStateException();
-		for (MessageId m : r.getMessageIds()) payload.write(m.getBytes());
-		writeRecord(REQUEST);
-	}
-
-	@Override
-	public void flush() throws IOException {
-		out.flush();
-	}
-}