add kobakei library to witness

.idea/codeStyles/Project.xml

@@ -36,9 +36,6 @@
       <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
     </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
     <Objective-C-extensions>
       <file>
         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
@@ -260,11 +257,5 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-      <option name="ENUM_CONSTANTS_WRAP" value="1" />
-    </codeStyleSettings>
   </code_scheme>
 </component>

.idea/runConfigurations/All_in_briar_headless.xml

@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All in briar-headless" type="AndroidJUnit" factoryName="Android JUnit" nameIsGenerated="true">
-    <module name="briar-headless" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-headless" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/All_tests.xml

@@ -24,7 +24,6 @@
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All in briar-headless" run_configuration_type="AndroidJUnit" />
     </method>
   </configuration>
-</component>
+</component>

.idea/runConfigurations/briar_headless.xml

@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" factoryName="Kotlin" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="-v" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="org.briarproject.briar.headless.MainKt" />
-    <option name="WORKING_DIRECTORY" value="" />
-    <module name="briar-headless" />
-    <envs />
-    <method>
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="jar" externalProjectPath="$PROJECT_DIR$/briar-headless" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>

bramble-android/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion 28
-	buildToolsVersion '28.0.3'
+	compileSdkVersion 27
+	buildToolsVersion '27.0.3'
 
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10103
-		versionName "1.1.3"
+		versionCode 10101
+		versionName "1.1.1"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -28,7 +28,7 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.4.8@zip'
+	tor 'org.briarproject:tor-android:0.2.9.16@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
 

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java

@@ -16,27 +16,18 @@ import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.AndroidUtils;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 
-import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_FINISHED;
-import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_STARTED;
 import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
@@ -46,13 +37,8 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERA
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
 import static android.bluetooth.BluetoothAdapter.STATE_OFF;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
-import static android.bluetooth.BluetoothDevice.ACTION_FOUND;
-import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -61,11 +47,8 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	private static final Logger LOG =
 			Logger.getLogger(AndroidBluetoothPlugin.class.getName());
 
-	private static final int MAX_DISCOVERY_MS = 10_000;
-
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
-	private final Clock clock;
 
 	private volatile boolean wasEnabledByUs = false;
 	private volatile BluetoothStateReceiver receiver = null;
@@ -75,13 +58,12 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			Executor ioExecutor, AndroidExecutor androidExecutor,
-			Context appContext, SecureRandom secureRandom, Clock clock,
-			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
+			Context appContext, SecureRandom secureRandom, Backoff backoff,
+			DuplexPluginCallback callback, int maxLatency) {
 		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
 				maxLatency);
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
-		this.clock = clock;
 	}
 
 	@Override
@@ -200,74 +182,6 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 		}
 	}
 
-	@Override
-	@Nullable
-	DuplexTransportConnection discoverAndConnect(String uuid) {
-		if (adapter == null) return null;
-		for (String address : discoverDevices()) {
-			try {
-				if (LOG.isLoggable(INFO))
-					LOG.info("Connecting to " + scrubMacAddress(address));
-				return connectTo(address, uuid);
-			} catch (IOException e) {
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Could not connect to "
-							+ scrubMacAddress(address));
-				}
-			}
-		}
-		LOG.info("Could not connect to any devices");
-		return null;
-	}
-
-	private Collection<String> discoverDevices() {
-		List<String> addresses = new ArrayList<>();
-		BlockingQueue<Intent> intents = new LinkedBlockingQueue<>();
-		DiscoveryReceiver receiver = new DiscoveryReceiver(intents);
-		IntentFilter filter = new IntentFilter();
-		filter.addAction(ACTION_DISCOVERY_STARTED);
-		filter.addAction(ACTION_DISCOVERY_FINISHED);
-		filter.addAction(ACTION_FOUND);
-		appContext.registerReceiver(receiver, filter);
-		try {
-			if (adapter.startDiscovery()) {
-				long now = clock.currentTimeMillis();
-				long end = now + MAX_DISCOVERY_MS;
-				while (now < end) {
-					Intent i = intents.poll(end - now, MILLISECONDS);
-					if (i == null) break;
-					String action = i.getAction();
-					if (ACTION_DISCOVERY_STARTED.equals(action)) {
-						LOG.info("Discovery started");
-					} else if (ACTION_DISCOVERY_FINISHED.equals(action)) {
-						LOG.info("Discovery finished");
-						break;
-					} else if (ACTION_FOUND.equals(action)) {
-						BluetoothDevice d = i.getParcelableExtra(EXTRA_DEVICE);
-						String address = d.getAddress();
-						if (LOG.isLoggable(INFO))
-							LOG.info("Discovered " + scrubMacAddress(address));
-						if (!addresses.contains(address))
-							addresses.add(address);
-					}
-					now = clock.currentTimeMillis();
-				}
-			} else {
-				LOG.info("Could not start discovery");
-			}
-		} catch (InterruptedException e) {
-			LOG.info("Interrupted while discovering devices");
-			Thread.currentThread().interrupt();
-		} finally {
-			LOG.info("Cancelling discovery");
-			adapter.cancelDiscovery();
-			appContext.unregisterReceiver(receiver);
-		}
-		// Shuffle the addresses so we don't always try the same one first
-		Collections.shuffle(addresses);
-		return addresses;
-	}
-
 	private void tryToClose(@Nullable Closeable c) {
 		try {
 			if (c != null) c.close();
@@ -293,18 +207,4 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 			}
 		}
 	}
-
-	private static class DiscoveryReceiver extends BroadcastReceiver {
-
-		private final BlockingQueue<Intent> intents;
-
-		private DiscoveryReceiver(BlockingQueue<Intent> intents) {
-			this.intents = intents;
-		}
-
-		@Override
-		public void onReceive(Context ctx, Intent intent) {
-			intents.add(intent);
-		}
-	}
 }

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java

@@ -11,7 +11,6 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
 
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
@@ -34,19 +33,17 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	private final Context appContext;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
-	private final Clock clock;
 	private final BackoffFactory backoffFactory;
 
 	public AndroidBluetoothPluginFactory(Executor ioExecutor,
 			AndroidExecutor androidExecutor, Context appContext,
-			SecureRandom secureRandom, EventBus eventBus, Clock clock,
+			SecureRandom secureRandom, EventBus eventBus,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
-		this.clock = clock;
 		this.backoffFactory = backoffFactory;
 	}
 
@@ -68,7 +65,7 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
 				connectionLimiter, ioExecutor, androidExecutor, appContext,
-				secureRandom, clock, backoff, callback, MAX_LATENCY);
+				secureRandom, backoff, callback, MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-android/witness.gradle

@@ -1,42 +1,40 @@
 dependencyVerification {
     verify = [
         'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-        'com.android.tools.analytics-library:protos:26.2.1:protos-26.2.1.jar:2f371f5b1f551e85ab08be4d6a2873471b3d44afd1ebf6aa3298f3b796bf691f',
-        'com.android.tools.analytics-library:shared:26.2.1:shared-26.2.1.jar:4c1e4e705fa4d45f23aaea230557f6508155012d9c296337787c1d7b26a97f5a',
-        'com.android.tools.analytics-library:tracker:26.2.1:tracker-26.2.1.jar:4a624ecc976539f755ddb0bb8dfc2dd3d08326cfec59a098dbd70f701ca7fb75',
-        'com.android.tools.build:aapt2:3.2.1-4818971:aapt2-3.2.1-4818971-linux.jar:f431b6f96c91a2c155144b091a9c97d9805c589fe8efc9c930b6cd346cb60a1e',
-        'com.android.tools.build:apksig:3.2.1:apksig-3.2.1.jar:2b46f2feffea66037aab29e4261b2433c190194a6ef97b958511eb157f2ccba5',
-        'com.android.tools.build:apkzlib:3.2.1:apkzlib-3.2.1.jar:c39ad0313905932431fe81c8899c2cf39a4d92ad6c4edcaa4b25432f461452aa',
-        'com.android.tools.build:builder-model:3.2.1:builder-model-3.2.1.jar:a9f68e6abcec122f9cb5ad352d3f05a3eb03acbcdca95e4d25c16310c2c965ff',
-        'com.android.tools.build:builder-test-api:3.2.1:builder-test-api-3.2.1.jar:533ac6c2b5884bb54967a33791f2628dfdfac7981af39417a333b43d4379b6be',
-        'com.android.tools.build:builder:3.2.1:builder-3.2.1.jar:aedcbfd115dbe91d09b4113e66ef50589b558d0aa3b2f133b1d867c9b87fae83',
-        'com.android.tools.build:gradle-api:3.2.1:gradle-api-3.2.1.jar:57cf0ac5ac1dca8afdb3f62b94265e776e7dcfa641cc3844fb53a05193de208d',
-        'com.android.tools.build:manifest-merger:26.2.1:manifest-merger-26.2.1.jar:8830573263361035d38cfdcb51e2db94029c93865b21334f5fbf8a27984281a6',
-        'com.android.tools.ddms:ddmlib:26.2.1:ddmlib-26.2.1.jar:a4bf0a29a19980bf27269465cc782064656750b77c26728f82f9e148b705218b',
-        'com.android.tools.external.com-intellij:intellij-core:26.2.1:intellij-core-26.2.1.jar:4925ad1892c2687cb1a63427d440ef519c8c59215fefe0dc5d541d5d411fcafe',
-        'com.android.tools.external.com-intellij:kotlin-compiler:26.2.1:kotlin-compiler-26.2.1.jar:daa064fd708f340ee25fb9823c4c74104ac77f1370b76d907eb9ae6daec0a2ae',
-        'com.android.tools.external.org-jetbrains:uast:26.2.1:uast-26.2.1.jar:f10f7258d2ab9189562cc0f9ad838c0378fdba439229173390a99de02ebac75b',
-        'com.android.tools.layoutlib:layoutlib-api:26.2.1:layoutlib-api-26.2.1.jar:ddbf4fca123733fa011595b1cc1f4ac2937ed327b60990711fafc33c775c2ade',
-        'com.android.tools.lint:lint-api:26.2.1:lint-api-26.2.1.jar:3b57e739de567b98bc9ab56c2c0ee66fc026b4adf5843e8f9804ca0666a6f66e',
-        'com.android.tools.lint:lint-checks:26.2.1:lint-checks-26.2.1.jar:c86f4cc9aaee722ee4ad70062f7b5af91e9b041914af27adc09f545ab0fb3bc6',
-        'com.android.tools.lint:lint-gradle-api:26.2.1:lint-gradle-api-26.2.1.jar:2283e7af32e301565f2a797e531f0fc8c648077d457afb3ffdddbee638976c2f',
-        'com.android.tools.lint:lint-gradle:26.2.1:lint-gradle-26.2.1.jar:8fd90b2f3ec788cbb9801c07ab3e1ea2255aa31a6093157d7ea0ff13d0315ecb',
-        'com.android.tools.lint:lint-kotlin:26.2.1:lint-kotlin-26.2.1.jar:7a6a5d2b18f69cf1b900d857c2632b4c683713c533295933b8b759f8cab4a877',
-        'com.android.tools.lint:lint:26.2.1:lint-26.2.1.jar:7848b82ae988b90dee259ae7c7e86e05cbf52db6cd21c8bbd38ce7df08f3f8c5',
-        'com.android.tools:annotations:26.2.1:annotations-26.2.1.jar:7391c6a1e080174b96e64ceb078dadd31ce4d8a2d2fee0ec65be202126f90f24',
-        'com.android.tools:common:26.2.1:common-26.2.1.jar:a50aab2d6411ff68f4004a87c7e93d87d8e980a0ec3b352246549897ea2d78e5',
-        'com.android.tools:dvlib:26.2.1:dvlib-26.2.1.jar:72a83bf2839b1df9b1fbf67ba45d1bfb9f966cd774da4320c762b2be8f1688aa',
-        'com.android.tools:repository:26.2.1:repository-26.2.1.jar:fa74dae09103faef703df38550ad8fa244c5b6d1bf90d6198be932292b3d9cc1',
-        'com.android.tools:sdk-common:26.2.1:sdk-common-26.2.1.jar:759d4b292ca69a35cf961fca377b54158fc6c88108978006999442e80a011cf4',
-        'com.android.tools:sdklib:26.2.1:sdklib-26.2.1.jar:248df7ad5eac4aeb6f96c394c76760de4b7b89ac056e54d0c21a739368b91b45',
+        'com.android.tools.analytics-library:protos:26.1.3:protos-26.1.3.jar:818c9f256f141d9dafec03a1aa2b94d240b2c140acfd7ee31a8b3e6c2b9479e3',
+        'com.android.tools.analytics-library:shared:26.1.3:shared-26.1.3.jar:7110706c7ada96c8b6f5ca80c478291bc7899d46277de2c48527e045442401a3',
+        'com.android.tools.analytics-library:tracker:26.1.3:tracker-26.1.3.jar:4155424bf2ce4872da83332579a1707252bc66cbd77c5144fdc4483d0f2e1418',
+        'com.android.tools.build:apksig:3.1.3:apksig-3.1.3.jar:7e1f8e675a6e768e5b56405e41d6c3cc05befe62e601b04177de1029902c9c89',
+        'com.android.tools.build:builder-model:3.1.3:builder-model-3.1.3.jar:06ad1c422d679fc698451479cb40ba863849d67bfd1de23f6d2c16d78b024b0b',
+        'com.android.tools.build:builder-test-api:3.1.3:builder-test-api-3.1.3.jar:4d989f780436794f0f8b2f50e9e079b786571eac90f26c208ab2ae6d4012f389',
+        'com.android.tools.build:builder:3.1.3:builder-3.1.3.jar:8a1092012c89d0ec1ee2eff09c5708c71ef4482a6862df8d3a44a67fccace01c',
+        'com.android.tools.build:gradle-api:3.1.3:gradle-api-3.1.3.jar:01e4df521456aef66514336f1d492346730dd1fb8f6433a89f62da834941ed72',
+        'com.android.tools.build:manifest-merger:26.1.3:manifest-merger-26.1.3.jar:1e4fc7e932adb4607082409800e5e6fccb42e6c5360ae5990094bf522f3ada55',
+        'com.android.tools.ddms:ddmlib:26.1.3:ddmlib-26.1.3.jar:c54931cd68df5d1ea2923b3b320eae47cd2307a5a916bb8674c0acf93cd1d3cd',
+        'com.android.tools.external.com-intellij:intellij-core:26.1.3:intellij-core-26.1.3.jar:af67f5535fef2e1a28b1007a4acb8c5deb6a1e33b8afe7b11d012c9e778ebcec',
+        'com.android.tools.external.com-intellij:kotlin-compiler:26.1.3:kotlin-compiler-26.1.3.jar:c746d2859dc11cc05c84b692b3498d3a621e0929511f8440ee009c6557838fd4',
+        'com.android.tools.external.org-jetbrains:uast:26.1.3:uast-26.1.3.jar:3f3f6651d0c7685a77ecb22e9c82d6b49fdf24322c17360768dc530678f43265',
+        'com.android.tools.layoutlib:layoutlib-api:26.1.3:layoutlib-api-26.1.3.jar:10bc73ce706c45629872d6a999dbe12116df64e24f47ff93b7b13121ff57b4b0',
+        'com.android.tools.lint:lint-api:26.1.3:lint-api-26.1.3.jar:6f97323f9af8deda86278717885b5c927f3766757db89709f52d11d42b6fb751',
+        'com.android.tools.lint:lint-checks:26.1.3:lint-checks-26.1.3.jar:73c3d53784c9ce3e6d5968506581918e0179645d20809927ca4a001dd766b001',
+        'com.android.tools.lint:lint-gradle-api:26.1.3:lint-gradle-api-26.1.3.jar:7ca3c4866ec21dc21d53a9d86f752b77ace6f6c610a0c9dc877313856c733d9d',
+        'com.android.tools.lint:lint-gradle:26.1.3:lint-gradle-26.1.3.jar:db0c354b8f4b6f6637e31f91c564785a59ff896325331fcbc3de7458e0b6c067',
+        'com.android.tools.lint:lint-kotlin:26.1.3:lint-kotlin-26.1.3.jar:94e2b0f4565a241561cfb8fc1222bb3f132a3b98d2a90421dbb72ee8358e7d68',
+        'com.android.tools.lint:lint:26.1.3:lint-26.1.3.jar:8d5f32c989c6d191d712e90ad3ca2d1c409313599551d04d834caa44d26c78df',
+        'com.android.tools:annotations:26.1.3:annotations-26.1.3.jar:c950430b24ac5d58fc97e7283b8f0115f99587e76e08b4e1e2aaa780f2d77323',
+        'com.android.tools:common:26.1.3:common-26.1.3.jar:7c31a90581a148ab219f615a59667f0dded7fa39b248529784474da3c2274ef2',
+        'com.android.tools:dvlib:26.1.3:dvlib-26.1.3.jar:0cae87906f53d3f1088366a916ed180a7312b6d9919b90797f238875c8492855',
+        'com.android.tools:repository:26.1.3:repository-26.1.3.jar:52d4539cc68db91b261e2a33b2c8206b26e05539078758dc28cfb3854adb4f59',
+        'com.android.tools:sdk-common:26.1.3:sdk-common-26.1.3.jar:1948603ca9ff22c7ebb3178000bffa3a9dd2ca1cc5cb0c793cae08468b8fcfc1',
+        'com.android.tools:sdklib:26.1.3:sdklib-26.1.3.jar:4adcfaad9514607098d2c51503c39811112d3050f4d1e744c01c7f08f591032b',
         'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
-        'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825',
+        'com.google.code.gson:gson:2.7:gson-2.7.jar:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
         'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
         'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
         'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
         'com.google.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b',
         'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
-        'com.google.guava:guava:23.0:guava-23.0.jar:7baa80df284117e5b945b19b98d367a85ea7b7801bd358ff657946c3bd1b6596',
+        'com.google.guava:guava:22.0:guava-22.0.jar:1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e',
         'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
         'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
         'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
@@ -45,8 +43,8 @@ dependencyVerification {
         'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
         'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
         'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
-        'commons-codec:commons-codec:1.9:commons-codec-1.9.jar:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
-        'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
+        'commons-codec:commons-codec:1.6:commons-codec-1.6.jar:54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86',
+        'commons-logging:commons-logging:1.1.1:commons-logging-1.1.1.jar:ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f',
         'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
         'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
@@ -57,13 +55,13 @@ dependencyVerification {
         'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
         'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
         'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
-        'org.apache.httpcomponents:httpclient:4.5.2:httpclient-4.5.2.jar:0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057',
-        'org.apache.httpcomponents:httpcore:4.4.5:httpcore-4.4.5.jar:64d5453874cab7e40a7065cb01a9a9ca1053845a9786b478878b679e0580cec3',
-        'org.apache.httpcomponents:httpmime:4.5.2:httpmime-4.5.2.jar:231a3f7e4962053db2be8461d5422e68fc458a3a7dd7d8ada803a348e21f8f07',
+        'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550',
+        'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9',
+        'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa',
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
         'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
-        'org.briarproject:tor-android:0.3.4.8:tor-android-0.3.4.8.zip:989a0352d9d8d8172cd6c2137654e165e5d2beb10ed1211bab3814e224ad1926',
+        'org.briarproject:tor-android:0.2.9.16:tor-android-0.2.9.16.zip:515e33dda6a30853c885a2de2c79ae1ab9ad8b6db44f5db8890333ec2e24f4ae',
         'org.codehaus.groovy:groovy-all:2.4.12:groovy-all-2.4.12.jar:6a56af4bd48903d56bec62821876cadefafd007360cc6bd0d8f7aa8d72b38be4',
         'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
         'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
@@ -72,10 +70,9 @@ dependencyVerification {
         'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
         'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
         'org.jetbrains.kotlin:kotlin-reflect:1.2.0:kotlin-reflect-1.2.0.jar:4f48a872bad6e4d9c053f4ad610d11e4012ad7e58dc19a03dd5eb811f36069dd',
-        'org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71:kotlin-stdlib-common-1.2.71.jar:63999687ff2fce8a592dd180ffbbf8f1d21c26b4044c55cdc74ff3cf3b3cf328',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71:kotlin-stdlib-jdk7-1.2.71.jar:b136bd61b240e07d4d92ce00d3bd1dbf584400a7bf5f220c2f3cd22446858082',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71:kotlin-stdlib-jdk8-1.2.71.jar:ac3c8abf47790b64b4f7e2509a53f0c145e061ac1612a597520535d199946ea9',
-        'org.jetbrains.kotlin:kotlin-stdlib:1.2.71:kotlin-stdlib-1.2.71.jar:4c895c270b87f5fec2a2796e1d89c15407ee821de961527c28588bb46afbc68b',
+        'org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0:kotlin-stdlib-jre7-1.2.0.jar:c7a20fb951d437797afe8980aff6c1e5a03f310c661ba58ba1d4fa90cb0f2926',
+        'org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0:kotlin-stdlib-jre8-1.2.0.jar:633524eee6ef1941f7cb1dab7ee3927b0a221ceee9047aeb5515f4cbb990c82a',
+        'org.jetbrains.kotlin:kotlin-stdlib:1.2.0:kotlin-stdlib-1.2.0.jar:05cfd9f5ac0b41910703a8925f7211a495909b27a2ffdd1c5106f1689aeafcd4',
         'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
         'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
         'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
@@ -84,11 +81,11 @@ dependencyVerification {
         'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
         'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
         'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
-        'org.ow2.asm:asm-analysis:6.0:asm-analysis-6.0.jar:2f1a6387219c3a6cc4856481f221b03bd9f2408a326d416af09af5d6f608c1f4',
-        'org.ow2.asm:asm-commons:6.0:asm-commons-6.0.jar:f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf',
-        'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215',
-        'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6',
+        'org.ow2.asm:asm-analysis:5.1:asm-analysis-5.1.jar:a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9',
+        'org.ow2.asm:asm-commons:5.1:asm-commons-5.1.jar:97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be',
+        'org.ow2.asm:asm-tree:5.1:asm-tree-5.1.jar:c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10',
+        'org.ow2.asm:asm-util:5.1:asm-util-5.1.jar:ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040',
         'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
-        'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461',
+        'org.ow2.asm:asm:5.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54',
     ]
 }

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

@@ -38,18 +38,4 @@ public abstract class StringMap extends Hashtable<String, String> {
 	public void putInt(String key, int value) {
 		put(key, String.valueOf(value));
 	}
-
-	public long getLong(String key, long defaultValue) {
-		String s = get(key);
-		if (s == null) return defaultValue;
-		try {
-			return Long.valueOf(s);
-		} catch (NumberFormatException e) {
-			return defaultValue;
-		}
-	}
-
-	public void putLong(String key, long value) {
-		put(key, String.valueOf(value));
-	}
 }

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

@@ -48,8 +48,12 @@ public abstract class BdfMessageValidator implements MessageValidator {
 			throw new InvalidMessageException(
 					"Timestamp is too far in the future");
 		}
+		byte[] body = m.getBody();
+		if (body.length == 0) {
+			throw new InvalidMessageException("Message is too short");
+		}
 		try {
-			BdfList bodyList = clientHelper.toList(m.getBody());
+			BdfList bodyList = clientHelper.toList(body);
 			BdfMessageContext result = validateMessage(m, g, bodyList);
 			Metadata meta = metadataEncoder.encode(result.getDictionary());
 			return new MessageContext(meta, result.getDependencies());

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

@@ -4,12 +4,8 @@ import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.util.StringUtils.toUtf8;
-
 @Immutable
 @NotNullByDefault
 public class Contact {
@@ -17,21 +13,13 @@ public class Contact {
 	private final ContactId id;
 	private final Author author;
 	private final AuthorId localAuthorId;
-	@Nullable
-	private final String alias;
 	private final boolean verified, active;
 
 	public Contact(ContactId id, Author author, AuthorId localAuthorId,
-			@Nullable String alias, boolean verified, boolean active) {
-		if (alias != null) {
-			int aliasLength = toUtf8(alias).length;
-			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
-				throw new IllegalArgumentException();
-		}
+			boolean verified, boolean active) {
 		this.id = id;
 		this.author = author;
 		this.localAuthorId = localAuthorId;
-		this.alias = alias;
 		this.verified = verified;
 		this.active = active;
 	}
@@ -48,11 +36,6 @@ public class Contact {
 		return localAuthorId;
 	}
 
-	@Nullable
-	public String getAlias() {
-		return alias;
-	}
-
 	public boolean isVerified() {
 		return verified;
 	}

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

@@ -5,14 +5,11 @@ 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.identity.AuthorInfo;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 
-import javax.annotation.Nullable;
-
 @NotNullByDefault
 public interface ContactManager {
 
@@ -96,12 +93,6 @@ public interface ContactManager {
 	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 
-	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
-	 */
-	void setContactAlias(ContactId c, @Nullable String alias)
-			throws DbException;
-
 	/**
 	 * Return true if a contact with this name and public key already exists
 	 */
@@ -114,16 +105,6 @@ public interface ContactManager {
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 
-	/**
-	 * Returns the {@link AuthorInfo} for the given author.
-	 */
-	AuthorInfo getAuthorInfo(AuthorId a) throws DbException;
-
-	/**
-	 * Returns the {@link AuthorInfo} for the given author.
-	 */
-	AuthorInfo getAuthorInfo(Transaction txn, AuthorId a) throws DbException;
-
 	interface ContactHook {
 
 		void addingContact(Transaction txn, Contact c) throws DbException;

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

@@ -76,19 +76,6 @@ public interface DatabaseComponent {
 	 */
 	void endTransaction(Transaction txn);
 
-	/**
-	 * Runs the given task within a transaction.
-	 */
-	<E extends Exception> void transaction(boolean readOnly,
-			DbRunnable<E> task) throws DbException, E;
-
-	/**
-	 * Runs the given task within a transaction and returns the result of the
-	 * task.
-	 */
-	<R, E extends Exception> R transactionWithResult(boolean readOnly,
-			DbCallable<R, E> task) throws DbException, E;
-
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * and returns an ID for the contact.
@@ -515,12 +502,6 @@ public interface DatabaseComponent {
 	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 
-	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
-	 */
-	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
-			throws DbException;
-
 	/**
 	 * Sets the given group's visibility to the given contact.
 	 */

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

@@ -1,6 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-public interface DbCallable<R, E extends Exception> {
-
-	R call(Transaction txn) throws DbException, E;
-}

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

@@ -1,6 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-public interface DbRunnable<E extends Exception> {
-
-	void run(Transaction txn) throws DbException, E;
-}

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

@@ -6,10 +6,6 @@ public interface MigrationListener {
 	 * This is called when a migration is started while opening the database.
 	 * It will be called once for each migration being applied.
 	 */
-	void onDatabaseMigration();
+	void onMigrationRun();
 
-	/**
-	 * This is called when compaction is started while opening the database.
-	 */
-	void onDatabaseCompaction();
 }

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

@@ -16,6 +16,10 @@ import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_K
 @NotNullByDefault
 public class Author implements Nameable {
 
+	public enum Status {
+		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES
+	}
+
 	/**
 	 * The current version of the author structure.
 	 */

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

@@ -1,42 +0,0 @@
-package org.briarproject.bramble.api.identity;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class AuthorInfo {
-
-	public enum Status {
-		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES;
-
-		public boolean isContact() {
-			return this == UNVERIFIED || this == VERIFIED;
-		}
-	}
-
-	private final Status status;
-	@Nullable
-	private final String alias;
-
-	public AuthorInfo(Status status, @Nullable String alias) {
-		this.status = status;
-		this.alias = alias;
-	}
-
-	public AuthorInfo(Status status) {
-		this(status, null);
-	}
-
-	public Status getStatus() {
-		return status;
-	}
-
-	@Nullable
-	public String getAlias() {
-		return alias;
-	}
-
-}

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

@@ -3,6 +3,7 @@ package org.briarproject.bramble.api.identity;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 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
@@ -36,4 +37,14 @@ public interface IdentityManager {
 	 */
 	LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
 
+	/**
+	 * Returns the {@link Status} of the given author.
+	 */
+	Status getAuthorStatus(AuthorId a) throws DbException;
+
+	/**
+	 * Returns the {@link Status} of the given author.
+	 */
+	Status getAuthorStatus(Transaction txn, AuthorId a) throws DbException;
+
 }

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

@@ -21,7 +21,7 @@ public interface KeyAgreementConstants {
 	/**
 	 * The connection timeout in milliseconds.
 	 */
-	long CONNECTION_TIMEOUT = 60_000;
+	long CONNECTION_TIMEOUT = 20 * 1000;
 
 	/**
 	 * The transport identifier for Bluetooth.

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

@@ -34,8 +34,7 @@ public interface LifecycleManager {
 	 */
 	enum LifecycleState {
 
-		STARTING, MIGRATING_DATABASE, COMPACTING_DATABASE, STARTING_SERVICES,
-		RUNNING, STOPPING;
+		STARTING, MIGRATING_DATABASE, STARTING_SERVICES, RUNNING, STOPPING;
 
 		public boolean isAfter(LifecycleState state) {
 			return ordinal() > state.ordinal();

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

@@ -4,8 +4,7 @@ public interface TorConstants {
 
 	TransportId ID = new TransportId("org.briarproject.bramble.tor");
 
-	String PROP_ONION_V2 = "onion";
-	String PROP_ONION_V3 = "onion3";
+	String PROP_ONION = "onion";
 
 	int SOCKS_PORT = 59050;
 	int CONTROL_PORT = 59051;

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

@@ -16,7 +16,6 @@ public class Message {
 	private final byte[] body;
 
 	public Message(MessageId id, GroupId groupId, long timestamp, byte[] body) {
-		if (body.length == 0) throw new IllegalArgumentException();
 		if (body.length > MAX_MESSAGE_BODY_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;

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

@@ -153,4 +153,15 @@ public class StringUtils {
 		return new String(c);
 	}
 
+
+	public static String getRandomBase32String(int length) {
+		char[] c = new char[length];
+		for (int i = 0; i < length; i++) {
+			int character = random.nextInt(32);
+			if (character < 26) c[i] = (char) ('A' + character);
+			else c[i] = (char) ('2' + (character - 26));
+		}
+		return new String(c);
+	}
+
 }

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

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.test;
-
-import org.briarproject.bramble.api.system.Clock;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-public class SettableClock implements Clock {
-
-	private final AtomicLong time;
-
-	public SettableClock(AtomicLong time) {
-		this.time = time;
-	}
-
-	@Override
-	public long currentTimeMillis() {
-		return time.get();
-	}
-
-	@Override
-	public void sleep(long milliseconds) throws InterruptedException {
-		Thread.sleep(milliseconds);
-	}
-}

bramble-core/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 	implementation 'com.h2database:h2:1.4.192' // The last version that supports Java 1.6
 	implementation 'org.bitlet:weupnp:0.1.4'
 	implementation 'net.i2p.crypto:eddsa:0.2.0'
-	implementation 'org.whispersystems:curve25519-java:0.5.0'
+	implementation 'org.whispersystems:curve25519-java:0.4.1'
 	implementation 'org.briarproject:jtorctl:0.3'
 
 	apt 'com.google.dagger:dagger-compiler:2.0.2'

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

@@ -159,8 +159,7 @@ class AccountManagerImpl implements AccountManager {
 	@Override
 	public boolean createAccount(String name, String password) {
 		synchronized (stateChangeLock) {
-			if (hasDatabaseKey())
-				throw new AssertionError("Already have a database key");
+			// TODO don't allow creating another account if one already exists
 			LocalAuthor localAuthor = identityManager.createLocalAuthor(name);
 			identityManager.registerLocalAuthor(localAuthor);
 			SecretKey key = crypto.generateSecretKey();
@@ -183,7 +182,6 @@ class AccountManagerImpl implements AccountManager {
 			LOG.info("Deleting account");
 			IoUtils.deleteFileOrDir(databaseConfig.getDatabaseKeyDirectory());
 			IoUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
-			databaseKey = null;
 		}
 	}
 

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

@@ -10,9 +10,6 @@ import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.AuthorInfo;
-import org.briarproject.bramble.api.identity.IdentityManager;
-import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.transport.KeyManager;
 
@@ -21,32 +18,21 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNKNOWN;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
-import static org.briarproject.bramble.util.StringUtils.toUtf8;
-
 @ThreadSafe
 @NotNullByDefault
 class ContactManagerImpl implements ContactManager {
 
 	private final DatabaseComponent db;
 	private final KeyManager keyManager;
-	private final IdentityManager identityManager;
 	private final List<ContactHook> hooks;
 
 	@Inject
-	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager,
-			IdentityManager identityManager) {
+	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager) {
 		this.db = db;
 		this.keyManager = keyManager;
-		this.identityManager = identityManager;
 		hooks = new CopyOnWriteArrayList<>();
 	}
 
@@ -162,17 +148,6 @@ class ContactManagerImpl implements ContactManager {
 		db.setContactActive(txn, c, active);
 	}
 
-	@Override
-	public void setContactAlias(ContactId c, @Nullable String alias)
-			throws DbException {
-		if (alias != null) {
-			int aliasLength = toUtf8(alias).length;
-			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
-				throw new IllegalArgumentException();
-		}
-		db.transaction(false, txn -> db.setContactAlias(txn, c, alias));
-	}
-
 	@Override
 	public boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException {
@@ -201,23 +176,4 @@ class ContactManagerImpl implements ContactManager {
 		db.removeContact(txn, c);
 	}
 
-	@Override
-	public AuthorInfo getAuthorInfo(AuthorId a) throws DbException {
-		return db.transactionWithResult(true, txn -> getAuthorInfo(txn, a));
-	}
-
-	@Override
-	public AuthorInfo getAuthorInfo(Transaction txn, AuthorId authorId)
-			throws DbException {
-		LocalAuthor localAuthor = identityManager.getLocalAuthor(txn);
-		if (localAuthor.getId().equals(authorId))
-			return new AuthorInfo(OURSELVES);
-		Collection<Contact> contacts = db.getContactsByAuthorId(txn, authorId);
-		if (contacts.isEmpty()) return new AuthorInfo(UNKNOWN);
-		if (contacts.size() > 1) throw new AssertionError();
-		Contact c = contacts.iterator().next();
-		if (c.isVerified()) return new AuthorInfo(VERIFIED, c.getAlias());
-		else return new AuthorInfo(UNVERIFIED, c.getAlias());
-	}
-
 }

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

@@ -616,12 +616,6 @@ interface Database<T> {
 	void setContactActive(T txn, ContactId c, boolean active)
 			throws DbException;
 
-	/**
-	 * Sets an alias name for a contact.
-	 */
-	void setContactAlias(T txn, ContactId c, @Nullable String alias)
-			throws DbException;
-
 	/**
 	 * Sets the given group's visibility to the given contact to either
 	 * {@link Visibility VISIBLE} or {@link Visibility SHARED}.

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

@@ -9,9 +9,7 @@ import org.briarproject.bramble.api.contact.event.ContactVerifiedEvent;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.ContactExistsException;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbCallable;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.DbRunnable;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.MigrationListener;
 import org.briarproject.bramble.api.db.NoSuchContactException;
@@ -168,31 +166,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 			for (Event e : transaction.getEvents()) eventBus.broadcast(e);
 	}
 
-	@Override
-	public <E extends Exception> void transaction(boolean readOnly,
-			DbRunnable<E> task) throws DbException, E {
-		Transaction txn = startTransaction(readOnly);
-		try {
-			task.run(txn);
-			commitTransaction(txn);
-		} finally {
-			endTransaction(txn);
-		}
-	}
-
-	@Override
-	public <R, E extends Exception> R transactionWithResult(boolean readOnly,
-			DbCallable<R, E> task) throws DbException, E {
-		Transaction txn = startTransaction(readOnly);
-		try {
-			R result = task.call(txn);
-			commitTransaction(txn);
-			return result;
-		} finally {
-			endTransaction(txn);
-		}
-	}
-
 	private T unbox(Transaction transaction) {
 		if (transaction.isCommitted()) throw new IllegalStateException();
 		return txnClass.cast(transaction.unbox());
@@ -859,16 +832,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		transaction.attach(new ContactStatusChangedEvent(c, active));
 	}
 
-	@Override
-	public void setContactAlias(Transaction transaction, ContactId c,
-			String alias) throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsContact(txn, c))
-			throw new NoSuchContactException();
-		db.setContactAlias(txn, c, alias);
-	}
-
 	@Override
 	public void setGroupVisibility(Transaction transaction, ContactId c,
 			GroupId g, Visibility v) throws DbException {

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

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

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

@@ -1,34 +0,0 @@
-package org.briarproject.bramble.db;
-
-class DatabaseTypes {
-
-	private final String hashType, secretType, binaryType;
-    private final String counterType, stringType;
-
-	public DatabaseTypes(String hashType, String secretType, String binaryType,
-			String counterType, String stringType) {
-		this.hashType = hashType;
-		this.secretType = secretType;
-		this.binaryType = binaryType;
-		this.counterType = counterType;
-		this.stringType = stringType;
-	}
-
-	/**
-	 * Replaces database type placeholders in a statement with the actual types.
-	 * These placeholders are currently supported:
-	 *	<li> _HASH
-	 *	<li> _SECRET
-	 *	<li> _BINARY
-	 *	<li> _COUNTER
-	 *	<li> _STRING
-	 */
-	String replaceTypes(String s) {
-		s = s.replaceAll("_HASH", hashType);
-		s = s.replaceAll("_SECRET", secretType);
-		s = s.replaceAll("_BINARY", binaryType);
-		s = s.replaceAll("_COUNTER", counterType);
-		s = s.replaceAll("_STRING", stringType);
-		return s;
-	}
-}

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

@@ -13,7 +13,6 @@ import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.Properties;
 
 import javax.annotation.Nullable;
@@ -30,8 +29,6 @@ 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 DatabaseTypes dbTypes = new DatabaseTypes(HASH_TYPE,
-			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE);
 
 	private final DatabaseConfig config;
 	private final String url;
@@ -42,7 +39,8 @@ class H2Database extends JdbcDatabase {
 	@Inject
 	H2Database(DatabaseConfig config, MessageFactory messageFactory,
 			Clock clock) {
-		super(dbTypes, messageFactory, clock);
+		super(HASH_TYPE, SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE,
+				messageFactory, clock);
 		this.config = config;
 		File dir = config.getDatabaseDirectory();
 		String path = new File(dir, "db").getAbsolutePath();
@@ -108,22 +106,4 @@ class H2Database extends JdbcDatabase {
 	String getUrl() {
 		return url;
 	}
-
-	@Override
-	protected void compactAndClose() throws DbException {
-		Connection c = null;
-		Statement s = null;
-		try {
-			c = createConnection();
-			closeAllConnections();
-			s = c.createStatement();
-			s.execute("SHUTDOWN COMPACT");
-			s.close();
-			c.close();
-		} catch (SQLException e) {
-			tryToClose(s);
-			tryToClose(c);
-			throw new DbException(e);
-		}
-	}
 }

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

@@ -30,8 +30,6 @@ 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 DatabaseTypes dbTypes = new DatabaseTypes(HASH_TYPE,
-			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE);
 
 	private final DatabaseConfig config;
 	private final String url;
@@ -42,7 +40,8 @@ class HyperSqlDatabase extends JdbcDatabase {
 	@Inject
 	HyperSqlDatabase(DatabaseConfig config, MessageFactory messageFactory,
 			Clock clock) {
-		super(dbTypes, messageFactory, clock);
+		super(HASH_TYPE, SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE,
+				messageFactory, clock);
 		this.config = config;
 		File dir = config.getDatabaseDirectory();
 		String path = new File(dir, "db").getAbsolutePath();
@@ -62,24 +61,20 @@ class HyperSqlDatabase extends JdbcDatabase {
 
 	@Override
 	public void close() throws DbException {
-		Connection c = null;
-		Statement s = null;
 		try {
 			super.closeAllConnections();
-			c = createConnection();
-			s = c.createStatement();
+			Connection c = createConnection();
+			Statement s = c.createStatement();
 			s.executeQuery("SHUTDOWN");
 			s.close();
 			c.close();
 		} catch (SQLException e) {
-			tryToClose(s);
-			tryToClose(c);
 			throw new DbException(e);
 		}
 	}
 
 	@Override
-	public long getFreeSpace() {
+	public long getFreeSpace() throws DbException {
 		File dir = config.getDatabaseDirectory();
 		long maxSize = config.getMaxSize();
 		long free = dir.getFreeSpace();
@@ -109,22 +104,4 @@ class HyperSqlDatabase extends JdbcDatabase {
 		String hex = StringUtils.toHexString(key.getBytes());
 		return DriverManager.getConnection(url + ";crypt_key=" + hex);
 	}
-
-	@Override
-	protected void compactAndClose() throws DbException {
-		Connection c = null;
-		Statement s = null;
-		try {
-			super.closeAllConnections();
-			c = createConnection();
-			s = c.createStatement();
-			s.executeQuery("SHUTDOWN COMPACT");
-			s.close();
-			c.close();
-		} catch (SQLException e) {
-			tryToClose(s);
-			tryToClose(c);
-			throw new DbException(e);
-		}
-	}
 }

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

@@ -56,7 +56,6 @@ import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 import static java.sql.Types.INTEGER;
-import static java.sql.Types.VARCHAR;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
@@ -68,13 +67,9 @@ import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERE
 import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.UNKNOWN;
 import static org.briarproject.bramble.db.DatabaseConstants.DB_SETTINGS_NAMESPACE;
-import static org.briarproject.bramble.db.DatabaseConstants.LAST_COMPACTED_KEY;
-import static org.briarproject.bramble.db.DatabaseConstants.MAX_COMPACTION_INTERVAL_MS;
 import static org.briarproject.bramble.db.DatabaseConstants.SCHEMA_VERSION_KEY;
 import static org.briarproject.bramble.db.ExponentialBackoff.calculateExpiry;
-import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.LogUtils.now;
 
 /**
  * A generic database implementation that can be used with any JDBC-compatible
@@ -84,7 +79,7 @@ import static org.briarproject.bramble.util.LogUtils.now;
 abstract class JdbcDatabase implements Database<Connection> {
 
 	// Package access for testing
-	static final int CODE_SCHEMA_VERSION = 41;
+	static final int CODE_SCHEMA_VERSION = 40;
 
 	// Rotation period offsets for incoming transport keys
 	private static final int OFFSET_PREV = -1;
@@ -114,7 +109,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " authorId _HASH NOT NULL,"
 					+ " formatVersion INT NOT NULL,"
 					+ " name _STRING NOT NULL,"
-					+ " alias _STRING," // Null if no alias exists
 					+ " publicKey _BINARY NOT NULL,"
 					+ " localAuthorId _HASH NOT NULL,"
 					+ " verified BOOLEAN NOT NULL,"
@@ -312,9 +306,10 @@ abstract class JdbcDatabase implements Database<Connection> {
 			Logger.getLogger(JdbcDatabase.class.getName());
 
 	// Different database libraries use different names for certain types
+	private final String hashType, secretType, binaryType;
+	private final String counterType, stringType;
 	private final MessageFactory messageFactory;
 	private final Clock clock;
-	private final DatabaseTypes dbTypes;
 
 	// Locking: connectionsLock
 	private final LinkedList<Connection> connections = new LinkedList<>();
@@ -322,16 +317,20 @@ abstract class JdbcDatabase implements Database<Connection> {
 	private int openConnections = 0; // Locking: connectionsLock
 	private boolean closed = false; // Locking: connectionsLock
 
+	@Nullable
 	protected abstract Connection createConnection() throws SQLException;
 
-	protected abstract void compactAndClose() throws DbException;
-
 	private final Lock connectionsLock = new ReentrantLock();
 	private final Condition connectionsChanged = connectionsLock.newCondition();
 
-	JdbcDatabase(DatabaseTypes databaseTypes, MessageFactory messageFactory,
-			Clock clock) {
-		this.dbTypes = databaseTypes;
+	JdbcDatabase(String hashType, String secretType, String binaryType,
+			String counterType, String stringType,
+			MessageFactory messageFactory, Clock clock) {
+		this.hashType = hashType;
+		this.secretType = secretType;
+		this.binaryType = binaryType;
+		this.counterType = counterType;
+		this.stringType = stringType;
 		this.messageFactory = messageFactory;
 		this.clock = clock;
 	}
@@ -345,16 +344,13 @@ abstract class JdbcDatabase implements Database<Connection> {
 			throw new DbException(e);
 		}
 		// Open the database and create the tables and indexes if necessary
-		boolean compact;
 		Connection txn = startTransaction();
 		try {
 			if (reopen) {
-				Settings s = getSettings(txn, DB_SETTINGS_NAMESPACE);
-				compact = migrateSchema(txn, s, listener) || isCompactionDue(s);
+				checkSchemaVersion(txn, listener);
 			} else {
 				createTables(txn);
-				initialiseSettings(txn);
-				compact = false;
+				storeSchemaVersion(txn, CODE_SCHEMA_VERSION);
 			}
 			createIndexes(txn);
 			commitTransaction(txn);
@@ -362,25 +358,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 			abortTransaction(txn);
 			throw e;
 		}
-		// Compact the database if necessary
-		if (compact) {
-			if (listener != null) listener.onDatabaseCompaction();
-			long start = now();
-			compactAndClose();
-			logDuration(LOG, "Compacting database", start);
-			// Allow the next transaction to reopen the DB
-			synchronized (connectionsLock) {
-				closed = false;
-			}
-			txn = startTransaction();
-			try {
-				storeLastCompacted(txn);
-				commitTransaction(txn);
-			} catch (DbException e) {
-				abortTransaction(txn);
-				throw e;
-			}
-		}
 	}
 
 	/**
@@ -388,18 +365,17 @@ abstract class JdbcDatabase implements Database<Connection> {
 	 * version used by the current code and applies any suitable migrations to
 	 * the data if necessary.
 	 *
-	 * @return true if any migrations were applied, false if the schema was
-	 * already current
 	 * @throws DataTooNewException if the data uses a newer schema than the
 	 * current code
 	 * @throws DataTooOldException if the data uses an older schema than the
 	 * current code and cannot be migrated
 	 */
-	private boolean migrateSchema(Connection txn, Settings s,
+	private void checkSchemaVersion(Connection txn,
 			@Nullable MigrationListener listener) throws DbException {
+		Settings s = getSettings(txn, DB_SETTINGS_NAMESPACE);
 		int dataSchemaVersion = s.getInt(SCHEMA_VERSION_KEY, -1);
 		if (dataSchemaVersion == -1) throw new DbException();
-		if (dataSchemaVersion == CODE_SCHEMA_VERSION) return false;
+		if (dataSchemaVersion == CODE_SCHEMA_VERSION) return;
 		if (CODE_SCHEMA_VERSION < dataSchemaVersion)
 			throw new DataTooNewException();
 		// Apply any suitable migrations in order
@@ -408,7 +384,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			if (start == dataSchemaVersion) {
 				if (LOG.isLoggable(INFO))
 					LOG.info("Migrating from schema " + start + " to " + end);
-				if (listener != null) listener.onDatabaseMigration();
+				if (listener != null) listener.onMigrationRun();
 				// Apply the migration
 				m.migrate(txn);
 				// Store the new schema version
@@ -418,24 +394,11 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 		if (dataSchemaVersion != CODE_SCHEMA_VERSION)
 			throw new DataTooOldException();
-		return true;
 	}
 
 	// Package access for testing
 	List<Migration<Connection>> getMigrations() {
-		return Arrays.asList(
-				new Migration38_39(),
-				new Migration39_40(),
-				new Migration40_41(dbTypes)
-		);
-	}
-
-	private boolean isCompactionDue(Settings s) {
-		long lastCompacted = s.getLong(LAST_COMPACTED_KEY, 0);
-		long elapsed = clock.currentTimeMillis() - lastCompacted;
-		if (LOG.isLoggable(INFO))
-			LOG.info(elapsed + " ms since last compaction");
-		return elapsed > MAX_COMPACTION_INTERVAL_MS;
+		return Arrays.asList(new Migration38_39(), new Migration39_40());
 	}
 
 	private void storeSchemaVersion(Connection txn, int version)
@@ -445,19 +408,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
 	}
 
-	private void storeLastCompacted(Connection txn) throws DbException {
-		Settings s = new Settings();
-		s.putLong(LAST_COMPACTED_KEY, clock.currentTimeMillis());
-		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
-	}
-
-	private void initialiseSettings(Connection txn) throws DbException {
-		Settings s = new Settings();
-		s.putInt(SCHEMA_VERSION_KEY, CODE_SCHEMA_VERSION);
-		s.putLong(LAST_COMPACTED_KEY, clock.currentTimeMillis());
-		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
-	}
-
 	private void tryToClose(@Nullable ResultSet rs) {
 		try {
 			if (rs != null) rs.close();
@@ -466,7 +416,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	protected void tryToClose(@Nullable Statement s) {
+	private void tryToClose(@Nullable Statement s) {
 		try {
 			if (s != null) s.close();
 		} catch (SQLException e) {
@@ -474,32 +424,24 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	protected void tryToClose(@Nullable Connection c) {
-		try {
-			if (c != null) c.close();
-		} catch (SQLException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-
 	private void createTables(Connection txn) throws DbException {
 		Statement s = null;
 		try {
 			s = txn.createStatement();
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_SETTINGS));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_LOCAL_AUTHORS));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_CONTACTS));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_GROUPS));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_GROUP_METADATA));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_GROUP_VISIBILITIES));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_MESSAGES));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_MESSAGE_METADATA));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_MESSAGE_DEPENDENCIES));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_OFFERS));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_STATUSES));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_TRANSPORTS));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_OUTGOING_KEYS));
-			s.executeUpdate(dbTypes.replaceTypes(CREATE_INCOMING_KEYS));
+			s.executeUpdate(insertTypeNames(CREATE_SETTINGS));
+			s.executeUpdate(insertTypeNames(CREATE_LOCAL_AUTHORS));
+			s.executeUpdate(insertTypeNames(CREATE_CONTACTS));
+			s.executeUpdate(insertTypeNames(CREATE_GROUPS));
+			s.executeUpdate(insertTypeNames(CREATE_GROUP_METADATA));
+			s.executeUpdate(insertTypeNames(CREATE_GROUP_VISIBILITIES));
+			s.executeUpdate(insertTypeNames(CREATE_MESSAGES));
+			s.executeUpdate(insertTypeNames(CREATE_MESSAGE_METADATA));
+			s.executeUpdate(insertTypeNames(CREATE_MESSAGE_DEPENDENCIES));
+			s.executeUpdate(insertTypeNames(CREATE_OFFERS));
+			s.executeUpdate(insertTypeNames(CREATE_STATUSES));
+			s.executeUpdate(insertTypeNames(CREATE_TRANSPORTS));
+			s.executeUpdate(insertTypeNames(CREATE_OUTGOING_KEYS));
+			s.executeUpdate(insertTypeNames(CREATE_INCOMING_KEYS));
 			s.close();
 		} catch (SQLException e) {
 			tryToClose(s);
@@ -524,6 +466,15 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
+	private String insertTypeNames(String s) {
+		s = s.replaceAll("_HASH", hashType);
+		s = s.replaceAll("_SECRET", secretType);
+		s = s.replaceAll("_BINARY", binaryType);
+		s = s.replaceAll("_COUNTER", counterType);
+		s = s.replaceAll("_STRING", stringType);
+		return s;
+	}
+
 	@Override
 	public Connection startTransaction() throws DbException {
 		Connection txn;
@@ -538,6 +489,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			if (txn == null) {
 				// Open a new connection
 				txn = createConnection();
+				if (txn == null) throw new DbException();
 				txn.setAutoCommit(false);
 				connectionsLock.lock();
 				try {
@@ -1249,8 +1201,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
-			String sql = "SELECT authorId, formatVersion, name, alias,"
-					+ " publicKey, localAuthorId, verified, active"
+			String sql = "SELECT authorId, formatVersion, name, publicKey,"
+					+ " localAuthorId, verified, active"
 					+ " FROM contacts"
 					+ " WHERE contactId = ?";
 			ps = txn.prepareStatement(sql);
@@ -1260,17 +1212,15 @@ abstract class JdbcDatabase implements Database<Connection> {
 			AuthorId authorId = new AuthorId(rs.getBytes(1));
 			int formatVersion = rs.getInt(2);
 			String name = rs.getString(3);
-			String alias = rs.getString(4);
-			byte[] publicKey = rs.getBytes(5);
-			AuthorId localAuthorId = new AuthorId(rs.getBytes(6));
-			boolean verified = rs.getBoolean(7);
-			boolean active = rs.getBoolean(8);
+			byte[] publicKey = rs.getBytes(4);
+			AuthorId localAuthorId = new AuthorId(rs.getBytes(5));
+			boolean verified = rs.getBoolean(6);
+			boolean active = rs.getBoolean(7);
 			rs.close();
 			ps.close();
 			Author author =
 					new Author(authorId, formatVersion, name, publicKey);
-			return new Contact(c, author, localAuthorId, alias, verified,
-					active);
+			return new Contact(c, author, localAuthorId, verified, active);
 		} catch (SQLException e) {
 			tryToClose(rs);
 			tryToClose(ps);
@@ -1285,7 +1235,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		ResultSet rs = null;
 		try {
 			String sql = "SELECT contactId, authorId, formatVersion, name,"
-					+ " alias, publicKey, localAuthorId, verified, active"
+					+ " publicKey, localAuthorId, verified, active"
 					+ " FROM contacts";
 			ps = txn.prepareStatement(sql);
 			rs = ps.executeQuery();
@@ -1295,15 +1245,14 @@ abstract class JdbcDatabase implements Database<Connection> {
 				AuthorId authorId = new AuthorId(rs.getBytes(2));
 				int formatVersion = rs.getInt(3);
 				String name = rs.getString(4);
-				String alias = rs.getString(5);
-				byte[] publicKey = rs.getBytes(6);
+				byte[] publicKey = rs.getBytes(5);
 				Author author =
 						new Author(authorId, formatVersion, name, publicKey);
-				AuthorId localAuthorId = new AuthorId(rs.getBytes(7));
-				boolean verified = rs.getBoolean(8);
-				boolean active = rs.getBoolean(9);
+				AuthorId localAuthorId = new AuthorId(rs.getBytes(6));
+				boolean verified = rs.getBoolean(7);
+				boolean active = rs.getBoolean(8);
 				contacts.add(new Contact(contactId, author, localAuthorId,
-						alias, verified, active));
+						verified, active));
 			}
 			rs.close();
 			ps.close();
@@ -1344,8 +1293,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
-			String sql = "SELECT contactId, formatVersion, name, alias,"
-					+ " publicKey, localAuthorId, verified, active"
+			String sql = "SELECT contactId, formatVersion, name, publicKey,"
+					+ " localAuthorId, verified, active"
 					+ " FROM contacts"
 					+ " WHERE authorId = ?";
 			ps = txn.prepareStatement(sql);
@@ -1356,15 +1305,14 @@ abstract class JdbcDatabase implements Database<Connection> {
 				ContactId c = new ContactId(rs.getInt(1));
 				int formatVersion = rs.getInt(2);
 				String name = rs.getString(3);
-				String alias = rs.getString(4);
-				byte[] publicKey = rs.getBytes(5);
-				AuthorId localAuthorId = new AuthorId(rs.getBytes(6));
-				boolean verified = rs.getBoolean(7);
-				boolean active = rs.getBoolean(8);
+				byte[] publicKey = rs.getBytes(4);
+				AuthorId localAuthorId = new AuthorId(rs.getBytes(5));
+				boolean verified = rs.getBoolean(6);
+				boolean active = rs.getBoolean(7);
 				Author author =
 						new Author(remote, formatVersion, name, publicKey);
-				contacts.add(new Contact(c, author, localAuthorId, alias,
-						verified, active));
+				contacts.add(new Contact(c, author, localAuthorId, verified,
+						active));
 			}
 			rs.close();
 			ps.close();
@@ -1560,7 +1508,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			rs.close();
 			ps.close();
 			if (raw == null) throw new MessageDeletedException();
-			if (raw.length <= MESSAGE_HEADER_LENGTH) throw new AssertionError();
+			if (raw.length < MESSAGE_HEADER_LENGTH) throw new AssertionError();
 			byte[] body = new byte[raw.length - MESSAGE_HEADER_LENGTH];
 			System.arraycopy(raw, MESSAGE_HEADER_LENGTH, body, 0, body.length);
 			return new Message(m, g, timestamp, body);
@@ -2789,25 +2737,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	public void setContactAlias(Connection txn, ContactId c,
-			@Nullable String alias) throws DbException {
-		PreparedStatement ps = null;
-		try {
-			String sql = "UPDATE contacts SET alias = ? WHERE contactId = ?";
-			ps = txn.prepareStatement(sql);
-			if (alias == null) ps.setNull(1, VARCHAR);
-			else ps.setString(1, alias);
-			ps.setInt(2, c.getInt());
-			int affected = ps.executeUpdate();
-			if (affected < 0 || affected > 1) throw new DbStateException();
-			ps.close();
-		} catch (SQLException e) {
-			tryToClose(ps);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public void setGroupVisibility(Connection txn, ContactId c, GroupId g,
 			boolean shared) throws DbException {

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

@@ -1,56 +0,0 @@
-package org.briarproject.bramble.db;
-
-import org.briarproject.bramble.api.db.DbException;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-class Migration40_41 implements Migration<Connection> {
-
-	private static final Logger LOG = getLogger(Migration40_41.class.getName());
-
-	private final DatabaseTypes dbTypes;
-
-	public Migration40_41(DatabaseTypes databaseTypes) {
-		this.dbTypes = databaseTypes;
-	}
-
-	@Override
-	public int getStartVersion() {
-		return 40;
-	}
-
-	@Override
-	public int getEndVersion() {
-		return 41;
-	}
-
-	@Override
-	public void migrate(Connection txn) throws DbException {
-		Statement s = null;
-		try {
-			s = txn.createStatement();
-			s.execute("ALTER TABLE contacts"
-					+ dbTypes.replaceTypes(" ADD alias VARCHAR"));
-		} catch (SQLException e) {
-			tryToClose(s);
-			throw new DbException(e);
-		}
-	}
-
-	private void tryToClose(@Nullable Statement s) {
-		try {
-			if (s != null) s.close();
-		} catch (SQLException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-}

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

@@ -1,21 +1,29 @@
 package org.briarproject.bramble.identity;
 
+import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 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.identity.AuthorFactory;
+import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
+import java.util.Collection;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
+import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
+import static org.briarproject.bramble.api.identity.Author.Status.UNKNOWN;
+import static org.briarproject.bramble.api.identity.Author.Status.UNVERIFIED;
+import static org.briarproject.bramble.api.identity.Author.Status.VERIFIED;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.now;
 
@@ -110,4 +118,26 @@ class IdentityManagerImpl implements IdentityManager {
 		return db.getLocalAuthors(txn).iterator().next();
 	}
 
+	@Override
+	public Status getAuthorStatus(AuthorId authorId) throws DbException {
+		Transaction txn = db.startTransaction(true);
+		try {
+			return getAuthorStatus(txn, authorId);
+		} finally {
+			db.endTransaction(txn);
+		}
+	}
+
+	@Override
+	public Status getAuthorStatus(Transaction txn, AuthorId authorId)
+			throws DbException {
+		if (getLocalAuthor(txn).getId().equals(authorId)) return OURSELVES;
+		Collection<Contact> contacts = db.getContactsByAuthorId(txn, authorId);
+		if (contacts.isEmpty()) return UNKNOWN;
+		for (Contact c : contacts) {
+			if (c.isVerified()) return VERIFIED;
+		}
+		return UNVERIFIED;
+	}
+
 }

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

@@ -29,7 +29,6 @@ import javax.inject.Inject;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.COMPACTING_DATABASE;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.MIGRATING_DATABASE;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING;
@@ -160,17 +159,11 @@ class LifecycleManagerImpl implements LifecycleManager, MigrationListener {
 	}
 
 	@Override
-	public void onDatabaseMigration() {
+	public void onMigrationRun() {
 		state = MIGRATING_DATABASE;
 		eventBus.broadcast(new LifecycleEvent(MIGRATING_DATABASE));
 	}
 
-	@Override
-	public void onDatabaseCompaction() {
-		state = COMPACTING_DATABASE;
-		eventBus.broadcast(new LifecycleEvent(COMPACTING_DATABASE));
-	}
-
 	@Override
 	public void stopServices() {
 		try {

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

@@ -23,6 +23,7 @@ import org.briarproject.bramble.api.plugin.event.EnableBluetoothEvent;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
+import org.briarproject.bramble.util.StringUtils;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -45,9 +46,6 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
-import static org.briarproject.bramble.util.StringUtils.macToBytes;
-import static org.briarproject.bramble.util.StringUtils.macToString;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -98,9 +96,6 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	abstract DuplexTransportConnection connectTo(String address, String uuid)
 			throws IOException;
 
-	@Nullable
-	abstract DuplexTransportConnection discoverAndConnect(String uuid);
-
 	BluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			Executor ioExecutor, SecureRandom secureRandom,
 			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
@@ -198,7 +193,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 			address = getBluetoothAddress();
 			if (LOG.isLoggable(INFO))
 				LOG.info("Local address " + scrubMacAddress(address));
-			if (!isNullOrEmpty(address)) {
+			if (!StringUtils.isNullOrEmpty(address)) {
 				p.put(PROP_ADDRESS, address);
 				changed = true;
 			}
@@ -261,9 +256,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		// Try to connect to known devices in parallel
 		for (Entry<ContactId, TransportProperties> e : contacts.entrySet()) {
 			String address = e.getValue().get(PROP_ADDRESS);
-			if (isNullOrEmpty(address)) continue;
+			if (StringUtils.isNullOrEmpty(address)) continue;
 			String uuid = e.getValue().get(PROP_UUID);
-			if (isNullOrEmpty(uuid)) continue;
+			if (StringUtils.isNullOrEmpty(uuid)) continue;
 			ContactId c = e.getKey();
 			ioExecutor.execute(() -> {
 				if (!isRunning() || !shouldAllowContactConnections()) return;
@@ -314,9 +309,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		if (!isRunning() || !shouldAllowContactConnections()) return null;
 		if (!connectionLimiter.canOpenContactConnection()) return null;
 		String address = p.get(PROP_ADDRESS);
-		if (isNullOrEmpty(address)) return null;
+		if (StringUtils.isNullOrEmpty(address)) return null;
 		String uuid = p.get(PROP_UUID);
-		if (isNullOrEmpty(uuid)) return null;
+		if (StringUtils.isNullOrEmpty(uuid)) return null;
 		DuplexTransportConnection conn = connect(address, uuid);
 		if (conn == null) return null;
 		// TODO: Why don't we reset the backoff here?
@@ -331,6 +326,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	@Override
 	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
 		if (!isRunning()) return null;
+		// There's no point listening if we can't discover our own address
+		String address = getBluetoothAddress();
+		if (address == null) return null;
 		// No truncation necessary because COMMIT_LENGTH = 16
 		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
 		if (LOG.isLoggable(INFO)) LOG.info("Key agreement UUID " + uuid);
@@ -348,8 +346,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		}
 		BdfList descriptor = new BdfList();
 		descriptor.add(TRANSPORT_ID_BLUETOOTH);
-		String address = getBluetoothAddress();
-		if (address != null) descriptor.add(macToBytes(address));
+		descriptor.add(StringUtils.macToBytes(address));
 		return new BluetoothKeyAgreementListener(descriptor, ss);
 	}
 
@@ -357,25 +354,18 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	public DuplexTransportConnection createKeyAgreementConnection(
 			byte[] commitment, BdfList descriptor) {
 		if (!isRunning()) return null;
+		String address;
+		try {
+			address = parseAddress(descriptor);
+		} catch (FormatException e) {
+			LOG.info("Invalid address in key agreement descriptor");
+			return null;
+		}
 		// No truncation necessary because COMMIT_LENGTH = 16
 		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
-		DuplexTransportConnection conn;
-		if (descriptor.size() == 1) {
-			if (LOG.isLoggable(INFO))
-				LOG.info("Discovering address for key agreement UUID " + uuid);
-			conn = discoverAndConnect(uuid);
-		} else {
-			String address;
-			try {
-				address = parseAddress(descriptor);
-			} catch (FormatException e) {
-				LOG.info("Invalid address in key agreement descriptor");
-				return null;
-			}
-			if (LOG.isLoggable(INFO))
-				LOG.info("Connecting to key agreement UUID " + uuid);
-			conn = connect(address, uuid);
-		}
+		if (LOG.isLoggable(INFO))
+			LOG.info("Connecting to key agreement UUID " + uuid);
+		DuplexTransportConnection conn = connect(address, uuid);
 		if (conn != null) connectionLimiter.keyAgreementConnectionOpened(conn);
 		return conn;
 	}
@@ -383,7 +373,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	private String parseAddress(BdfList descriptor) throws FormatException {
 		byte[] mac = descriptor.getRaw(1);
 		if (mac.length != 6) throw new FormatException();
-		return macToString(mac);
+		return StringUtils.macToString(mac);
 	}
 
 	@Override

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

@@ -28,6 +28,7 @@ import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.util.IoUtils;
+import org.briarproject.bramble.util.StringUtils;
 
 import java.io.Closeable;
 import java.io.EOFException;
@@ -69,11 +70,9 @@ import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WITH_BRIDGES;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
-import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V2;
-import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3;
+import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -88,8 +87,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final String OWNER = "__OwningControllerProcess";
 	private static final int COOKIE_TIMEOUT_MS = 3000;
 	private static final int COOKIE_POLLING_INTERVAL_MS = 200;
-	private static final Pattern ONION_V2 = Pattern.compile("[a-z2-7]{16}");
-	private static final Pattern ONION_V3 = Pattern.compile("[a-z2-7]{56}");
+	private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}");
 
 	private final Executor ioExecutor, connectionStatusExecutor;
 	private final NetworkManager networkManager;
@@ -364,7 +362,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			// If there's already a port number stored in config, reuse it
 			String portString = settings.get(PREF_TOR_PORT);
 			int port;
-			if (isNullOrEmpty(portString)) port = 0;
+			if (StringUtils.isNullOrEmpty(portString)) port = 0;
 			else port = Integer.parseInt(portString);
 			// Bind a server socket to receive connections from Tor
 			ServerSocket ss = null;
@@ -429,11 +427,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			return;
 		}
 		// Publish the hidden service's onion hostname in transport properties
-		String onion2 = response.get(HS_ADDRESS);
+		String hostname = response.get(HS_ADDRESS);
 		if (LOG.isLoggable(INFO))
-			LOG.info("Hidden service " + scrubOnion(onion2));
+			LOG.info("Hidden service " + scrubOnion(hostname));
 		TransportProperties p = new TransportProperties();
-		p.put(PROP_ONION_V2, onion2);
+		p.put(PROP_ONION, hostname);
 		callback.mergeLocalProperties(p);
 		if (privKey == null) {
 			// Save the hidden service's private key for next time
@@ -532,41 +530,26 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public DuplexTransportConnection createConnection(TransportProperties p) {
 		if (!isRunning()) return null;
-		String bestOnion = null;
-		String onion2 = p.get(PROP_ONION_V2);
-		String onion3 = p.get(PROP_ONION_V3);
-		if (!isNullOrEmpty(onion2)) {
-			if (ONION_V2.matcher(onion2).matches()) {
-				bestOnion = onion2;
-			} else {
-				// Don't scrub the address so we can find the problem
-				if (LOG.isLoggable(INFO))
-					LOG.info("Invalid v2 hostname: " + onion2);
-			}
+		String onion = p.get(PROP_ONION);
+		if (StringUtils.isNullOrEmpty(onion)) return null;
+		if (!ONION.matcher(onion).matches()) {
+			// not scrubbing this address, so we are able to find the problem
+			if (LOG.isLoggable(INFO)) LOG.info("Invalid hostname: " + onion);
+			return null;
 		}
-		if (!isNullOrEmpty(onion3)) {
-			if (ONION_V3.matcher(onion3).matches()) {
-				bestOnion = onion3;
-			} else {
-				// Don't scrub the address so we can find the problem
-				if (LOG.isLoggable(INFO))
-					LOG.info("Invalid v3 hostname: " + onion3);
-			}
-		}
-		if (bestOnion == null) return null;
 		Socket s = null;
 		try {
 			if (LOG.isLoggable(INFO))
-				LOG.info("Connecting to " + scrubOnion(bestOnion));
-			s = torSocketFactory.createSocket(bestOnion + ".onion", 80);
+				LOG.info("Connecting to " + scrubOnion(onion));
+			s = torSocketFactory.createSocket(onion + ".onion", 80);
 			s.setSoTimeout(socketTimeout);
 			if (LOG.isLoggable(INFO))
-				LOG.info("Connected to " + scrubOnion(bestOnion));
+				LOG.info("Connected to " + scrubOnion(onion));
 			return new TorTransportConnection(this, s);
 		} catch (IOException e) {
 			if (LOG.isLoggable(INFO)) {
-				LOG.info("Could not connect to " + scrubOnion(bestOnion)
-						+ ": " + e.toString());
+				LOG.info("Could not connect to " + scrubOnion(onion) + ": " +
+						e.toString());
 			}
 			tryToClose(s);
 			return null;
@@ -644,9 +627,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (s.getNamespace().equals(ID.getString())) {
 				LOG.info("Tor settings updated");
 				settings = s.getSettings();
-				// Works around a bug introduced in Tor 0.3.4.8. Could be
-				// replaced with callback.transportDisabled() when fixed.
-				disableNetwork();
 				updateConnectionStatus(networkManager.getNetworkStatus());
 			}
 		} else if (e instanceof NetworkStatusEvent) {
@@ -654,16 +634,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	private void disableNetwork() {
-		connectionStatusExecutor.execute(() -> {
-			try {
-				enableNetwork(false);
-			} catch (IOException ex) {
-				logException(LOG, WARNING, ex);
-			}
-		});
-	}
-
 	private void updateConnectionStatus(NetworkStatus status) {
 		connectionStatusExecutor.execute(() -> {
 			if (!running) return;

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

@@ -36,7 +36,6 @@ class MessageFactoryImpl implements MessageFactory {
 
 	@Override
 	public Message createMessage(GroupId g, long timestamp, byte[] body) {
-		if (body.length == 0) throw new IllegalArgumentException();
 		if (body.length > MAX_MESSAGE_BODY_LENGTH)
 			throw new IllegalArgumentException();
 		MessageId id = getMessageId(g, timestamp, body);
@@ -55,7 +54,7 @@ class MessageFactoryImpl implements MessageFactory {
 
 	@Override
 	public Message createMessage(byte[] raw) {
-		if (raw.length <= MESSAGE_HEADER_LENGTH)
+		if (raw.length < MESSAGE_HEADER_LENGTH)
 			throw new IllegalArgumentException();
 		if (raw.length > MAX_MESSAGE_LENGTH)
 			throw new IllegalArgumentException();

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

@@ -124,8 +124,7 @@ class SyncRecordReaderImpl implements SyncRecordReader {
 		if (!hasMessage()) throw new FormatException();
 		if (nextRecord == null) throw new AssertionError();
 		byte[] payload = nextRecord.getPayload();
-		if (payload.length <= MESSAGE_HEADER_LENGTH)
-			throw new FormatException();
+		if (payload.length < MESSAGE_HEADER_LENGTH) throw new FormatException();
 		// Validate timestamp
 		long timestamp = ByteUtils.readUint64(payload, UniqueId.LENGTH);
 		if (timestamp < 0) throw new FormatException();

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

@@ -79,6 +79,18 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 		assertSame(meta, messageContext.getMetadata());
 	}
 
+	@Test(expected = InvalidMessageException.class)
+	public void testRejectsTooShortMessage() throws Exception {
+		Message invalidMessage = getMessage(groupId, 0);
+
+		context.checking(new Expectations() {{
+			oneOf(clock).currentTimeMillis();
+			will(returnValue(timestamp));
+		}});
+
+		failIfSubclassIsCalled.validateMessage(invalidMessage, group);
+	}
+
 	@Test
 	public void testAcceptsMinLengthMessage() throws Exception {
 		Message shortMessage = getMessage(groupId, 1);

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

@@ -5,17 +5,12 @@ import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.SecretKey;
 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.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.AuthorInfo;
-import org.briarproject.bramble.api.identity.IdentityManager;
-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.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;
@@ -25,20 +20,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Random;
 
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNKNOWN;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
 import static org.briarproject.bramble.test.TestUtils.getAuthor;
-import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public class ContactManagerImplTest extends BrambleMockTestCase {
@@ -46,20 +31,16 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	private final Mockery context = new Mockery();
 	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
 	private final KeyManager keyManager = context.mock(KeyManager.class);
-	private final IdentityManager identityManager =
-			context.mock(IdentityManager.class);
 	private final ContactManager contactManager;
 	private final ContactId contactId = new ContactId(42);
 	private final Author remote = getAuthor();
 	private final AuthorId local = new AuthorId(getRandomId());
-	private final LocalAuthor localAuthor = getLocalAuthor();
-	private final String alias = getRandomString(MAX_AUTHOR_NAME_LENGTH);
 	private final boolean verified = false, active = true;
 	private final Contact contact =
-			new Contact(contactId, remote, local, alias, verified, active);
+			new Contact(contactId, remote, local, verified, active);
 
 	public ContactManagerImplTest() {
-		contactManager = new ContactManagerImpl(db, keyManager, identityManager);
+		contactManager = new ContactManagerImpl(db, keyManager);
 	}
 
 	@Test
@@ -124,7 +105,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
 			oneOf(db).getContactsByAuthorId(txn, remote.getId());
-			will(returnValue(emptyList()));
+			will(returnValue(Collections.emptyList()));
 			oneOf(db).endTransaction(txn);
 		}});
 
@@ -150,8 +131,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	public void testActiveContacts() throws Exception {
 		Collection<Contact> activeContacts = Collections.singletonList(contact);
 		Collection<Contact> contacts = new ArrayList<>(activeContacts);
-		contacts.add(new Contact(new ContactId(3), remote, local, alias, true,
-				false));
+		contacts.add(new Contact(new ContactId(3), remote, local, true, false));
 		Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -191,23 +171,6 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 		contactManager.setContactActive(txn, contactId, active);
 	}
 
-	@Test
-	public void testSetContactAlias() throws Exception {
-		Transaction txn = new Transaction(null, false);
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(equal(false)), withDbRunnable(txn));
-			oneOf(db).setContactAlias(txn, contactId, alias);
-		}});
-
-		contactManager.setContactAlias(contactId, alias);
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void testSetContactAliasTooLong() throws Exception {
-		contactManager.setContactAlias(contactId,
-				getRandomString(MAX_AUTHOR_NAME_LENGTH + 1));
-	}
-
 	@Test
 	public void testContactExists() throws Exception {
 		Transaction txn = new Transaction(null, true);
@@ -223,79 +186,4 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 		assertTrue(contactManager.contactExists(remote.getId(), local));
 	}
 
-	@Test
-	public void testGetAuthorStatus() throws Exception {
-		Transaction txn = new Transaction(null, true);
-		Collection<Contact> contacts = singletonList(
-				new Contact(new ContactId(1), remote, localAuthor.getId(),
-						alias, false, true));
-
-		context.checking(new DbExpectations() {{
-			oneOf(db).transactionWithResult(with(equal(true)),
-					withDbCallable(txn));
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			oneOf(db).getContactsByAuthorId(txn, remote.getId());
-			will(returnValue(contacts));
-		}});
-		AuthorInfo authorInfo =
-				contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(UNVERIFIED, authorInfo.getStatus());
-		assertEquals(alias, contact.getAlias());
-	}
-
-	@Test
-	public void testGetAuthorStatusTransaction() throws DbException {
-		Transaction txn = new Transaction(null, true);
-
-		// check unknown author
-		context.checking(new Expectations() {{
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			oneOf(db).getContactsByAuthorId(txn, remote.getId());
-			will(returnValue(emptyList()));
-		}});
-		AuthorInfo authorInfo =
-				contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(UNKNOWN, authorInfo.getStatus());
-		assertNull(authorInfo.getAlias());
-
-		// check unverified contact
-		Collection<Contact> contacts = singletonList(
-				new Contact(new ContactId(1), remote, localAuthor.getId(),
-						alias, false, true));
-		checkAuthorStatusContext(txn, remote.getId(), contacts);
-		authorInfo = contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(UNVERIFIED, authorInfo.getStatus());
-		assertEquals(alias, contact.getAlias());
-
-		// check verified contact
-		contacts = singletonList(new Contact(new ContactId(1), remote,
-				localAuthor.getId(), alias, true, true));
-		checkAuthorStatusContext(txn, remote.getId(), contacts);
-		authorInfo = contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(VERIFIED, authorInfo.getStatus());
-		assertEquals(alias, contact.getAlias());
-
-		// check ourselves
-		context.checking(new Expectations() {{
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			never(db).getContactsByAuthorId(txn, remote.getId());
-		}});
-		authorInfo = contactManager.getAuthorInfo(txn, localAuthor.getId());
-		assertEquals(OURSELVES, authorInfo.getStatus());
-		assertNull(authorInfo.getAlias());
-	}
-
-	private void checkAuthorStatusContext(Transaction txn, AuthorId authorId,
-			Collection<Contact> contacts) throws DbException {
-		context.checking(new Expectations() {{
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			oneOf(db).getContactsByAuthorId(txn, authorId);
-			will(returnValue(contacts));
-		}});
-	}
-
 }

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

@@ -77,7 +77,6 @@ import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -100,7 +99,6 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 	private final Group group;
 	private final Author author;
 	private final LocalAuthor localAuthor;
-	private final String alias;
 	private final Message message, message1;
 	private final MessageId messageId, messageId1;
 	private final Metadata metadata;
@@ -117,7 +115,6 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		groupId = group.getId();
 		author = getAuthor();
 		localAuthor = getLocalAuthor();
-		alias = getRandomString(5);
 		message = getMessage(groupId);
 		message1 = getMessage(groupId);
 		messageId = message.getId();
@@ -127,7 +124,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		transportId = getTransportId();
 		maxLatency = Integer.MAX_VALUE;
 		contactId = new ContactId(234);
-		contact = new Contact(contactId, author, localAuthor.getId(), alias,
+		contact = new Contact(contactId, author, localAuthor.getId(),
 				true, true);
 		keySetId = new KeySetId(345);
 	}
@@ -291,11 +288,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(17).of(database).startTransaction();
+			exactly(16).of(database).startTransaction();
 			will(returnValue(txn));
-			exactly(17).of(database).containsContact(txn, contactId);
+			exactly(16).of(database).containsContact(txn, contactId);
 			will(returnValue(false));
-			exactly(17).of(database).abortTransaction(txn);
+			exactly(16).of(database).abortTransaction(txn);
 		}});
 		DatabaseComponent db = createDatabaseComponent(database, eventBus,
 				shutdown);
@@ -453,16 +450,6 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			db.endTransaction(transaction);
 		}
 
-		transaction = db.startTransaction(false);
-		try {
-			db.setContactAlias(transaction, contactId, alias);
-			fail();
-		} catch (NoSuchContactException expected) {
-			// Expected
-		} finally {
-			db.endTransaction(transaction);
-		}
-
 		transaction = db.startTransaction(false);
 		try {
 			db.setGroupVisibility(transaction, contactId, groupId, SHARED);

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

@@ -26,10 +26,11 @@ import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.OutgoingKeys;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import org.briarproject.bramble.system.SystemClock;
+import org.briarproject.bramble.test.ArrayClock;
 import org.briarproject.bramble.test.BrambleTestCase;
-import org.briarproject.bramble.test.SettableClock;
 import org.briarproject.bramble.test.TestDatabaseConfig;
 import org.briarproject.bramble.test.TestMessageFactory;
+import org.briarproject.bramble.test.TestUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,7 +46,6 @@ import java.util.Map.Entry;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
@@ -53,7 +53,6 @@ import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
@@ -62,9 +61,6 @@ import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERE
 import static org.briarproject.bramble.api.sync.ValidationManager.State.INVALID;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.UNKNOWN;
-import static org.briarproject.bramble.db.DatabaseConstants.DB_SETTINGS_NAMESPACE;
-import static org.briarproject.bramble.db.DatabaseConstants.LAST_COMPACTED_KEY;
-import static org.briarproject.bramble.db.DatabaseConstants.MAX_COMPACTION_INTERVAL_MS;
 import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getAuthor;
 import static org.briarproject.bramble.test.TestUtils.getClientId;
@@ -75,7 +71,6 @@ import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -1715,39 +1710,6 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.close();
 	}
 
-	@Test
-	public void testSetContactAlias() throws Exception {
-		Database<Connection> db = open(false);
-		Connection txn = db.startTransaction();
-
-		// Add a contact
-		db.addLocalAuthor(txn, localAuthor);
-		assertEquals(contactId, db.addContact(txn, author, localAuthor.getId(),
-				true, true));
-
-		// The contact should have no alias
-		Contact contact = db.getContact(txn, contactId);
-		assertNull(contact.getAlias());
-
-		// Set a contact alias
-		String alias = getRandomString(MAX_AUTHOR_NAME_LENGTH);
-		db.setContactAlias(txn, contactId, alias);
-
-		// The contact should have an alias
-		contact = db.getContact(txn, contactId);
-		assertEquals(alias, contact.getAlias());
-
-		// Set the contact alias null
-		db.setContactAlias(txn, contactId, null);
-
-		// The contact should have no alias
-		contact = db.getContact(txn, contactId);
-		assertNull(contact.getAlias());
-
-		db.commitTransaction(txn);
-		db.close();
-	}
-
 	@Test
 	public void testSetMessageState() throws Exception {
 		Database<Connection> db = open(false);
@@ -1856,9 +1818,10 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	@Test
 	public void testMessageRetransmission() throws Exception {
 		long now = System.currentTimeMillis();
-		AtomicLong time = new AtomicLong(now);
+		long steps[] = {now, now, now + MAX_LATENCY * 2 - 1,
+				now + MAX_LATENCY * 2};
 		Database<Connection> db =
-				open(false, new TestMessageFactory(), new SettableClock(time));
+				open(false, new TestMessageFactory(), new ArrayClock(steps));
 		Connection txn = db.startTransaction();
 
 		// Add a contact, a shared group and a shared message
@@ -1884,13 +1847,11 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// Time: now + MAX_LATENCY * 2 - 1
 		// The message should not yet be sendable
-		time.set(now + MAX_LATENCY * 2 - 1);
 		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Time: now + MAX_LATENCY * 2
 		// The message should have expired and should now be sendable
-		time.set(now + MAX_LATENCY * 2);
 		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 
@@ -1898,12 +1859,13 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.close();
 	}
 
+
 	@Test
 	public void testFasterMessageRetransmission() throws Exception {
 		long now = System.currentTimeMillis();
-		AtomicLong time = new AtomicLong(now);
+		long steps[] = {now, now, now, now, now + 1};
 		Database<Connection> db =
-				open(false, new TestMessageFactory(), new SettableClock(time));
+				open(false, new TestMessageFactory(), new ArrayClock(steps));
 		Connection txn = db.startTransaction();
 
 		// Add a contact, a shared group and a shared message
@@ -1941,7 +1903,6 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		// Time: now + 1
 		// The message should no longer be sendable via the faster transport,
 		// as the ETA is now equal
-		time.set(now + 1);
 		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE,
 				MAX_LATENCY - 1);
 		assertTrue(ids.isEmpty());
@@ -1950,45 +1911,6 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.close();
 	}
 
-	@Test
-	public void testCompactionTime() throws Exception {
-		MessageFactory messageFactory = new TestMessageFactory();
-		long now = System.currentTimeMillis();
-		AtomicLong time = new AtomicLong(now);
-		Clock clock = new SettableClock(time);
-
-		// Time: now
-		// The last compaction time should be initialised to the current time
-		Database<Connection> db = open(false, messageFactory, clock);
-		Connection txn = db.startTransaction();
-		Settings s = db.getSettings(txn, DB_SETTINGS_NAMESPACE);
-		assertEquals(now, s.getLong(LAST_COMPACTED_KEY, 0));
-		db.commitTransaction(txn);
-		db.close();
-
-		// Time: now + MAX_COMPACTION_INTERVAL_MS
-		// The DB should not be compacted, so the last compaction time should
-		// not be updated
-		time.set(now + MAX_COMPACTION_INTERVAL_MS);
-		db = open(true, messageFactory, clock);
-		txn = db.startTransaction();
-		s = db.getSettings(txn, DB_SETTINGS_NAMESPACE);
-		assertEquals(now, s.getLong(LAST_COMPACTED_KEY, 0));
-		db.commitTransaction(txn);
-		db.close();
-
-		// Time: now + MAX_COMPACTION_INTERVAL_MS + 1
-		// The DB should be compacted, so the last compaction time should be
-		// updated
-		time.set(now + MAX_COMPACTION_INTERVAL_MS + 1);
-		db = open(true, messageFactory, clock);
-		txn = db.startTransaction();
-		s = db.getSettings(txn, DB_SETTINGS_NAMESPACE);
-		assertEquals(now + MAX_COMPACTION_INTERVAL_MS + 1,
-				s.getLong(LAST_COMPACTED_KEY, 0));
-		db.commitTransaction(txn);
-		db.close();
-	}
 
 	private Database<Connection> open(boolean resume) throws Exception {
 		return open(resume, new TestMessageFactory(), new SystemClock());
@@ -1999,7 +1921,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		Database<Connection> db =
 				createDatabase(new TestDatabaseConfig(testDir, MAX_SIZE),
 						messageFactory, clock);
-		if (!resume) deleteTestDirectory(testDir);
+		if (!resume) TestUtils.deleteTestDirectory(testDir);
 		db.open(key, null);
 		return db;
 	}

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

@@ -1,5 +1,7 @@
 package org.briarproject.bramble.identity;
 
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.PrivateKey;
@@ -7,7 +9,9 @@ import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 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.AuthorFactory;
+import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.test.BrambleMockTestCase;
@@ -15,9 +19,15 @@ import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
+import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
+import static org.briarproject.bramble.api.identity.Author.Status.UNKNOWN;
+import static org.briarproject.bramble.api.identity.Author.Status.UNVERIFIED;
+import static org.briarproject.bramble.api.identity.Author.Status.VERIFIED;
+import static org.briarproject.bramble.test.TestUtils.getAuthor;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.junit.Assert.assertEquals;
 
@@ -97,4 +107,60 @@ public class IdentityManagerImplTest extends BrambleMockTestCase {
 		assertEquals(localAuthor, identityManager.getLocalAuthor());
 	}
 
+	@Test
+	public void testGetAuthorStatus() throws DbException {
+		Author author = getAuthor();
+		AuthorId authorId = author.getId();
+		Collection<Contact> contacts = new ArrayList<>();
+
+		context.checking(new Expectations() {{
+			oneOf(db).startTransaction(true);
+			will(returnValue(txn));
+			oneOf(db).getLocalAuthors(txn);
+			will(returnValue(localAuthors));
+			oneOf(db).getContactsByAuthorId(txn, authorId);
+			will(returnValue(contacts));
+			oneOf(db).endTransaction(txn);
+		}});
+		assertEquals(UNKNOWN, identityManager.getAuthorStatus(authorId));
+
+		// add one unverified contact
+		Contact contact = new Contact(new ContactId(1), author,
+				localAuthor.getId(), false, true);
+		contacts.add(contact);
+
+		checkAuthorStatusContext(authorId, contacts);
+		assertEquals(UNVERIFIED, identityManager.getAuthorStatus(authorId));
+
+		// add one verified contact
+		Contact contact2 = new Contact(new ContactId(1), author,
+				localAuthor.getId(), true, true);
+		contacts.add(contact2);
+
+		checkAuthorStatusContext(authorId, contacts);
+		assertEquals(VERIFIED, identityManager.getAuthorStatus(authorId));
+
+		context.checking(new Expectations() {{
+			oneOf(db).startTransaction(true);
+			will(returnValue(txn));
+			never(db).getLocalAuthors(txn);
+			never(db).getContactsByAuthorId(txn, authorId);
+			oneOf(db).endTransaction(txn);
+		}});
+		assertEquals(OURSELVES,
+				identityManager.getAuthorStatus(localAuthor.getId()));
+	}
+
+	private void checkAuthorStatusContext(AuthorId authorId,
+			Collection<Contact> contacts) throws DbException {
+		context.checking(new Expectations() {{
+			oneOf(db).startTransaction(true);
+			will(returnValue(txn));
+			never(db).getLocalAuthors(txn);
+			oneOf(db).getContactsByAuthorId(txn, authorId);
+			will(returnValue(contacts));
+			oneOf(db).endTransaction(txn);
+		}});
+	}
+
 }

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

@@ -39,7 +39,6 @@ import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -613,7 +612,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	private Contact getContact(boolean active) {
 		ContactId c = new ContactId(nextContactId++);
 		return new Contact(c, getAuthor(), localAuthor.getId(),
-				getRandomString(5), true, active);
+				true, active);
 	}
 
 	private void expectGetLocalProperties(Transaction txn) throws Exception {

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

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.test;
-
-import org.briarproject.bramble.api.db.DbCallable;
-import org.briarproject.bramble.api.db.DbRunnable;
-import org.briarproject.bramble.api.db.Transaction;
-import org.jmock.Expectations;
-
-public class DbExpectations extends Expectations {
-
-	protected <E extends Exception> DbRunnable<E> withDbRunnable(
-			Transaction txn) {
-		addParameterMatcher(any(DbRunnable.class));
-		currentBuilder().setAction(new RunTransactionAction(txn));
-		return null;
-	}
-
-	protected <R, E extends Exception> DbCallable<R, E> withDbCallable(
-			Transaction txn) {
-		addParameterMatcher(any(DbCallable.class));
-		currentBuilder().setAction(new RunTransactionWithResultAction(txn));
-		return null;
-	}
-
-}

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

@@ -1,30 +0,0 @@
-package org.briarproject.bramble.test;
-
-import org.briarproject.bramble.api.db.DbRunnable;
-import org.briarproject.bramble.api.db.Transaction;
-import org.hamcrest.Description;
-import org.jmock.api.Action;
-import org.jmock.api.Invocation;
-
-public class RunTransactionAction implements Action {
-
-	private final Transaction txn;
-
-	@SuppressWarnings("WeakerAccess")
-	public RunTransactionAction(Transaction txn) {
-		this.txn = txn;
-	}
-
-	@Override
-	public Object invoke(Invocation invocation) throws Throwable {
-		DbRunnable task = (DbRunnable) invocation.getParameter(1);
-		task.run(txn);
-		return null;
-	}
-
-	@Override
-	public void describeTo(Description description) {
-		description.appendText("runs a task inside a database transaction");
-	}
-
-}

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

@@ -1,27 +0,0 @@
-package org.briarproject.bramble.test;
-
-import org.briarproject.bramble.api.db.DbCallable;
-import org.briarproject.bramble.api.db.Transaction;
-import org.hamcrest.Description;
-import org.jmock.api.Action;
-import org.jmock.api.Invocation;
-
-public class RunTransactionWithResultAction implements Action {
-
-	private final Transaction txn;
-
-	public RunTransactionWithResultAction(Transaction txn) {
-		this.txn = txn;
-	}
-
-	@Override
-	public Object invoke(Invocation invocation) throws Throwable {
-		DbCallable task = (DbCallable) invocation.getParameter(1);
-		return task.call(txn);
-	}
-
-	@Override
-	public void describeTo(Description description) {
-		description.appendText("runs a task inside a database transaction");
-	}
-}

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

@@ -33,7 +33,6 @@ import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
 
 public class KeyManagerImplTest extends BrambleMockTestCase {
@@ -67,10 +66,10 @@ public class KeyManagerImplTest extends BrambleMockTestCase {
 		Author remoteAuthor = getAuthor();
 		AuthorId localAuthorId = new AuthorId(getRandomId());
 		Collection<Contact> contacts = new ArrayList<>();
-		contacts.add(new Contact(contactId, remoteAuthor, localAuthorId,
-				getRandomString(5), true, true));
+		contacts.add(new Contact(contactId, remoteAuthor, localAuthorId, true,
+				true));
 		contacts.add(new Contact(inactiveContactId, remoteAuthor, localAuthorId,
-				getRandomString(5), true, false));
+				true, false));
 		SimplexPluginFactory pluginFactory =
 				context.mock(SimplexPluginFactory.class);
 		Collection<SimplexPluginFactory> factories =

bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java

@@ -38,7 +38,6 @@ import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_LOCAL;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_UPDATE_VERSION;
@@ -57,8 +56,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 	private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
 	private final Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
 	private final Contact contact = new Contact(new ContactId(123),
-			getAuthor(), getLocalAuthor().getId(), getRandomString(5), true,
-			true);
+			getAuthor(), getLocalAuthor().getId(), true, true);
 	private final ClientId clientId = getClientId();
 	private final long now = System.currentTimeMillis();
 	private final Transaction txn = new Transaction(null, false);

bramble-core/witness.gradle

@@ -28,6 +28,6 @@ dependencyVerification {
         'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
         'org.ow2.asm:asm-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
         'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
-        'org.whispersystems:curve25519-java:0.5.0:curve25519-java-0.5.0.jar:0aadd43cf01d11e9b58f867b3c4f25c3194e8b0623d1953d32dfbfbee009e38d',
+        'org.whispersystems:curve25519-java:0.4.1:curve25519-java-0.4.1.jar:7dd659d8822c06c3aea1a47f18fac9e5761e29cab8100030b877db445005f03e',
     ]
 }

bramble-java/build.gradle

@@ -14,9 +14,9 @@ configurations {
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
 	implementation fileTree(dir: 'libs', include: '*.jar')
-	implementation 'net.java.dev.jna:jna:4.5.2'
-	implementation 'net.java.dev.jna:jna-platform:4.5.2'
-	tor 'org.briarproject:tor:0.3.4.8@zip'
+	implementation 'net.java.dev.jna:jna:4.4.0'
+	implementation 'net.java.dev.jna:jna-platform:4.4.0'
+	tor 'org.briarproject:tor:0.2.9.16@zip'
 
 	apt 'com.google.dagger:dagger-compiler:2.0.2'
 

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java

@@ -108,12 +108,6 @@ class JavaBluetoothPlugin extends BluetoothPlugin<StreamConnectionNotifier> {
 		return wrapSocket((StreamConnection) Connector.open(url));
 	}
 
-	@Override
-	@Nullable
-	DuplexTransportConnection discoverAndConnect(String uuid) {
-		return null; // TODO
-	}
-
 	private String makeUrl(String address, String uuid) {
 		return "btspp://" + address + ":" + uuid + ";name=RFCOMM";
 	}

bramble-java/witness.gradle

@@ -7,12 +7,12 @@ dependencyVerification {
         'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-        'net.java.dev.jna:jna-platform:4.5.2:jna-platform-4.5.2.jar:f1d00c167d8921c6e23c626ef9f1c3ae0be473c95c68ffa012bc7ae55a87e2d6',
-        'net.java.dev.jna:jna:4.5.2:jna-4.5.2.jar:0c8eb7acf67261656d79005191debaba3b6bf5dd60a43735a245429381dbecff',
+        'net.java.dev.jna:jna-platform:4.4.0:jna-platform-4.4.0.jar:e9dda9e884fc107eb6367710540789a12dfa8ad28be9326b22ca6e352e325499',
+        'net.java.dev.jna:jna:4.4.0:jna-4.4.0.jar:c4dadeeecaa90c8847902082aee5eb107fcf59c5d0e63a17fcaf273c0e2d2bd1',
         'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
         'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
-        'org.briarproject:tor:0.3.4.8:tor-0.3.4.8.zip:bc0158c34002f471a4fe14a6a481816c918eb520a220bb027f64be902beb757f',
+        'org.briarproject:tor:0.2.9.16:tor-0.2.9.16.zip:f33091ba414d6a952263981d9059b3d0a9093fd277ae887b3cdd02e8f1936558',
         'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
         'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
         'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',

briar-android/artwork/ic_link_down.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   style="width:24px;height:24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_link_down.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="13.906433"
+     inkscape:cx="5.1490538"
+     inkscape:cy="22.945407"
+     inkscape:window-x="1440"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     fill="#000000"
+     d="M16,6H13V7.9H16C18.26,7.9 20.1,9.73 20.1,12A4.1,4.1 0 0,1 16,16.1H13V18H16A6,6 0 0,0 22,12C22,8.68 19.31,6 16,6M3.9,12C3.9,9.73 5.74,7.9 8,7.9H11V6H8A6,6 0 0,0 2,12A6,6 0 0,0 8,18H11V16.1H8C5.74,16.1 3.9,14.26 3.9,12M8,13H16V11H8V13Z"
+     id="path2" />
+  <path
+     id="path884"
+     d="m 21.659779,17.473157 h -2.295918 v 3.061224 H 17.51182 l 3.000001,3 2.999999,-3 h -1.852041 z"
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke-width:0.38265303" />
+</svg>

briar-android/artwork/ic_link_up.svg

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   style="width:24px;height:24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_link_up.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="13.906433"
+     inkscape:cx="5.1490538"
+     inkscape:cy="22.945407"
+     inkscape:window-x="1440"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     fill="#000000"
+     d="M16,6H13V7.9H16C18.26,7.9 20.1,9.73 20.1,12A4.1,4.1 0 0,1 16,16.1H13V18H16A6,6 0 0,0 22,12C22,8.68 19.31,6 16,6M3.9,12C3.9,9.73 5.74,7.9 8,7.9H11V6H8A6,6 0 0,0 2,12A6,6 0 0,0 8,18H11V16.1H8C5.74,16.1 3.9,14.26 3.9,12M8,13H16V11H8V13Z"
+     id="path2" />
+  <path
+     id="path884"
+     d="M 21.659779,23.534381 H 19.363861 V 20.473157 H 17.51182 l 3.000001,-3 2.999999,3 h -1.852041 z"
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke-width:0.38265303" />
+</svg>

briar-android/build.gradle

@@ -2,6 +2,73 @@ apply plugin: 'com.android.application'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
 
+// prototype
+repositories {
+	maven { url 'https://jitpack.io' }
+}
+
+dependencies {
+	implementation project(path: ':briar-core', configuration: 'default')
+	implementation project(path: ':bramble-core', configuration: 'default')
+	implementation project(':bramble-android')
+
+	def supportVersion = '28.0.0'
+	implementation "com.android.support:support-v4:$supportVersion"
+	implementation("com.android.support:appcompat-v7:$supportVersion") {
+		exclude module: 'support-v4'
+	}
+	implementation("com.android.support:preference-v14:$supportVersion") {
+		exclude module: 'support-v4'
+	}
+	implementation("com.android.support:design:$supportVersion") {
+		exclude module: 'support-v4'
+		exclude module: 'recyclerview-v7'
+	}
+	implementation "com.android.support:cardview-v7:$supportVersion"
+	implementation "com.android.support:support-annotations:$supportVersion"
+	implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+	implementation('ch.acra:acra:4.9.1') {
+		exclude module: 'support-v4'
+		exclude module: 'support-annotations'
+	}
+	implementation 'info.guardianproject.panic:panic:0.5'
+	implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
+	implementation 'de.hdodenhof:circleimageview:2.2.0'
+	implementation 'com.google.zxing:core:3.3.0'
+	implementation 'uk.co.samuelwall:material-tap-target-prompt:2.8.0'
+	implementation 'com.vanniktech:emoji-google:0.5.1'
+
+	// prototype
+	implementation "com.github.kobakei:MaterialFabSpeedDial:1.2.0"
+
+	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
+
+	compileOnly 'javax.annotation:jsr250-api:1.0'
+
+	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
+	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
+	testImplementation 'org.robolectric:robolectric:3.8'
+	testImplementation 'org.robolectric:shadows-support-v4:3.3.2'
+	testImplementation 'org.mockito:mockito-core:2.13.0'
+	testImplementation 'junit:junit:4.12'
+	testImplementation "org.jmock:jmock:2.8.2"
+	testImplementation "org.jmock:jmock-junit4:2.8.2"
+	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "org.hamcrest:hamcrest-library:1.3"
+	testImplementation "org.hamcrest:hamcrest-core:1.3"
+
+	def espressoVersion = '3.0.2'
+	androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
+	androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
+	androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espressoVersion"
+	androidTestImplementation "tools.fastlane:screengrab:1.1.0"
+	androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:2.1.3"
+	androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.0.2"
+	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
+	androidTestImplementation 'junit:junit:4.12'
+}
+
 def getStdout = { command, defaultValue ->
 	def stdout = new ByteArrayOutputStream()
 	try {
@@ -17,20 +84,20 @@ def getStdout = { command, defaultValue ->
 
 android {
 	compileSdkVersion 28
-	buildToolsVersion '28.0.3'
+	buildToolsVersion '28.0.2'
 
 	defaultConfig {
 		minSdkVersion 15
 		targetSdkVersion 26
-		versionCode 10103
-		versionName "1.1.3"
+		versionCode 10101
+		versionName "1.1.1"
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
 		def now = (long) (System.currentTimeMillis() / 1000)
 		buildConfigField "Long", "BuildTimestamp",
 				"${getStdout(['git', 'log', '-n', '1', '--format=%ct'], now)}000L"
-		testInstrumentationRunner 'org.briarproject.briar.android.BriarTestRunner'
+		testInstrumentationRunner 'org.briarproject.briar.android.test.BriarTestRunner'
 	}
 
 	buildTypes {
@@ -85,66 +152,6 @@ android {
 	}
 }
 
-dependencies {
-	implementation project(path: ':briar-core', configuration: 'default')
-	implementation project(path: ':bramble-core', configuration: 'default')
-	implementation project(':bramble-android')
-
-	def supportVersion = '28.0.0'
-	implementation "com.android.support:support-v4:$supportVersion"
-	implementation("com.android.support:appcompat-v7:$supportVersion") {
-		exclude module: 'support-v4'
-	}
-	implementation("com.android.support:preference-v14:$supportVersion") {
-		exclude module: 'support-v4'
-	}
-	implementation("com.android.support:design:$supportVersion") {
-		exclude module: 'support-v4'
-		exclude module: 'recyclerview-v7'
-	}
-	implementation "com.android.support:cardview-v7:$supportVersion"
-	implementation "com.android.support:support-annotations:$supportVersion"
-	implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-	implementation "android.arch.lifecycle:extensions:1.1.1"
-
-	implementation('ch.acra:acra:4.11') {
-		exclude module: 'support-v4'
-		exclude module: 'support-annotations'
-	}
-	implementation 'info.guardianproject.panic:panic:0.5'
-	implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
-	implementation 'de.hdodenhof:circleimageview:2.2.0'
-	implementation 'com.google.zxing:core:3.3.3'
-	implementation 'uk.co.samuelwall:material-tap-target-prompt:2.12.4'
-	implementation 'com.vanniktech:emoji-google:0.5.1'
-
-	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
-
-	compileOnly 'javax.annotation:jsr250-api:1.0'
-
-	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
-	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
-	testImplementation 'org.robolectric:robolectric:3.8'
-	testImplementation 'org.robolectric:shadows-support-v4:3.3.2'
-	testImplementation 'org.mockito:mockito-core:2.13.0'
-	testImplementation 'junit:junit:4.12'
-	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock-legacy:2.8.2"
-	testImplementation "org.hamcrest:hamcrest-library:1.3"
-	testImplementation "org.hamcrest:hamcrest-core:1.3"
-
-	def espressoVersion = '3.0.2'
-	androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
-	androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
-	androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espressoVersion"
-	androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.0.2"
-	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
-	androidTestImplementation 'junit:junit:4.12'
-	androidTestScreenshotImplementation "tools.fastlane:screengrab:1.2.0"
-	androidTestScreenshotImplementation "com.android.support.test.uiautomator:uiautomator-v18:2.1.3"
-}
-
 task verifyTranslations {
 	doLast {
 		def file = project.file("src/main/res/values/arrays.xml")

briar-android/fastlane/Screengrabfile

@@ -1,7 +1,9 @@
 app_package_name "org.briarproject.briar.android.screenshot.debug"
 locales ['en-US']
+use_tests_in_classes([
+    'org.briarproject.briar.android.login.SetupActivityScreenshotTest',
+    'org.briarproject.briar.android.settings.SettingsActivityScreenshotTest',
+])
 app_apk_path "build/outputs/apk/screenshot/debug/briar-android-screenshot-debug.apk"
 tests_apk_path "build/outputs/apk/androidTest/screenshot/debug/briar-android-screenshot-debug-androidTest.apk"
-test_instrumentation_runner "org.briarproject.briar.android.BriarTestRunner"
-reinstall_app = true
-exit_on_test_failure = true
+test_instrumentation_runner "org.briarproject.briar.android.test.BriarTestRunner"

briar-android/fastlane/demo-mode-activate.sh

@@ -4,8 +4,4 @@ adb shell am broadcast -a com.android.systemui.demo -e command enter
 adb shell am broadcast -a com.android.systemui.demo -e command notifications -e visible false
 adb shell am broadcast -a com.android.systemui.demo -e command battery -e level 100
 adb shell am broadcast -a com.android.systemui.demo -e command network -e wifi show
-adb shell am broadcast -a com.android.systemui.demo -e command clock -e hhmm 1337
-
-# workaround for Android Pie hidden API Espresso bug
-adb shell settings put global hidden_api_policy_pre_p_apps  1
-adb shell settings put global hidden_api_policy_p_apps 1
+adb shell am broadcast -a com.android.systemui.demo -e command clock -e hhmm 1337

briar-android/proguard-rules.txt

@@ -19,8 +19,6 @@
 -dontnote com.android.org.conscrypt.SSLParametersImpl
 -dontnote org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
 -dontnote sun.security.ssl.SSLContextImpl
--dontwarn org.conscrypt.OpenSSLProvider
--dontwarn org.conscrypt.Conscrypt
 
 # HTML sanitiser
 -keep class org.jsoup.safety.Whitelist

briar-android/proguard-test.txt

@@ -12,4 +12,4 @@
 -keep class junit.** { *; }
 -dontwarn junit.**
 
--dontwarn org.briarproject.briar.android.**
+-dontwarn org.briarproject.briar.android.BriarTestComponentApplication

briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -4,7 +4,8 @@ import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.briar.BriarCoreModule;
-import org.briarproject.briar.android.contact.ConversationActivityScreenshotTest;
+import org.briarproject.briar.android.login.SetupActivityScreenshotTest;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
 import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
 
 import javax.inject.Singleton;
@@ -21,9 +22,8 @@ import dagger.Component;
 })
 public interface BriarUiTestComponent extends AndroidComponent {
 
-	void inject(SetupDataTest test);
-
-	void inject(ConversationActivityScreenshotTest test);
+	void inject(SetupActivityScreenshotTest test);
+	void inject(NavDrawerActivityTest test);
 	void inject(SettingsActivityScreenshotTest test);
 
 }

briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java

@@ -1,79 +0,0 @@
-package org.briarproject.briar.android;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.support.test.espresso.intent.rule.IntentsTestRule;
-
-import org.briarproject.bramble.api.account.AccountManager;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-
-@SuppressWarnings("WeakerAccess")
-public abstract class UiTest {
-
-	protected final String USERNAME =
-			getTargetContext().getString(R.string.screenshot_alice);
-	protected static final String PASSWORD = "123456";
-
-	@Inject
-	protected AccountManager accountManager;
-	@Inject
-	protected LifecycleManager lifecycleManager;
-
-	public UiTest() {
-		BriarTestComponentApplication app =
-				(BriarTestComponentApplication) getTargetContext()
-						.getApplicationContext();
-		inject((BriarUiTestComponent) app.getApplicationComponent());
-	}
-
-	protected abstract void inject(BriarUiTestComponent component);
-
-	@NotNullByDefault
-	protected class CleanAccountTestRule<A extends Activity>
-			extends IntentsTestRule<A> {
-
-		@Nullable
-		private final Runnable runnable;
-
-		public CleanAccountTestRule(Class<A> activityClass) {
-			super(activityClass);
-			this.runnable = null;
-		}
-
-		/**
-		 * Use this if you need to run code before launching the activity.
-		 * Note: You need to use {@link #launchActivity(Intent)} yourself
-		 * to start the activity.
-		 */
-		public CleanAccountTestRule(Class<A> activityClass, Runnable runnable) {
-			super(activityClass, false, false);
-			this.runnable = runnable;
-		}
-
-		@Override
-		protected void beforeActivityLaunched() {
-			super.beforeActivityLaunched();
-			accountManager.deleteAccount();
-			accountManager.createAccount(USERNAME, PASSWORD);
-			if (runnable != null) {
-				Intent serviceIntent =
-						new Intent(getTargetContext(), BriarService.class);
-				getTargetContext().startService(serviceIntent);
-				try {
-					lifecycleManager.waitForStartup();
-				} catch (InterruptedException e) {
-					throw new AssertionError(e);
-				}
-				runnable.run();
-			}
-		}
-	}
-
-}

briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android;
+package org.briarproject.briar.android.login;
 
 import android.support.test.espresso.intent.rule.IntentsTestRule;
 import android.support.test.runner.AndroidJUnit4;
@@ -6,12 +6,9 @@ import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.login.OpenDatabaseActivity;
-import org.briarproject.briar.android.login.SetupActivity;
+import org.briarproject.briar.android.BriarUiTestComponent;
+import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,14 +26,14 @@ import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static android.support.test.runner.lifecycle.Stage.PAUSED;
-import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
-import static org.briarproject.briar.android.ViewActions.waitForActivity;
-import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
+import static junit.framework.Assert.assertTrue;
+import static org.briarproject.briar.android.test.ViewActions.waitForActivity;
+import static org.briarproject.briar.android.test.ViewActions.waitUntilMatches;
 import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
-import static org.junit.Assert.assertTrue;
+
 
 @RunWith(AndroidJUnit4.class)
-public class SetupDataTest extends ScreenshotTest {
+public class SetupActivityScreenshotTest extends ScreenshotTest {
 
 	@Rule
 	public IntentsTestRule<SetupActivity> testRule =
@@ -64,7 +61,7 @@ public class SetupDataTest extends ScreenshotTest {
 		onView(withId(R.id.nickname_entry))
 				.perform(waitUntilMatches(withText(USERNAME)));
 
-		screenshot("manual_create_account", testRule.getActivity());
+		screenshot("manual_create_account");
 
 		onView(withId(R.id.next))
 				.check(matches(isDisplayed()))
@@ -97,54 +94,13 @@ public class SetupDataTest extends ScreenshotTest {
 		}
 
 		// wait for OpenDatabaseActivity to show up
+		onView(withId(R.id.progress))
+				.check(matches(isDisplayed()));
 		onView(isRoot())
 				.perform(waitForActivity(testRule.getActivity(), PAUSED));
 		intended(hasComponent(OpenDatabaseActivity.class.getName()));
 
 		assertTrue(accountManager.hasDatabaseKey());
-
-		lifecycleManager.waitForStartup();
-		createTestData();
-
-		// close expiry warning
-		onView(withId(R.id.expiryWarning))
-				.perform(waitUntilMatches(isDisplayed()));
-		onView(withId(R.id.expiryWarningClose))
-				.check(matches(isDisplayed()));
-		onView(withId(R.id.expiryWarningClose))
-				.perform(click());
-	}
-
-	private void createTestData() {
-		try {
-			createTestDataExceptions();
-		} catch (DbException | FormatException e) {
-			throw new AssertionError(e);
-		}
-	}
-
-	private void createTestDataExceptions()
-			throws DbException, FormatException {
-		String bobName =
-				getTargetContext().getString(R.string.screenshot_bob);
-		Contact bob = testDataCreator.addContact(bobName);
-
-		String bobHi = getTargetContext()
-				.getString(R.string.screenshot_message_1);
-		long bobTime = getMinutesAgo(2);
-		testDataCreator.addPrivateMessage(bob, bobHi, bobTime, true);
-
-		String aliceHi = getTargetContext()
-				.getString(R.string.screenshot_message_2);
-		long aliceTime = getMinutesAgo(1);
-		testDataCreator.addPrivateMessage(bob, aliceHi, aliceTime, false);
-
-		String bobHi2 = getTargetContext()
-				.getString(R.string.screenshot_message_3);
-		long bobTime2 = getMinutesAgo(0);
-		testDataCreator.addPrivateMessage(bob, bobHi2, bobTime2, true);
-
-		connectionRegistry.registerConnection(bob.getId(), ID, true);
 	}
 
 }

briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java

@@ -6,8 +6,8 @@ import android.view.Gravity;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarUiTestComponent;
-import org.briarproject.briar.android.UiTest;
 import org.briarproject.briar.android.settings.SettingsActivity;
+import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,7 +23,7 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
 @RunWith(AndroidJUnit4.class)
-public class NavDrawerActivityTest extends UiTest {
+public class NavDrawerActivityTest extends ScreenshotTest {
 
 	@Rule
 	public CleanAccountTestRule<NavDrawerActivity> testRule =

briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java

@@ -2,15 +2,14 @@ package org.briarproject.briar.android.settings;
 
 import android.content.Intent;
 import android.support.test.espresso.contrib.DrawerActions;
-import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarUiTestComponent;
-import org.briarproject.briar.android.ScreenshotTest;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
+import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,15 +26,15 @@ import static android.support.test.espresso.matcher.ViewMatchers.withChild;
 import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
+import static org.briarproject.briar.android.test.ViewActions.waitUntilMatches;
 import static org.hamcrest.CoreMatchers.is;
 
 @RunWith(AndroidJUnit4.class)
 public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 	@Rule
-	public ActivityTestRule<SettingsActivity> testRule =
-			new ActivityTestRule<>(SettingsActivity.class);
+	public CleanAccountTestRule<SettingsActivity> testRule =
+			new CleanAccountTestRule<>(SettingsActivity.class);
 
 	@Override
 	protected void inject(BriarUiTestComponent component) {
@@ -47,7 +46,7 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 		onView(withText(R.string.settings_button))
 				.check(matches(isDisplayed()));
 
-		screenshot("manual_dark_theme_settings", testRule.getActivity());
+		screenshot("manual_dark_theme_settings");
 
 		// switch to dark theme
 		onView(withText(R.string.pref_theme_title))
@@ -57,20 +56,10 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 				.check(matches(isDisplayed()))
 				.perform(click());
 
-		openNavDrawer();
+		// open nav drawer and remove expiry warning
+		openNavDrawer(true);
 
-		screenshot("manual_dark_theme_nav_drawer", testRule.getActivity());
-
-		// switch to back to light theme
-		onView(withText(R.string.settings_button))
-				.check(matches(isDisplayed()))
-				.perform(click());
-		onView(withText(R.string.pref_theme_title))
-				.check(matches(isDisplayed()))
-				.perform(click());
-		onView(withText(R.string.pref_theme_light))
-				.check(matches(isDisplayed()))
-				.perform(click());
+		screenshot("manual_dark_theme_nav_drawer");
 	}
 
 	@Test
@@ -94,11 +83,12 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 				.check(matches(isDisplayed()))
 				.check(matches(isEnabled()));
 
-		screenshot("manual_app_lock", testRule.getActivity());
+		screenshot("manual_app_lock");
 
-		openNavDrawer();
+		// no more expiry warning to remove, because sharedprefs cached?
+		openNavDrawer(false);
 
-		screenshot("manual_app_lock_nav_drawer", testRule.getActivity());
+		screenshot("manual_app_lock_nav_drawer");
 	}
 
 	@Test
@@ -114,15 +104,23 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 				.check(matches(isDisplayed()))
 				.perform(waitUntilMatches(isEnabled()));
 
-		screenshot("manual_tor_settings", testRule.getActivity());
+		screenshot("manual_tor_settings");
 	}
 
-	private void openNavDrawer() {
+	private void openNavDrawer(boolean expiry) {
 		// start main activity
 		Intent i =
 				new Intent(testRule.getActivity(), NavDrawerActivity.class);
 		testRule.getActivity().startActivity(i);
 
+		// close expiry warning
+		if (expiry) {
+			onView(withId(R.id.expiryWarningClose))
+					.check(matches(isDisplayed()));
+			onView(withId(R.id.expiryWarningClose))
+					.perform(click());
+		}
+
 		// open navigation drawer
 		onView(withId(R.id.drawer_layout))
 				.check(matches(isClosed(Gravity.START)))

briar-android/src/androidTest/java/org/briarproject/briar/android/test/BriarTestRunner.java

@@ -1,9 +1,11 @@
-package org.briarproject.briar.android;
+package org.briarproject.briar.android.test;
 
 import android.app.Application;
 import android.content.Context;
 import android.support.test.runner.AndroidJUnitRunner;
 
+import org.briarproject.briar.android.BriarTestComponentApplication;
+
 public class BriarTestRunner extends AndroidJUnitRunner {
 
 	@Override
@@ -11,8 +13,8 @@ public class BriarTestRunner extends AndroidJUnitRunner {
 			Context context)
 			throws InstantiationException, IllegalAccessException,
 			ClassNotFoundException {
-		return super.newApplication(cl,
-				BriarTestComponentApplication.class.getName(), context);
+		return super.newApplication(cl, BriarTestComponentApplication.class.getName(),
+				context);
 	}
 
 }

briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java

@@ -0,0 +1,73 @@
+package org.briarproject.briar.android.test;
+
+import android.app.Activity;
+import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.util.Log;
+
+import org.briarproject.bramble.api.account.AccountManager;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.briar.android.BriarTestComponentApplication;
+import org.briarproject.briar.android.BriarUiTestComponent;
+import org.junit.ClassRule;
+
+import javax.inject.Inject;
+
+import tools.fastlane.screengrab.Screengrab;
+import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
+import tools.fastlane.screengrab.locale.LocaleTestRule;
+
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static tools.fastlane.screengrab.Screengrab.setDefaultScreenshotStrategy;
+
+public abstract class ScreenshotTest {
+
+	@ClassRule
+	public static final LocaleTestRule localeTestRule = new LocaleTestRule();
+
+	protected static final String USERNAME = "Alice";
+	protected static final String PASSWORD = "123456";
+
+	@Inject
+	protected AccountManager accountManager;
+	@Inject
+	protected LifecycleManager lifecycleManager;
+
+	public ScreenshotTest() {
+		super();
+		setDefaultScreenshotStrategy(new UiAutomatorScreenshotStrategy());
+		BriarTestComponentApplication app =
+				(BriarTestComponentApplication) getTargetContext()
+						.getApplicationContext();
+		inject((BriarUiTestComponent) app.getApplicationComponent());
+	}
+
+	protected abstract void inject(BriarUiTestComponent component);
+
+	protected void screenshot(String name) {
+		try {
+			Screengrab.screenshot(name);
+		} catch (RuntimeException e) {
+			if (!e.getMessage().equals("Unable to capture screenshot."))
+				throw e;
+			// The tests should still pass when run from AndroidStudio
+			// without manually granting permissions like fastlane does.
+			Log.w("Screengrab", "Permission to write screenshot is missing.");
+		}
+	}
+
+	protected class CleanAccountTestRule<A extends Activity>
+			extends IntentsTestRule<A> {
+
+		public CleanAccountTestRule(Class<A> activityClass) {
+			super(activityClass);
+		}
+
+		@Override
+		protected void beforeActivityLaunched() {
+			super.beforeActivityLaunched();
+			accountManager.deleteAccount();
+			accountManager.createAccount(USERNAME, PASSWORD);
+		}
+	}
+
+}

briar-android/src/androidTest/java/org/briarproject/briar/android/test/ViewActions.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android;
+package org.briarproject.briar.android.test;
 
 import android.app.Activity;
 import android.support.test.espresso.PerformException;

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -1,25 +0,0 @@
-package org.briarproject.briar.android;
-
-import org.briarproject.bramble.BrambleAndroidModule;
-import org.briarproject.bramble.BrambleCoreModule;
-import org.briarproject.bramble.account.BriarAccountModule;
-import org.briarproject.briar.BriarCoreModule;
-import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
-
-import javax.inject.Singleton;
-
-import dagger.Component;
-
-@Singleton
-@Component(modules = {
-		AppModule.class,
-		BriarCoreModule.class,
-		BrambleAndroidModule.class,
-		BriarAccountModule.class,
-		BrambleCoreModule.class
-})
-public interface BriarUiTestComponent extends AndroidComponent {
-
-	void inject(NavDrawerActivityTest test);
-
-}

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java

@@ -1,45 +0,0 @@
-package org.briarproject.briar.android;
-
-import android.app.Activity;
-import android.util.Log;
-
-import org.briarproject.bramble.api.plugin.ConnectionRegistry;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.api.test.TestDataCreator;
-import org.junit.ClassRule;
-
-import javax.inject.Inject;
-
-import tools.fastlane.screengrab.FalconScreenshotStrategy;
-import tools.fastlane.screengrab.Screengrab;
-import tools.fastlane.screengrab.locale.LocaleTestRule;
-
-public abstract class ScreenshotTest extends UiTest {
-
-	@ClassRule
-	public static final LocaleTestRule localeTestRule = new LocaleTestRule();
-
-	@Inject
-	protected TestDataCreator testDataCreator;
-	@Inject
-	protected ConnectionRegistry connectionRegistry;
-	@Inject
-	protected Clock clock;
-
-	protected void screenshot(String name, Activity activity) {
-		try {
-			Screengrab.screenshot(name, new FalconScreenshotStrategy(activity));
-		} catch (RuntimeException e) {
-			if (!e.getMessage().equals("Unable to capture screenshot."))
-				throw e;
-			// The tests should still pass when run from AndroidStudio
-			// without manually granting permissions like fastlane does.
-			Log.w("Screengrab", "Permission to write screenshot is missing.");
-		}
-	}
-
-	protected long getMinutesAgo(int minutes) {
-		return clock.currentTimeMillis() - minutes * 60 * 1000;
-	}
-
-}

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/contact/ConversationActivityScreenshotTest.java

@@ -1,52 +0,0 @@
-package org.briarproject.briar.android.contact;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.BriarUiTestComponent;
-import org.briarproject.briar.android.ScreenshotTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID;
-import static org.hamcrest.Matchers.allOf;
-
-@RunWith(AndroidJUnit4.class)
-public class ConversationActivityScreenshotTest extends ScreenshotTest {
-
-	@Rule
-	public ActivityTestRule<ConversationActivity> testRule =
-			new ActivityTestRule<>(ConversationActivity.class, false, false);
-
-	@Override
-	protected void inject(BriarUiTestComponent component) {
-		component.inject(this);
-	}
-
-	@Test
-	public void messaging() throws Exception {
-		Context targetContext = getInstrumentation().getTargetContext();
-		Intent intent = new Intent(targetContext, ConversationActivity.class);
-		intent.putExtra(CONTACT_ID, 1);
-		testRule.launchActivity(intent);
-
-		onView(withId(R.id.conversationView))
-				.perform(waitUntilMatches(allOf(
-						withText(R.string.screenshot_message_3),
-						isCompletelyDisplayed())
-				));
-
-		screenshot("manual_messaging", testRule.getActivity());
-	}
-
-}

briar-android/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	package="org.briarproject.briar"
-	xmlns:android="http://schemas.android.com/apk/res/android">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 	<uses-feature android:name="android.hardware.camera" android:required="false"/>
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<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" />
@@ -28,7 +28,8 @@
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
-		android:theme="@style/BriarTheme">
+		android:theme="@style/BriarTheme"
+		tools:ignore="GoogleAppIndexingWarning">
 
 		<receiver
 			android:name="org.briarproject.briar.android.login.SignInReminderReceiver"
@@ -388,7 +389,7 @@
 		<activity
 			android:name="org.briarproject.briar.android.panic.PanicResponderActivity"
 			android:noHistory="true"
-			android:theme="@style/Theme.AppCompat.NoActionBar">
+			android:theme="@android:style/Theme.NoDisplay">
 			<!-- this can never have launchMode singleTask or singleInstance! -->
 			<intent-filter>
 				<action android:name="info.guardianproject.panic.action.TRIGGER"/>
@@ -398,12 +399,12 @@
 
 		<activity
 			android:name="org.briarproject.briar.android.logout.ExitActivity"
-			android:theme="@style/Theme.AppCompat.NoActionBar">
+			android:theme="@android:style/Theme.NoDisplay">
 		</activity>
 
 		<activity
 			android:name=".android.logout.HideUiActivity"
-			android:theme="@style/Theme.AppCompat.NoActionBar">
+			android:theme="@android:style/Theme.NoDisplay">
 		</activity>
 
 		<activity
@@ -412,5 +413,34 @@
 			android:launchMode="singleTask"
 			android:theme="@style/BriarTheme.NoActionBar"/>
 
+		<!-- Prototype -->
+		<activity
+			android:name=".android.contact.ContactInviteOutputActivity"
+			android:theme="@style/BriarTheme"
+			android:label="@string/send_link_title"/>
+
+		<activity
+			android:name=".android.contact.ContactInviteInputActivity"
+			android:theme="@style/BriarTheme"
+			android:label="@string/open_link_title"
+			android:windowSoftInputMode="stateHidden|adjustResize">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="briar"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.SEND"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<data android:mimeType="text/plain"/>
+			</intent-filter>
+		</activity>
+
+		<activity
+			android:name=".android.contact.PendingRequestsActivity"
+			android:label="@string/pending_contact_requests"
+			android:theme="@style/BriarTheme"/>
+
 	</application>
 </manifest>

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java

@@ -26,7 +26,6 @@ import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.plugin.tor.CircumventionProvider;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
-import org.briarproject.briar.android.contact.ConversationViewModel;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.reporting.BriarReportSender;
 import org.briarproject.briar.android.view.TextInputView;
@@ -165,8 +164,6 @@ public interface AndroidComponent
 
 	void inject(TextInputView textInputView);
 
-	void inject(ConversationViewModel conversationViewModel);
-
 	// Eager singleton load
 	void inject(AppModule.EagerSingletons init);
 }

briar-android/src/main/java/org/briarproject/briar/android/AppModule.java

@@ -107,7 +107,7 @@ public class AppModule {
 		Context appContext = app.getApplicationContext();
 		DuplexPluginFactory bluetooth =
 				new AndroidBluetoothPluginFactory(ioExecutor, androidExecutor,
-						appContext, random, eventBus, clock, backoffFactory);
+						appContext, random, eventBus, backoffFactory);
 		DuplexPluginFactory tor = new AndroidTorPluginFactory(ioExecutor,
 				scheduler, appContext, networkManager, locationUtils, eventBus,
 				torSocketFactory, backoffFactory, resourceProvider,

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -15,9 +15,17 @@ import org.briarproject.briar.android.blog.ReblogFragment;
 import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
+import org.briarproject.briar.android.contact.ContactAliasInputFragment;
+import org.briarproject.briar.android.contact.ContactInviteInputActivity;
+import org.briarproject.briar.android.contact.ContactInviteOutputActivity;
+import org.briarproject.briar.android.contact.ContactLinkInputFragment;
+import org.briarproject.briar.android.contact.ContactLinkOutputFragment;
 import org.briarproject.briar.android.contact.ContactListFragment;
 import org.briarproject.briar.android.contact.ContactModule;
+import org.briarproject.briar.android.contact.ContactQrCodeInputFragment;
+import org.briarproject.briar.android.contact.ContactQrCodeOutputFragment;
 import org.briarproject.briar.android.contact.ConversationActivity;
+import org.briarproject.briar.android.contact.PendingRequestsActivity;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
@@ -167,6 +175,15 @@ public interface ActivityComponent {
 
 	void inject(UnlockActivity activity);
 
+	void inject(ContactInviteOutputActivity activity);
+	void inject(ContactInviteInputActivity activity);
+	void inject(PendingRequestsActivity activity);
+	void inject(ContactLinkOutputFragment activity);
+	void inject(ContactQrCodeOutputFragment activity);
+	void inject(ContactLinkInputFragment activity);
+	void inject(ContactQrCodeInputFragment activity);
+	void inject(ContactAliasInputFragment activity);
+
 	// Fragments
 	void inject(AuthorNameFragment fragment);
 

briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java

@@ -24,7 +24,6 @@ import org.briarproject.briar.android.controller.ActivityLifecycleController;
 import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
-import org.briarproject.briar.android.reporting.DevReportActivity;
 import org.briarproject.briar.android.util.UiUtils;
 import org.briarproject.briar.android.widget.TapSafeFrameLayout;
 import org.briarproject.briar.android.widget.TapSafeFrameLayout.OnTapFilteredListener;
@@ -34,28 +33,18 @@ import org.briarproject.briar.api.android.ScreenFilterMonitor.AppDetails;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import static android.arch.lifecycle.Lifecycle.State.STARTED;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
 
-/**
- * Warning: Some activities don't extend {@link BaseActivity}.
- *          E.g. {@link DevReportActivity}
- */
 public abstract class BaseActivity extends AppCompatActivity
 		implements DestroyableContext, OnTapFilteredListener {
 
-	private final static Logger LOG = getLogger(BaseActivity.class.getName());
-
 	@Inject
 	protected ScreenFilterMonitor screenFilterMonitor;
 
@@ -124,8 +113,6 @@ public abstract class BaseActivity extends AppCompatActivity
 	@Override
 	protected void onStart() {
 		super.onStart();
-		if (LOG.isLoggable(INFO))
-			LOG.info("Starting " + this.getClass().getSimpleName());
 		for (ActivityLifecycleController alc : lifecycleControllers) {
 			alc.onActivityStart();
 		}
@@ -144,8 +131,6 @@ public abstract class BaseActivity extends AppCompatActivity
 	@Override
 	protected void onStop() {
 		super.onStop();
-		if (LOG.isLoggable(INFO))
-			LOG.info("Stopping " + this.getClass().getSimpleName());
 		for (ActivityLifecycleController alc : lifecycleControllers) {
 			alc.onActivityStop();
 		}
@@ -158,7 +143,6 @@ public abstract class BaseActivity extends AppCompatActivity
 	}
 
 	public void showNextFragment(BaseFragment f) {
-		if (!getLifecycle().getCurrentState().isAtLeast(STARTED)) return;
 		getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.step_next_in,
 						R.anim.step_previous_out, R.anim.step_previous_in,

briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java

@@ -9,9 +9,9 @@ public interface RequestCodes {
 	int REQUEST_WRITE_BLOG_POST = 5;
 	int REQUEST_SHARE_BLOG = 6;
 	int REQUEST_RINGTONE = 7;
-	int REQUEST_PERMISSION_CAMERA_LOCATION = 8;
+	int REQUEST_PERMISSION_CAMERA = 8;
 	int REQUEST_DOZE_WHITELISTING = 9;
-	int REQUEST_BLUETOOTH_DISCOVERABLE = 10;
+	int REQUEST_ENABLE_BLUETOOTH = 10;
 	int REQUEST_UNLOCK = 11;
 	int REQUEST_KEYGUARD_UNLOCK = 12;
 

briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java

@@ -51,7 +51,7 @@ abstract class BaseControllerImpl extends DbControllerImpl
 	protected final IdentityManager identityManager;
 	protected final BlogManager blogManager;
 
-	private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
+	private final Map<MessageId, String> bodyCache = new ConcurrentHashMap<>();
 	private final Map<MessageId, BlogPostHeader> headerCache =
 			new ConcurrentHashMap<>();
 
@@ -129,17 +129,17 @@ abstract class BaseControllerImpl extends DbControllerImpl
 	public void loadBlogPost(BlogPostHeader header,
 			ResultExceptionHandler<BlogPostItem, DbException> handler) {
 
-		String text = textCache.get(header.getId());
-		if (text != null) {
-			LOG.info("Loaded text from cache");
-			handler.onResult(new BlogPostItem(header, text));
+		String body = bodyCache.get(header.getId());
+		if (body != null) {
+			LOG.info("Loaded body from cache");
+			handler.onResult(new BlogPostItem(header, body));
 			return;
 		}
 		runOnDbThread(() -> {
 			try {
 				long start = now();
 				BlogPostItem item = getItem(header);
-				logDuration(LOG, "Loading text", start);
+				logDuration(LOG, "Loading body", start);
 				handler.onResult(item);
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
@@ -200,28 +200,28 @@ abstract class BaseControllerImpl extends DbControllerImpl
 
 	@DatabaseExecutor
 	private BlogPostItem getItem(BlogPostHeader h) throws DbException {
-		String text;
+		String body;
 		if (h instanceof BlogCommentHeader) {
 			BlogCommentHeader c = (BlogCommentHeader) h;
 			BlogCommentItem item = new BlogCommentItem(c);
-			text = getPostText(item.getPostHeader().getId());
-			item.setText(text);
+			body = getPostBody(item.getPostHeader().getId());
+			item.setBody(body);
 			return item;
 		} else {
-			text = getPostText(h.getId());
-			return new BlogPostItem(h, text);
+			body = getPostBody(h.getId());
+			return new BlogPostItem(h, body);
 		}
 	}
 
 	@DatabaseExecutor
-	private String getPostText(MessageId m) throws DbException {
-		String text = textCache.get(m);
-		if (text == null) {
-			text = HtmlUtils.clean(blogManager.getPostText(m), ARTICLE);
-			textCache.put(m, text);
+	private String getPostBody(MessageId m) throws DbException {
+		String body = bodyCache.get(m);
+		if (body == null) {
+			body = HtmlUtils.clean(blogManager.getPostBody(m), ARTICLE);
+			bodyCache.put(m, body);
 		}
 		//noinspection ConstantConditions
-		return text;
+		return body;
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogCommentItem.java

@@ -34,8 +34,8 @@ class BlogCommentItem extends BlogPostItem {
 		}
 	}
 
-	public void setText(String text) {
-		this.text = text;
+	public void setBody(String body) {
+		this.body = body;
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostItem.java

@@ -3,7 +3,7 @@ package org.briarproject.briar.android.blog;
 import android.support.annotation.NonNull;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.AuthorInfo;
+import org.briarproject.bramble.api.identity.Author.Status;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.blog.BlogPostHeader;
@@ -15,13 +15,12 @@ import javax.annotation.concurrent.NotThreadSafe;
 public class BlogPostItem implements Comparable<BlogPostItem> {
 
 	private final BlogPostHeader header;
-	@Nullable
-	protected String text;
+	protected String body;
 	private boolean read;
 
-	BlogPostItem(BlogPostHeader header, @Nullable String text) {
+	BlogPostItem(BlogPostHeader header, @Nullable String body) {
 		this.header = header;
-		this.text = text;
+		this.body = body;
 		this.read = header.isRead();
 	}
 
@@ -41,13 +40,12 @@ public class BlogPostItem implements Comparable<BlogPostItem> {
 		return header.getAuthor();
 	}
 
-	AuthorInfo getAuthorInfo() {
-		return header.getAuthorInfo();
+	Status getAuthorStatus() {
+		return header.getAuthorStatus();
 	}
 
-	@Nullable
-	public String getText() {
-		return text;
+	public String getBody() {
+		return body;
 	}
 
 	public boolean isRssFeed() {

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java

@@ -14,6 +14,7 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.view.AuthorView;
@@ -40,7 +41,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 	private final AuthorView reblogger;
 	private final AuthorView author;
 	private final ImageButton reblogButton;
-	private final TextView text;
+	private final TextView body;
 	private final ViewGroup commentContainer;
 	private final boolean fullText;
 
@@ -62,7 +63,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 		reblogger = v.findViewById(R.id.rebloggerView);
 		author = v.findViewById(R.id.authorView);
 		reblogButton = v.findViewById(R.id.commentView);
-		text = v.findViewById(R.id.textView);
+		body = v.findViewById(R.id.bodyView);
 		commentContainer = v.findViewById(R.id.commentContainer);
 	}
 
@@ -97,7 +98,9 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 
 		// author and date
 		BlogPostHeader post = item.getPostHeader();
-		author.setAuthor(post.getAuthor(), post.getAuthorInfo());
+		Author a = post.getAuthor();
+		author.setAuthor(a);
+		author.setAuthorStatus(post.getAuthorStatus());
 		author.setDate(post.getTimestamp());
 		author.setPersona(
 				item.isRssFeed() ? AuthorView.RSS_FEED : AuthorView.NORMAL);
@@ -108,17 +111,17 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 			author.setAuthorNotClickable();
 		}
 
-		// post text
-		Spanned postText = getSpanned(item.getText());
+		// post body
+		Spanned bodyText = getSpanned(item.getBody());
 		if (fullText) {
-			text.setText(postText);
-			text.setTextIsSelectable(true);
-			makeLinksClickable(text, fragmentManager);
+			body.setText(bodyText);
+			body.setTextIsSelectable(true);
+			makeLinksClickable(body, fragmentManager);
 		} else {
-			text.setTextIsSelectable(false);
-			if (postText.length() > TEASER_LENGTH)
-				postText = getTeaser(ctx, postText);
-			text.setText(postText);
+			body.setTextIsSelectable(false);
+			if (bodyText.length() > TEASER_LENGTH)
+				bodyText = getTeaser(ctx, bodyText);
+			body.setText(bodyText);
 		}
 
 		// reblog button
@@ -140,7 +143,8 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 
 	private void onBindComment(BlogCommentItem item) {
 		// reblogger
-		reblogger.setAuthor(item.getAuthor(), item.getAuthorInfo());
+		reblogger.setAuthor(item.getAuthor());
+		reblogger.setAuthorStatus(item.getAuthorStatus());
 		reblogger.setDate(item.getTimestamp());
 		if (!fullText) {
 			reblogger.setAuthorClickable(v -> listener.onAuthorClick(item));
@@ -159,14 +163,15 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 							commentContainer, false);
 
 			AuthorView author = v.findViewById(R.id.authorView);
-			TextView text = v.findViewById(R.id.textView);
+			TextView body = v.findViewById(R.id.bodyView);
 
-			author.setAuthor(c.getAuthor(), c.getAuthorInfo());
+			author.setAuthor(c.getAuthor());
+			author.setAuthorStatus(c.getAuthorStatus());
 			author.setDate(c.getTimestamp());
 			// TODO make author clickable #624
 
-			text.setText(c.getComment());
-			if (fullText) text.setTextIsSelectable(true);
+			body.setText(c.getComment());
+			if (fullText) body.setTextIsSelectable(true);
 
 			commentContainer.addView(v);
 		}

briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java

@@ -35,7 +35,7 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
+import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_BODY_LENGTH;
 
 public class WriteBlogPostActivity extends BriarActivity
 		implements OnEditorActionListener, TextInputListener {
@@ -70,7 +70,7 @@ public class WriteBlogPostActivity extends BriarActivity
 
 		setContentView(R.layout.activity_write_blog_post);
 
-		input = findViewById(R.id.textInput);
+		input = findViewById(R.id.bodyInput);
 		input.setSendButtonEnabled(false);
 		input.addTextChangedListener(new TextWatcher() {
 			@Override
@@ -132,23 +132,23 @@ public class WriteBlogPostActivity extends BriarActivity
 	}
 
 	@Override
-	public void onSendClick(String text) {
+	public void onSendClick(String body) {
 		// hide publish button, show progress bar
 		input.hideSoftKeyboard();
 		input.setVisibility(GONE);
 		progressBar.setVisibility(VISIBLE);
 
-		text = StringUtils.truncateUtf8(text, MAX_BLOG_POST_TEXT_LENGTH);
-		storePost(text);
+		body = StringUtils.truncateUtf8(body, MAX_BLOG_POST_BODY_LENGTH);
+		storePost(body);
 	}
 
-	private void storePost(String text) {
+	private void storePost(String body) {
 		runOnDbThread(() -> {
 			long timestamp = System.currentTimeMillis();
 			try {
 				LocalAuthor author = identityManager.getLocalAuthor();
 				BlogPost p = blogPostFactory
-						.createBlogPost(groupId, timestamp, null, author, text);
+						.createBlogPost(groupId, timestamp, null, author, body);
 				blogManager.addLocalPost(p);
 				postPublished();
 			} catch (DbException | GeneralSecurityException

briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java

@@ -1,75 +0,0 @@
-package org.briarproject.briar.android.contact;
-
-import android.arch.lifecycle.ViewModelProviders;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatDialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.briar.R;
-
-public class AliasDialogFragment extends AppCompatDialogFragment {
-
-	final static String TAG = AliasDialogFragment.class.getName();
-
-	private ConversationViewModel viewModel;
-	private ContactId contactId;
-	private EditText aliasEditText;
-
-	public static AliasDialogFragment newInstance(ContactId id) {
-		AliasDialogFragment f = new AliasDialogFragment();
-
-		Bundle args = new Bundle();
-		args.putInt("contactId", id.getInt());
-		f.setArguments(args);
-
-		return f;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		if (getArguments() == null) throw new IllegalArgumentException();
-		int contactIdInt = getArguments().getInt("contactId", -1);
-		if (contactIdInt == -1) throw new IllegalArgumentException();
-		contactId = new ContactId(contactIdInt);
-
-		setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme);
-
-		viewModel =
-				ViewModelProviders.of(getActivity()).get(ConversationViewModel.class);
-	}
-
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			ViewGroup container, Bundle savedInstanceState) {
-
-		View v = inflater.inflate(R.layout.fragment_alias_dialog, container,
-				false);
-
-		aliasEditText = v.findViewById(R.id.aliasEditText);
-		Contact contact = viewModel.getContact().getValue();
-		String alias = contact == null ? null : contact.getAlias();
-		aliasEditText.setText(alias);
-		if (alias != null) aliasEditText.setSelection(alias.length());
-
-		Button setButton = v.findViewById(R.id.setButton);
-		setButton.setOnClickListener(v1 -> {
-			viewModel.setContactAlias(contactId,
-					aliasEditText.getText().toString());
-			getDialog().dismiss();
-		});
-
-		Button cancelButton = v.findViewById(R.id.cancelButton);
-		cancelButton.setOnClickListener(v1 -> getDialog().cancel());
-
-		return v;
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java

@@ -1,7 +1,6 @@
 package org.briarproject.briar.android.contact;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.View;
 
 import org.briarproject.bramble.api.contact.ContactId;
@@ -10,7 +9,6 @@ import org.briarproject.briar.android.util.BriarAdapter;
 import javax.annotation.Nullable;
 
 import static android.support.v7.util.SortedList.INVALID_POSITION;
-import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 public abstract class BaseContactListAdapter<I extends ContactItem, VH extends ContactItemViewHolder<I>>
 		extends BriarAdapter<I, VH> {
@@ -25,15 +23,15 @@ public abstract class BaseContactListAdapter<I extends ContactItem, VH extends C
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull VH ui, int position) {
+	public void onBindViewHolder(VH ui, int position) {
 		I item = items.get(position);
 		ui.bind(item, listener);
 	}
 
 	@Override
 	public int compare(I c1, I c2) {
-		return getContactDisplayName(c1.getContact())
-				.compareTo(getContactDisplayName(c2.getContact()));
+		return c1.getContact().getAuthor().getName()
+				.compareTo(c2.getContact().getAuthor().getName());
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactAliasInputFragment.java

@@ -0,0 +1,116 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
+
+import javax.annotation.Nullable;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.os.Build.VERSION.SDK_INT;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
+
+@NotNullByDefault
+public class ContactAliasInputFragment extends BaseFragment
+		implements TextWatcher {
+
+	private EditText contactNameInput;
+	private Button addButton;
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		getActivity().setTitle("Enter Contact Name");
+
+		View v = inflater.inflate(R.layout.fragment_contact_alias_input,
+				container, false);
+
+		contactNameInput = v.findViewById(R.id.contactNameInput);
+		contactNameInput.addTextChangedListener(this);
+
+		addButton = v.findViewById(R.id.addButton);
+		addButton.setOnClickListener(view -> onAddButtonClicked());
+
+		return v;
+	}
+
+	public static final String TAG = ContactAliasInputFragment.class.getName();
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count,
+			int after) {
+	}
+
+	@Override
+	public void onTextChanged(CharSequence s, int start, int before,
+			int count) {
+		updateAddButtonState();
+	}
+
+	@Override
+	public void afterTextChanged(Editable s) {
+	}
+
+	private boolean isBriarLink(CharSequence s) {
+		return getActivity() != null &&
+				((ContactInviteInputActivity) getActivity()).isBriarLink(s);
+	}
+
+	private void updateAddButtonState() {
+		addButton.setEnabled(contactNameInput.getText().length() > 0);
+	}
+
+	private void onAddButtonClicked() {
+		if (getActivity() == null || getContext() == null) return;;
+
+		((ContactInviteInputActivity) getActivity())
+				.addFakeRequest(contactNameInput.getText().toString());
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.BriarDialogTheme_Neutral);
+		builder.setTitle("Contact requested");
+		builder.setMessage(getString(R.string.add_contact_link_question));
+		builder.setPositiveButton(R.string.yes, (dialog, which) -> {
+			Intent intent = new Intent(getContext(), NavDrawerActivity.class);
+			intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
+			startActivity(intent);
+			finish();
+		});
+		builder.setNegativeButton(R.string.no, (dialog, which) -> {
+			startActivity(
+					new Intent(getContext(), ContactInviteOutputActivity.class));
+			finish();
+		});
+		builder.show();
+	}
+
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteInputActivity.java

@@ -0,0 +1,158 @@
+package org.briarproject.briar.android.contact;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.util.Log;
+import android.view.MenuItem;
+
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+import org.briarproject.briar.api.messaging.MessagingManager;
+
+import java.util.Random;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static android.app.AlarmManager.ELAPSED_REALTIME;
+import static android.content.Intent.ACTION_SEND;
+import static android.content.Intent.ACTION_VIEW;
+import static android.content.Intent.EXTRA_TEXT;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.os.SystemClock.elapsedRealtime;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING;
+
+public class ContactInviteInputActivity extends BriarActivity implements
+		BaseFragmentListener {
+
+	@Inject
+	LifecycleManager lifecycleManager;
+	@Inject
+	MessagingManager messagingManager;
+	@Inject
+	Clock clock;
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+		setContentView(R.layout.activity_fragment_container);
+
+		ActionBar ab = getSupportActionBar();
+		if (ab != null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+
+		Intent i = getIntent();
+		if (i != null) {
+			String action = i.getAction();
+			if (ACTION_SEND.equals(action) || ACTION_VIEW.equals(action)) {
+				String text = i.getStringExtra(EXTRA_TEXT);
+				if (text != null) {
+					showInitialFragment(
+							ContactLinkInputFragment.newInstance(text));
+					return;
+				}
+				String uri = i.getDataString();
+				if (uri != null) {
+					showInitialFragment(
+							ContactLinkInputFragment.newInstance(uri));
+					return;
+				}
+			} else if ("addContact".equals(action)) {
+				removeFakeRequest(i.getStringExtra("name"),
+						i.getLongExtra("timestamp", 0));
+				setIntent(null);
+				finish();
+			}
+		}
+		if (state == null) {
+			showInitialFragment(ContactLinkInputFragment.newInstance(null));
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				onBackPressed();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
+
+	boolean isBriarLink(CharSequence s) {
+		String link = s.toString().trim();
+		return link.matches("^(briar://)?[A-Z2-7]{64}$");
+	}
+
+	void showLink(@Nullable String link) {
+		showInitialFragment(ContactLinkInputFragment.newInstance(link));
+	}
+
+	void showCode() {
+		showNextFragment(new ContactQrCodeInputFragment());
+	}
+
+	void showAlias() {
+		showNextFragment(new ContactAliasInputFragment());
+	}
+
+	void addFakeRequest(String name) {
+		long timestamp = clock.currentTimeMillis();
+		try {
+			messagingManager.addNewPendingContact(name, timestamp);
+		} catch (DbException e) {
+			e.printStackTrace();
+		}
+
+		AlarmManager alarmManager =
+				(AlarmManager) requireNonNull(getSystemService(ALARM_SERVICE));
+		long m = MINUTES.toMillis(1);
+		long fromNow = (long) (-m * Math.log(new Random().nextDouble()));
+		long triggerAt = elapsedRealtime() + fromNow;
+
+		Intent i = new Intent(this, ContactInviteInputActivity.class);
+		i.setAction("addContact");
+		i.setFlags(FLAG_ACTIVITY_NEW_TASK);
+		i.putExtra("name", name);
+		i.putExtra("timestamp", timestamp);
+		PendingIntent pendingIntent = PendingIntent
+				.getActivity(this, (int) timestamp / 1000, i, 0);
+		alarmManager.set(ELAPSED_REALTIME, triggerAt, pendingIntent);
+
+		Log.e("TEST", "Setting Alarm in " + MILLISECONDS.toSeconds(fromNow) +
+				" seconds");
+		Log.e("TEST", "with contact: " + name);
+	}
+
+	private void removeFakeRequest(String name, long timestamp) {
+		if (lifecycleManager.getLifecycleState() != RUNNING) {
+			Log.e("TEST", "Lifecycle not started, not adding contact " + name);
+			return;
+		}
+		Log.e("TEST", "Adding Contact " + name);
+		try {
+			messagingManager.removePendingContact(name, timestamp);
+		} catch (DbException e) {
+			e.printStackTrace();
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteOutputActivity.java

@@ -0,0 +1,57 @@
+package org.briarproject.briar.android.contact;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.view.MenuItem;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+
+import javax.annotation.Nullable;
+
+public class ContactInviteOutputActivity extends BriarActivity implements
+		BaseFragmentListener {
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+
+		setContentView(R.layout.activity_fragment_container);
+
+		ActionBar ab = getSupportActionBar();
+		if (ab != null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+
+		if (state == null) {
+			showInitialFragment(new ContactLinkOutputFragment());
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				onBackPressed();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
+
+	void showLink() {
+		showInitialFragment(new ContactLinkOutputFragment());
+	}
+
+	void showCode() {
+		showNextFragment(new ContactQrCodeOutputFragment());
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java

@@ -16,8 +16,6 @@ import javax.annotation.Nullable;
 
 import im.delight.android.identicons.IdenticonDrawable;
 
-import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
-
 @UiThread
 @NotNullByDefault
 public class ContactItemViewHolder<I extends ContactItem>
@@ -43,7 +41,8 @@ public class ContactItemViewHolder<I extends ContactItem>
 		Author author = item.getContact().getAuthor();
 		avatar.setImageDrawable(
 				new IdenticonDrawable(author.getId().getBytes()));
-		name.setText(getContactDisplayName(item.getContact()));
+		String contactName = author.getName();
+		name.setText(contactName);
 
 		if (bulb != null) {
 			// online/offline

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputFragment.java

@@ -0,0 +1,178 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.ClipboardManager;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+
+import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN;
+import static android.content.Context.CLIPBOARD_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.support.v4.graphics.drawable.DrawableCompat.setTint;
+import static android.support.v4.graphics.drawable.DrawableCompat.wrap;
+import static java.util.Objects.requireNonNull;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
+
+@NotNullByDefault
+public class ContactLinkInputFragment extends BaseFragment
+		implements TextWatcher {
+
+	private ClipboardManager clipboard;
+	private EditText linkInput;
+	private Button pasteButton;
+	private EditText contactNameInput;
+	private Button addButton;
+
+	static BaseFragment newInstance(@Nullable String link) {
+		BaseFragment f = new ContactLinkInputFragment();
+		Bundle bundle = new Bundle();
+		bundle.putString("link", link);
+		f.setArguments(bundle);
+		return f;
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		getActivity().setTitle(R.string.open_link_title);
+
+		View v = inflater.inflate(R.layout.fragment_contact_link_input,
+				container, false);
+
+		clipboard = (ClipboardManager) requireNonNull(
+				getContext().getSystemService(CLIPBOARD_SERVICE));
+
+		int color = resolveColorAttribute(getContext(), R.attr.colorControlNormal);
+
+		linkInput = v.findViewById(R.id.linkInput);
+		linkInput.addTextChangedListener(this);
+		if (SDK_INT < 23) {
+			Drawable drawable = wrap(linkInput.getCompoundDrawables()[0]);
+			setTint(drawable, color);
+			linkInput.setCompoundDrawables(drawable, null, null, null);
+		}
+
+		pasteButton = v.findViewById(R.id.pasteButton);
+		pasteButton.setOnClickListener(view -> linkInput
+				.setText(clipboard.getPrimaryClip().getItemAt(0).getText()));
+
+		contactNameInput = v.findViewById(R.id.contactNameInput);
+		contactNameInput.addTextChangedListener(this);
+		if (SDK_INT < 23) {
+			Drawable drawable =
+					wrap(contactNameInput.getCompoundDrawables()[0]);
+			setTint(drawable, color);
+			contactNameInput.setCompoundDrawables(drawable, null, null, null);
+		}
+
+		addButton = v.findViewById(R.id.addButton);
+		addButton.setOnClickListener(view -> onAddButtonClicked());
+
+		Button scanCodeButton = v.findViewById(R.id.scanCodeButton);
+		scanCodeButton.setOnClickListener(view ->
+				((ContactInviteInputActivity) getActivity()).showCode());
+
+		linkInput.setText(getArguments().getString("link"));
+
+		return v;
+	}
+
+	public static final String TAG = ContactLinkInputFragment.class.getName();
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (hasLinkInClipboard()) pasteButton.setEnabled(true);
+		else pasteButton.setEnabled(false);
+	}
+
+	private boolean hasLinkInClipboard() {
+		return clipboard.hasPrimaryClip() &&
+				clipboard.getPrimaryClip().getDescription()
+						.hasMimeType(MIMETYPE_TEXT_PLAIN) &&
+				clipboard.getPrimaryClip().getItemCount() > 0;
+	}
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count,
+			int after) {
+	}
+
+	@Override
+	public void onTextChanged(CharSequence s, int start, int before,
+			int count) {
+		if (isBriarLink(linkInput.getText()) && getActivity() != null) {
+			updateAddButtonState();
+//			linkInput.setText(null);
+//			((ContactInviteInputActivity) getActivity()).showAlias();
+		}
+	}
+
+	@Override
+	public void afterTextChanged(Editable s) {
+	}
+
+	private boolean isBriarLink(CharSequence s) {
+		return getActivity() != null &&
+				((ContactInviteInputActivity) getActivity()).isBriarLink(s);
+	}
+
+	private void updateAddButtonState() {
+		addButton.setEnabled(isBriarLink(linkInput.getText()) &&
+				contactNameInput.getText().length() > 0);
+	}
+
+	private void onAddButtonClicked() {
+		if (getActivity() == null || getContext() == null) return;
+
+		((ContactInviteInputActivity) getActivity())
+				.addFakeRequest(contactNameInput.getText().toString());
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(),
+				R.style.BriarDialogTheme_Neutral);
+		builder.setTitle("Contact requested");
+		builder.setMessage(getString(R.string.add_contact_link_question));
+		builder.setPositiveButton(R.string.yes, (dialog, which) -> {
+			Intent intent = new Intent(getContext(), PendingRequestsActivity.class);
+//			intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
+			startActivity(intent);
+			finish();
+		});
+		builder.setNegativeButton(R.string.no, (dialog, which) -> {
+			startActivity(
+					new Intent(getContext(),
+							ContactInviteOutputActivity.class));
+			finish();
+		});
+		builder.show();
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkOutputFragment.java

@@ -0,0 +1,86 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+
+import static android.content.Context.CLIPBOARD_SERVICE;
+import static android.content.Intent.ACTION_SEND;
+import static android.content.Intent.EXTRA_TEXT;
+import static android.widget.Toast.LENGTH_SHORT;
+import static org.briarproject.bramble.util.StringUtils.getRandomBase32String;
+
+@NotNullByDefault
+public class ContactLinkOutputFragment extends BaseFragment {
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		getActivity().setTitle(R.string.send_link_title);
+
+		View v = inflater.inflate(R.layout.fragment_contact_link_output,
+				container, false);
+
+		String link = "briar://" + getRandomBase32String(64);
+
+		TextView linkView = v.findViewById(R.id.linkView);
+		linkView.setText(link);
+
+		ClipboardManager clipboard = (ClipboardManager)
+				getContext().getSystemService(CLIPBOARD_SERVICE);
+		if (clipboard == null) throw new AssertionError();
+		ClipData clip = ClipData.newPlainText(
+				getString(R.string.link_clip_label), link);
+
+		Button copyButton = v.findViewById(R.id.copyButton);
+		copyButton.setOnClickListener(view -> {
+			clipboard.setPrimaryClip(clip);
+			Toast.makeText(getContext(), R.string.link_copied_toast,
+					LENGTH_SHORT).show();
+		});
+
+		Button shareButton = v.findViewById(R.id.shareButton);
+		shareButton.setOnClickListener(view -> {
+			Intent i = new Intent(ACTION_SEND);
+			i.putExtra(EXTRA_TEXT, link);
+			i.setType("text/plain");
+			startActivity(i);
+		});
+
+		Button showCodeButton = v.findViewById(R.id.showCodeButton);
+		showCodeButton.setOnClickListener(
+				view -> ((ContactInviteOutputActivity) getActivity()).showCode());
+		return v;
+	}
+
+	public static final String TAG = ContactLinkOutputFragment.class.getName();
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -2,8 +2,11 @@ package org.briarproject.briar.android.contact;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.util.Pair;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
@@ -12,10 +15,12 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
 import org.briarproject.bramble.api.contact.event.ContactStatusChangedEvent;
 import org.briarproject.bramble.api.db.DbException;
@@ -37,17 +42,24 @@ import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
 import org.briarproject.briar.api.messaging.ConversationManager;
+import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import io.github.kobakei.materialfabspeeddial.FabSpeedDial;
+import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener;
+
 import static android.os.Build.VERSION.SDK_INT;
+import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE;
 import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
 import static android.support.v4.view.ViewCompat.getTransitionName;
 import static java.util.logging.Level.WARNING;
@@ -58,7 +70,8 @@ import static org.briarproject.briar.android.contact.ConversationActivity.CONTAC
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class ContactListFragment extends BaseFragment implements EventListener {
+public class ContactListFragment extends BaseFragment implements EventListener,
+		OnMenuItemClickListener {
 
 	public static final String TAG = ContactListFragment.class.getName();
 	private static final Logger LOG = Logger.getLogger(TAG);
@@ -70,8 +83,13 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 	@Inject
 	AndroidNotificationManager notificationManager;
 
+	// TODO remove
+	@Inject
+	MessagingManager messagingManager;
+
 	private ContactListAdapter adapter;
 	private BriarRecyclerView list;
+	private Snackbar snackbar;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -104,7 +122,12 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 
 		getActivity().setTitle(R.string.contact_list_button);
 
-		View contentView = inflater.inflate(R.layout.list, container, false);
+		View contentView =
+				inflater.inflate(R.layout.fragment_contact_list, container,
+						false);
+
+		FabSpeedDial speedDialView = contentView.findViewById(R.id.speedDial);
+		speedDialView.addOnMenuItemClickListener(this);
 
 		OnContactClickListener<ContactListItem> onContactClickListener =
 				(view, item) -> {
@@ -143,12 +166,20 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 		list.setEmptyText(getString(R.string.no_contacts));
 		list.setEmptyAction(getString(R.string.no_contacts_action));
 
+		snackbar = Snackbar.make(contentView,
+				R.string.pending_contact_requests_snackbar, LENGTH_INDEFINITE);
+		snackbar.getView().setBackgroundResource(R.color.briar_primary);
+		snackbar.setAction(R.string.show, v -> startActivity(
+				new Intent(getContext(), PendingRequestsActivity.class)));
+		snackbar.setActionTextColor(ContextCompat
+				.getColor(getContext(), R.color.briar_button_text_positive));
+
 		return contentView;
 	}
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.contact_list_actions, menu);
+//		inflater.inflate(R.menu.contact_list_actions, menu);
 		super.onCreateOptionsMenu(menu, inflater);
 	}
 
@@ -166,6 +197,28 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 		}
 	}
 
+	@Override
+	public void onMenuItemClick(FloatingActionButton fab, TextView v,
+			int itemId) {
+		switch (itemId) {
+			case R.id.action_add_contact:
+				Intent intent =
+						new Intent(getContext(), ContactExchangeActivity.class);
+				startActivity(intent);
+				return;
+			case R.id.action_open_link:
+				startActivity(new Intent(getContext(),
+						ContactInviteInputActivity.class));
+				return;
+			case R.id.action_send_link:
+				startActivity(new Intent(getContext(),
+						ContactInviteOutputActivity.class));
+				return;
+			default:
+				return;
+		}
+	}
+
 	@Override
 	public void onStart() {
 		super.onStart();
@@ -174,6 +227,26 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 		notificationManager.clearAllIntroductionNotifications();
 		loadContacts();
 		list.startPeriodicUpdate();
+
+		// TODO remove
+		checkForPendingContacts();
+	}
+
+	// TODO remove
+	private void checkForPendingContacts() {
+		listener.runOnDbThread(() -> {
+			try {
+				Collection<PendingContact> contacts =
+						messagingManager.getPendingContacts();
+				if (contacts.isEmpty()) {
+					runOnUiThreadUnlessDestroyed(() -> snackbar.dismiss());
+				} else {
+					runOnUiThreadUnlessDestroyed(() -> snackbar.show());
+				}
+			} catch (DbException e) {
+				e.printStackTrace();
+			}
+		});
 	}
 
 	@Override
@@ -248,6 +321,11 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 			PrivateMessageHeader h = p.getMessageHeader();
 			updateItem(p.getContactId(), h);
 		}
+
+		// TODO remove
+		else if (e instanceof ContactAddedEvent) {
+			checkForPendingContacts();
+		}
 	}
 
 	private void updateItem(ContactId c, PrivateMessageHeader h) {

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java

@@ -10,8 +10,6 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
 import org.briarproject.briar.android.util.UiUtils;
 
-import java.util.Locale;
-
 import javax.annotation.Nullable;
 
 import static android.support.v4.view.ViewCompat.setTransitionName;
@@ -38,7 +36,7 @@ class ContactListItemViewHolder extends ContactItemViewHolder<ContactListItem> {
 		// unread count
 		int unreadCount = item.getUnreadCount();
 		if (unreadCount > 0) {
-			unread.setText(String.format(Locale.getDefault(), "%d", unreadCount));
+			unread.setText(String.valueOf(unreadCount));
 			unread.setVisibility(View.VISIBLE);
 		} else {
 			unread.setVisibility(View.INVISIBLE);

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactQrCodeInputFragment.java

@@ -0,0 +1,181 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.zxing.Result;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.keyagreement.CameraException;
+import org.briarproject.briar.android.keyagreement.CameraView;
+import org.briarproject.briar.android.keyagreement.QrCodeDecoder;
+import org.briarproject.briar.android.util.UiUtils;
+
+import javax.annotation.Nullable;
+
+import static android.Manifest.permission.CAMERA;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.widget.Toast.LENGTH_LONG;
+import static android.widget.Toast.LENGTH_SHORT;
+import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA;
+
+@NotNullByDefault
+public class ContactQrCodeInputFragment extends BaseFragment
+		implements QrCodeDecoder.ResultCallback {
+
+	private CameraView cameraView;
+
+	@Override
+	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+		super.onActivityCreated(savedInstanceState);
+		getActivity().setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR);
+		cameraView.setPreviewConsumer(new QrCodeDecoder(this));
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		getActivity().setTitle("Scan QR Code");
+
+		View v = inflater.inflate(R.layout.fragment_contact_qr_code_input,
+				container, false);
+
+		cameraView = v.findViewById(R.id.camera_view);
+
+
+//		Button enterLinkButton = v.findViewById(R.id.enterLinkButton);
+//		enterLinkButton.setOnClickListener(view ->
+//				((ContactInviteInputActivity) getActivity()).showLink());
+
+		return v;
+	}
+
+	public static final String TAG = ContactQrCodeInputFragment.class.getName();
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (checkPermissions()) {
+			startCamera();
+		}
+	}
+
+	@Override
+	public void onStop() {
+		super.onStop();
+		try {
+			cameraView.stop();
+		} catch (CameraException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void startCamera() {
+		try {
+			cameraView.start();
+		} catch (CameraException e) {
+			e.printStackTrace();
+			Toast.makeText(getContext(), "Camera Error", LENGTH_SHORT)
+					.show();
+		}
+	}
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	private boolean checkPermissions() {
+		if (ActivityCompat.checkSelfPermission(getContext(), CAMERA) !=
+				PERMISSION_GRANTED) {
+			// Should we show an explanation?
+			if (shouldShowRequestPermissionRationale(CAMERA)) {
+				DialogInterface.OnClickListener continueListener =
+						(dialog, which) -> requestPermission();
+				AlertDialog.Builder
+						builder = new AlertDialog.Builder(getContext(), R.style.BriarDialogTheme);
+				builder.setTitle(R.string.permission_camera_title);
+				builder.setMessage(R.string.permission_camera_request_body);
+				builder.setNeutralButton(R.string.continue_button,
+						continueListener);
+				builder.show();
+			} else {
+				requestPermission();
+			}
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode,
+			@NonNull String[] permissions, @NonNull int[] grantResults) {
+		if (requestCode == REQUEST_PERMISSION_CAMERA) {
+			// If request is cancelled, the result arrays are empty.
+			if (grantResults.length > 0 &&
+					grantResults[0] == PERMISSION_GRANTED) {
+				startCamera();
+			} else {
+				if (!shouldShowRequestPermissionRationale(CAMERA)) {
+					// The user has permanently denied the request
+					AlertDialog.Builder
+							builder = new AlertDialog.Builder(getContext(),
+							R.style.BriarDialogTheme);
+					builder.setTitle(R.string.permission_camera_title);
+					builder.setMessage(R.string.permission_camera_denied_body);
+					builder.setPositiveButton(R.string.ok,
+							UiUtils.getGoToSettingsListener(getContext()));
+					builder.setNegativeButton(R.string.cancel,
+							(dialog, which) -> showLink(null));
+					builder.show();
+				} else {
+					Toast.makeText(getContext(),
+							R.string.permission_camera_denied_toast,
+							LENGTH_LONG).show();
+					showLink(null);
+				}
+			}
+		}
+	}
+
+	private void requestPermission() {
+		requestPermissions(new String[] {CAMERA}, REQUEST_PERMISSION_CAMERA);
+	}
+
+	private void showLink(@Nullable String link) {
+		if (getActivity() != null)
+			((ContactInviteInputActivity) getActivity()).showLink(link);
+	}
+
+	@Override
+	public void handleResult(Result result) {
+		Log.e("TEST", result.toString());
+		if (getActivity() != null &&
+				((ContactInviteInputActivity) getActivity())
+						.isBriarLink(result.getText())) {
+			showLink(result.getText());
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactQrCodeOutputFragment.java

@@ -0,0 +1,73 @@
+package org.briarproject.briar.android.contact;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.view.QrCodeView;
+
+import javax.annotation.Nullable;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+import static org.briarproject.bramble.util.StringUtils.getRandomBase32String;
+import static org.briarproject.briar.android.keyagreement.QrCodeUtils.createQrCode;
+
+@NotNullByDefault
+public class ContactQrCodeOutputFragment extends BaseFragment
+		implements QrCodeView.FullscreenListener {
+
+	private View linkIntro;
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		getActivity().setTitle("Show my QR Code");
+
+		View v = inflater.inflate(R.layout.fragment_contact_qr_code_output,
+				container, false);
+		linkIntro = v.findViewById(R.id.linkIntro);
+
+		String link = "briar://" + getRandomBase32String(64);
+		DisplayMetrics dm = getResources().getDisplayMetrics();
+		Bitmap qrCode = createQrCode(dm, link);
+		QrCodeView qrCodeView = v.findViewById(R.id.qrCodeView);
+		qrCodeView.setQrCode(qrCode);
+		qrCodeView.setFullscreenListener(this);
+
+		Button showLinkButton = v.findViewById(R.id.showLinkButton);
+		showLinkButton.setOnClickListener(
+				view -> ((ContactInviteOutputActivity) getActivity()).showLink());
+
+		return v;
+	}
+
+	public static final String TAG = ContactQrCodeOutputFragment.class.getName();
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void setFullscreen(boolean fullscreen) {
+		linkIntro.setVisibility(fullscreen ? GONE : VISIBLE);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java

@@ -1,8 +1,7 @@
 package org.briarproject.briar.android.contact;
 
-import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MutableLiveData;
 import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -24,6 +23,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.briarproject.bramble.api.FormatException;
+import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
@@ -34,6 +34,7 @@ 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.EventListener;
+import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
@@ -52,7 +53,7 @@ import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.blog.BlogActivity;
 import org.briarproject.briar.android.contact.ConversationAdapter.ConversationListener;
-import org.briarproject.briar.android.contact.ConversationVisitor.TextCache;
+import org.briarproject.briar.android.contact.ConversationVisitor.BodyCache;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
@@ -104,7 +105,7 @@ import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_INTRO
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.getAvatarTransitionName;
 import static org.briarproject.briar.android.util.UiUtils.getBulbTransitionName;
-import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH;
+import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH;
 import static uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.STATE_DISMISSED;
 import static uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.STATE_FINISHED;
 
@@ -112,7 +113,7 @@ import static uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.S
 @ParametersNotNullByDefault
 public class ConversationActivity extends BriarActivity
 		implements EventListener, ConversationListener, TextInputListener,
-		TextCache {
+		BodyCache {
 
 	public static final String CONTACT_ID = "briar.CONTACT_ID";
 
@@ -129,9 +130,9 @@ public class ConversationActivity extends BriarActivity
 	@CryptoExecutor
 	Executor cryptoExecutor;
 
-	private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
+	private final Map<MessageId, String> bodyCache = new ConcurrentHashMap<>();
+	private final MutableLiveData<String> contactName = new MutableLiveData<>();
 
-	private ConversationViewModel viewModel;
 	private ConversationVisitor visitor;
 	private ConversationAdapter adapter;
 	private Toolbar toolbar;
@@ -165,6 +166,8 @@ public class ConversationActivity extends BriarActivity
 
 	private volatile ContactId contactId;
 	@Nullable
+	private volatile AuthorId contactAuthorId;
+	@Nullable
 	private volatile GroupId messagingGroupId;
 
 	@SuppressWarnings("ConstantConditions")
@@ -173,9 +176,6 @@ public class ConversationActivity extends BriarActivity
 		setSceneTransitionAnimation();
 		super.onCreate(state);
 
-		viewModel =
-				ViewModelProviders.of(this).get(ConversationViewModel.class);
-
 		Intent i = getIntent();
 		int id = i.getIntExtra(CONTACT_ID, -1);
 		if (id == -1) throw new IllegalStateException();
@@ -185,29 +185,16 @@ public class ConversationActivity extends BriarActivity
 
 		// Custom Toolbar
 		toolbar = setUpCustomToolbar(true);
-		toolbarAvatar = toolbar.findViewById(R.id.contactAvatar);
-		toolbarStatus = toolbar.findViewById(R.id.contactStatus);
-		toolbarTitle = toolbar.findViewById(R.id.contactName);
-
-		viewModel.getContactAuthorId().observe(this, authorId -> {
-			toolbarAvatar.setImageDrawable(
-					new IdenticonDrawable(authorId.getBytes()));
-			// we only need this once
-			viewModel.getContactAuthorId().removeObservers(this);
-		});
-		viewModel.getContactDisplayName().observe(this, contactName -> {
-			toolbarTitle.setText(contactName);
-		});
-		viewModel.isContactDeleted().observe(this, deleted -> {
-			if (deleted != null && deleted) finish();
-		});
-		viewModel.loadContact(contactId);
+		if (toolbar != null) {
+			toolbarAvatar = toolbar.findViewById(R.id.contactAvatar);
+			toolbarStatus = toolbar.findViewById(R.id.contactStatus);
+			toolbarTitle = toolbar.findViewById(R.id.contactName);
+		}
 
 		setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId));
 		setTransitionName(toolbarStatus, getBulbTransitionName(contactId));
 
-		visitor = new ConversationVisitor(this, this,
-				viewModel.getContactDisplayName());
+		visitor = new ConversationVisitor(this, this, contactName);
 		adapter = new ConversationAdapter(this, this);
 		list = findViewById(R.id.conversationView);
 		list.setLayoutManager(new LinearLayoutManager(this));
@@ -242,19 +229,7 @@ public class ConversationActivity extends BriarActivity
 		notificationManager.blockContactNotification(contactId);
 		notificationManager.clearContactNotification(contactId);
 		displayContactOnlineStatus();
-		LiveData<String> contactName = viewModel.getContactDisplayName();
-		if (contactName.getValue() == null) {
-			// wait for contact name to be initialized
-			contactName.observe(this, new Observer<String>() {
-				@Override
-				public void onChanged(@Nullable String cName) {
-					if (cName != null) {
-						loadMessages();
-						contactName.removeObserver(this);
-					}
-				}
-			});
-		} else loadMessages();
+		loadContactDetailsAndMessages();
 		list.startPeriodicUpdate();
 	}
 
@@ -291,10 +266,6 @@ public class ConversationActivity extends BriarActivity
 				intent.putExtra(CONTACT_ID, contactId.getInt());
 				startActivityForResult(intent, REQUEST_INTRODUCTION);
 				return true;
-			case R.id.action_set_alias:
-				AliasDialogFragment.newInstance(contactId).show(
-						getSupportFragmentManager(), AliasDialogFragment.TAG);
-				return true;
 			case R.id.action_social_remove_person:
 				askToRemoveContact();
 				return true;
@@ -303,6 +274,36 @@ public class ConversationActivity extends BriarActivity
 		}
 	}
 
+	private void loadContactDetailsAndMessages() {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				if (contactAuthorId == null) {
+					Contact contact = contactManager.getContact(contactId);
+					contactName.postValue(contact.getAuthor().getName());
+					contactAuthorId = contact.getAuthor().getId();
+				}
+				logDuration(LOG, "Loading contact", start);
+				loadMessages();
+				displayContactDetails();
+			} catch (NoSuchContactException e) {
+				finishOnUiThread();
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
+	}
+
+	// contactAuthorId and contactName are expected to be set
+	private void displayContactDetails() {
+		runOnUiThreadUnlessDestroyed(() -> {
+			//noinspection ConstantConditions
+			toolbarAvatar.setImageDrawable(
+					new IdenticonDrawable(contactAuthorId.getBytes()));
+			toolbarTitle.setText(contactName.getValue());
+		});
+	}
+
 	private void displayContactOnlineStatus() {
 		runOnUiThreadUnlessDestroyed(() -> {
 			if (connectionRegistry.isConnected(contactId)) {
@@ -369,28 +370,28 @@ public class ConversationActivity extends BriarActivity
 		return items;
 	}
 
-	private void loadMessageText(MessageId m) {
+	private void loadMessageBody(MessageId m) {
 		runOnDbThread(() -> {
 			try {
 				long start = now();
-				String text = messagingManager.getMessageText(m);
-				logDuration(LOG, "Loading text", start);
-				displayMessageText(m, text);
+				String body = messagingManager.getMessageBody(m);
+				logDuration(LOG, "Loading body", start);
+				displayMessageBody(m, body);
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
 			}
 		});
 	}
 
-	private void displayMessageText(MessageId m, String text) {
+	private void displayMessageBody(MessageId m, String body) {
 		runOnUiThreadUnlessDestroyed(() -> {
-			textCache.put(m, text);
+			bodyCache.put(m, body);
 			SparseArray<ConversationItem> messages =
 					adapter.getPrivateMessages();
 			for (int i = 0; i < messages.size(); i++) {
 				ConversationItem item = messages.valueAt(i);
 				if (item.getId().equals(m)) {
-					item.setText(text);
+					item.setBody(body);
 					adapter.notifyItemChanged(messages.keyAt(i));
 					list.scrollToPosition(adapter.getItemCount() - 1);
 					return;
@@ -452,17 +453,15 @@ public class ConversationActivity extends BriarActivity
 	private void onNewPrivateMessage(PrivateMessageHeader h) {
 		runOnUiThreadUnlessDestroyed(() -> {
 			if (h instanceof PrivateRequest || h instanceof PrivateResponse) {
-				String cName = viewModel.getContactDisplayName().getValue();
+				String cName = contactName.getValue();
 				if (cName == null) {
 					// Wait for the contact name to be loaded
-					viewModel.getContactDisplayName()
-							.observe(this, new Observer<String>() {
+					contactName.observe(this, new Observer<String>() {
 						@Override
 						public void onChanged(@Nullable String cName) {
 							if (cName != null) {
 								addConversationItem(h.accept(visitor));
-								viewModel.getContactDisplayName()
-										.removeObserver(this);
+								contactName.removeObserver(this);
 							}
 						}
 					});
@@ -471,7 +470,7 @@ public class ConversationActivity extends BriarActivity
 				}
 			} else {
 				addConversationItem(h.accept(visitor));
-				loadMessageText(h.getId());
+				loadMessageBody(h.getId());
 			}
 		});
 	}
@@ -496,8 +495,8 @@ public class ConversationActivity extends BriarActivity
 
 	@Override
 	public void onSendClick(String text) {
-		if (text.isEmpty()) return;
-		text = StringUtils.truncateUtf8(text, MAX_PRIVATE_MESSAGE_TEXT_LENGTH);
+		if (text.equals("")) return;
+		text = StringUtils.truncateUtf8(text, MAX_PRIVATE_MESSAGE_BODY_LENGTH);
 		long timestamp = System.currentTimeMillis();
 		timestamp = Math.max(timestamp, getMinTimestampForNewMessage());
 		if (messagingGroupId == null) loadGroupId(text, timestamp);
@@ -511,12 +510,12 @@ public class ConversationActivity extends BriarActivity
 		return item == null ? 0 : item.getTime() + 1;
 	}
 
-	private void loadGroupId(String text, long timestamp) {
+	private void loadGroupId(String body, long timestamp) {
 		runOnDbThread(() -> {
 			try {
 				messagingGroupId =
 						messagingManager.getConversationId(contactId);
-				createMessage(text, timestamp);
+				createMessage(body, timestamp);
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
 			}
@@ -524,19 +523,19 @@ public class ConversationActivity extends BriarActivity
 		});
 	}
 
-	private void createMessage(String text, long timestamp) {
+	private void createMessage(String body, long timestamp) {
 		cryptoExecutor.execute(() -> {
 			try {
 				//noinspection ConstantConditions init in loadGroupId()
 				storeMessage(privateMessageFactory.createPrivateMessage(
-						messagingGroupId, timestamp, text), text);
+						messagingGroupId, timestamp, body), body);
 			} catch (FormatException e) {
 				throw new RuntimeException(e);
 			}
 		});
 	}
 
-	private void storeMessage(PrivateMessage m, String text) {
+	private void storeMessage(PrivateMessage m, String body) {
 		runOnDbThread(() -> {
 			try {
 				long start = now();
@@ -546,7 +545,7 @@ public class ConversationActivity extends BriarActivity
 				PrivateMessageHeader h = new PrivateMessageHeader(
 						message.getId(), message.getGroupId(),
 						message.getTimestamp(), true, false, false, false);
-				textCache.put(message.getId(), text);
+				bodyCache.put(message.getId(), body);
 				addConversationItem(h.accept(visitor));
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
@@ -762,9 +761,9 @@ public class ConversationActivity extends BriarActivity
 
 	@Nullable
 	@Override
-	public String getText(MessageId m) {
-		String text = textCache.get(m);
-		if (text == null) loadMessageText(m);
-		return text;
+	public String getBody(MessageId m) {
+		String body = bodyCache.get(m);
+		if (body == null) loadMessageBody(m);
+		return body;
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java

@@ -14,17 +14,17 @@ import javax.annotation.concurrent.NotThreadSafe;
 abstract class ConversationItem {
 
 	@Nullable
-	protected String text;
+	protected String body;
 	private final MessageId id;
 	private final GroupId groupId;
 	private final long time;
 	private boolean read;
 
-	ConversationItem(MessageId id, GroupId groupId, @Nullable String text,
+	ConversationItem(MessageId id, GroupId groupId, @Nullable String body,
 			long time, boolean read) {
 		this.id = id;
 		this.groupId = groupId;
-		this.text = text;
+		this.body = body;
 		this.time = time;
 		this.read = read;
 	}
@@ -37,13 +37,13 @@ abstract class ConversationItem {
 		return groupId;
 	}
 
-	void setText(String text) {
-		this.text = text;
+	void setBody(String body) {
+		this.body = body;
 	}
 
 	@Nullable
-	public String getText() {
-		return text;
+	public String getBody() {
+		return body;
 	}
 
 	long getTime() {