Resolve merge conflict with social-backup-poc

* social-backup-poc:
  Improve setup password explanation string
  Improve choose password info dialog
  Improve threshold selector screen
  Basic strength meter when choosing threshold

.idea/codeStyles/Project.xml

@@ -31,15 +31,6 @@
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value />
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

bramble-android/build.gradle

@@ -8,11 +8,15 @@ android {
 	compileSdkVersion 30
 	buildToolsVersion '30.0.2'
 
+	packagingOptions {
+		doNotStrip '**/*.so'
+	}
+
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10216
-		versionName "1.2.16"
+		versionCode 10218
+		versionName "1.2.18"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -46,10 +50,10 @@ dependencies {
 	compileOnly 'javax.annotation:jsr250-api:1.0'
 
 	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
-	testImplementation 'junit:junit:4.12'
-	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-junit4:$jmock_version"
+	testImplementation "org.jmock:jmock-imposters:$jmock_version"
 }
 
 def torBinariesDir = 'src/main/res/raw'

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

@@ -175,6 +175,11 @@ class AndroidBluetoothPlugin
 		} catch (IOException e) {
 			IoUtils.tryToClose(s, LOG, WARNING);
 			throw e;
+		} catch (NullPointerException e) {
+			// BluetoothSocket#connect() may throw an NPE under unknown
+			// circumstances
+			IoUtils.tryToClose(s, LOG, WARNING);
+			throw new IOException(e);
 		}
 	}
 

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

@@ -114,12 +114,8 @@ public class AndroidUtils {
 
 	/**
 	 * Returns an array of supported content types for image attachments.
-	 * GIFs can't be compressed on API < 24 so they're not supported.
-	 * <p>
-	 * TODO: Remove this restriction when large message support is added
 	 */
 	public static String[] getSupportedImageContentTypes() {
-		if (SDK_INT < 24) return new String[] {"image/jpeg", "image/png"};
-		else return new String[] {"image/jpeg", "image/png", "image/gif"};
+		return new String[] {"image/jpeg", "image/png", "image/gif"};
 	}
 }

bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java

@@ -9,7 +9,7 @@ import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +44,7 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 	private AndroidAccountManager accountManager;
 
 	public AndroidAccountManagerTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		app = context.mock(Application.class);
 		applicationInfo = new ApplicationInfo();
 		applicationInfo.dataDir = testDir.getAbsolutePath();

bramble-android/witness.gradle

@@ -1,38 +1,39 @@
 dependencyVerification {
     verify = [
-        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-        'com.android.tools.analytics-library:protos:27.1.1:protos-27.1.1.jar:13f77e73762e58ab372d140b3a6be6903aea9775b62dd14fbc62d4cc7069c9a4',
-        'com.android.tools.analytics-library:shared:27.1.1:shared-27.1.1.jar:82930a52001410e97d809930b670f4de3002286975f046b9de5f6b777b06d366',
-        'com.android.tools.analytics-library:tracker:27.1.1:tracker-27.1.1.jar:31bc5a00be0055bac89c9b2f34751883e987cd89e3ac1783720645c164f591d9',
+        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
+        'com.android.tools.analytics-library:protos:27.2.2:protos-27.2.2.jar:02482564443c294dfe87c5f2b25387f724a698a09ed58e0cf0127400caa35a19',
+        'com.android.tools.analytics-library:shared:27.2.2:shared-27.2.2.jar:0efe017ca17ee775c5af386475a09799a1282faa04821d54810c1a34f6348d9c',
+        'com.android.tools.analytics-library:tracker:27.2.2:tracker-27.2.2.jar:62489d84192dc06219664945c43201654ff85c3b715f46550751512a880d0e39',
         'com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524:aapt2-proto-4.1.0-alpha01-6193524.jar:17e75523e1e92dd4f222c7368ee41df9e964a508232f591e265d0c499baf9dca',
-        'com.android.tools.build:apksig:4.1.1:apksig-4.1.1.jar:e0a69da9e5a03986d608b45bbf954ef0e6a0b3f58c1b8315bd169ec08b279e72',
-        'com.android.tools.build:apkzlib:4.1.1:apkzlib-4.1.1.jar:ba4b5e419b6be0130eae7f8301c3a551ad3976f487d2e0c6852ebb175ac41127',
-        'com.android.tools.build:builder-model:4.1.1:builder-model-4.1.1.jar:e95c99cc298ad67b8deb6ced99c51abc8f59afebedad044b1a10dde14646a4dd',
-        'com.android.tools.build:builder-test-api:4.1.1:builder-test-api-4.1.1.jar:464f596ab261c051c3847406748e843770dea123f6fa5fee8a9390644e709b7a',
-        'com.android.tools.build:builder:4.1.1:builder-4.1.1.jar:0f78d4759d2f7b57b95865522ec34596ba419b9982f3b25e3449213f9c98b80d',
-        'com.android.tools.build:gradle-api:4.1.1:gradle-api-4.1.1.jar:d42e6b539e4c1353ad3546e75ec8ce11a017b97481023e8ea18577eefe374358',
-        'com.android.tools.build:manifest-merger:27.1.1:manifest-merger-27.1.1.jar:7a45fa143687859bb2e5a961dcf6ee88094d3853de0cb543dc03dbcb0f4b554b',
-        'com.android.tools.ddms:ddmlib:27.1.1:ddmlib-27.1.1.jar:da6e4bd834b6a85dae8019039849d8bd96933347dfbf460df74913ddade6e40a',
-        'com.android.tools.external.com-intellij:intellij-core:27.1.1:intellij-core-27.1.1.jar:2591a7363c4443c59bf9f793730acafce9d6ec3076e2f46716edaf53a41b6fb6',
-        'com.android.tools.external.com-intellij:kotlin-compiler:27.1.1:kotlin-compiler-27.1.1.jar:5054ae770ba788f110303c65abd6b1fa28eccf52dee1274510e201b2b81885c8',
-        'com.android.tools.external.org-jetbrains:uast:27.1.1:uast-27.1.1.jar:54cd8f6886a9d2f5641659dd5c91f626629672cd48301f7f0bd6aad9bd448714',
-        'com.android.tools.layoutlib:layoutlib-api:27.1.1:layoutlib-api-27.1.1.jar:8a9a22e3b309521ea83b724e5a89cfdac6076f52d675c0e17d77b05527bc0f8c',
-        'com.android.tools.lint:lint-api:27.1.1:lint-api-27.1.1.jar:c1d8176094cb0478786070d40533efb578ebc53529a82f6ef5bee879bdca418b',
-        'com.android.tools.lint:lint-checks:27.1.1:lint-checks-27.1.1.jar:3899c91e00bd059b40c31a9ca00cd0f8303191947608735ae1b657323693fb61',
-        'com.android.tools.lint:lint-gradle-api:27.1.1:lint-gradle-api-27.1.1.jar:26aa89d38b9825cc73229daa82a68875801c8b8491f30497ce62aff1f206eb0d',
-        'com.android.tools.lint:lint-gradle:27.1.1:lint-gradle-27.1.1.jar:f7355823ead869f4d28184ba28b7a0c693b507519a2d3705bb9848a0f35b3756',
-        'com.android.tools.lint:lint-model:27.1.1:lint-model-27.1.1.jar:bc23c0c413bdfca59dac2cd56b870d8360d009e9ec0d365e71f774bcf127971d',
-        'com.android.tools.lint:lint:27.1.1:lint-27.1.1.jar:2f6038a5398a42bd591883c3f5e5894f4ec52ca1c3683bf94fa8553c1700af81',
-        'com.android.tools:annotations:27.1.1:annotations-27.1.1.jar:ff28c504d2acb9fd1a5ffbd97ae85cf59ee18c76927525aad250509bccf2cab1',
-        'com.android.tools:common:27.1.1:common-27.1.1.jar:63d9a2a9ad6d278db319f3749b9f50bdf5457ef7020074a1bebe124e714b535c',
-        'com.android.tools:dvlib:27.1.1:dvlib-27.1.1.jar:998a54201fc1cefee5f2399215e95c42b1f64f9e1d8f4452eb8255c68ba5440f',
-        'com.android.tools:repository:27.1.1:repository-27.1.1.jar:d25b74ccabf4d876903efb375e9af6fb380d8ae0445bb74bbdcc225c1e37fa1d',
-        'com.android.tools:sdk-common:27.1.1:sdk-common-27.1.1.jar:4473ae97d0ef7061ee1de61041d5aa97405ae08e44c09cf7bb278b42e4b97c7c',
-        'com.android.tools:sdklib:27.1.1:sdklib-27.1.1.jar:08e6b83961ac9724b3c1e3d0eff971f13be6701292c77914b8794480f3391250',
-        'com.android:signflinger:4.1.1:signflinger-4.1.1.jar:0c66825988873ec2d51057fa463f54a8f18fc7326ff4530b9da363b71e97ce60',
-        'com.android:zipflinger:4.1.1:zipflinger-4.1.1.jar:0a8c3e52ac13dd031236f9fb5ba4408b1d5dcd12325a05440b36da09d8881446',
+        'com.android.tools.build:apksig:4.2.2:apksig-4.2.2.jar:632690bf641b429dcb31650e6b2f6a2e87c4ac8afd45a6ba3cbc99fb1612178f',
+        'com.android.tools.build:apkzlib:4.2.2:apkzlib-4.2.2.jar:3b5167c1265e97f65201c4d2be6a6f72165a3aa2fe9e0594a59b67af9e9e97b9',
+        'com.android.tools.build:builder-model:4.2.2:builder-model-4.2.2.jar:41868de0cb88ae70b828eee4191c13e0233f433abb1becdf6a2bd391bd446bc0',
+        'com.android.tools.build:builder-test-api:4.2.2:builder-test-api-4.2.2.jar:2f305c6d3a7b637d736b821bad372dcabd959e979f2065a9f65bac1e7b4d1875',
+        'com.android.tools.build:builder:4.2.2:builder-4.2.2.jar:40fedd0d16db8f34ddb4eaf812d966b90ef1764f65cf119030442823bcf995cd',
+        'com.android.tools.build:gradle-api:4.2.2:gradle-api-4.2.2.jar:dd4ef35bbbfb8fc2d20e3311c76b516bc1672e82b61cb3a59fc877da0f9b4f61',
+        'com.android.tools.build:manifest-merger:27.2.2:manifest-merger-27.2.2.jar:971974756f32d9e94c857d92772b1499b0b0f5d9c70cb8ebbd20d9bbf804a923',
+        'com.android.tools.ddms:ddmlib:27.2.2:ddmlib-27.2.2.jar:9ab0f9b58737c316af454184705854c75936ca3531f21acc29bd68a3343334d1',
+        'com.android.tools.external.com-intellij:intellij-core:27.2.2:intellij-core-27.2.2.jar:01619d5dc28ec909cbdee699f1f13056e84462faf6dccf4817561293fb28bef0',
+        'com.android.tools.external.com-intellij:kotlin-compiler:27.2.2:kotlin-compiler-27.2.2.jar:71bd460199ce7293ecc54b91a115319c1e4b585eca5a5b3699f6a406f29e626c',
+        'com.android.tools.external.org-jetbrains:uast:27.2.2:uast-27.2.2.jar:efa59302fd433015e993143530cecb456b63d10d0b89bd1d3b1a016904338a65',
+        'com.android.tools.layoutlib:layoutlib-api:27.2.2:layoutlib-api-27.2.2.jar:f0901f2295d814e82ad95850ea2103dd89d8489e01727fafa55ccccc0dccd163',
+        'com.android.tools.lint:lint-api:27.2.2:lint-api-27.2.2.jar:1ecb5959c8e624ee49cdf9178de67bb0e823b4382ed253410eb36afe5c458b05',
+        'com.android.tools.lint:lint-checks:27.2.2:lint-checks-27.2.2.jar:989e545a6b5e398e63a9f3608da02d6111f2241faec1baa0a3b4492cb03aeaf2',
+        'com.android.tools.lint:lint-gradle-api:27.2.2:lint-gradle-api-27.2.2.jar:2be9c69d6fbbfb012ff6521fdfcb22eb7cfaa57d108e07bb1d4143dae9c1b433',
+        'com.android.tools.lint:lint-gradle:27.2.2:lint-gradle-27.2.2.jar:742dedd5ccb459a245a35bf4fa16dfecc762da1a6b1741332cfe5228e812301a',
+        'com.android.tools.lint:lint-model:27.2.2:lint-model-27.2.2.jar:ee31012586462bea2d591b6175934e5f29b6f781a78fda50f79387972364b9ab',
+        'com.android.tools.lint:lint:27.2.2:lint-27.2.2.jar:7247016af7fba8cabee6ae887515b144f5a2ff7823422654daf23be9202f8fb1',
+        'com.android.tools:annotations:27.2.2:annotations-27.2.2.jar:9375fb2df5c0cf1b46fef9e65b3a27ac88925ccf90054b19ae0ca0adc7036fe1',
+        'com.android.tools:common:27.2.2:common-27.2.2.jar:a76f4e10cad39bed317be031fee915d280aa8bc11616c58ab94e051b1e38769d',
+        'com.android.tools:dvlib:27.2.2:dvlib-27.2.2.jar:9931c6b57460b5f8cc2613ca5ff8596aa089a67655ace13d173f90538ecb4301',
+        'com.android.tools:repository:27.2.2:repository-27.2.2.jar:ac5f9b19dc5d9d08e80b57da76059f5760ca76c221e40ffd4bf43d7b13991674',
+        'com.android.tools:sdk-common:27.2.2:sdk-common-27.2.2.jar:b147acc13850808d61fc391ccfeeebdf90841b461a7042acb2d92e466da8e674',
+        'com.android.tools:sdklib:27.2.2:sdklib-27.2.2.jar:fae0bafbe8b4f546cf64986a22b7d8ed108d45519366ff22f0170a9cf3ea7f34',
+        'com.android:signflinger:4.2.2:signflinger-4.2.2.jar:4d7aafd9666707b483b1ad2c466824287cf2e379dda1d204dd3b7e453ffcf760',
+        'com.android:zipflinger:4.2.2:zipflinger-4.2.2.jar:8e4677086c9a8f4a67374a4edc31db7e481f0d9b85907263c51ca72452c23a93',
+        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-        'com.google.code.gson:gson:2.8.5:gson-2.8.5.jar:233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81',
+        'com.google.code.gson:gson:2.8.6:gson-2.8.6.jar:c8fb4839054d280b3033f800d1f5a97de2f028eb8ba2eb458ad287e536f3f25f',
         'com.google.dagger:dagger-compiler:2.24:dagger-compiler-2.24.jar:3c5afb955fb188da485cb2c048eff37dce0e1530b9780a0f2f7187d16d1ccc1f',
         'com.google.dagger:dagger-producers:2.24:dagger-producers-2.24.jar:f10f45b95191954d5d6b043fca9e62fb621d21bf70634b8f8476c7988b504c3a',
         'com.google.dagger:dagger-spi:2.24:dagger-spi-2.24.jar:c038445d14dbcb4054e61bf49e05009edf26fce4fdc7ec1a9db544784f68e718',
@@ -53,26 +54,28 @@ dependencyVerification {
         'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90',
         'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
         'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
-        'com.sun.istack:istack-commons-runtime:3.0.7:istack-commons-runtime-3.0.7.jar:6443e10ba2e259fb821d9b6becf10db5316285fc30c53cec9d7b19a3877e7fdf',
-        'com.sun.xml.fastinfoset:FastInfoset:1.2.15:FastInfoset-1.2.15.jar:785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec',
+        'com.sun.istack:istack-commons-runtime:3.0.8:istack-commons-runtime-3.0.8.jar:4ffabb06be454a05e4398e20c77fa2b6308d4b88dfbef7ca30a76b5b7d5505ef',
+        'com.sun.xml.fastinfoset:FastInfoset:1.2.16:FastInfoset-1.2.16.jar:056f3a1e144409f21ed16afc26805f58e9a21f3fce1543c42d400719d250c511',
         'commons-codec:commons-codec:1.10:commons-codec-1.10.jar:4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569',
         'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
-        'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
-        'javax.activation:javax.activation-api:1.2.0:javax.activation-api-1.2.0.jar:43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393',
+        'it.unimi.dsi:fastutil:8.4.0:fastutil-8.4.0.jar:2ad2824a4a0a0eb836b52ee2fc84ba2134f44bce7bfa54015ae3f31c710a3071',
+        'jakarta.activation:jakarta.activation-api:1.2.1:jakarta.activation-api-1.2.1.jar:8b0a0f52fa8b05c5431921a063ed866efaa41dadf2e3a7ee3e1961f2b0d9645b',
+        'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2:jakarta.xml.bind-api-2.3.2.jar:69156304079bdeed9fc0ae3b39389f19b3cc4ba4443bc80508995394ead742ea',
         'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-        'javax.xml.bind:jaxb-api:2.3.1:jaxb-api-2.3.1.jar:88b955a0df57880a26a74708bc34f74dcaf8ebf4e78843a28b50eae945732b06',
         'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+        'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',
+        'net.java.dev.jna:jna-platform:5.6.0:jna-platform-5.6.0.jar:9ecea8bf2b1b39963939d18b70464eef60c508fed8820f9dcaba0c35518eabf7',
+        'net.java.dev.jna:jna:5.6.0:jna-5.6.0.jar:5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf',
+        'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
         'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
         'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
         'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
-        '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-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
         'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
         'org.apache.httpcomponents:httpclient:4.5.6:httpclient-4.5.6.jar:c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7',
         'org.apache.httpcomponents:httpcore:4.4.10:httpcore-4.4.10.jar:78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd',
         'org.apache.httpcomponents:httpmime:4.5.6:httpmime-4.5.6.jar:0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e',
-        '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:obfs4proxy-android:0.0.12-dev-40245c4a:obfs4proxy-android-0.0.12-dev-40245c4a.zip:8ab05a8f8391be2cb5ab2b665c281a06d9e3a756bd0f95a40a36ca927866ea82',
@@ -83,28 +86,32 @@ dependencyVerification {
         'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',
         'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
         'org.codehaus.mojo:animal-sniffer-annotations:1.18:animal-sniffer-annotations-1.18.jar:47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d',
-        'org.glassfish.jaxb:jaxb-runtime:2.3.1:jaxb-runtime-2.3.1.jar:45fecfa5c8217ce1f3652ab95179790ec8cc0dec0384bca51cbeb94a293d9f2f',
-        'org.glassfish.jaxb:txw2:2.3.1:txw2-2.3.1.jar:34975dde1c6920f1a39791142235689bc3cd357e24d05edd8ff93b885bd68d60',
-        '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.3.72:kotlin-reflect-1.3.72.jar:a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40',
-        'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72:kotlin-stdlib-common-1.3.72.jar:5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72:kotlin-stdlib-jdk7-1.3.72.jar:40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72:kotlin-stdlib-jdk8-1.3.72.jar:133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95',
-        'org.jetbrains.kotlin:kotlin-stdlib:1.3.72:kotlin-stdlib-1.3.72.jar:3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b',
-        'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
+        'org.glassfish.jaxb:jaxb-runtime:2.3.2:jaxb-runtime-2.3.2.jar:e6e0a1e89fb6ff786279e6a0082d5cef52dc2ebe67053d041800737652b4fd1b',
+        'org.glassfish.jaxb:txw2:2.3.2:txw2-2.3.2.jar:4a6a9f483388d461b81aa9a28c685b8b74c0597993bf1884b04eddbca95f48fe',
+        'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
+        'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
+        'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
+        'org.jetbrains.intellij.deps:trove4j:1.0.20181211:trove4j-1.0.20181211.jar:affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601',
+        'org.jetbrains.kotlin:kotlin-reflect:1.4.31:kotlin-reflect-1.4.31.jar:91fad0b42974a7d5811e30a61f05706e176b144235717c6de7e81e3a781028f2',
+        'org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31:kotlin-stdlib-common-1.4.31.jar:57962f44371a746b678218a0802a8712c6255206de9a69ede215e3aa4b044708',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31:kotlin-stdlib-jdk7-1.4.31.jar:1f966e54e86cf4b7d7014afdce04e0f3ee4625084cda3494edccc7b84af52664',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31:kotlin-stdlib-jdk8-1.4.31.jar:b2f8364435ebcb0106ff9d4415a11ffdef8ec7786ee6e5ed465a01556cbd1683',
+        'org.jetbrains.kotlin:kotlin-stdlib:1.4.31:kotlin-stdlib-1.4.31.jar:76a599d88b167e8ac90879b6daa722c6ad3452ba714c9aba19bd196544b97f1c',
         'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
-        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
-        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
-        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-        'org.jvnet.staxex:stax-ex:1.8:stax-ex-1.8.jar:95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77',
-        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
+        'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',
+        'org.jmock:jmock-legacy:2.12.0:jmock-legacy-2.12.0.jar:dea3a9cca653d082e2fe7e40232e982fe03a9984c7d67ceff24f3e03fe580dcd',
+        'org.jmock:jmock-testjar:2.12.0:jmock-testjar-2.12.0.jar:efefbcf6cd294d0e29f0c46eb2a3380d4ca4e1763ff719c69e2f2ac62f564a04',
+        'org.jmock:jmock:2.12.0:jmock-2.12.0.jar:266d07314c0cd343c46ff8a55601272de8cf406807caf55e6f313295f83d10be',
+        'org.jvnet.staxex:stax-ex:1.8.1:stax-ex-1.8.1.jar:20522549056e9e50aa35ef0b445a2e47a53d06be0b0a9467d704e2483ffb049a',
+        'org.objenesis:objenesis:3.0.1:objenesis-3.0.1.jar:7a8ff780b9ff48415d7c705f60030b0acaa616e7f823c98eede3b63508d4e984',
         'org.ow2.asm:asm-analysis:7.0:asm-analysis-7.0.jar:e981f8f650c4d900bb033650b18e122fa6b161eadd5f88978d08751f72ee8474',
         'org.ow2.asm:asm-commons:7.0:asm-commons-7.0.jar:fed348ef05958e3e846a3ac074a12af5f7936ef3d21ce44a62c4fa08a771927d',
         'org.ow2.asm:asm-tree:7.0:asm-tree-7.0.jar:cfd7a0874f9de36a999c127feeadfbfe6e04d4a71ee954d7af3d853f0be48a6c',
         'org.ow2.asm:asm-util:7.0:asm-util-7.0.jar:75fbbca440ef463f41c2b0ab1a80abe67e910ac486da60a7863cbcb5bae7e145',
-        'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
         'org.ow2.asm:asm:7.0:asm-7.0.jar:b88ef66468b3c978ad0c97fd6e90979e56155b4ac69089ba7a44e9aa7ffe9acf',
+        'org.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de',
+        'xerces:xercesImpl:2.12.0:xercesImpl-2.12.0.jar:b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0',
+        'xml-apis:xml-apis:1.4.01:xml-apis-1.4.01.jar:a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad',
     ]
 }

bramble-api/build.gradle

@@ -10,10 +10,9 @@ dependencies {
 	implementation "com.google.dagger:dagger:2.24"
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
-	testImplementation 'junit:junit:4.12'
-	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-junit4:$jmock_version"
 
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }

bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java

@@ -2,6 +2,7 @@ package org.briarproject.bramble.api.account;
 
 import org.briarproject.bramble.api.crypto.DecryptionException;
 import org.briarproject.bramble.api.crypto.SecretKey;
+import org.briarproject.bramble.api.identity.Identity;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
@@ -43,6 +44,17 @@ public interface AccountManager {
 	 */
 	boolean createAccount(String name, String password);
 
+	/**
+	 * Restores a given identity by registering it with the
+	 * {@link IdentityManager}.  Creates a database key, encrypts it with the
+	 * given password and stores it on disk. {@link #accountExists()} will
+	 * return true after this method returns true.
+ 	 * @param identity
+	 * @param password
+	 * @return
+	 */
+	boolean restoreAccount(Identity identity, String password);
+
 	/**
 	 * Deletes all account state from disk. {@link #accountExists()} will
 	 * return false after this method returns.

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

@@ -1,6 +1,6 @@
-package org.briarproject.bramble.contact;
+package org.briarproject.bramble.api.contact;
 
-interface ContactExchangeConstants {
+public interface ContactExchangeConstants {
 
 	/**
 	 * The current version of the contact exchange protocol.

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

@@ -1,4 +1,4 @@
-package org.briarproject.bramble.contact;
+package org.briarproject.bramble.api.contact;
 
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
@@ -6,7 +6,7 @@ import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
-interface ContactExchangeCrypto {
+public interface ContactExchangeCrypto {
 
 	/**
 	 * Derives the header key for a contact exchange stream from the master key.

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

@@ -0,0 +1,9 @@
+package org.briarproject.bramble.api.contact;
+
+/**
+ * Record types for the contact exchange protocol.
+ */
+public interface ContactExchangeRecordTypes {
+
+	byte CONTACT_INFO = 0;
+}

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

@@ -3,6 +3,7 @@ package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.UnsupportedVersionException;
+import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.ContactExistsException;
 import org.briarproject.bramble.api.db.DbException;
@@ -48,6 +49,10 @@ public interface ContactManager {
 			SecretKey rootKey, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 
+	ContactId addContact(Transaction txn, Author remote, AuthorId local,
+			PublicKey handshake, boolean verified)
+			throws DbException, GeneralSecurityException;
+
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * replacing the given pending contact, derives and stores handshake mode
@@ -205,6 +210,19 @@ public interface ContactManager {
 	void setContactAlias(ContactId c, @Nullable String alias)
 			throws DbException;
 
+	/**
+	 * Sets the contact's handshake public key
+	 */
+	void setHandshakePublicKey(Transaction txn, ContactId c,
+			PublicKey handshakePublicKey) throws DbException,
+			GeneralSecurityException;
+
+	/**
+	 * Sets the contact's handshake public key
+	 */
+	void setHandshakePublicKey(ContactId c, PublicKey handshakePublicKey)
+			throws DbException, GeneralSecurityException;
+
 	/**
 	 * Returns true if a contact with this {@code remoteAuthorId} belongs to
 	 * the local pseudonym with this {@code localAuthorId}.

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

@@ -24,6 +24,19 @@ public interface HandshakeManager {
 	HandshakeResult handshake(PendingContactId p, InputStream in,
 			StreamWriter out) throws DbException, IOException;
 
+	/**
+	 * Handshakes with the given contact. Returns an ephemeral master key
+	 * authenticated with both parties' handshake key pairs and a flag
+	 * indicating whether the local peer is Alice or Bob.
+	 *
+	 * @param in An incoming stream for the handshake, which must be secured in
+	 * handshake mode
+	 * @param out An outgoing stream for the handshake, which must be secured
+	 * in handshake mode
+	 */
+	HandshakeResult handshake(ContactId c, InputStream in, StreamWriter out)
+			throws DbException, IOException;
+
 	class HandshakeResult {
 
 		private final SecretKey masterKey;

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

@@ -546,6 +546,11 @@ public interface DatabaseComponent extends TransactionManager {
 	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
 			throws DbException;
 
+	/**
+	 * Sets the remote handshake public key for a given contact
+	 */
+	void setHandshakePublicKey(Transaction txn, ContactId c, PublicKey handshakePublicKey) throws DbException;
+
 	/**
 	 * Sets the given group's visibility to the given contact.
 	 */

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

@@ -35,6 +35,20 @@ public interface KeyManager {
 			ContactId c, SecretKey rootKey, long timestamp, boolean alice,
 			boolean active) throws DbException;
 
+	/**
+	 * Derives and stores a set of rotation mode transport keys for
+	 * communicating with the given contact over each transport and returns the
+	 * key set IDs.
+	 * <p/>
+	 * {@link StreamContext StreamContexts} for the contact can be created
+	 * after this method has returned.
+	 *
+	 * @param alice True if the local party is Alice
+	 * @param active Whether the derived keys can be used for outgoing streams
+	 */
+	Map<TransportId, KeySetId> addRotationKeys(ContactId c, SecretKey rootKey,
+			long timestamp, boolean alice, boolean active) throws DbException;
+
 	/**
 	 * Informs the key manager that a new contact has been added. Derives and
 	 * stores a set of handshake mode transport keys for communicating with the

bramble-api/witness.gradle

@@ -1,24 +1,27 @@
 dependencyVerification {
     verify = [
-        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
+        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
         'com.google.dagger:dagger:2.24:dagger-2.24.jar:550a6e46a6dfcdf1d764887b6090cea94f783327e50e5c73754f18facfc70b64',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-        'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
-        'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
-        'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
+        'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',
+        'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
+        'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
         'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
         'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90',
         'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52',
-        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
-        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
-        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
-        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
-        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
+        'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
+        'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
+        'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
+        'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',
+        'org.jmock:jmock-legacy:2.12.0:jmock-legacy-2.12.0.jar:dea3a9cca653d082e2fe7e40232e982fe03a9984c7d67ceff24f3e03fe580dcd',
+        'org.jmock:jmock-testjar:2.12.0:jmock-testjar-2.12.0.jar:efefbcf6cd294d0e29f0c46eb2a3380d4ca4e1763ff719c69e2f2ac62f564a04',
+        'org.jmock:jmock:2.12.0:jmock-2.12.0.jar:266d07314c0cd343c46ff8a55601272de8cf406807caf55e6f313295f83d10be',
+        'org.objenesis:objenesis:3.0.1:objenesis-3.0.1.jar:7a8ff780b9ff48415d7c705f60030b0acaa616e7f823c98eede3b63508d4e984',
         '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.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de',
     ]
 }

bramble-core/build.gradle

@@ -10,7 +10,7 @@ apply from: '../dagger.gradle'
 
 dependencies {
 	implementation project(path: ':bramble-api', configuration: 'default')
-	implementation 'com.madgag.spongycastle:core:1.58.0.0'
+	implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
 	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'
@@ -21,16 +21,25 @@ dependencies {
 
 	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	testImplementation 'org.hsqldb:hsqldb:2.3.5' // The last version that supports Java 1.6
-	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 'net.jodah:concurrentunit:0.4.2'
+	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-junit4:$jmock_version"
+	testImplementation "org.jmock:jmock-imposters:$jmock_version"
 
 	testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }
 
+animalsniffer {
+	// Allow requireNonNull: Android desugaring rewrites it (so it's safe for us to use),
+	// and it gets used when passing method references instead of lambdas with Java 11.
+	// Note that this line allows *all* methods from java.util.Objects.
+	// That's the best that we can do with the configuration options that Animal Sniffer offers.
+	ignore 'java.util.Objects'
+}
+
 // needed to make test output available to bramble-java
 configurations {
 	testOutput.extendsFrom(testCompile)

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

@@ -176,6 +176,18 @@ class AccountManagerImpl implements AccountManager {
 		}
 	}
 
+	public boolean restoreAccount(Identity identity, String password) {
+		synchronized (stateChangeLock) {
+			if (hasDatabaseKey())
+				throw new AssertionError("Already have a database key");
+			identityManager.registerIdentity(identity);
+			SecretKey key = crypto.generateSecretKey();
+			if (!encryptAndStoreDatabaseKey(key, password)) return false;
+			databaseKey = key;
+			return true;
+		}
+	}
+
 	@GuardedBy("stateChangeLock")
 	private boolean encryptAndStoreDatabaseKey(SecretKey key, String password) {
 		byte[] plaintext = key.getBytes();

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

@@ -76,7 +76,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 		ioExecutor.execute(new IncomingDuplexSyncConnection(keyManager,
 				connectionRegistry, streamReaderFactory, streamWriterFactory,
 				syncSessionFactory, transportPropertyManager, ioExecutor,
-				t, d));
+				t, d, handshakeManager));
 	}
 
 	@Override
@@ -101,7 +101,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 		ioExecutor.execute(new OutgoingDuplexSyncConnection(keyManager,
 				connectionRegistry, streamReaderFactory, streamWriterFactory,
 				syncSessionFactory, transportPropertyManager, ioExecutor,
-				secureRandom, c, t, d));
+				secureRandom, handshakeManager, c, t, d));
 	}
 
 	@Override

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

@@ -3,6 +3,7 @@ package org.briarproject.bramble.connection;
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
 import org.briarproject.bramble.api.connection.InterruptibleConnection;
 import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.contact.HandshakeManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportConnectionReader;
 import org.briarproject.bramble.api.plugin.TransportConnectionWriter;

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

@@ -2,6 +2,7 @@ package org.briarproject.bramble.connection;
 
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
 import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.contact.HandshakeManager;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
@@ -13,9 +14,11 @@ import org.briarproject.bramble.api.sync.SyncSessionFactory;
 import org.briarproject.bramble.api.transport.KeyManager;
 import org.briarproject.bramble.api.transport.StreamContext;
 import org.briarproject.bramble.api.transport.StreamReaderFactory;
+import org.briarproject.bramble.api.transport.StreamWriter;
 import org.briarproject.bramble.api.transport.StreamWriterFactory;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.concurrent.Executor;
 
 import static java.util.logging.Level.WARNING;
@@ -24,6 +27,10 @@ import static org.briarproject.bramble.util.LogUtils.logException;
 @NotNullByDefault
 class IncomingDuplexSyncConnection extends DuplexSyncConnection
 		implements Runnable {
+	private final HandshakeManager handshakeManager;
+
+	// FIXME: Exchange timestamp as part of handshake protocol?
+	private static final long TIMESTAMP = 1617235200; // 1 April 2021 00:00 UTC
 
 	IncomingDuplexSyncConnection(KeyManager keyManager,
 			ConnectionRegistry connectionRegistry,
@@ -32,14 +39,18 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
 			SyncSessionFactory syncSessionFactory,
 			TransportPropertyManager transportPropertyManager,
 			Executor ioExecutor, TransportId transportId,
-			DuplexTransportConnection connection) {
+			DuplexTransportConnection connection,
+			HandshakeManager handshakeManager) {
 		super(keyManager, connectionRegistry, streamReaderFactory,
 				streamWriterFactory, syncSessionFactory,
 				transportPropertyManager, ioExecutor, transportId, connection);
+		this.handshakeManager = handshakeManager;
 	}
 
 	@Override
 	public void run() {
+		LOG.info("Running IncomingDuplexSyncConnection on transport " +
+				transportId.getString());
 		// Read and recognise the tag
 		StreamContext ctx = recogniseTag(reader, transportId);
 		if (ctx == null) {
@@ -54,10 +65,22 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
 			return;
 		}
 		if (ctx.isHandshakeMode()) {
-			// TODO: Support handshake mode for contacts
-			LOG.warning("Received handshake tag, expected rotation mode");
-			onReadError(true);
-			return;
+			if (!performHandshake(ctx, contactId)) {
+				LOG.warning("Handshake failed");
+				return;
+			}
+			// Allocate a rotation mode stream context
+			ctx = allocateStreamContext(contactId, transportId);
+			if (ctx == null) {
+				LOG.warning("Could not allocate stream context");
+				onWriteError();
+				return;
+			}
+			if (ctx.isHandshakeMode()) {
+				LOG.warning("Got handshake mode context after handshaking");
+				onWriteError();
+				return;
+			}
 		}
 		connectionRegistry.registerIncomingConnection(contactId, transportId,
 				this);
@@ -103,5 +126,35 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
 			onWriteError();
 		}
 	}
+
+	private boolean performHandshake(StreamContext ctxIn, ContactId contactId) {
+		LOG.info("Performing handshake (Incoming)");
+		// Allocate the outgoing stream context
+		StreamContext ctxOut =
+				allocateStreamContext(contactId, transportId);
+		if (ctxOut == null) {
+			LOG.warning("Could not allocate stream context");
+			onReadError(true);
+			return false;
+		}
+		try {
+			InputStream in = streamReaderFactory.createStreamReader(
+					reader.getInputStream(), ctxIn);
+			// Flush the output stream to send the outgoing stream header
+			StreamWriter out = streamWriterFactory.createStreamWriter(
+					writer.getOutputStream(), ctxOut);
+			out.getOutputStream().flush();
+			HandshakeManager.HandshakeResult result =
+					handshakeManager.handshake(contactId, in, out);
+			keyManager.addRotationKeys(contactId, result.getMasterKey(),
+					TIMESTAMP, result.isAlice(), true);
+			LOG.info("Rotation keys added");
+			return true;
+		} catch (IOException | DbException e) {
+			logException(LOG, WARNING, e);
+			onReadError(true);
+			return false;
+		}
+	}
 }
 

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

@@ -2,6 +2,7 @@ package org.briarproject.bramble.connection;
 
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
 import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.contact.HandshakeManager;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
@@ -14,9 +15,11 @@ import org.briarproject.bramble.api.sync.SyncSessionFactory;
 import org.briarproject.bramble.api.transport.KeyManager;
 import org.briarproject.bramble.api.transport.StreamContext;
 import org.briarproject.bramble.api.transport.StreamReaderFactory;
+import org.briarproject.bramble.api.transport.StreamWriter;
 import org.briarproject.bramble.api.transport.StreamWriterFactory;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
 
@@ -28,26 +31,38 @@ import static org.briarproject.bramble.util.LogUtils.logException;
 class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 		implements Runnable {
 
+	// FIXME: Exchange timestamp as part of handshake protocol?
+	private static final long TIMESTAMP = 1617235200; // 1 April 2021 00:00 UTC
+
 	private final SecureRandom secureRandom;
+	private final HandshakeManager handshakeManager;
 	private final ContactId contactId;
 
-	OutgoingDuplexSyncConnection(KeyManager keyManager,
+	OutgoingDuplexSyncConnection(
+			KeyManager keyManager,
 			ConnectionRegistry connectionRegistry,
 			StreamReaderFactory streamReaderFactory,
 			StreamWriterFactory streamWriterFactory,
 			SyncSessionFactory syncSessionFactory,
 			TransportPropertyManager transportPropertyManager,
-			Executor ioExecutor, SecureRandom secureRandom, ContactId contactId,
-			TransportId transportId, DuplexTransportConnection connection) {
+			Executor ioExecutor,
+			SecureRandom secureRandom,
+			HandshakeManager handshakeManager,
+			ContactId contactId,
+			TransportId transportId,
+			DuplexTransportConnection connection) {
 		super(keyManager, connectionRegistry, streamReaderFactory,
 				streamWriterFactory, syncSessionFactory,
 				transportPropertyManager, ioExecutor, transportId, connection);
 		this.secureRandom = secureRandom;
+		this.handshakeManager = handshakeManager;
 		this.contactId = contactId;
 	}
 
 	@Override
 	public void run() {
+		LOG.info("Running OutgoingDuplexSyncConnection on transport " +
+				transportId.getString());
 		// Allocate a stream context
 		StreamContext ctx = allocateStreamContext(contactId, transportId);
 		if (ctx == null) {
@@ -56,10 +71,22 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 			return;
 		}
 		if (ctx.isHandshakeMode()) {
-			// TODO: Support handshake mode for contacts
-			LOG.warning("Cannot use handshake mode stream context");
-			onWriteError();
-			return;
+			if (!performHandshake(ctx)) {
+				LOG.warning("Handshake failed");
+				return;
+			}
+			// Allocate a rotation mode stream context
+			ctx = allocateStreamContext(contactId, transportId);
+			if (ctx == null) {
+				LOG.warning("Could not allocate stream context");
+				onWriteError();
+				return;
+			}
+			if (ctx.isHandshakeMode()) {
+				LOG.warning("Got handshake mode context after handshaking");
+				onWriteError();
+				return;
+			}
 		}
 		// Start the incoming session on another thread
 		Priority priority = generatePriority();
@@ -127,6 +154,59 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 		}
 	}
 
+	private boolean performHandshake(StreamContext ctxOut) {
+		LOG.info("Performing handshake (Outgoing)");
+		// Flush the output stream to send the outgoing stream header
+		StreamWriter out;
+		try {
+			out = streamWriterFactory.createStreamWriter(
+					writer.getOutputStream(), ctxOut);
+			out.getOutputStream().flush();
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+			onWriteError();
+			return false;
+		}
+		// Read and recognise the tag
+		StreamContext ctxIn = recogniseTag(reader, transportId);
+		// Unrecognised tags are suspicious in this case
+		if (ctxIn == null) {
+			LOG.warning("Unrecognised tag for returning stream");
+			onReadError();
+			return false;
+		}
+		// Check that the stream comes from the expected contact
+		ContactId inContactId = ctxIn.getContactId();
+		if (contactId == null) {
+			LOG.warning("Expected contact tag, got rendezvous tag");
+			onReadError();
+			return false;
+		}
+		if (!inContactId.equals(contactId)) {
+			LOG.warning("Wrong contact ID for returning stream");
+			onReadError();
+			return false;
+		}
+		// TODO: Register the connection, close it if it's redundant
+		// Handshake and exchange contacts
+		try {
+			InputStream in = streamReaderFactory.createStreamReader(
+					reader.getInputStream(), ctxIn);
+			HandshakeManager.HandshakeResult result =
+					handshakeManager.handshake(contactId, in, out);
+			keyManager.addRotationKeys(contactId, result.getMasterKey(),
+					TIMESTAMP, result.isAlice(), true);
+			LOG.info("Rotation keys added");
+			return true;
+		} catch (IOException | DbException e) {
+			logException(LOG, WARNING, e);
+			onWriteError();
+			return false;
+		} finally {
+			// TODO: Unregister the connection
+		}
+	}
+
 	private void onReadError() {
 		// 'Recognised' is always true for outgoing connections
 		onReadError(true);

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

@@ -1,5 +1,6 @@
 package org.briarproject.bramble.contact;
 
+import org.briarproject.bramble.api.contact.ContactExchangeCrypto;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
@@ -10,12 +11,12 @@ import java.security.GeneralSecurityException;
 
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.contact.ContactExchangeConstants.ALICE_KEY_LABEL;
-import static org.briarproject.bramble.contact.ContactExchangeConstants.ALICE_NONCE_LABEL;
-import static org.briarproject.bramble.contact.ContactExchangeConstants.BOB_KEY_LABEL;
-import static org.briarproject.bramble.contact.ContactExchangeConstants.BOB_NONCE_LABEL;
-import static org.briarproject.bramble.contact.ContactExchangeConstants.PROTOCOL_VERSION;
-import static org.briarproject.bramble.contact.ContactExchangeConstants.SIGNING_LABEL;
+import static org.briarproject.bramble.api.contact.ContactExchangeConstants.ALICE_KEY_LABEL;
+import static org.briarproject.bramble.api.contact.ContactExchangeConstants.ALICE_NONCE_LABEL;
+import static org.briarproject.bramble.api.contact.ContactExchangeConstants.BOB_KEY_LABEL;
+import static org.briarproject.bramble.api.contact.ContactExchangeConstants.BOB_NONCE_LABEL;
+import static org.briarproject.bramble.api.contact.ContactExchangeConstants.PROTOCOL_VERSION;
+import static org.briarproject.bramble.api.contact.ContactExchangeConstants.SIGNING_LABEL;
 
 @NotNullByDefault
 class ContactExchangeCryptoImpl implements ContactExchangeCrypto {

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

@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.Predicate;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactExchangeCrypto;
 import org.briarproject.bramble.api.contact.ContactExchangeManager;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -47,8 +48,8 @@ import javax.inject.Inject;
 
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
-import static org.briarproject.bramble.contact.ContactExchangeConstants.PROTOCOL_VERSION;
-import static org.briarproject.bramble.contact.ContactExchangeRecordTypes.CONTACT_INFO;
+import static org.briarproject.bramble.api.contact.ContactExchangeConstants.PROTOCOL_VERSION;
+import static org.briarproject.bramble.api.contact.ContactExchangeRecordTypes.CONTACT_INFO;
 import static org.briarproject.bramble.util.ValidationUtils.checkLength;
 import static org.briarproject.bramble.util.ValidationUtils.checkSize;
 
@@ -81,7 +82,8 @@ class ContactExchangeManagerImpl implements ContactExchangeManager {
 	private final ContactManager contactManager;
 	private final IdentityManager identityManager;
 	private final TransportPropertyManager transportPropertyManager;
-	private final ContactExchangeCrypto contactExchangeCrypto;
+	private final org.briarproject.bramble.api.contact.ContactExchangeCrypto
+			contactExchangeCrypto;
 	private final StreamReaderFactory streamReaderFactory;
 	private final StreamWriterFactory streamWriterFactory;
 

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.contact;
-
-/**
- * Record types for the contact exchange protocol.
- */
-interface ContactExchangeRecordTypes {
-
-	byte CONTACT_INFO = 0;
-}

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

@@ -9,6 +9,7 @@ import org.briarproject.bramble.api.contact.PendingContact;
 import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.contact.PendingContactState;
 import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent;
+import org.briarproject.bramble.api.crypto.CryptoConstants;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
@@ -119,6 +120,18 @@ class ContactManagerImpl implements ContactManager, EventListener {
 						verified, active));
 	}
 
+	@Override
+	public ContactId addContact(Transaction txn, Author remote, AuthorId local,
+			PublicKey handshake, boolean verified)
+			throws DbException, GeneralSecurityException {
+		ContactId c = db.addContact(txn, remote, local, handshake, verified);
+		Contact contact = db.getContact(txn, c);
+		KeyPair ourKeyPair = identityManager.getHandshakeKeys(txn);
+		keyManager.addContact(txn, c, handshake, ourKeyPair);
+		for (ContactHook hook : hooks) hook.addingContact(txn, contact);
+		return c;
+	}
+
 	@Override
 	public String getHandshakeLink() throws DbException {
 		KeyPair keyPair = db.transactionWithResult(true,
@@ -234,6 +247,25 @@ class ContactManagerImpl implements ContactManager, EventListener {
 		db.transaction(false, txn -> setContactAlias(txn, c, alias));
 	}
 
+	@Override
+	public void setHandshakePublicKey(Transaction txn, ContactId c,
+			PublicKey handshakePublicKey) throws DbException, GeneralSecurityException {
+		if (handshakePublicKey.getKeyType() !=
+				CryptoConstants.KEY_TYPE_AGREEMENT) {
+			throw new IllegalArgumentException();
+		}
+		db.setHandshakePublicKey(txn, c, handshakePublicKey);
+		KeyPair ourKeyPair = identityManager.getHandshakeKeys(txn);
+		keyManager.addContact(txn, c, handshakePublicKey, ourKeyPair);
+	}
+
+	@Override
+	public void setHandshakePublicKey(ContactId c, PublicKey handshakePublicKey)
+			throws DbException, GeneralSecurityException {
+		db.transaction(false,
+				txn -> setHandshakePublicKey(txn, c, handshakePublicKey));
+	}
+
 	@Override
 	public boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException {

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

@@ -1,5 +1,6 @@
 package org.briarproject.bramble.contact;
 
+import org.briarproject.bramble.api.contact.ContactExchangeCrypto;
 import org.briarproject.bramble.api.contact.ContactExchangeManager;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.contact.HandshakeManager;

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

@@ -3,6 +3,8 @@ package org.briarproject.bramble.contact;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.Predicate;
+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.HandshakeManager;
 import org.briarproject.bramble.api.contact.PendingContact;
@@ -88,6 +90,27 @@ class HandshakeManagerImpl implements HandshakeManager {
 		});
 		PublicKey theirStaticPublicKey = keys.getFirst();
 		KeyPair ourStaticKeyPair = keys.getSecond();
+		return handshake(theirStaticPublicKey, ourStaticKeyPair, in, out);
+	}
+
+	@Override
+	public HandshakeResult handshake(ContactId c, InputStream in,
+			StreamWriter out) throws DbException, IOException {
+		Pair<PublicKey, KeyPair> keys = db.transactionWithResult(true, txn -> {
+			Contact contact = contactManager.getContact(txn, c);
+			PublicKey handshakePublicKey = contact.getHandshakePublicKey();
+			if (handshakePublicKey == null) throw new DbException();
+			KeyPair keyPair = identityManager.getHandshakeKeys(txn);
+			return new Pair<>(handshakePublicKey, keyPair);
+		});
+		PublicKey theirStaticPublicKey = keys.getFirst();
+		KeyPair ourStaticKeyPair = keys.getSecond();
+		return handshake(theirStaticPublicKey, ourStaticKeyPair, in, out);
+	}
+
+	private HandshakeResult handshake(PublicKey theirStaticPublicKey,
+			KeyPair ourStaticKeyPair, InputStream in, StreamWriter out)
+			throws IOException {
 		boolean alice = transportCrypto.isAlice(theirStaticPublicKey,
 				ourStaticKeyPair);
 		RecordReader recordReader = recordReaderFactory.createRecordReader(in);

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

@@ -21,9 +21,9 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 import org.briarproject.bramble.util.ByteUtils;
 import org.briarproject.bramble.util.StringUtils;
-import org.spongycastle.crypto.CryptoException;
-import org.spongycastle.crypto.Digest;
-import org.spongycastle.crypto.digests.Blake2bDigest;
+import org.bouncycastle.crypto.CryptoException;
+import org.bouncycastle.crypto.Digest;
+import org.bouncycastle.crypto.digests.Blake2bDigest;
 import org.whispersystems.curve25519.Curve25519;
 import org.whispersystems.curve25519.Curve25519KeyPair;
 

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

@@ -6,33 +6,33 @@ import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.util.StringUtils;
-import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
-import org.spongycastle.asn1.x9.X9ECParameters;
-import org.spongycastle.crypto.AsymmetricCipherKeyPair;
-import org.spongycastle.crypto.BasicAgreement;
-import org.spongycastle.crypto.BlockCipher;
-import org.spongycastle.crypto.CipherParameters;
-import org.spongycastle.crypto.CryptoException;
-import org.spongycastle.crypto.DerivationFunction;
-import org.spongycastle.crypto.KeyEncoder;
-import org.spongycastle.crypto.Mac;
-import org.spongycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.spongycastle.crypto.digests.SHA256Digest;
-import org.spongycastle.crypto.engines.AESLightEngine;
-import org.spongycastle.crypto.engines.IESEngine;
-import org.spongycastle.crypto.generators.ECKeyPairGenerator;
-import org.spongycastle.crypto.generators.EphemeralKeyPairGenerator;
-import org.spongycastle.crypto.generators.KDF2BytesGenerator;
-import org.spongycastle.crypto.macs.HMac;
-import org.spongycastle.crypto.modes.CBCBlockCipher;
-import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.spongycastle.crypto.params.AsymmetricKeyParameter;
-import org.spongycastle.crypto.params.ECDomainParameters;
-import org.spongycastle.crypto.params.ECKeyGenerationParameters;
-import org.spongycastle.crypto.params.ECPrivateKeyParameters;
-import org.spongycastle.crypto.params.ECPublicKeyParameters;
-import org.spongycastle.crypto.params.IESWithCipherParameters;
-import org.spongycastle.crypto.parsers.ECIESPublicKeyParser;
+import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.crypto.BasicAgreement;
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.CryptoException;
+import org.bouncycastle.crypto.DerivationFunction;
+import org.bouncycastle.crypto.KeyEncoder;
+import org.bouncycastle.crypto.Mac;
+import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
+import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.bouncycastle.crypto.engines.AESLightEngine;
+import org.bouncycastle.crypto.engines.IESEngine;
+import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
+import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator;
+import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
+import org.bouncycastle.crypto.macs.HMac;
+import org.bouncycastle.crypto.modes.CBCBlockCipher;
+import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.crypto.params.IESWithCipherParameters;
+import org.bouncycastle.crypto.parsers.ECIESPublicKeyParser;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

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

@@ -3,7 +3,7 @@ package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.StringUtils;
-import org.spongycastle.crypto.generators.SCrypt;
+import org.bouncycastle.crypto.generators.SCrypt;
 
 import java.util.logging.Logger;
 

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

@@ -4,11 +4,11 @@ import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.spongycastle.crypto.params.ECDomainParameters;
-import org.spongycastle.crypto.params.ECPrivateKeyParameters;
-import org.spongycastle.crypto.params.ECPublicKeyParameters;
-import org.spongycastle.math.ec.ECCurve;
-import org.spongycastle.math.ec.ECPoint;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.math.ec.ECCurve;
+import org.bouncycastle.math.ec.ECPoint;
 
 import java.math.BigInteger;
 import java.security.GeneralSecurityException;

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

@@ -2,7 +2,7 @@ package org.briarproject.bramble.crypto;
 
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 
 import javax.annotation.concurrent.Immutable;
 

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

@@ -2,7 +2,7 @@ package org.briarproject.bramble.crypto;
 
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 
 import javax.annotation.concurrent.Immutable;
 

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

@@ -9,8 +9,8 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.transport.IncomingKeys;
 import org.briarproject.bramble.api.transport.OutgoingKeys;
 import org.briarproject.bramble.api.transport.TransportKeys;
-import org.spongycastle.crypto.Digest;
-import org.spongycastle.crypto.digests.Blake2bDigest;
+import org.bouncycastle.crypto.Digest;
+import org.bouncycastle.crypto.digests.Blake2bDigest;
 
 import java.security.GeneralSecurityException;
 

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

@@ -3,12 +3,12 @@ package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.spongycastle.crypto.DataLengthException;
-import org.spongycastle.crypto.engines.XSalsa20Engine;
-import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
-import org.spongycastle.crypto.macs.Poly1305;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.crypto.engines.XSalsa20Engine;
+import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
+import org.bouncycastle.crypto.macs.Poly1305;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 import java.security.GeneralSecurityException;
 

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

@@ -32,6 +32,7 @@ import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.TransportKeySet;
 import org.briarproject.bramble.api.transport.TransportKeys;
 
+import java.sql.Connection;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -695,6 +696,11 @@ interface Database<T> {
 	void setHandshakeKeyPair(T txn, AuthorId local, PublicKey publicKey,
 			PrivateKey privateKey) throws DbException;
 
+	/**
+	 * Sets the handshake public key for a given contact
+	 */
+	void setHandshakePublicKey(T txn, ContactId c, PublicKey handshakePublicKey) throws DbException;
+
 	/**
 	 * Marks the given message as permanent, i.e. not temporary.
 	 */

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

@@ -1040,6 +1040,15 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		}
 	}
 
+	@Override
+	public void setHandshakePublicKey(Transaction transaction, ContactId c, PublicKey handshakePublicKey) throws DbException {
+		if (transaction.isReadOnly()) throw new IllegalArgumentException();
+		T txn = unbox(transaction);
+		if (!db.containsContact(txn, c))
+			throw new NoSuchContactException();
+		db.setHandshakePublicKey(txn, c, handshakePublicKey);
+	}
+
 	@Override
 	public void setHandshakeKeyPair(Transaction transaction, AuthorId local,
 			PublicKey publicKey, PrivateKey privateKey) throws DbException {

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

@@ -3058,6 +3058,23 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
+	@Override
+	public void setHandshakePublicKey(Connection txn, ContactId c, PublicKey handshakePublicKey) throws DbException {
+		PreparedStatement ps = null;
+		try {
+			String sql = "UPDATE contacts SET handshakePublicKey = ? WHERE contactId = ?";
+			ps = txn.prepareStatement(sql);
+			ps.setBytes(1, handshakePublicKey.getEncoded());
+			ps.setInt(2, c.getInt());
+			int affected = ps.executeUpdate();
+			if (affected < 0 || affected > 1) throw new DbStateException();
+			ps.close();
+		} catch (SQLException e) {
+			tryToClose(ps, LOG, WARNING);
+			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/keyagreement/KeyAgreementConnector.java

@@ -127,6 +127,7 @@ class KeyAgreementConnector {
 		List<Pair<DuplexPlugin, BdfList>> transports = new ArrayList<>();
 		for (TransportId id : PREFERRED_TRANSPORTS) {
 			TransportDescriptor d = descriptors.get(id);
+			LOG.info("id: " + id + " d: " + d);
 			Plugin p = pluginManager.getPlugin(id);
 			if (d != null && p instanceof DuplexPlugin) {
 				if (LOG.isLoggable(INFO))
@@ -137,6 +138,9 @@ class KeyAgreementConnector {
 
 		// TODO: If we don't have any transports in common with the peer,
 		//  warn the user and give up (#1224)
+        if (transports.isEmpty()) {
+           LOG.info("No transports found");
+        }
 
 		if (!transports.isEmpty()) {
 			byte[] commitment = remotePayload.getCommitment();

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

@@ -34,12 +34,12 @@ class KeyAgreementTransport {
 			Logger.getLogger(KeyAgreementTransport.class.getName());
 
 	// Accept records with current protocol version, known record type
-	private static Predicate<Record> ACCEPT = r ->
+	private static final Predicate<Record> ACCEPT = r ->
 			r.getProtocolVersion() == PROTOCOL_VERSION &&
 					isKnownRecordType(r.getRecordType());
 
 	// Ignore records with current protocol version, unknown record type
-	private static Predicate<Record> IGNORE = r ->
+	private static final Predicate<Record> IGNORE = r ->
 			r.getProtocolVersion() == PROTOCOL_VERSION &&
 					!isKnownRecordType(r.getRecordType());
 

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

@@ -5,9 +5,9 @@ import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
 import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec;
 
 import org.briarproject.bramble.util.Base32;
-import org.spongycastle.crypto.Digest;
-import org.spongycastle.crypto.digests.SHA3Digest;
-import org.spongycastle.util.encoders.Base64;
+import org.bouncycastle.crypto.Digest;
+import org.bouncycastle.crypto.digests.SHA3Digest;
+import org.bouncycastle.util.encoders.Base64;
 
 import java.nio.charset.Charset;
 

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

@@ -3,9 +3,9 @@ package org.briarproject.bramble.rendezvous;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
-import org.spongycastle.crypto.engines.Salsa20Engine;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.crypto.engines.Salsa20Engine;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;

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

@@ -101,9 +101,9 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 	}
 
 	@Override
-	public Map<TransportId, KeySetId> addRotationKeys(
-			Transaction txn, ContactId c, SecretKey rootKey, long timestamp,
-			boolean alice, boolean active) throws DbException {
+	public Map<TransportId, KeySetId> addRotationKeys(Transaction txn,
+			ContactId c, SecretKey rootKey, long timestamp, boolean alice,
+			boolean active) throws DbException {
 		Map<TransportId, KeySetId> ids = new HashMap<>();
 		for (Entry<TransportId, TransportKeyManager> e : managers.entrySet()) {
 			TransportId t = e.getKey();
@@ -114,6 +114,14 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 		return ids;
 	}
 
+	@Override
+	public Map<TransportId, KeySetId> addRotationKeys(ContactId c,
+			SecretKey rootKey, long timestamp, boolean alice, boolean active)
+			throws DbException {
+		return db.transactionWithResult(false, txn ->
+				addRotationKeys(txn, c, rootKey, timestamp, alice, active));
+	}
+
 	@Override
 	public Map<TransportId, KeySetId> addContact(Transaction txn, ContactId c,
 			PublicKey theirPublicKey, KeyPair ourKeyPair)
@@ -137,7 +145,7 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 			PendingContactId p, PublicKey theirPublicKey, KeyPair ourKeyPair)
 			throws DbException, GeneralSecurityException {
 		SecretKey staticMasterKey = transportCrypto
-					.deriveStaticMasterKey(theirPublicKey, ourKeyPair);
+				.deriveStaticMasterKey(theirPublicKey, ourKeyPair);
 		SecretKey rootKey =
 				transportCrypto.deriveHandshakeRootKey(staticMasterKey, true);
 		boolean alice = transportCrypto.isAlice(theirPublicKey, ourKeyPair);

bramble-core/src/main/resources/bridges

@@ -2,12 +2,11 @@ Bridge obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUV
 Bridge obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1
 Bridge obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0
 Bridge obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0
-Bridge obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0
+Bridge obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0
 Bridge obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0
 Bridge obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0
 Bridge obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0
 Bridge obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0
-Bridge obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0
 Bridge obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0
 Bridge obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0
 Bridge obfs4 78.46.188.239:37356 5A2D2F4158D0453E00C7C176978D3F41D69C45DB cert=3c0SwxpOisbohNxEc4tb875RVW8eOu1opRTVXJhafaKA/PNNtI7ElQIVOVZg1AdL5bxGCw iat-mode=0

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

@@ -13,7 +13,7 @@ import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
 import org.briarproject.bramble.test.ValidatorTestCase;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.Test;
 
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
@@ -38,7 +38,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 	private final Metadata meta = new Metadata();
 
 	public BdfMessageValidatorTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 	}
 
 	@Test(expected = InvalidMessageException.class)

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

@@ -3,7 +3,7 @@ package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.util.StringUtils;
 import org.junit.Test;
-import org.spongycastle.crypto.digests.Blake2bDigest;
+import org.bouncycastle.crypto.digests.Blake2bDigest;
 
 import java.util.Random;
 

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

@@ -1,115 +0,0 @@
-package org.briarproject.bramble.crypto;
-
-import org.briarproject.bramble.test.BrambleTestCase;
-import org.junit.Test;
-import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
-import org.spongycastle.asn1.x9.X9ECParameters;
-import org.spongycastle.crypto.AsymmetricCipherKeyPair;
-import org.spongycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.spongycastle.crypto.generators.ECKeyPairGenerator;
-import org.spongycastle.crypto.params.ECDomainParameters;
-import org.spongycastle.crypto.params.ECKeyGenerationParameters;
-import org.spongycastle.crypto.params.ECPrivateKeyParameters;
-import org.spongycastle.crypto.params.ECPublicKeyParameters;
-import org.spongycastle.math.ec.ECCurve;
-import org.spongycastle.math.ec.ECPoint;
-import org.spongycastle.math.ec.MontgomeryLadderMultiplier;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import static org.junit.Assert.assertEquals;
-
-public class EllipticCurveMultiplicationTest extends BrambleTestCase {
-
-	@Test
-	public void testMultiplierProducesSameResultsAsDefault() throws Exception {
-		// Instantiate the default implementation of the curve
-		X9ECParameters defaultX9Parameters =
-				TeleTrusTNamedCurves.getByName("brainpoolp256r1");
-		ECCurve defaultCurve = defaultX9Parameters.getCurve();
-		ECPoint defaultG = defaultX9Parameters.getG();
-		BigInteger defaultN = defaultX9Parameters.getN();
-		BigInteger defaultH = defaultX9Parameters.getH();
-		ECDomainParameters defaultParameters = new ECDomainParameters(
-				defaultCurve, defaultG, defaultN, defaultH);
-		// Instantiate an implementation using the Montgomery ladder multiplier
-		ECDomainParameters montgomeryParameters =
-				constantTime(defaultParameters);
-		// Generate two key pairs with each set of parameters, using the same
-		// deterministic PRNG for both sets of parameters
-		byte[] seed = new byte[32];
-		new SecureRandom().nextBytes(seed);
-		// Montgomery ladder multiplier
-		SecureRandom random = new PseudoSecureRandom(seed);
-		ECKeyGenerationParameters montgomeryGeneratorParams =
-				new ECKeyGenerationParameters(montgomeryParameters, random);
-		ECKeyPairGenerator montgomeryGenerator = new ECKeyPairGenerator();
-		montgomeryGenerator.init(montgomeryGeneratorParams);
-		AsymmetricCipherKeyPair montgomeryKeyPair1 =
-				montgomeryGenerator.generateKeyPair();
-		ECPrivateKeyParameters montgomeryPrivate1 =
-				(ECPrivateKeyParameters) montgomeryKeyPair1.getPrivate();
-		ECPublicKeyParameters montgomeryPublic1 =
-				(ECPublicKeyParameters) montgomeryKeyPair1.getPublic();
-		AsymmetricCipherKeyPair montgomeryKeyPair2 =
-				montgomeryGenerator.generateKeyPair();
-		ECPrivateKeyParameters montgomeryPrivate2 =
-				(ECPrivateKeyParameters) montgomeryKeyPair2.getPrivate();
-		ECPublicKeyParameters montgomeryPublic2 =
-				(ECPublicKeyParameters) montgomeryKeyPair2.getPublic();
-		// Default multiplier
-		random = new PseudoSecureRandom(seed);
-		ECKeyGenerationParameters defaultGeneratorParams =
-				new ECKeyGenerationParameters(defaultParameters, random);
-		ECKeyPairGenerator defaultGenerator = new ECKeyPairGenerator();
-		defaultGenerator.init(defaultGeneratorParams);
-		AsymmetricCipherKeyPair defaultKeyPair1 =
-				defaultGenerator.generateKeyPair();
-		ECPrivateKeyParameters defaultPrivate1 =
-				(ECPrivateKeyParameters) defaultKeyPair1.getPrivate();
-		ECPublicKeyParameters defaultPublic1 =
-				(ECPublicKeyParameters) defaultKeyPair1.getPublic();
-		AsymmetricCipherKeyPair defaultKeyPair2 =
-				defaultGenerator.generateKeyPair();
-		ECPrivateKeyParameters defaultPrivate2 =
-				(ECPrivateKeyParameters) defaultKeyPair2.getPrivate();
-		ECPublicKeyParameters defaultPublic2 =
-				(ECPublicKeyParameters) defaultKeyPair2.getPublic();
-		// The key pairs generated with both sets of parameters should be equal
-		assertEquals(montgomeryPrivate1.getD(), defaultPrivate1.getD());
-		assertEquals(montgomeryPublic1.getQ(), defaultPublic1.getQ());
-		assertEquals(montgomeryPrivate2.getD(), defaultPrivate2.getD());
-		assertEquals(montgomeryPublic2.getQ(), defaultPublic2.getQ());
-		// OK, all of the above was just sanity checks - now for the test!
-		ECDHCBasicAgreement agreement = new ECDHCBasicAgreement();
-		agreement.init(montgomeryPrivate1);
-		BigInteger sharedSecretMontgomeryMontgomery =
-				agreement.calculateAgreement(montgomeryPublic2);
-		agreement.init(montgomeryPrivate1);
-		BigInteger sharedSecretMontgomeryDefault =
-				agreement.calculateAgreement(defaultPublic2);
-		agreement.init(defaultPrivate1);
-		BigInteger sharedSecretDefaultMontgomery =
-				agreement.calculateAgreement(montgomeryPublic2);
-		agreement.init(defaultPrivate1);
-		BigInteger sharedSecretDefaultDefault =
-				agreement.calculateAgreement(defaultPublic2);
-		// Shared secrets calculated with different multipliers should be equal
-		assertEquals(sharedSecretMontgomeryMontgomery,
-				sharedSecretMontgomeryDefault);
-		assertEquals(sharedSecretMontgomeryMontgomery,
-				sharedSecretDefaultMontgomery);
-		assertEquals(sharedSecretMontgomeryMontgomery,
-				sharedSecretDefaultDefault);
-	}
-
-	private static ECDomainParameters constantTime(ECDomainParameters in) {
-		ECCurve curve = in.getCurve().configure().setMultiplier(
-				new MontgomeryLadderMultiplier()).create();
-		BigInteger x = in.getG().getAffineXCoord().toBigInteger();
-		BigInteger y = in.getG().getAffineYCoord().toBigInteger();
-		ECPoint g = curve.createPoint(x, y);
-		return new ECDomainParameters(curve, g, in.getN(), in.getH());
-	}
-}

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

@@ -3,30 +3,26 @@ package org.briarproject.bramble.crypto;
 import net.i2p.crypto.eddsa.EdDSASecurityProvider;
 import net.i2p.crypto.eddsa.KeyPairGenerator;
 
-import org.spongycastle.asn1.sec.SECNamedCurves;
-import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
-import org.spongycastle.asn1.x9.X9ECParameters;
-import org.spongycastle.crypto.AsymmetricCipherKeyPair;
-import org.spongycastle.crypto.BasicAgreement;
-import org.spongycastle.crypto.Digest;
-import org.spongycastle.crypto.agreement.ECDHBasicAgreement;
-import org.spongycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.spongycastle.crypto.digests.Blake2bDigest;
-import org.spongycastle.crypto.generators.ECKeyPairGenerator;
-import org.spongycastle.crypto.params.ECDomainParameters;
-import org.spongycastle.crypto.params.ECKeyGenerationParameters;
-import org.spongycastle.crypto.params.ParametersWithRandom;
-import org.spongycastle.crypto.signers.DSADigestSigner;
-import org.spongycastle.crypto.signers.DSAKCalculator;
-import org.spongycastle.crypto.signers.ECDSASigner;
-import org.spongycastle.crypto.signers.HMacDSAKCalculator;
-import org.spongycastle.math.ec.ECCurve;
-import org.spongycastle.math.ec.ECPoint;
-import org.spongycastle.math.ec.MontgomeryLadderMultiplier;
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.crypto.BasicAgreement;
+import org.bouncycastle.crypto.Digest;
+import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
+import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
+import org.bouncycastle.crypto.digests.Blake2bDigest;
+import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
+import org.bouncycastle.crypto.params.ParametersWithRandom;
+import org.bouncycastle.crypto.signers.DSADigestSigner;
+import org.bouncycastle.crypto.signers.DSAKCalculator;
+import org.bouncycastle.crypto.signers.ECDSASigner;
+import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
 import org.whispersystems.curve25519.Curve25519;
 import org.whispersystems.curve25519.Curve25519KeyPair;
 
-import java.math.BigInteger;
 import java.security.GeneralSecurityException;
 import java.security.KeyPair;
 import java.security.Provider;
@@ -55,14 +51,12 @@ public class EllipticCurvePerformanceTest {
 		for (String name : SEC_NAMES) {
 			ECDomainParameters params =
 					convertParams(SECNamedCurves.getByName(name));
-			runTest(name + " default", params);
-			runTest(name + " constant", constantTime(params));
+			runTest(name, params);
 		}
 		for (String name : BRAINPOOL_NAMES) {
 			ECDomainParameters params =
 					convertParams(TeleTrusTNamedCurves.getByName(name));
-			runTest(name + " default", params);
-			runTest(name + " constant", constantTime(params));
+			runTest(name, params);
 		}
 		runCurve25519Test();
 		runEd25519Test();
@@ -193,13 +187,4 @@ public class EllipticCurvePerformanceTest {
 		return new ECDomainParameters(in.getCurve(), in.getG(), in.getN(),
 				in.getH());
 	}
-
-	private static ECDomainParameters constantTime(ECDomainParameters in) {
-		ECCurve curve = in.getCurve().configure().setMultiplier(
-				new MontgomeryLadderMultiplier()).create();
-		BigInteger x = in.getG().getAffineXCoord().toBigInteger();
-		BigInteger y = in.getG().getAffineYCoord().toBigInteger();
-		ECPoint g = curve.createPoint(x, y);
-		return new ECDomainParameters(curve, g, in.getN(), in.getH());
-	}
 }

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

@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.junit.Test;
-import org.spongycastle.crypto.CryptoException;
+import org.bouncycastle.crypto.CryptoException;
 
 import java.security.SecureRandom;
 

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

@@ -1,11 +1,11 @@
 package org.briarproject.bramble.crypto;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.spongycastle.crypto.Digest;
-import org.spongycastle.crypto.digests.Blake2bDigest;
-import org.spongycastle.crypto.engines.Salsa20Engine;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.crypto.Digest;
+import org.bouncycastle.crypto.digests.Blake2bDigest;
+import org.bouncycastle.crypto.engines.Salsa20Engine;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 import javax.annotation.concurrent.NotThreadSafe;
 

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

@@ -11,8 +11,8 @@ import org.briarproject.bramble.api.keyagreement.PayloadEncoder;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.jmock.integration.junit4.JUnitRuleMockery;
-import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -34,7 +34,7 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Rule
 	public JUnitRuleMockery context = new JUnitRuleMockery() {{
 		// So we can mock concrete classes like KeyAgreementTransport
-		setImposteriser(ClassImposteriser.INSTANCE);
+		setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 	}};
 
 	private final PublicKey alicePubKey = getAgreementPublicKey();

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

@@ -14,7 +14,7 @@ import org.briarproject.bramble.api.record.RecordWriterFactory;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.CaptureArgumentAction;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.Test;
 
 import java.io.InputStream;
@@ -58,7 +58,7 @@ public class KeyAgreementTransportTest extends BrambleMockTestCase {
 	private KeyAgreementTransport kat;
 
 	public KeyAgreementTransportTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		inputStream = context.mock(InputStream.class);
 		outputStream = context.mock(OutputStream.class);
 	}

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

@@ -25,7 +25,7 @@ import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.bramble.test.RunAction;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -69,7 +69,7 @@ public class PollerImplTest extends BrambleMockTestCase {
 	private PollerImpl poller;
 
 	public PollerImplTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		random = context.mock(SecureRandom.class);
 	}
 

bramble-core/witness.gradle

@@ -1,6 +1,7 @@
 dependencyVerification {
     verify = [
-        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
+        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
         'com.google.dagger:dagger-compiler:2.24:dagger-compiler-2.24.jar:3c5afb955fb188da485cb2c048eff37dce0e1530b9780a0f2f7187d16d1ccc1f',
         'com.google.dagger:dagger-producers:2.24:dagger-producers-2.24.jar:f10f45b95191954d5d6b043fca9e62fb621d21bf70634b8f8476c7988b504c3a',
@@ -14,17 +15,18 @@ dependencyVerification {
         'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
         'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
         'com.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
-        'com.madgag.spongycastle:core:1.58.0.0:core-1.58.0.0.jar:199617dd5698c5a9312b898c0a4cec7ce9dd8649d07f65d91629f58229d72728',
         'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90',
         'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+        'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',
         'net.i2p.crypto:eddsa:0.2.0:eddsa-0.2.0.jar:a7cb1b85c16e2f0730b9204106929a1d9aaae1df728adc7041a8b8b605692140',
+        'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
+        'net.jodah:concurrentunit:0.4.2:concurrentunit-0.4.2.jar:5583078e1acf91734939e985bc9e7ee947b0e93a8eef679da6bb07bbeb47ced3',
         'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
-        '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.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
         'org.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
+        'org.bouncycastle:bcprov-jdk15on:1.65:bcprov-jdk15on-1.65.jar:e78f96eb59066c94c94fb2d6b5eb80f52feac6f5f9776898634f8addec6e2137',
         'org.briarproject:jtorctl:0.3:jtorctl-0.3.jar:f2939238a097898998432effe93b0334d97a787972ab3a91a8973a1d309fc864',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
@@ -32,16 +34,18 @@ dependencyVerification {
         'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
         'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90',
         'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52',
-        '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.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
+        'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
+        'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
         'org.hsqldb:hsqldb:2.3.5:hsqldb-2.3.5.jar:6676a6977ac98997a80f827ddbd3fe8ca1e0853dad1492512135fd1a222ccfad',
-        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
-        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
-        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
+        'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',
+        'org.jmock:jmock-legacy:2.12.0:jmock-legacy-2.12.0.jar:dea3a9cca653d082e2fe7e40232e982fe03a9984c7d67ceff24f3e03fe580dcd',
+        'org.jmock:jmock-testjar:2.12.0:jmock-testjar-2.12.0.jar:efefbcf6cd294d0e29f0c46eb2a3380d4ca4e1763ff719c69e2f2ac62f564a04',
+        'org.jmock:jmock:2.12.0:jmock-2.12.0.jar:266d07314c0cd343c46ff8a55601272de8cf406807caf55e6f313295f83d10be',
+        'org.objenesis:objenesis:3.0.1:objenesis-3.0.1.jar:7a8ff780b9ff48415d7c705f60030b0acaa616e7f823c98eede3b63508d4e984',
         '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.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de',
         'org.whispersystems:curve25519-java:0.5.0:curve25519-java-0.5.0.jar:0aadd43cf01d11e9b58f867b3c4f25c3194e8b0623d1953d32dfbfbee009e38d',
     ]
 }

bramble-java/build.gradle

@@ -16,17 +16,16 @@ dependencies {
 	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.5.13@zip'
+	tor 'org.briarproject:tor:0.3.5.13-1@zip'
 	tor 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 
 	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
-	testImplementation 'junit:junit:4.12'
-	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-junit4:$jmock_version"
 
 	testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 }

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

@@ -25,6 +25,7 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 import javax.net.SocketFactory;
 
+import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.OsUtils.isLinux;
 
@@ -96,8 +97,15 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 		String architecture = null;
 		if (isLinux()) {
 			String arch = System.getProperty("os.arch");
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("System's os.arch is " + arch);
+			}
 			if (arch.equals("amd64")) {
 				architecture = "linux-x86_64";
+			} else if (arch.equals("aarch64")) {
+				architecture = "linux-aarch64";
+			} else if (arch.equals("arm")) {
+				architecture = "linux-armhf";
 			}
 		}
 		if (architecture == null) {
@@ -105,6 +113,10 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 			return null;
 		}
 
+		if (LOG.isLoggable(INFO)) {
+			LOG.info("The selected architecture for Tor is " + architecture);
+		}
+
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		TorRendezvousCrypto torRendezvousCrypto = new TorRendezvousCryptoImpl();

bramble-java/witness.gradle

@@ -1,6 +1,7 @@
 dependencyVerification {
     verify = [
-        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
+        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
         'com.google.dagger:dagger-compiler:2.24:dagger-compiler-2.24.jar:3c5afb955fb188da485cb2c048eff37dce0e1530b9780a0f2f7187d16d1ccc1f',
         'com.google.dagger:dagger-producers:2.24:dagger-producers-2.24.jar:f10f45b95191954d5d6b043fca9e62fb621d21bf70634b8f8476c7988b504c3a',
@@ -17,24 +18,26 @@ dependencyVerification {
         'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+        'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',
         '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.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
         'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
-        '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.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
         'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a:obfs4proxy-0.0.12-dev-40245c4a.zip:172029e7058b3a83ac93ac4991a44bf76e16ce8d46f558f5836d57da3cb3a766',
-        'org.briarproject:tor:0.3.5.13:tor-0.3.5.13.zip:1c5f0b821ee2aadb0ea04aa96caab3ca0a08370cce8de81c2dfe04d172f8a2a0',
+        'org.briarproject:tor:0.3.5.13-1:tor-0.3.5.13-1.zip:ef35c16bf8dc1f4c75ed71d9f55e4514f383d124ec96b859aca647c990927c99',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
         'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
-        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
-        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
-        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
-        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
-        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
-        'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
+        'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
+        'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
+        'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
+        'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
+        'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',
+        'org.jmock:jmock-legacy:2.12.0:jmock-legacy-2.12.0.jar:dea3a9cca653d082e2fe7e40232e982fe03a9984c7d67ceff24f3e03fe580dcd',
+        'org.jmock:jmock-testjar:2.12.0:jmock-testjar-2.12.0.jar:efefbcf6cd294d0e29f0c46eb2a3380d4ca4e1763ff719c69e2f2ac62f564a04',
+        'org.jmock:jmock:2.12.0:jmock-2.12.0.jar:266d07314c0cd343c46ff8a55601272de8cf406807caf55e6f313295f83d10be',
+        'org.objenesis:objenesis:3.0.1:objenesis-3.0.1.jar:7a8ff780b9ff48415d7c705f60030b0acaa616e7f823c98eede3b63508d4e984',
+        'org.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de',
     ]
 }

briar-android/build.gradle

@@ -19,11 +19,15 @@ android {
 	compileSdkVersion 30
 	buildToolsVersion '30.0.2'
 
+	packagingOptions {
+		doNotStrip '**/*.so'
+	}
+
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10216
-		versionName "1.2.16"
+		versionCode 10218
+		versionName "1.2.18"
 		applicationId "org.briarproject.briar.socialbackup"
 
 		vectorDrawables.useSupportLibrary = true
@@ -95,6 +99,7 @@ dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
 	implementation project(':bramble-android')
 
+	implementation 'androidx.fragment:fragment:1.3.0'
 	implementation 'androidx.preference:preference:1.1.1'
 	implementation 'androidx.exifinterface:exifinterface:1.3.1'
 	implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -132,11 +137,12 @@ dependencies {
 	testImplementation "androidx.arch.core:core-testing:2.1.0"
 	testImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 	testImplementation 'org.robolectric:robolectric:4.3.1'
-	testImplementation 'org.mockito:mockito-core:3.1.0'
-	testImplementation 'junit:junit:4.13.1'
-	testImplementation "org.jmock:jmock:$jmockVersion"
-	testImplementation "org.jmock:jmock-junit4:$jmockVersion"
-	testImplementation "org.jmock:jmock-legacy:$jmockVersion"
+
+	testImplementation 'org.mockito:mockito-core:3.9.0'
+	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-junit4:$jmock_version"
+	testImplementation "org.jmock:jmock-imposters:$jmock_version"
 	testAnnotationProcessor "com.google.dagger:dagger-compiler:2.24"
 
 	androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput')

briar-android/src/main/AndroidManifest.xml

@@ -27,7 +27,10 @@
 	<uses-permission android:name="android.permission.USE_FINGERPRINT" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission
+		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+		android:maxSdkVersion="18"
+		tools:ignore="ScopedStorage" />
 
 	<uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -38,6 +41,7 @@
 		android:name="org.briarproject.briar.android.BriarApplicationImpl"
 		android:allowBackup="false"
 		android:banner="@mipmap/tv_banner"
+		android:fullBackupContent="@xml/backup_rules"
 		android:icon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
@@ -135,16 +139,7 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.account.NewOrRecoverActivity"
-			android:label="@string/activity_name_new_or_recover_account"
-			android:parentActivityName="org.briarproject.briar.android.login.StartupActivity">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.login.StartupActivity" />
-		</activity>
-
-		<activity
-			android:name="org.briarproject.briar.android.socialbackup.DistributedBackupActivity"
+			android:name="org.briarproject.briar.android.socialbackup.SocialBackupSetupActivity"
 			android:label="@string/activity_name_distributed_backup"
 			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
 			<meta-data
@@ -153,16 +148,7 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.socialbackup.RecoverActivity"
-			android:label="@string/activity_name_recovery"
-			android:parentActivityName="org.briarproject.briar.android.account.NewOrRecoverActivity">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" />
-		</activity>
-
-		<activity
-			android:name="org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity"
+			android:name="org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity"
 			android:label="@string/activity_name_custodian_help_recovery"
 			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
 			<meta-data
@@ -170,6 +156,25 @@
 				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
 		</activity>
 
+		<activity
+			android:name="org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity"
+			android:label="@string/activity_name_recovery"
+
+			android:parentActivityName="org.briarproject.briar.android.account.SetupActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.account.SetupActivity" />
+		</activity>
+
+		<activity
+			android:name="org.briarproject.briar.android.socialbackup.recover.RestoreAccountActivity"
+			android:label="@string/activity_name_restore_account"
+			android:parentActivityName="org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity" />
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.conversation.ConversationActivity"
 			android:label="@string/app_name"
@@ -374,7 +379,7 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.keyagreement.ContactExchangeActivity"
+			android:name="org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity"
 			android:label="@string/add_contact_title"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
 			android:theme="@style/BriarTheme.NoActionBar">
@@ -459,6 +464,42 @@
 			</intent-filter>
 		</activity>
 
+		<activity
+			android:name="org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity"
+			android:noHistory="true"
+			android:theme="@style/TranslucentTheme">
+			<intent-filter>
+				<action android:name="org.briarproject.briar.android.AndroidNotifiactionManager" />
+			</intent-filter>
+		</activity>
+
+		<activity
+			android:name="org.briarproject.briar.android.remotewipe.RemoteWipeSetupActivity"
+			android:label="@string/activity_name_remote_wipe"
+			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
+		</activity>
+
+		<activity
+			android:name="org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeActivity"
+			android:label="@string/activity_name_activate_remote_wipe"
+			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
+		</activity>
+
+		<activity
+			android:name="org.briarproject.briar.android.remotewipe.revoke.RevokeRemoteWipeActivity"
+			android:label="@string/activity_name_revoke_remote_wipe"
+			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.logout.ExitActivity"
 			android:theme="@android:style/Theme.NoDisplay" />

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

@@ -8,6 +8,7 @@ import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.bramble.api.account.AccountManager;
+import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
 import org.briarproject.bramble.api.contact.ContactExchangeManager;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -62,7 +63,6 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
 import org.briarproject.briar.api.socialbackup.SocialBackupManager;
 import org.briarproject.briar.api.test.TestDataCreator;
-import org.briarproject.briar.socialbackup.SocialBackupManagerImpl_Factory;
 
 import java.util.concurrent.Executor;
 
@@ -191,6 +191,8 @@ public interface AndroidComponent
 
     DatabaseComponent databaseComponent();
 
+    ClientHelper clientHelper();
+
 	void inject(SignInReminderReceiver briarService);
 
 	void inject(BriarService briarService);

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

@@ -33,6 +33,7 @@ import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
+import org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.util.BriarNotificationBuilder;
 import org.briarproject.briar.api.android.AndroidNotificationManager;

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

@@ -31,16 +31,21 @@ import org.briarproject.briar.android.account.DozeHelperModule;
 import org.briarproject.briar.android.account.LockManagerImpl;
 import org.briarproject.briar.android.account.SetupModule;
 import org.briarproject.briar.android.contact.ContactListModule;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactModule;
 import org.briarproject.briar.android.forum.ForumModule;
-import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
+import org.briarproject.briar.android.introduction.IntroductionModule;
 import org.briarproject.briar.android.logging.LoggingModule;
 import org.briarproject.briar.android.login.LoginModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerModule;
 import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
 import org.briarproject.briar.android.privategroup.list.GroupListModule;
+import org.briarproject.briar.android.remotewipe.RemoteWipeModule;
 import org.briarproject.briar.android.reporting.DevReportModule;
 import org.briarproject.briar.android.settings.SettingsModule;
 import org.briarproject.briar.android.sharing.SharingModule;
+import org.briarproject.briar.android.socialbackup.SocialBackupSetupModule;
+import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardModule;
+import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardModule;
 import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -75,7 +80,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 @Module(includes = {
 		SetupModule.class,
 		DozeHelperModule.class,
-		ContactExchangeModule.class,
+		AddNearbyContactModule.class,
 		LoggingModule.class,
 		LoginModule.class,
 		NavDrawerModule.class,
@@ -84,11 +89,16 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		DevReportModule.class,
 		ContactListModule.class,
 		AndroidDarkCrystalModule.class,
+		IntroductionModule.class,
 		// below need to be within same scope as ViewModelProvider.Factory
 		ForumModule.class,
 		GroupListModule.class,
 		GroupConversationModule.class,
 		SharingModule.class,
+		OwnerReturnShardModule.class,
+		CustodianReturnShardModule.class,
+		RemoteWipeModule.class,
+		SocialBackupSetupModule.class
 })
 public class AppModule {
 

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

@@ -18,14 +18,19 @@ import com.bumptech.glide.Glide;
 
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.SecretKey;
+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.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.logout.HideUiActivity;
+import org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.LockManager;
+import org.briarproject.briar.api.remotewipe.RemoteWipeActivatedEvent;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -62,7 +67,7 @@ import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGO
 import static org.briarproject.briar.api.android.LockManager.ACTION_LOCK;
 import static org.briarproject.briar.api.android.LockManager.EXTRA_PID;
 
-public class BriarService extends Service {
+public class BriarService extends Service implements EventListener {
 
 	public static String EXTRA_START_RESULT =
 			"org.briarproject.briar.START_RESULT";
@@ -96,6 +101,8 @@ public class BriarService extends Service {
 	@Inject
 	volatile AndroidExecutor androidExecutor;
 	private volatile boolean started = false;
+	@Inject
+	volatile EventBus eventBus;
 
 	@Override
 	public void onCreate() {
@@ -173,6 +180,8 @@ public class BriarService extends Service {
 			filter.addAction("android.intent.action.QUICKBOOT_POWEROFF");
 			filter.addAction("com.htc.intent.action.QUICKBOOT_POWEROFF");
 			registerReceiver(receiver, filter);
+
+			eventBus.addListener(this);
 		}, "LifecycleStartup");
 	}
 
@@ -239,6 +248,7 @@ public class BriarService extends Service {
 			wakeLockManager.executeWakefully(() -> {
 				if (started) lifecycleManager.stopServices();
 			}, "LifecycleShutdown");
+			eventBus.removeListener(this);
 		}, "LifecycleShutdown");
 	}
 
@@ -327,6 +337,19 @@ public class BriarService extends Service {
 		stopSelf(); // This will call onDestroy()
 	}
 
+	/**
+	 * Listens for the remote wipe event
+	 */
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof RemoteWipeActivatedEvent) {
+			Intent i = new Intent(this, RemoteWipeActivatedActivity.class);
+			i.addFlags(FLAG_ACTIVITY_NEW_TASK
+					| FLAG_ACTIVITY_CLEAR_TASK);
+			startActivity(i);
+		}
+	}
+
 	public class BriarBinder extends Binder {
 
 		/**

briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java

@@ -30,6 +30,7 @@ public class AuthorNameFragment extends SetupFragment {
 	private TextInputLayout authorNameWrapper;
 	private TextInputEditText authorNameInput;
 	private Button nextButton;
+	private Button recoverButton;
 
 	public static AuthorNameFragment newInstance() {
 		return new AuthorNameFragment();
@@ -54,6 +55,9 @@ public class AuthorNameFragment extends SetupFragment {
 		authorNameInput.addTextChangedListener(this);
 		nextButton.setOnClickListener(this);
 
+		recoverButton = v.findViewById(R.id.buttonRestoreAccount);
+		recoverButton.setOnClickListener(e -> viewModel.recoverClicked());
+
 		return v;
 	}
 
@@ -75,6 +79,8 @@ public class AuthorNameFragment extends SetupFragment {
 		boolean enabled = authorNameLength > 0 && !error;
 		authorNameInput.setOnEditorActionListener(enabled ? this : null);
 		nextButton.setEnabled(enabled);
+		recoverButton.setEnabled(!enabled);
+//		recoverButton.setVisibility(enabled ? View.INVISIBLE : View.VISIBLE);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java

@@ -33,7 +33,6 @@ public class DozeFragment extends SetupFragment
 	private DozeView dozeView;
 	private HuaweiView huaweiView;
 	private Button next;
-	private ProgressBar progressBar;
 	private boolean secondAttempt = false;
 
 	public static DozeFragment newInstance() {
@@ -58,11 +57,19 @@ public class DozeFragment extends SetupFragment
 		huaweiView = v.findViewById(R.id.huaweiView);
 		huaweiView.setOnCheckedChangedListener(this);
 		next = v.findViewById(R.id.next);
-		progressBar = v.findViewById(R.id.progress);
+		ProgressBar progressBar = v.findViewById(R.id.progress);
 
 		dozeView.setOnButtonClickListener(this::askForDozeWhitelisting);
 		next.setOnClickListener(this);
 
+		viewModel.getIsCreatingAccount()
+				.observe(getViewLifecycleOwner(), isCreatingAccount -> {
+					if (isCreatingAccount) {
+						next.setVisibility(INVISIBLE);
+						progressBar.setVisibility(VISIBLE);
+					}
+				});
+
 		return v;
 	}
 
@@ -104,15 +111,6 @@ public class DozeFragment extends SetupFragment
 
 	@Override
 	public void onClick(View view) {
-		setNextClicked();
 		viewModel.dozeExceptionConfirmed();
 	}
-
-	@Override
-	void setNextClicked() {
-		super.setNextClicked();
-
-		next.setVisibility(INVISIBLE);
-		progressBar.setVisibility(VISIBLE);
-	}
 }

briar-android/src/main/java/org/briarproject/briar/android/account/DozeHelper.java

@@ -2,7 +2,7 @@ package org.briarproject.briar.android.account;
 
 import android.content.Context;
 
-interface DozeHelper {
+public interface DozeHelper {
 
 	boolean needToShowDozeFragment(Context context);
 }

briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java

@@ -14,7 +14,7 @@ import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 
 @UiThread
 @NotNullByDefault
-class DozeView extends PowerView {
+public class DozeView extends PowerView {
 
 	@Nullable
 	private Runnable onButtonClickListener;

briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiView.java

@@ -21,7 +21,7 @@ import static android.os.Build.VERSION.SDK_INT;
 
 @UiThread
 @NotNullByDefault
-class HuaweiView extends PowerView {
+public class HuaweiView extends PowerView {
 
 	private final static String PACKAGE_NAME = "com.huawei.systemmanager";
 	private final static String CLASS_NAME =

briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverActivity.java

@@ -1,59 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.activity.BaseActivity;
-import org.briarproject.briar.android.fragment.BaseFragment;
-import org.briarproject.briar.android.socialbackup.RecoverActivity;
-
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
-
-public class NewOrRecoverActivity extends BaseActivity implements
-		BaseFragment.BaseFragmentListener, SetupNewAccountChosenListener,
-		RecoverAccountListener {
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public void onCreate(Bundle state) {
-		super.onCreate(state);
-		// fade-in after splash screen instead of default animation
-		overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
-		setContentView(R.layout.activity_fragment_container);
-		NewOrRecoverFragment fragment = NewOrRecoverFragment.newInstance();
-		showInitialFragment(fragment);
-	}
-
-	@Override
-	public void setupNewAccountChosen() {
-		finish();
-		Intent i = new Intent(this, SetupActivity.class);
-		i.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
-				FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
-		startActivity(i);
-	}
-
-	@Override
-	public void recoverAccountChosen() {
-		finish();
-		Intent i = new Intent(this, RecoverActivity.class);
-		i.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
-				FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
-		startActivity(i);
-	}
-
-	@Override
-	@Deprecated
-	public void runOnDbThread(Runnable runnable) {
-		throw new RuntimeException("Don't use this deprecated method here.");
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverFragment.java

@@ -1,70 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.fragment.BaseFragment;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public class NewOrRecoverFragment extends BaseFragment {
-
-	public static final String TAG = NewOrRecoverFragment.class.getName();
-
-	protected SetupNewAccountChosenListener setupNewAccountListener;
-	protected RecoverAccountListener recoverAccountListener;
-
-	public static NewOrRecoverFragment newInstance() {
-		Bundle bundle = new Bundle();
-		NewOrRecoverFragment fragment = new NewOrRecoverFragment();
-		fragment.setArguments(bundle);
-		return fragment;
-	}
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		requireActivity().setTitle(R.string.setup_title);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable
-			ViewGroup container, @Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_new_or_recover,
-				container, false);
-		Button newAccountButton = view.findViewById(R.id.buttonSetupNewAccount);
-		newAccountButton.setOnClickListener(e -> {
-			setupNewAccountListener.setupNewAccountChosen();
-		});
-
-		Button recoverAccountButton = view.findViewById(R.id.buttonRestoreAccount);
-		recoverAccountButton.setOnClickListener(e -> {
-			recoverAccountListener.recoverAccountChosen();
-		});
-		return view;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		setupNewAccountListener = (SetupNewAccountChosenListener) context;
-		recoverAccountListener = (RecoverAccountListener) context;
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java

@@ -24,7 +24,7 @@ import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 
 @UiThread
 @NotNullByDefault
-abstract class PowerView extends ConstraintLayout {
+public abstract class PowerView extends ConstraintLayout {
 
 	private final TextView textView;
 	private final ImageView checkImage;
@@ -156,7 +156,7 @@ abstract class PowerView extends ConstraintLayout {
 		};
 	}
 
-	interface OnCheckedChangedListener {
+	public interface OnCheckedChangedListener {
 		void onCheckedChanged();
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java

@@ -38,7 +38,6 @@ public class SetPasswordFragment extends SetupFragment {
 	private TextInputEditText passwordConfirmation;
 	private StrengthMeter strengthMeter;
 	private Button nextButton;
-	private ProgressBar progressBar;
 
 	public static SetPasswordFragment newInstance() {
 		return new SetPasswordFragment();
@@ -64,7 +63,7 @@ public class SetPasswordFragment extends SetupFragment {
 				v.findViewById(R.id.password_confirm_wrapper);
 		passwordConfirmation = v.findViewById(R.id.password_confirm);
 		nextButton = v.findViewById(R.id.next);
-		progressBar = v.findViewById(R.id.progress);
+		ProgressBar progressBar = v.findViewById(R.id.progress);
 
 		passwordEntry.addTextChangedListener(this);
 		passwordConfirmation.addTextChangedListener(this);
@@ -75,6 +74,17 @@ public class SetPasswordFragment extends SetupFragment {
 			passwordConfirmation.setImeOptions(IME_ACTION_DONE);
 		}
 
+		viewModel.getIsCreatingAccount()
+				.observe(getViewLifecycleOwner(), isCreatingAccount -> {
+					if (isCreatingAccount) {
+						nextButton.setVisibility(INVISIBLE);
+						progressBar.setVisibility(VISIBLE);
+						// this also avoids the keyboard popping up
+						passwordEntry.setFocusable(false);
+						passwordConfirmation.setFocusable(false);
+					}
+				});
+
 		return v;
 	}
 
@@ -116,20 +126,6 @@ public class SetPasswordFragment extends SetupFragment {
 		IBinder token = passwordEntry.getWindowToken();
 		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
 		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
-
-		setNextClicked();
 		viewModel.setPassword(passwordEntry.getText().toString());
 	}
-
-	@Override
-	void setNextClicked() {
-		super.setNextClicked();
-
-		passwordEntry.setFocusable(false);
-		passwordConfirmation.setFocusable(false);
-		if (!viewModel.needToShowDozeFragment()) {
-			nextButton.setVisibility(INVISIBLE);
-			progressBar.setVisibility(VISIBLE);
-		}
-	}
 }

briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java

@@ -10,6 +10,7 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -25,6 +26,7 @@ import static org.briarproject.briar.android.account.SetupViewModel.State.AUTHOR
 import static org.briarproject.briar.android.account.SetupViewModel.State.CREATED;
 import static org.briarproject.briar.android.account.SetupViewModel.State.DOZE;
 import static org.briarproject.briar.android.account.SetupViewModel.State.FAILED;
+import static org.briarproject.briar.android.account.SetupViewModel.State.RECOVER;
 import static org.briarproject.briar.android.account.SetupViewModel.State.SET_PASSWORD;
 
 @MethodsNotNullByDefault
@@ -60,6 +62,8 @@ public class SetupActivity extends BaseActivity
 			showPasswordFragment();
 		} else if (state == DOZE) {
 			showDozeFragment();
+		} else if (state == RECOVER) {
+			recover();
 		} else if (state == CREATED || state == FAILED) {
 			// TODO: Show an error if failed
 			showApp();
@@ -84,6 +88,13 @@ public class SetupActivity extends BaseActivity
 		overridePendingTransition(R.anim.screen_new_in, R.anim.screen_old_out);
 	}
 
+	void recover () {
+//		finish();
+		Intent i = new Intent(this, OwnerReturnShardActivity.class);
+		i.addFlags(FLAG_ACTIVITY_NEW_TASK);
+		startActivity(i);
+	}
+
 	@Override
 	@Deprecated
 	public void runOnDbThread(Runnable runnable) {

briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java

@@ -7,7 +7,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
@@ -19,8 +18,6 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 
 import javax.inject.Inject;
 
-import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -35,7 +32,6 @@ abstract class SetupFragment extends BaseFragment implements TextWatcher,
 		OnEditorActionListener, OnClickListener {
 
 	private final static String STATE_KEY_CLICKED = "setupFragmentClicked";
-	private boolean clicked = false;
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -48,27 +44,6 @@ abstract class SetupFragment extends BaseFragment implements TextWatcher,
 				.get(SetupViewModel.class);
 	}
 
-	@Override
-	public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-		if (savedInstanceState != null) {
-			clicked = savedInstanceState.getBoolean(STATE_KEY_CLICKED);
-		}
-		if (clicked) {
-			setNextClicked();
-		}
-	}
-
-	@Override
-	public void onSaveInstanceState(@NonNull Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putBoolean(STATE_KEY_CLICKED, clicked);
-	}
-
-	@CallSuper
-	void setNextClicked() {
-		this.clicked = true;
-	}
-
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		inflater.inflate(R.menu.help_action, menu);
@@ -114,5 +89,4 @@ abstract class SetupFragment extends BaseFragment implements TextWatcher,
 	public void afterTextChanged(Editable editable) {
 		// noop
 	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/account/SetupViewModel.java

@@ -17,18 +17,22 @@ import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
 import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.account.SetupViewModel.State.AUTHOR_NAME;
 import static org.briarproject.briar.android.account.SetupViewModel.State.CREATED;
 import static org.briarproject.briar.android.account.SetupViewModel.State.DOZE;
 import static org.briarproject.briar.android.account.SetupViewModel.State.FAILED;
+import static org.briarproject.briar.android.account.SetupViewModel.State.RECOVER;
 import static org.briarproject.briar.android.account.SetupViewModel.State.SET_PASSWORD;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
+public
 class SetupViewModel extends AndroidViewModel {
-	enum State {AUTHOR_NAME, SET_PASSWORD, DOZE, CREATED, FAILED}
+	enum State {AUTHOR_NAME, SET_PASSWORD, DOZE, CREATED, FAILED, RECOVER}
 
 	private static final Logger LOG =
 			getLogger(SetupActivity.class.getName());
@@ -36,6 +40,8 @@ class SetupViewModel extends AndroidViewModel {
 	@Nullable
 	private String authorName, password;
 	private final MutableLiveEvent<State> state = new MutableLiveEvent<>();
+	private final MutableLiveData<Boolean> isCreatingAccount =
+			new MutableLiveData<>(false);
 
 	private final AccountManager accountManager;
 	private final Executor ioExecutor;
@@ -67,6 +73,10 @@ class SetupViewModel extends AndroidViewModel {
 		return state;
 	}
 
+	LiveData<Boolean> getIsCreatingAccount() {
+		return isCreatingAccount;
+	}
+
 	void setAuthorName(String authorName) {
 		this.authorName = authorName;
 		state.setEvent(SET_PASSWORD);
@@ -97,6 +107,7 @@ class SetupViewModel extends AndroidViewModel {
 	private void createAccount() {
 		if (authorName == null) throw new IllegalStateException();
 		if (password == null) throw new IllegalStateException();
+		isCreatingAccount.setValue(true);
 		ioExecutor.execute(() -> {
 			if (accountManager.createAccount(authorName, password)) {
 				LOG.info("Created account");
@@ -107,4 +118,9 @@ class SetupViewModel extends AndroidViewModel {
 			}
 		});
 	}
+
+	public void recoverClicked() {
+		LOG.info("RECOVER CLICKED ***");
+	  state.postEvent(RECOVER);
+	}
 }

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

@@ -7,8 +7,6 @@ import org.briarproject.briar.android.AndroidComponent;
 import org.briarproject.briar.android.StartupFailureActivity;
 import org.briarproject.briar.android.account.AuthorNameFragment;
 import org.briarproject.briar.android.account.DozeFragment;
-import org.briarproject.briar.android.account.NewOrRecoverActivity;
-import org.briarproject.briar.android.account.NewOrRecoverFragment;
 import org.briarproject.briar.android.account.SetPasswordFragment;
 import org.briarproject.briar.android.account.SetupActivity;
 import org.briarproject.briar.android.account.UnlockActivity;
@@ -24,6 +22,10 @@ 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.ContactListFragment;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactErrorFragment;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactFragment;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactIntroFragment;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment;
 import org.briarproject.briar.android.contact.add.remote.NicknameFragment;
@@ -39,10 +41,6 @@ import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.introduction.ContactChooserFragment;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.introduction.IntroductionMessageFragment;
-import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
-import org.briarproject.briar.android.keyagreement.ContactExchangeErrorFragment;
-import org.briarproject.briar.android.keyagreement.KeyAgreementActivity;
-import org.briarproject.briar.android.keyagreement.KeyAgreementFragment;
 import org.briarproject.briar.android.login.ChangePasswordActivity;
 import org.briarproject.briar.android.login.OpenDatabaseFragment;
 import org.briarproject.briar.android.login.PasswordFragment;
@@ -65,6 +63,15 @@ import org.briarproject.briar.android.privategroup.memberlist.GroupMemberModule;
 import org.briarproject.briar.android.privategroup.reveal.GroupRevealModule;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsFragment;
+import org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity;
+import org.briarproject.briar.android.remotewipe.RemoteWipeDisplayFragment;
+import org.briarproject.briar.android.remotewipe.RemoteWipeSetupActivity;
+import org.briarproject.briar.android.remotewipe.RemoteWipeSetupExplainerFragment;
+import org.briarproject.briar.android.remotewipe.WiperSelectorFragment;
+import org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeActivity;
+import org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeExplainerFragment;
+import org.briarproject.briar.android.remotewipe.revoke.RevokeRemoteWipeActivity;
+import org.briarproject.briar.android.remotewipe.revoke.RevokeRemoteWipeSuccessFragment;
 import org.briarproject.briar.android.reporting.CrashFragment;
 import org.briarproject.briar.android.reporting.CrashReportActivity;
 import org.briarproject.briar.android.reporting.ReportFormFragment;
@@ -80,16 +87,25 @@ import org.briarproject.briar.android.sharing.ShareBlogFragment;
 import org.briarproject.briar.android.sharing.ShareForumActivity;
 import org.briarproject.briar.android.sharing.ShareForumFragment;
 import org.briarproject.briar.android.sharing.SharingModule;
-//import org.briarproject.briar.android.socialbackup.CustodianDisplayFragment;
-import org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity;
+import org.briarproject.briar.android.socialbackup.SetupExplainerFragment;
+import org.briarproject.briar.android.socialbackup.recover.CustodianRecoveryModeExplainerFragment;
 import org.briarproject.briar.android.socialbackup.CustodianSelectorFragment;
-import org.briarproject.briar.android.socialbackup.DistributedBackupActivity;
+import org.briarproject.briar.android.socialbackup.SocialBackupSetupActivity;
 import org.briarproject.briar.android.socialbackup.ExistingBackupFragment;
-import org.briarproject.briar.android.socialbackup.OwnerRecoveryModeExplainerFragment;
-import org.briarproject.briar.android.socialbackup.RecoverActivity;
-import org.briarproject.briar.android.socialbackup.ShardsSentFragment;
+import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity;
+import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardErrorFragment;
+import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardFragment;
+import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeErrorFragment;
+import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeExplainerFragment;
+import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeMainFragment;
+import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity;
+import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardFragment;
 import org.briarproject.briar.android.socialbackup.ThresholdSelectorFragment;
 import org.briarproject.briar.android.socialbackup.creation.CreateBackupModule;
+import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardSuccessFragment;
+import org.briarproject.briar.android.socialbackup.recover.RestoreAccountActivity;
+import org.briarproject.briar.android.socialbackup.recover.RestoreAccountDozeFragment;
+import org.briarproject.briar.android.socialbackup.recover.RestoreAccountSetPasswordFragment;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
 
@@ -122,9 +138,7 @@ public interface ActivityComponent {
 
 	void inject(PanicPreferencesActivity activity);
 
-	void inject(ContactExchangeActivity activity);
-
-	void inject(KeyAgreementActivity activity);
+	void inject(AddNearbyContactActivity activity);
 
 	void inject(ConversationActivity activity);
 
@@ -196,9 +210,21 @@ public interface ActivityComponent {
 
 	void inject(CrashReportActivity crashReportActivity);
 
-	void inject(NewOrRecoverActivity newOrRecoverActivity);
+	void inject(CustodianReturnShardActivity custodianReturnShardActivity);
 
-	void inject(CustodianHelpRecoverActivity custodianHelpRecoverActivity);
+    void inject(OwnerReturnShardActivity ownerReturnShardActivity);
+
+    void inject(OwnerRecoveryModeMainFragment ownerRecoveryModeMainFragment);
+
+    void inject(RestoreAccountActivity restoreAccountActivity);
+
+    void inject(RemoteWipeSetupActivity remoteWipeSetupActivity);
+
+    void inject(ActivateRemoteWipeActivity activateRemoteWipeActivity);
+
+    void inject(RemoteWipeActivatedActivity remoteWipeActivatedActivity);
+
+    void inject(RevokeRemoteWipeActivity revokeRemoteWipeActivity);
 
 	// Fragments
 
@@ -226,7 +252,9 @@ public interface ActivityComponent {
 
 	void inject(FeedFragment fragment);
 
-	void inject(KeyAgreementFragment fragment);
+	void inject(AddNearbyContactIntroFragment fragment);
+
+	void inject(AddNearbyContactFragment fragment);
 
 	void inject(LinkExchangeFragment fragment);
 
@@ -244,7 +272,7 @@ public interface ActivityComponent {
 
 	void inject(ScreenFilterDialogFragment fragment);
 
-	void inject(ContactExchangeErrorFragment fragment);
+	void inject(AddNearbyContactErrorFragment fragment);
 
 	void inject(AliasDialogFragment aliasDialogFragment);
 
@@ -258,19 +286,41 @@ public interface ActivityComponent {
 
 	void inject(ThresholdSelectorFragment thresholdSelectorFragment);
 
-	void inject(DistributedBackupActivity distributedBackupActivity);
-
-	void inject(RecoverActivity recoverActivity);
+	void inject(SocialBackupSetupActivity distributedBackupActivity);
 
 	void inject(DatabaseComponent databaseComponent);
 
 	void inject(CustodianSelectorFragment custodianSelectorFragment);
 
-	void inject(ShardsSentFragment shardsSentFragment);
-
 	void inject(OwnerRecoveryModeExplainerFragment ownerRecoveryModeExplainerFragment);
 
 	void inject(ExistingBackupFragment existingBackupFragment);
 
-	void inject(NewOrRecoverFragment newOrRecoverFragment);
+	void inject(CustodianRecoveryModeExplainerFragment custodianRecoveryModeExplainerFragment);
+
+	void inject(CustodianReturnShardFragment custodianReturnShardFragment);
+
+	void inject(OwnerReturnShardFragment ownerReturnShardFragment);
+
+	void inject(RestoreAccountSetPasswordFragment restoreAccountSetPasswordFragment);
+
+	void inject(RestoreAccountDozeFragment restoreAccountDozeFragment);
+
+	void inject(OwnerReturnShardSuccessFragment ownerReturnShardSuccessFragment);
+
+	void inject(OwnerRecoveryModeErrorFragment ownerRecoveryModeErrorFragment);
+
+	void inject(CustodianReturnShardErrorFragment custodianReturnShardErrorFragment);
+
+	void inject(WiperSelectorFragment wiperSelectorFragment);
+
+	void inject(RemoteWipeDisplayFragment remoteWipeDisplayFragment);
+
+	void inject(ActivateRemoteWipeExplainerFragment activateRemoteWipeExplainerFragment);
+
+	void inject(RevokeRemoteWipeSuccessFragment revokeRemoteWipeSuccessFragment);
+
+	void inject(RemoteWipeSetupExplainerFragment remoteWipeSetupExplainerFragment);
+
+	void inject(SetupExplainerFragment setupExplainerFragment);
 }

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

@@ -9,9 +9,7 @@ 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_DOZE_WHITELISTING = 9;
-	int REQUEST_BLUETOOTH_DISCOVERABLE = 10;
 	int REQUEST_UNLOCK = 11;
 	int REQUEST_KEYGUARD_UNLOCK = 12;
 	int REQUEST_ATTACH_IMAGE = 13;

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java

@@ -28,9 +28,12 @@ import javax.inject.Inject;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
+import static java.util.Arrays.asList;
 import static java.util.Objects.requireNonNull;
+import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.AndroidUtils.getSupportedImageContentTypes;
 import static org.briarproject.bramble.util.IoUtils.tryToClose;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.attachment.AttachmentItem.State.AVAILABLE;
@@ -86,7 +89,17 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 		List<AttachmentHeader> headers = messageHeader.getAttachmentHeaders();
 		List<LiveData<AttachmentItem>> items = new ArrayList<>(headers.size());
 		boolean needsSize = headers.size() == 1;
+		List<String> supported = asList(getSupportedImageContentTypes());
 		for (AttachmentHeader h : headers) {
+			// Fail early if we don't support the content type
+			if (!supported.contains(h.getContentType())) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Unsupported content type " + h.getContentType());
+				}
+				AttachmentItem item = new AttachmentItem(h, "", ERROR);
+				items.add(new MutableLiveData<>(item));
+				continue;
+			}
 			// try cache for existing item live data
 			MutableLiveData<AttachmentItem> liveData =
 					itemsWithSize.get(h.getMessageId());

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.view.View;
 
 import org.briarproject.briar.android.util.BriarAdapter;
 
@@ -45,8 +44,4 @@ public abstract class BaseContactListAdapter<I extends ContactItem, VH extends C
 		return true;
 	}
 
-	public interface OnContactClickListener<I> {
-		void onItemClick(View view, I item);
-	}
-
 }

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

@@ -7,7 +7,6 @@ import android.widget.TextView;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
 
 import javax.annotation.Nullable;
 

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

@@ -7,7 +7,6 @@ import android.view.ViewGroup;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.NullSafety;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
 
 import androidx.recyclerview.widget.DiffUtil.ItemCallback;
 import androidx.recyclerview.widget.ListAdapter;
@@ -16,9 +15,6 @@ import androidx.recyclerview.widget.ListAdapter;
 public class ContactListAdapter extends
 		ListAdapter<ContactListItem, ContactListItemViewHolder> {
 
-	// TODO: using the click listener interface from BaseContactListAdapter on
-	// purpose here because it is entangled with ContactListItemViewHolder. At
-	// some point we probably want to change that.
 	protected final OnContactClickListener<ContactListItem> listener;
 
 	public ContactListAdapter(

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

@@ -15,12 +15,11 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
 import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.fragment.BaseFragment;
-import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
 
@@ -34,7 +33,6 @@ import io.github.kobakei.materialfabspeeddial.FabSpeedDial;
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener;
 
 import static com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_INDEFINITE;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 
 @MethodsNotNullByDefault
@@ -102,7 +100,6 @@ public class ContactListFragment extends BaseFragment
 				.observe(getViewLifecycleOwner(), result -> {
 					result.onError(this::handleException).onSuccess(items -> {
 						adapter.submitList(items);
-						if (requireNonNull(items).size() == 0) list.showData();
 					});
 				});
 		viewModel.getHasPendingContacts()
@@ -128,7 +125,8 @@ public class ContactListFragment extends BaseFragment
 		switch (itemId) {
 			case R.id.action_add_contact_nearby:
 				Intent intent =
-						new Intent(getContext(), ContactExchangeActivity.class);
+						new Intent(getContext(),
+								AddNearbyContactActivity.class);
 				startActivity(intent);
 				return;
 			case R.id.action_add_contact_remotely:

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

@@ -5,7 +5,6 @@ import android.widget.TextView;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
 
 import java.util.Locale;
 

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

@@ -3,70 +3,41 @@ package org.briarproject.briar.android.contact;
 import android.app.Application;
 
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
-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.PendingContactAddedEvent;
 import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
 import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.briar.android.viewmodel.DbViewModel;
-import org.briarproject.briar.android.viewmodel.LiveResult;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.avatar.event.AvatarUpdatedEvent;
-import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.conversation.ConversationManager;
-import org.briarproject.briar.api.conversation.ConversationMessageHeader;
-import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
-import org.briarproject.briar.api.identity.AuthorInfo;
 import org.briarproject.briar.api.identity.AuthorManager;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import androidx.arch.core.util.Function;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.LogUtils.now;
 
 @NotNullByDefault
-class ContactListViewModel extends DbViewModel implements EventListener {
+class ContactListViewModel extends ContactsViewModel {
 
 	private static final Logger LOG =
 			getLogger(ContactListViewModel.class.getName());
 
-	private final ContactManager contactManager;
-	private final AuthorManager authorManager;
-	private final ConversationManager conversationManager;
-	private final ConnectionRegistry connectionRegistry;
-	private final EventBus eventBus;
 	private final AndroidNotificationManager notificationManager;
 
-	private final MutableLiveData<LiveResult<List<ContactListItem>>>
-			contactListItems = new MutableLiveData<>();
-
 	private final MutableLiveData<Boolean> hasPendingContacts =
 			new MutableLiveData<>();
 
@@ -79,99 +50,25 @@ class ContactListViewModel extends DbViewModel implements EventListener {
 			ConversationManager conversationManager,
 			ConnectionRegistry connectionRegistry, EventBus eventBus,
 			AndroidNotificationManager notificationManager) {
-		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
-		this.contactManager = contactManager;
-		this.authorManager = authorManager;
-		this.conversationManager = conversationManager;
-		this.connectionRegistry = connectionRegistry;
-		this.eventBus = eventBus;
+		super(application, dbExecutor, lifecycleManager, db, androidExecutor,
+				contactManager, authorManager, conversationManager,
+				connectionRegistry, eventBus);
 		this.notificationManager = notificationManager;
-		this.eventBus.addListener(this);
-	}
-
-	@Override
-	protected void onCleared() {
-		super.onCleared();
-		eventBus.removeListener(this);
-	}
-
-	void loadContacts() {
-		loadList(this::loadContacts, contactListItems::setValue);
-	}
-
-	private List<ContactListItem> loadContacts(Transaction txn)
-			throws DbException {
-		long start = now();
-		List<ContactListItem> contacts = new ArrayList<>();
-		for (Contact c : contactManager.getContacts(txn)) {
-			ContactId id = c.getId();
-			AuthorInfo authorInfo = authorManager.getAuthorInfo(txn, c);
-			MessageTracker.GroupCount count =
-					conversationManager.getGroupCount(txn, id);
-			boolean connected = connectionRegistry.isConnected(c.getId());
-			contacts.add(new ContactListItem(c, authorInfo, connected, count));
-		}
-		Collections.sort(contacts);
-		logDuration(LOG, "Full load", start);
-		return contacts;
 	}
 
 	@Override
 	public void eventOccurred(Event e) {
-		if (e instanceof ContactAddedEvent) {
-			LOG.info("Contact added, reloading");
-			loadContacts();
-		} else if (e instanceof ContactConnectedEvent) {
-			updateItem(((ContactConnectedEvent) e).getContactId(),
-					item -> new ContactListItem(item, true), false);
-		} else if (e instanceof ContactDisconnectedEvent) {
-			updateItem(((ContactDisconnectedEvent) e).getContactId(),
-					item -> new ContactListItem(item, false), false);
-		} else if (e instanceof ContactRemovedEvent) {
-			LOG.info("Contact removed, removing item");
-			removeItem(((ContactRemovedEvent) e).getContactId());
-		} else if (e instanceof ConversationMessageReceivedEvent) {
-			LOG.info("Conversation message received, updating item");
-			ConversationMessageReceivedEvent<?> p =
-					(ConversationMessageReceivedEvent<?>) e;
-			ConversationMessageHeader h = p.getMessageHeader();
-			updateItem(p.getContactId(), item -> new ContactListItem(item, h),
-					true);
-		} else if (e instanceof PendingContactAddedEvent ||
+		super.eventOccurred(e);
+		if (e instanceof PendingContactAddedEvent ||
 				e instanceof PendingContactRemovedEvent) {
 			checkForPendingContacts();
-		} else if (e instanceof AvatarUpdatedEvent) {
-			AvatarUpdatedEvent a = (AvatarUpdatedEvent) e;
-			updateItem(a.getContactId(), item -> new ContactListItem(item,
-					a.getAttachmentHeader()), false);
 		}
 	}
 
-	LiveData<LiveResult<List<ContactListItem>>> getContactListItems() {
-		return contactListItems;
-	}
-
 	LiveData<Boolean> getHasPendingContacts() {
 		return hasPendingContacts;
 	}
 
-	private void updateItem(ContactId c,
-			Function<ContactListItem, ContactListItem> replacer, boolean sort) {
-		List<ContactListItem> list = updateListItems(contactListItems,
-				itemToTest -> itemToTest.getContact().getId().equals(c),
-				replacer);
-		if (list == null) return;
-		if (sort) Collections.sort(list);
-		contactListItems.setValue(new LiveResult<>(list));
-	}
-
-	private void removeItem(ContactId c) {
-		List<ContactListItem> list = removeListItems(contactListItems,
-				itemToTest -> itemToTest.getContact().getId().equals(c));
-		if (list == null) return;
-		contactListItems.setValue(new LiveResult<>(list));
-	}
-
 	void checkForPendingContacts() {
 		runOnDbThread(() -> {
 			try {

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

@@ -0,0 +1,170 @@
+package org.briarproject.briar.android.contact;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.connection.ConnectionRegistry;
+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.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.Transaction;
+import org.briarproject.bramble.api.db.TransactionManager;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
+import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.briar.android.viewmodel.DbViewModel;
+import org.briarproject.briar.android.viewmodel.LiveResult;
+import org.briarproject.briar.api.avatar.event.AvatarUpdatedEvent;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.conversation.ConversationManager;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
+import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
+import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.briar.api.identity.AuthorManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import androidx.annotation.UiThread;
+import androidx.arch.core.util.Function;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.LogUtils.logDuration;
+import static org.briarproject.bramble.util.LogUtils.now;
+
+@NotNullByDefault
+public class ContactsViewModel extends DbViewModel implements EventListener {
+
+	private static final Logger LOG =
+			getLogger(ContactsViewModel.class.getName());
+
+	protected final ContactManager contactManager;
+	private final AuthorManager authorManager;
+	private final ConversationManager conversationManager;
+	private final ConnectionRegistry connectionRegistry;
+	private final EventBus eventBus;
+
+	private final MutableLiveData<LiveResult<List<ContactListItem>>>
+			contactListItems = new MutableLiveData<>();
+
+	@Inject
+	public ContactsViewModel(Application application,
+			@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, TransactionManager db,
+			AndroidExecutor androidExecutor, ContactManager contactManager,
+			AuthorManager authorManager,
+			ConversationManager conversationManager,
+			ConnectionRegistry connectionRegistry, EventBus eventBus) {
+		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
+		this.contactManager = contactManager;
+		this.authorManager = authorManager;
+		this.conversationManager = conversationManager;
+		this.connectionRegistry = connectionRegistry;
+		this.eventBus = eventBus;
+		this.eventBus.addListener(this);
+	}
+
+	@Override
+	protected void onCleared() {
+		super.onCleared();
+		eventBus.removeListener(this);
+	}
+
+	protected void loadContacts() {
+		loadList(this::loadContacts, contactListItems::setValue);
+	}
+
+	private List<ContactListItem> loadContacts(Transaction txn)
+			throws DbException {
+		long start = now();
+		List<ContactListItem> contacts = new ArrayList<>();
+		for (Contact c : contactManager.getContacts(txn)) {
+			ContactId id = c.getId();
+			if (!displayContact(id)) {
+				continue;
+			}
+			AuthorInfo authorInfo = authorManager.getAuthorInfo(txn, c);
+			MessageTracker.GroupCount count =
+					conversationManager.getGroupCount(txn, id);
+			boolean connected = connectionRegistry.isConnected(c.getId());
+			contacts.add(new ContactListItem(c, authorInfo, connected, count));
+		}
+		Collections.sort(contacts);
+		logDuration(LOG, "Full load", start);
+		return contacts;
+	}
+
+	/**
+	 * Override this method to display only a subset of contacts.
+	 */
+	protected boolean displayContact(ContactId contactId) {
+		return true;
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof ContactAddedEvent) {
+			LOG.info("Contact added, reloading");
+			loadContacts();
+		} else if (e instanceof ContactConnectedEvent) {
+			updateItem(((ContactConnectedEvent) e).getContactId(),
+					item -> new ContactListItem(item, true), false);
+		} else if (e instanceof ContactDisconnectedEvent) {
+			updateItem(((ContactDisconnectedEvent) e).getContactId(),
+					item -> new ContactListItem(item, false), false);
+		} else if (e instanceof ContactRemovedEvent) {
+			LOG.info("Contact removed, removing item");
+			removeItem(((ContactRemovedEvent) e).getContactId());
+		} else if (e instanceof ConversationMessageReceivedEvent) {
+			LOG.info("Conversation message received, updating item");
+			ConversationMessageReceivedEvent<?> p =
+					(ConversationMessageReceivedEvent<?>) e;
+			ConversationMessageHeader h = p.getMessageHeader();
+			updateItem(p.getContactId(), item -> new ContactListItem(item, h),
+					true);
+		} else if (e instanceof AvatarUpdatedEvent) {
+			AvatarUpdatedEvent a = (AvatarUpdatedEvent) e;
+			updateItem(a.getContactId(), item -> new ContactListItem(item,
+					a.getAttachmentHeader()), false);
+		}
+	}
+
+	public LiveData<LiveResult<List<ContactListItem>>> getContactListItems() {
+		return contactListItems;
+	}
+
+	@UiThread
+	private void updateItem(ContactId c,
+			Function<ContactListItem, ContactListItem> replacer, boolean sort) {
+		List<ContactListItem> list = updateListItems(contactListItems,
+				itemToTest -> itemToTest.getContact().getId().equals(c),
+				replacer);
+		if (list == null) return;
+		if (sort) Collections.sort(list);
+		contactListItems.setValue(new LiveResult<>(list));
+	}
+
+	@UiThread
+	private void removeItem(ContactId c) {
+		List<ContactListItem> list = removeListItems(contactListItems,
+				itemToTest -> itemToTest.getContact().getId().equals(c));
+		if (list == null) return;
+		contactListItems.setValue(new LiveResult<>(list));
+	}
+
+}

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

@@ -1,50 +0,0 @@
-package org.briarproject.briar.android.contact;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
-@NotNullByDefault
-public class LegacyContactListAdapter extends
-		BaseContactListAdapter<ContactListItem, ContactListItemViewHolder> {
-
-	public LegacyContactListAdapter(Context context,
-			OnContactClickListener<ContactListItem> listener) {
-		super(context, ContactListItem.class, listener);
-	}
-
-	@Override
-	public ContactListItemViewHolder onCreateViewHolder(ViewGroup viewGroup,
-			int i) {
-		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
-				R.layout.list_item_contact, viewGroup, false);
-
-		return new ContactListItemViewHolder(v);
-	}
-
-	@Override
-	public boolean areContentsTheSame(ContactListItem c1, ContactListItem c2) {
-		// check for all properties that influence visual
-		// representation of contact
-		if (c1.isEmpty() != c2.isEmpty()) {
-			return false;
-		}
-		if (c1.getUnreadCount() != c2.getUnreadCount()) {
-			return false;
-		}
-		if (c1.getTimestamp() != c2.getTimestamp()) {
-			return false;
-		}
-		return c1.isConnected() == c2.isConnected();
-	}
-
-	@Override
-	public int compare(ContactListItem c1, ContactListItem c2) {
-		return Long.compare(c2.getTimestamp(), c1.getTimestamp());
-	}
-
-}

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

@@ -0,0 +1,9 @@
+package org.briarproject.briar.android.contact;
+
+import android.view.View;
+
+public interface OnContactClickListener<I> {
+
+	void onItemClick(View view, I item);
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddContactState.java

@@ -0,0 +1,76 @@
+package org.briarproject.briar.android.contact.add.nearby;
+
+import android.graphics.Bitmap;
+
+import org.briarproject.bramble.api.identity.Author;
+
+import androidx.annotation.Nullable;
+
+abstract class AddContactState {
+
+	static class KeyAgreementListening extends AddContactState {
+		final Bitmap qrCode;
+
+		KeyAgreementListening(Bitmap qrCode) {
+			this.qrCode = qrCode;
+		}
+	}
+
+	static class QrCodeScanned extends AddContactState {
+	}
+
+	static class KeyAgreementWaiting extends AddContactState {
+	}
+
+	static class KeyAgreementStarted extends AddContactState {
+	}
+
+	static class ContactExchangeStarted extends AddContactState {
+	}
+
+	static class ContactExchangeFinished extends AddContactState {
+		final ContactExchangeResult result;
+
+		ContactExchangeFinished(ContactExchangeResult result) {
+			this.result = result;
+		}
+	}
+
+	static class Failed extends AddContactState {
+		/**
+		 * Non-null if failed due to the scanned QR code version.
+		 * True if the app producing the code is too old.
+		 * False if the scanning app is too old.
+		 */
+		@Nullable
+		final Boolean qrCodeTooOld;
+
+		Failed(@Nullable Boolean qrCodeTooOld) {
+			this.qrCodeTooOld = qrCodeTooOld;
+		}
+
+		Failed() {
+			this(null);
+		}
+	}
+
+	abstract static class ContactExchangeResult {
+		static class Success extends ContactExchangeResult {
+			final Author remoteAuthor;
+
+			Success(Author remoteAuthor) {
+				this.remoteAuthor = remoteAuthor;
+			}
+		}
+
+		static class Error extends ContactExchangeResult {
+			@Nullable
+			final Author duplicateAuthor;
+
+			Error(@Nullable Author duplicateAuthor) {
+				this.duplicateAuthor = duplicateAuthor;
+			}
+		}
+	} // end ContactExchangeResult
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java

@@ -0,0 +1,204 @@
+package org.briarproject.briar.android.contact.add.nearby;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import org.briarproject.bramble.api.identity.Author;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeFinished;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeResult;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.Failed;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+import org.briarproject.briar.android.util.RequestBluetoothDiscoverable;
+
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProvider;
+
+import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static android.widget.Toast.LENGTH_LONG;
+import static java.util.Objects.requireNonNull;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.ACCEPTED;
+import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.REFUSED;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class AddNearbyContactActivity extends BriarActivity
+		implements BaseFragmentListener {
+
+	private static final Logger LOG =
+			getLogger(AddNearbyContactActivity.class.getName());
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private AddNearbyContactViewModel viewModel;
+	private final ActivityResultLauncher<Integer> bluetoothLauncher =
+			registerForActivityResult(new RequestBluetoothDiscoverable(),
+					this::onBluetoothDiscoverableResult);
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+		viewModel = new ViewModelProvider(this, viewModelFactory)
+				.get(AddNearbyContactViewModel.class);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+		setContentView(R.layout.activity_fragment_container_toolbar);
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
+		requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
+		if (state == null) {
+			showInitialFragment(AddNearbyContactIntroFragment.newInstance());
+		}
+		viewModel.getRequestBluetoothDiscoverable().observeEvent(this, r ->
+				requestBluetoothDiscoverable()); // never false
+		viewModel.getShowQrCodeFragment().observeEvent(this, show -> {
+			if (show) showQrCodeFragment();
+		});
+		requireNonNull(getSupportActionBar())
+				.setTitle(R.string.add_contact_title);
+		viewModel.getState()
+				.observe(this, this::onAddContactStateChanged);
+	}
+
+	@Override
+	protected void onPostResume() {
+		super.onPostResume();
+		viewModel.setIsActivityResumed(true);
+	}
+
+	@Override
+	protected void onPause() {
+		super.onPause();
+		viewModel.setIsActivityResumed(false);
+	}
+
+	private void onBluetoothDiscoverableResult(boolean discoverable) {
+		if (discoverable) {
+			LOG.info("Bluetooth discoverability was accepted");
+			viewModel.setBluetoothDecision(ACCEPTED);
+		} else {
+			LOG.info("Bluetooth discoverability was refused");
+			viewModel.setBluetoothDecision(REFUSED);
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public void onBackPressed() {
+		if (viewModel.getState().getValue() instanceof Failed) {
+			// re-create this activity when going back in failed state
+			Intent i = new Intent(this, AddNearbyContactActivity.class);
+			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+			startActivity(i);
+		} else {
+			super.onBackPressed();
+		}
+	}
+
+	private void requestBluetoothDiscoverable() {
+		Intent i = new Intent(ACTION_REQUEST_DISCOVERABLE);
+		if (i.resolveActivity(getPackageManager()) != null) {
+			LOG.info("Asking for Bluetooth discoverability");
+			viewModel.setBluetoothDecision(BluetoothDecision.WAITING);
+			bluetoothLauncher.launch(120); // 2min discoverable
+		} else {
+			viewModel.setBluetoothDecision(BluetoothDecision.NO_ADAPTER);
+		}
+	}
+
+	private void showQrCodeFragment() {
+		// FIXME #824
+		FragmentManager fm = getSupportFragmentManager();
+		if (fm.findFragmentByTag(AddNearbyContactFragment.TAG) == null) {
+			BaseFragment f = AddNearbyContactFragment.newInstance();
+			fm.beginTransaction()
+					.replace(R.id.fragmentContainer, f, f.getUniqueTag())
+					.addToBackStack(f.getUniqueTag())
+					.commit();
+		}
+	}
+
+	private void onAddContactStateChanged(@Nullable AddContactState state) {
+		if (state instanceof ContactExchangeFinished) {
+			ContactExchangeResult result =
+					((ContactExchangeFinished) state).result;
+			onContactExchangeResult(result);
+		} else if (state instanceof Failed) {
+			Boolean qrCodeTooOld = ((Failed) state).qrCodeTooOld;
+			onAddingContactFailed(qrCodeTooOld);
+		}
+	}
+
+	private void onContactExchangeResult(ContactExchangeResult result) {
+		if (result instanceof ContactExchangeResult.Success) {
+			Author remoteAuthor =
+					((ContactExchangeResult.Success) result).remoteAuthor;
+			String contactName = remoteAuthor.getName();
+			String text = getString(R.string.contact_added_toast, contactName);
+			Toast.makeText(this, text, LENGTH_LONG).show();
+			supportFinishAfterTransition();
+		} else if (result instanceof ContactExchangeResult.Error) {
+			Author duplicateAuthor =
+					((ContactExchangeResult.Error) result).duplicateAuthor;
+			if (duplicateAuthor == null) {
+				showErrorFragment();
+			} else {
+				String contactName = duplicateAuthor.getName();
+				String text =
+						getString(R.string.contact_already_exists, contactName);
+				Toast.makeText(this, text, LENGTH_LONG).show();
+				supportFinishAfterTransition();
+			}
+		} else throw new AssertionError();
+	}
+
+	private void onAddingContactFailed(@Nullable Boolean qrCodeTooOld) {
+		if (qrCodeTooOld == null) {
+			showErrorFragment();
+		} else {
+			String msg;
+			if (qrCodeTooOld) {
+				msg = getString(R.string.qr_code_too_old,
+						getString(R.string.app_name));
+			} else {
+				msg = getString(R.string.qr_code_too_new,
+						getString(R.string.app_name));
+			}
+			showNextFragment(AddNearbyContactErrorFragment.newInstance(msg));
+		}
+	}
+
+	private void showErrorFragment() {
+		showNextFragment(new AddNearbyContactErrorFragment());
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -24,14 +24,14 @@ import static org.briarproject.briar.android.util.UiUtils.onSingleLinkClick;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class ContactExchangeErrorFragment extends BaseFragment {
+public class AddNearbyContactErrorFragment extends BaseFragment {
 
 	public static final String TAG =
-			ContactExchangeErrorFragment.class.getName();
+			AddNearbyContactErrorFragment.class.getName();
 	private static final String ERROR_MSG = "errorMessage";
 
-	public static ContactExchangeErrorFragment newInstance(String errorMsg) {
-		ContactExchangeErrorFragment f = new ContactExchangeErrorFragment();
+	public static AddNearbyContactErrorFragment newInstance(String errorMsg) {
+		AddNearbyContactErrorFragment f = new AddNearbyContactErrorFragment();
 		Bundle args = new Bundle();
 		args.putString(ERROR_MSG, errorMsg);
 		f.setArguments(args);
@@ -72,7 +72,7 @@ public class ContactExchangeErrorFragment extends BaseFragment {
 		tryAgain.setOnClickListener(view -> {
 			// Recreate the activity so we return to the intro fragment
 			FragmentActivity activity = requireActivity();
-			Intent i = new Intent(activity, ContactExchangeActivity.class);
+			Intent i = new Intent(activity, AddNearbyContactActivity.class);
 			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
 			activity.startActivity(i);
 		});

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java

@@ -0,0 +1,202 @@
+package org.briarproject.briar.android.contact.add.nearby;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeStarted;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.Failed;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.KeyAgreementStarted;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.KeyAgreementWaiting;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.QrCodeScanned;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.view.QrCodeView;
+
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.annotation.UiThread;
+import androidx.lifecycle.ViewModelProvider;
+
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.widget.LinearLayout.HORIZONTAL;
+import static android.widget.Toast.LENGTH_LONG;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class AddNearbyContactFragment extends BaseFragment
+		implements QrCodeView.FullscreenListener {
+
+	public static final String TAG = AddNearbyContactFragment.class.getName();
+
+	private static final Logger LOG = Logger.getLogger(TAG);
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private AddNearbyContactViewModel viewModel;
+	private CameraView cameraView;
+	private LinearLayout cameraOverlay;
+	private View statusView;
+	private QrCodeView qrCodeView;
+	private TextView status;
+
+	public static AddNearbyContactFragment newInstance() {
+		Bundle args = new Bundle();
+		AddNearbyContactFragment fragment = new AddNearbyContactFragment();
+		fragment.setArguments(args);
+		return fragment;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(AddNearbyContactViewModel.class);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		return inflater.inflate(R.layout.fragment_keyagreement_qr, container,
+				false);
+	}
+
+	@Override
+	public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		cameraView = view.findViewById(R.id.camera_view);
+		cameraOverlay = view.findViewById(R.id.camera_overlay);
+		statusView = view.findViewById(R.id.status_container);
+		status = view.findViewById(R.id.connect_status);
+		qrCodeView = view.findViewById(R.id.qr_code_view);
+		qrCodeView.setFullscreenListener(this);
+
+		viewModel.getState().observe(getViewLifecycleOwner(),
+				this::onAddContactStateChanged);
+	}
+
+	@Override
+	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+		super.onActivityCreated(savedInstanceState);
+		requireActivity().setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR);
+		cameraView.setPreviewConsumer(viewModel.getQrCodeDecoder());
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		try {
+			cameraView.start();
+		} catch (CameraException e) {
+			logCameraExceptionAndFinish(e);
+		}
+	}
+
+	@Override
+	public void onStop() {
+		super.onStop();
+		try {
+			cameraView.stop();
+		} catch (CameraException e) {
+			logCameraExceptionAndFinish(e);
+		}
+	}
+
+	@Override
+	public void onDestroy() {
+		requireActivity()
+				.setRequestedOrientation(SCREEN_ORIENTATION_UNSPECIFIED);
+		super.onDestroy();
+	}
+
+	@Override
+	public void setFullscreen(boolean fullscreen) {
+		LinearLayout.LayoutParams statusParams, qrCodeParams;
+		if (fullscreen) {
+			// Grow the QR code view to fill its parent
+			statusParams = new LayoutParams(0, 0, 0f);
+			qrCodeParams = new LayoutParams(MATCH_PARENT, MATCH_PARENT, 1f);
+		} else {
+			// Shrink the QR code view to fill half its parent
+			if (cameraOverlay.getOrientation() == HORIZONTAL) {
+				statusParams = new LayoutParams(0, MATCH_PARENT, 1f);
+				qrCodeParams = new LayoutParams(0, MATCH_PARENT, 1f);
+			} else {
+				statusParams = new LayoutParams(MATCH_PARENT, 0, 1f);
+				qrCodeParams = new LayoutParams(MATCH_PARENT, 0, 1f);
+			}
+		}
+		statusView.setLayoutParams(statusParams);
+		qrCodeView.setLayoutParams(qrCodeParams);
+		cameraOverlay.invalidate();
+	}
+
+	@UiThread
+	private void onAddContactStateChanged(@Nullable AddContactState state) {
+		if (state instanceof AddContactState.KeyAgreementListening) {
+			Bitmap qrCode =
+					((AddContactState.KeyAgreementListening) state).qrCode;
+			qrCodeView.setQrCode(qrCode);
+		} else if (state instanceof QrCodeScanned) {
+			try {
+				cameraView.stop();
+			} catch (CameraException e) {
+				logCameraExceptionAndFinish(e);
+			}
+			cameraView.setVisibility(INVISIBLE);
+			statusView.setVisibility(VISIBLE);
+			status.setText(R.string.connecting_to_device);
+		} else if (state instanceof KeyAgreementWaiting) {
+			status.setText(R.string.waiting_for_contact_to_scan);
+		} else if (state instanceof KeyAgreementStarted) {
+			qrCodeView.setVisibility(INVISIBLE);
+			status.setText(R.string.authenticating_with_device);
+		} else if (state instanceof ContactExchangeStarted) {
+			status.setText(R.string.exchanging_contact_details);
+		} else if (state instanceof Failed) {
+			// the activity will replace this fragment with an error fragment
+			statusView.setVisibility(INVISIBLE);
+			cameraView.setVisibility(INVISIBLE);
+		}
+	}
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@UiThread
+	private void logCameraExceptionAndFinish(CameraException e) {
+		logException(LOG, WARNING, e);
+		Toast.makeText(getActivity(), R.string.camera_error,
+				LENGTH_LONG).show();
+		finish();
+	}
+
+	@Override
+	protected void finish() {
+		requireActivity().getSupportFragmentManager().popBackStack();
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java

@@ -0,0 +1,91 @@
+package org.briarproject.briar.android.contact.add.nearby;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;
+import androidx.lifecycle.ViewModelProvider;
+
+import static android.view.View.FOCUS_DOWN;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class AddNearbyContactIntroFragment extends BaseFragment {
+
+	public static final String TAG =
+			AddNearbyContactIntroFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private AddNearbyContactViewModel viewModel;
+	private AddNearbyContactPermissionManager permissionManager;
+
+	private ScrollView scrollView;
+
+	private final ActivityResultLauncher<String[]> permissionLauncher =
+			registerForActivityResult(new RequestMultiplePermissions(), r ->
+					permissionManager.onRequestPermissionResult(r,
+							viewModel::showQrCodeFragmentIfAllowed));
+
+	public static AddNearbyContactIntroFragment newInstance() {
+		Bundle args = new Bundle();
+		AddNearbyContactIntroFragment
+				fragment = new AddNearbyContactIntroFragment();
+		fragment.setArguments(args);
+		return fragment;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(AddNearbyContactViewModel.class);
+		permissionManager = new AddNearbyContactPermissionManager(
+				requireActivity(), permissionLauncher::launch,
+				viewModel.isBluetoothSupported());
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		View v = inflater.inflate(R.layout.fragment_keyagreement_id, container,
+				false);
+		scrollView = v.findViewById(R.id.scrollView);
+		View button = v.findViewById(R.id.continueButton);
+		button.setOnClickListener(view -> viewModel.onContinueClicked(() ->
+				permissionManager.checkPermissions()
+		));
+		return v;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		// Permissions may have been granted manually while we were stopped
+		permissionManager.resetPermissions();
+		scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+	}
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactModule.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import org.briarproject.briar.android.viewmodel.ViewModelKey;
 
@@ -8,12 +8,12 @@ import dagger.Module;
 import dagger.multibindings.IntoMap;
 
 @Module
-public abstract class ContactExchangeModule {
+public abstract class AddNearbyContactModule {
 
 	@Binds
 	@IntoMap
-	@ViewModelKey(ContactExchangeViewModel.class)
+	@ViewModelKey(AddNearbyContactViewModel.class)
 	abstract ViewModel bindContactExchangeViewModel(
-			ContactExchangeViewModel contactExchangeViewModel);
+			AddNearbyContactViewModel addNearbyContactViewModel);
 
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java

@@ -0,0 +1,209 @@
+package org.briarproject.briar.android.contact.add.nearby;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.location.LocationManager;
+import android.widget.Toast;
+
+import org.briarproject.briar.R;
+
+import java.util.Map;
+
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.util.Consumer;
+import androidx.fragment.app.FragmentActivity;
+
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.Manifest.permission.CAMERA;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS;
+import static android.widget.Toast.LENGTH_LONG;
+import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale;
+import static androidx.core.content.ContextCompat.checkSelfPermission;
+import static org.briarproject.briar.android.util.UiUtils.getGoToSettingsListener;
+
+public class AddNearbyContactPermissionManager {
+
+	private enum Permission {
+		UNKNOWN, GRANTED, SHOW_RATIONALE, PERMANENTLY_DENIED
+	}
+
+	private Permission cameraPermission = Permission.UNKNOWN;
+	private Permission locationPermission = Permission.UNKNOWN;
+
+	private final FragmentActivity ctx;
+	private final Consumer<String[]> requestPermissions;
+	private final boolean isBluetoothSupported;
+
+	public AddNearbyContactPermissionManager(FragmentActivity ctx,
+			Consumer<String[]> requestPermissions,
+			boolean isBluetoothSupported) {
+		this.ctx = ctx;
+		this.requestPermissions = requestPermissions;
+		this.isBluetoothSupported = isBluetoothSupported;
+	}
+
+	public void resetPermissions() {
+		cameraPermission = Permission.UNKNOWN;
+		locationPermission = Permission.UNKNOWN;
+	}
+
+	/**
+	 * @return true if location is enabled,
+	 * or it isn't required due to this being a SDK < 28 device.
+	 */
+	static boolean isLocationEnabled(Context ctx) {
+		if (SDK_INT >= 28) {
+			LocationManager lm = ctx.getSystemService(LocationManager.class);
+			return lm.isLocationEnabled();
+		} else {
+			return true;
+		}
+	}
+
+	public static boolean areEssentialPermissionsGranted(Context ctx,
+			boolean isBluetoothSupported) {
+		int ok = PERMISSION_GRANTED;
+		return checkSelfPermission(ctx, CAMERA) == ok &&
+				(SDK_INT < 23 ||
+						checkSelfPermission(ctx, ACCESS_FINE_LOCATION) == ok ||
+						!isBluetoothSupported);
+	}
+
+	private boolean areEssentialPermissionsGranted() {
+		return cameraPermission == Permission.GRANTED &&
+				(SDK_INT < 23 || locationPermission == Permission.GRANTED ||
+						!isBluetoothSupported);
+	}
+
+	public boolean checkPermissions() {
+		boolean locationEnabled = isLocationEnabled(ctx);
+		if (locationEnabled && areEssentialPermissionsGranted()) return true;
+		// If an essential permission has been permanently denied, ask the
+		// user to change the setting
+		if (cameraPermission == Permission.PERMANENTLY_DENIED) {
+			showDenialDialog(R.string.permission_camera_title,
+					R.string.permission_camera_denied_body);
+			return false;
+		}
+		if (isBluetoothSupported &&
+				locationPermission == Permission.PERMANENTLY_DENIED) {
+			showDenialDialog(R.string.permission_location_title,
+					R.string.permission_location_denied_body);
+			return false;
+		}
+		// Should we show the rationale for one or both permissions?
+		if (cameraPermission == Permission.SHOW_RATIONALE &&
+				locationPermission == Permission.SHOW_RATIONALE) {
+			showRationale(R.string.permission_camera_location_title,
+					R.string.permission_camera_location_request_body);
+		} else if (cameraPermission == Permission.SHOW_RATIONALE) {
+			showRationale(R.string.permission_camera_title,
+					R.string.permission_camera_request_body);
+		} else if (locationPermission == Permission.SHOW_RATIONALE) {
+			showRationale(R.string.permission_location_title,
+					R.string.permission_location_request_body);
+		} else if (isLocationEnabled(ctx)) {
+			requestPermissions();
+		} else {
+			showLocationDialog(ctx);
+		}
+		return false;
+	}
+
+	private void showDenialDialog(@StringRes int title, @StringRes int body) {
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
+		builder.setTitle(title);
+		builder.setMessage(body);
+		builder.setPositiveButton(R.string.ok, getGoToSettingsListener(ctx));
+		builder.setNegativeButton(R.string.cancel,
+				(dialog, which) -> ctx.supportFinishAfterTransition());
+		builder.show();
+	}
+
+	private void showRationale(@StringRes int title, @StringRes int body) {
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
+		builder.setTitle(title);
+		builder.setMessage(body);
+		builder.setNeutralButton(R.string.continue_button,
+				(dialog, which) -> requestPermissions());
+		builder.show();
+	}
+
+	private static void showLocationDialog(Context ctx) {
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
+		builder.setTitle(R.string.permission_location_setting_title);
+		builder.setMessage(R.string.permission_location_setting_body);
+		builder.setNegativeButton(R.string.cancel, null);
+		builder.setPositiveButton(R.string.permission_location_setting_button,
+				(dialog, which) -> {
+					Intent i = new Intent(ACTION_LOCATION_SOURCE_SETTINGS);
+					try {
+						ctx.startActivity(i);
+					} catch (ActivityNotFoundException e) {
+						Toast.makeText(ctx, R.string.error_start_activity,
+								LENGTH_LONG).show();
+					}
+				});
+		builder.show();
+	}
+
+	private void requestPermissions() {
+		String[] permissions;
+		if (isBluetoothSupported) {
+			permissions = new String[] {CAMERA, ACCESS_FINE_LOCATION};
+		} else {
+			permissions = new String[] {CAMERA};
+		}
+		requestPermissions.accept(permissions);
+	}
+
+	public void onRequestPermissionResult(Map<String, Boolean> result,
+			Runnable onPermissionsGranted) {
+		if (gotPermission(CAMERA, result)) {
+			cameraPermission = Permission.GRANTED;
+		} else if (shouldShowRationale(CAMERA)) {
+			cameraPermission = Permission.SHOW_RATIONALE;
+		} else {
+			cameraPermission = Permission.PERMANENTLY_DENIED;
+		}
+		if (isBluetoothSupported) {
+			if (gotPermission(ACCESS_FINE_LOCATION, result)) {
+				locationPermission = Permission.GRANTED;
+			} else if (shouldShowRationale(ACCESS_FINE_LOCATION)) {
+				locationPermission = Permission.SHOW_RATIONALE;
+			} else {
+				locationPermission = Permission.PERMANENTLY_DENIED;
+			}
+		}
+		// If a permission dialog has been shown, showing the QR code fragment
+		// on this call path would cause a crash due to
+		// https://code.google.com/p/android/issues/detail?id=190966.
+		// In that case the isResumed flag prevents the fragment from being
+		// shown here, and showQrCodeFragmentIfAllowed() will be called again
+		// from onPostResume().
+		if (checkPermissions()) onPermissionsGranted.run();
+	}
+
+	private boolean gotPermission(String permission,
+			Map<String, Boolean> result) {
+		Boolean permissionResult = result.get(permission);
+		return permissionResult == null ?
+				isGranted(permission) : permissionResult;
+	}
+
+	private boolean isGranted(String permission) {
+		return checkSelfPermission(ctx, permission) == PERMISSION_GRANTED;
+	}
+
+	private boolean shouldShowRationale(String permission) {
+		return shouldShowRequestPermissionRationale(ctx, permission);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java

@@ -0,0 +1,532 @@
+package org.briarproject.briar.android.contact.add.nearby;
+
+import android.app.Application;
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.util.DisplayMetrics;
+import android.widget.Toast;
+
+import com.google.zxing.Result;
+
+import org.briarproject.bramble.api.UnsupportedVersionException;
+import org.briarproject.bramble.api.connection.ConnectionManager;
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactExchangeManager;
+import org.briarproject.bramble.api.crypto.SecretKey;
+import org.briarproject.bramble.api.db.ContactExistsException;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
+import org.briarproject.bramble.api.keyagreement.KeyAgreementTask;
+import org.briarproject.bramble.api.keyagreement.Payload;
+import org.briarproject.bramble.api.keyagreement.PayloadEncoder;
+import org.briarproject.bramble.api.keyagreement.PayloadParser;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementAbortedEvent;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementFailedEvent;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementFinishedEvent;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStartedEvent;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementWaitingEvent;
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.BluetoothConstants;
+import org.briarproject.bramble.api.plugin.LanTcpConstants;
+import org.briarproject.bramble.api.plugin.Plugin;
+import org.briarproject.bramble.api.plugin.Plugin.State;
+import org.briarproject.bramble.api.plugin.PluginManager;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+import org.briarproject.bramble.api.plugin.event.TransportStateEvent;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeFinished;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeResult.Error;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeResult.Success;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.ContactExchangeStarted;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.KeyAgreementListening;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.KeyAgreementStarted;
+import org.briarproject.briar.android.contact.add.nearby.AddContactState.KeyAgreementWaiting;
+import org.briarproject.briar.android.viewmodel.LiveEvent;
+import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.core.util.Supplier;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
+import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
+import static android.widget.Toast.LENGTH_LONG;
+import static java.util.Objects.requireNonNull;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
+import static org.briarproject.bramble.api.plugin.Plugin.State.DISABLED;
+import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE;
+import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager.areEssentialPermissionsGranted;
+import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager.isLocationEnabled;
+import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.NO_ADAPTER;
+import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.REFUSED;
+import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.UNKNOWN;
+
+@NotNullByDefault
+class AddNearbyContactViewModel extends AndroidViewModel
+		implements EventListener, QrCodeDecoder.ResultCallback {
+
+	private static final Logger LOG =
+			getLogger(AddNearbyContactViewModel.class.getName());
+
+	enum BluetoothDecision {
+		/**
+		 * We haven't asked the user about Bluetooth discoverability.
+		 */
+		UNKNOWN,
+
+		/**
+		 * The device doesn't have a Bluetooth adapter.
+		 */
+		NO_ADAPTER,
+
+		/**
+		 * We're waiting for the user to accept or refuse discoverability.
+		 */
+		WAITING,
+
+		/**
+		 * The user has accepted discoverability.
+		 */
+		ACCEPTED,
+
+		/**
+		 * The user has refused discoverability.
+		 */
+		REFUSED
+	}
+
+	@SuppressWarnings("CharsetObjectCanBeUsed") // Requires minSdkVersion >= 19
+	private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
+
+	private final EventBus eventBus;
+	private final AndroidExecutor androidExecutor;
+	private final Executor ioExecutor;
+	private final PluginManager pluginManager;
+	private final PayloadEncoder payloadEncoder;
+	private final PayloadParser payloadParser;
+	private final Provider<KeyAgreementTask> keyAgreementTaskProvider;
+	private final ContactExchangeManager contactExchangeManager;
+	private final ConnectionManager connectionManager;
+
+	private final MutableLiveEvent<Boolean> requestBluetoothDiscoverable =
+			new MutableLiveEvent<>();
+	private final MutableLiveEvent<Boolean> showQrCodeFragment =
+			new MutableLiveEvent<>();
+	private final MutableLiveData<AddContactState> state =
+			new MutableLiveData<>();
+
+	private final QrCodeDecoder qrCodeDecoder;
+	private final BroadcastReceiver bluetoothReceiver =
+			new BluetoothStateReceiver();
+
+	@Nullable
+	private final BluetoothAdapter bt;
+	@Nullable
+	private final Plugin wifiPlugin, bluetoothPlugin;
+
+	// UiThread
+	private BluetoothDecision bluetoothDecision = BluetoothDecision.UNKNOWN;
+
+	private boolean wasContinueClicked = false;
+	private boolean isActivityResumed = false;
+
+	/**
+	 * Records whether we've enabled the wifi plugin so we don't enable it more
+	 * than once.
+	 */
+	private boolean hasEnabledWifi = false;
+
+	/**
+	 * Records whether we've enabled the Bluetooth plugin so we don't enable it
+	 * more than once.
+	 */
+	private boolean hasEnabledBluetooth = false;
+
+	@Nullable
+	private volatile KeyAgreementTask task;
+	private volatile boolean gotLocalPayload = false, gotRemotePayload = false;
+
+	@Inject
+	AddNearbyContactViewModel(Application app,
+			EventBus eventBus,
+			AndroidExecutor androidExecutor,
+			@IoExecutor Executor ioExecutor,
+			PluginManager pluginManager,
+			PayloadEncoder payloadEncoder,
+			PayloadParser payloadParser,
+			Provider<KeyAgreementTask> keyAgreementTaskProvider,
+			ContactExchangeManager contactExchangeManager,
+			ConnectionManager connectionManager) {
+		super(app);
+		this.eventBus = eventBus;
+		this.androidExecutor = androidExecutor;
+		this.ioExecutor = ioExecutor;
+		this.pluginManager = pluginManager;
+		this.payloadEncoder = payloadEncoder;
+		this.payloadParser = payloadParser;
+		this.keyAgreementTaskProvider = keyAgreementTaskProvider;
+		this.contactExchangeManager = contactExchangeManager;
+		this.connectionManager = connectionManager;
+		bt = BluetoothAdapter.getDefaultAdapter();
+		wifiPlugin = pluginManager.getPlugin(LanTcpConstants.ID);
+		bluetoothPlugin = pluginManager.getPlugin(BluetoothConstants.ID);
+		qrCodeDecoder = new QrCodeDecoder(androidExecutor, ioExecutor, this);
+		eventBus.addListener(this);
+		IntentFilter filter = new IntentFilter(ACTION_SCAN_MODE_CHANGED);
+		getApplication().registerReceiver(bluetoothReceiver, filter);
+	}
+
+	@Override
+	protected void onCleared() {
+		super.onCleared();
+		getApplication().unregisterReceiver(bluetoothReceiver);
+		eventBus.removeListener(this);
+		stopListening();
+	}
+
+	@UiThread
+	void onContinueClicked(Supplier<Boolean> checkPermissions) {
+		if (bluetoothDecision == REFUSED) {
+			bluetoothDecision = UNKNOWN; // Ask again
+		}
+		wasContinueClicked = true;
+		if (checkPermissions.get()) showQrCodeFragmentIfAllowed();
+	}
+
+	@UiThread
+	boolean isBluetoothSupported() {
+		return bt != null && bluetoothPlugin != null;
+	}
+
+	@UiThread
+	private boolean isWifiReady() {
+		if (wifiPlugin == null) return true; // Continue without wifi
+		State state = wifiPlugin.getState();
+		// Wait for plugin to become enabled
+		return state == ACTIVE || state == INACTIVE;
+	}
+
+	@UiThread
+	private boolean isBluetoothReady() {
+		if (bt == null || bluetoothPlugin == null) {
+			// Continue without Bluetooth
+			return true;
+		}
+		if (bluetoothDecision == BluetoothDecision.UNKNOWN ||
+				bluetoothDecision == BluetoothDecision.WAITING ||
+				bluetoothDecision == BluetoothDecision.REFUSED) {
+			// Wait for user to accept
+			return false;
+		}
+		if (bt.getScanMode() != SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+			// Wait for adapter to become discoverable
+			return false;
+		}
+		// Wait for plugin to become active
+		return bluetoothPlugin.getState() == ACTIVE;
+	}
+
+	@UiThread
+	private void enableWifiIfWeShould() {
+		if (hasEnabledWifi) return;
+		if (wifiPlugin == null) return;
+		State state = wifiPlugin.getState();
+		if (state == STARTING_STOPPING || state == DISABLED) {
+			LOG.info("Enabling wifi plugin");
+			hasEnabledWifi = true;
+			pluginManager.setPluginEnabled(LanTcpConstants.ID, true);
+		}
+	}
+
+	@UiThread
+	private void enableBluetoothIfWeShould() {
+		if (bluetoothDecision != BluetoothDecision.ACCEPTED) return;
+		if (hasEnabledBluetooth) return;
+		if (bluetoothPlugin == null || !isBluetoothSupported()) return;
+		State state = bluetoothPlugin.getState();
+		if (state == STARTING_STOPPING || state == DISABLED) {
+			LOG.info("Enabling Bluetooth plugin");
+			hasEnabledBluetooth = true;
+			pluginManager.setPluginEnabled(BluetoothConstants.ID, true);
+		}
+	}
+
+	@UiThread
+	private void startAddingContact() {
+		// If we return to the intro fragment, the continue button needs to be
+		// clicked again before showing the QR code fragment
+		wasContinueClicked = false;
+		// If we return to the intro fragment, ask for Bluetooth
+		// discoverability again before showing the QR code fragment
+		bluetoothDecision = UNKNOWN;
+		// If we return to the intro fragment, we may need to enable wifi and
+		// Bluetooth again
+		hasEnabledWifi = false;
+		hasEnabledBluetooth = false;
+		// reset state, so we don't show an old QR code again
+		state.setValue(null);
+		// start to listen with a KeyAgreementTask
+		startListening();
+		showQrCodeFragment.setEvent(true);
+	}
+
+	/**
+	 * Call this once Bluetooth and Wi-Fi are ready to be used.
+	 * It is possible to call this more than once over the ViewModel's lifetime.
+	 */
+	@UiThread
+	private void startListening() {
+		KeyAgreementTask oldTask = task;
+		KeyAgreementTask newTask = keyAgreementTaskProvider.get();
+		task = newTask;
+		ioExecutor.execute(() -> {
+			if (oldTask != null) oldTask.stopListening();
+			newTask.listen();
+		});
+	}
+
+	@UiThread
+	private void stopListening() {
+		KeyAgreementTask oldTask = task;
+		ioExecutor.execute(() -> {
+			if (oldTask != null) oldTask.stopListening();
+		});
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof TransportStateEvent) {
+			TransportStateEvent t = (TransportStateEvent) e;
+			if (t.getTransportId().equals(BluetoothConstants.ID)) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Bluetooth state changed to " + t.getState());
+				}
+				showQrCodeFragmentIfAllowed();
+			} else if (t.getTransportId().equals(LanTcpConstants.ID)) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Wifi state changed to " + t.getState());
+				}
+				showQrCodeFragmentIfAllowed();
+			}
+		} else if (e instanceof KeyAgreementListeningEvent) {
+			LOG.info("KeyAgreementListeningEvent received");
+			KeyAgreementListeningEvent event = (KeyAgreementListeningEvent) e;
+			onLocalPayloadReceived(event.getLocalPayload());
+		} else if (e instanceof KeyAgreementWaitingEvent) {
+			LOG.info("KeyAgreementWaitingEvent received");
+			state.setValue(new KeyAgreementWaiting());
+		} else if (e instanceof KeyAgreementStartedEvent) {
+			LOG.info("KeyAgreementStartedEvent received");
+			state.setValue(new KeyAgreementStarted());
+		} else if (e instanceof KeyAgreementFinishedEvent) {
+			LOG.info("KeyAgreementFinishedEvent received");
+			KeyAgreementResult result =
+					((KeyAgreementFinishedEvent) e).getResult();
+			startContactExchange(result);
+			state.setValue(new ContactExchangeStarted());
+		} else if (e instanceof KeyAgreementAbortedEvent) {
+			LOG.info("KeyAgreementAbortedEvent received");
+			resetPayloadFlags();
+			state.setValue(new AddContactState.Failed());
+		} else if (e instanceof KeyAgreementFailedEvent) {
+			LOG.info("KeyAgreementFailedEvent received");
+			resetPayloadFlags();
+			state.setValue(new AddContactState.Failed());
+		}
+	}
+
+	@SuppressWarnings("StatementWithEmptyBody")
+	@UiThread
+	void showQrCodeFragmentIfAllowed() {
+		boolean permissionsGranted = areEssentialPermissionsGranted(
+				getApplication(), isBluetoothSupported());
+		boolean locationEnabled = isLocationEnabled(getApplication());
+		if (isActivityResumed && wasContinueClicked && permissionsGranted &&
+				locationEnabled) {
+			if (isWifiReady() && isBluetoothReady()) {
+				LOG.info("Wifi and Bluetooth are ready");
+				startAddingContact();
+			} else {
+				enableWifiIfWeShould();
+				if (bluetoothDecision == UNKNOWN) {
+					if (isBluetoothSupported()) {
+						requestBluetoothDiscoverable.setEvent(true);
+					} else {
+						bluetoothDecision = NO_ADAPTER;
+					}
+				} else if (bluetoothDecision == REFUSED) {
+					// Ask again when the user clicks "continue"
+				} else {
+					enableBluetoothIfWeShould();
+				}
+			}
+		}
+	}
+
+	/**
+	 * This sets the QR code by setting the state to KeyAgreementListening.
+	 */
+	private void onLocalPayloadReceived(Payload localPayload) {
+		if (gotLocalPayload) return;
+		DisplayMetrics dm = getApplication().getResources().getDisplayMetrics();
+		ioExecutor.execute(() -> {
+			byte[] payloadBytes = payloadEncoder.encode(localPayload);
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("Local payload is " + payloadBytes.length
+						+ " bytes");
+			}
+			// Use ISO 8859-1 to encode bytes directly as a string
+			String content = new String(payloadBytes, ISO_8859_1);
+			Bitmap qrCode = QrCodeUtils.createQrCode(dm, content);
+			gotLocalPayload = true;
+			state.postValue(new KeyAgreementListening(qrCode));
+		});
+	}
+
+	@Override
+	@IoExecutor
+	public void onQrCodeDecoded(Result result) {
+		LOG.info("Got result from decoder");
+		// Ignore results until the KeyAgreementTask is ready
+		if (!gotLocalPayload || gotRemotePayload) return;
+		try {
+			byte[] payloadBytes = result.getText().getBytes(ISO_8859_1);
+			if (LOG.isLoggable(INFO))
+				LOG.info("Remote payload is " + payloadBytes.length + " bytes");
+			Payload remotePayload = payloadParser.parse(payloadBytes);
+			gotRemotePayload = true;
+			requireNonNull(task).connectAndRunProtocol(remotePayload);
+			state.postValue(new AddContactState.QrCodeScanned());
+		} catch (UnsupportedVersionException e) {
+			resetPayloadFlags();
+			state.postValue(new AddContactState.Failed(e.isTooOld()));
+		} catch (IOException | IllegalArgumentException e) {
+			LOG.log(WARNING, "QR Code Invalid", e);
+			androidExecutor.runOnUiThread(() -> Toast.makeText(getApplication(),
+					R.string.qr_code_invalid, LENGTH_LONG).show());
+			resetPayloadFlags();
+			state.postValue(new AddContactState.Failed());
+		}
+	}
+
+	private void resetPayloadFlags() {
+		gotRemotePayload = false;
+		gotLocalPayload = false;
+	}
+
+	@UiThread
+	private void startContactExchange(KeyAgreementResult result) {
+		TransportId t = result.getTransportId();
+		DuplexTransportConnection conn = result.getConnection();
+		SecretKey masterKey = result.getMasterKey();
+		boolean alice = result.wasAlice();
+		ioExecutor.execute(() -> {
+			try {
+				Contact contact = contactExchangeManager.exchangeContacts(conn,
+						masterKey, alice, true);
+				// Reuse the connection as a transport connection
+				connectionManager
+						.manageOutgoingConnection(contact.getId(), t, conn);
+				Success success = new Success(contact.getAuthor());
+				state.postValue(new ContactExchangeFinished(success));
+			} catch (ContactExistsException e) {
+				tryToClose(conn);
+				Error error = new Error(e.getRemoteAuthor());
+				state.postValue(new ContactExchangeFinished(error));
+			} catch (DbException | IOException e) {
+				tryToClose(conn);
+				logException(LOG, WARNING, e);
+				Error error = new Error(null);
+				state.postValue(new ContactExchangeFinished(error));
+			}
+		});
+	}
+
+	private class BluetoothStateReceiver extends BroadcastReceiver {
+		@UiThread
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, -1);
+			LOG.info("Bluetooth scan mode changed: " + scanMode);
+			showQrCodeFragmentIfAllowed();
+		}
+	}
+
+	private void tryToClose(DuplexTransportConnection conn) {
+		try {
+			conn.getReader().dispose(true, true);
+			conn.getWriter().dispose(true);
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+		}
+	}
+
+	/**
+	 * Set to true in onPostResume() and false in onPause(). This prevents the
+	 * QR code fragment from being shown if onRequestPermissionsResult() is
+	 * called while the activity is paused, which could cause a crash due to
+	 * https://issuetracker.google.com/issues/37067655.
+	 * TODO check if this is still happening with new permission requesting
+	 */
+	@UiThread
+	void setIsActivityResumed(boolean resumed) {
+		isActivityResumed = resumed;
+		// Workaround for
+		// https://code.google.com/p/android/issues/detail?id=190966
+		showQrCodeFragmentIfAllowed();
+	}
+
+	@UiThread
+	void setBluetoothDecision(BluetoothDecision decision) {
+		bluetoothDecision = decision;
+		showQrCodeFragmentIfAllowed();
+	}
+
+	QrCodeDecoder getQrCodeDecoder() {
+		return qrCodeDecoder;
+	}
+
+	LiveEvent<Boolean> getRequestBluetoothDiscoverable() {
+		return requestBluetoothDiscoverable;
+	}
+
+	LiveEvent<Boolean> getShowQrCodeFragment() {
+		return showQrCodeFragment;
+	}
+
+	/**
+	 * This LiveData will be null initially.
+	 */
+	LiveData<AddContactState> getState() {
+		return state;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraException.java

@@ -1,8 +1,8 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import java.io.IOException;
 
-class CameraException extends IOException {
+public class CameraException extends IOException {
 
 	CameraException(String message) {
 		super(message);

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.content.Context;
 import android.hardware.Camera;
@@ -40,7 +40,6 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
-@SuppressWarnings("deprecation")
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
@@ -126,8 +125,14 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 			throw new CameraException(e);
 		}
 		setDisplayOrientation(getScreenRotationDegrees());
+		if (camera == null) throw new CameraException("No camera found");
 		// Use barcode scene mode if it's available
-		Parameters params = camera.getParameters();
+		Parameters params;
+		try {
+			params = camera.getParameters();
+		} catch (RuntimeException e) {
+			throw new CameraException(e);
+		}
 		params = setSceneMode(camera, params);
 		if (SCENE_MODE_BARCODE.equals(params.getSceneMode())) {
 			// If the scene mode enabled the flash, try to disable it

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/PreviewConsumer.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.hardware.Camera;
 
@@ -6,7 +6,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import androidx.annotation.UiThread;
 
-@SuppressWarnings("deprecation")
 @NotNullByDefault
 interface PreviewConsumer {
 

briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeDecoder.java

@@ -1,10 +1,9 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.PreviewCallback;
 import android.hardware.Camera.Size;
-import android.os.AsyncTask;
 
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
@@ -15,10 +14,13 @@ import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.qrcode.QRCodeReader;
 
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.system.AndroidExecutor;
 
+import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
 import androidx.annotation.UiThread;
@@ -26,22 +28,26 @@ import androidx.annotation.UiThread;
 import static com.google.zxing.DecodeHintType.CHARACTER_SET;
 import static java.util.Collections.singletonMap;
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 
-@SuppressWarnings("deprecation")
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
+public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 
-	private static final Logger LOG =
-			Logger.getLogger(QrCodeDecoder.class.getName());
+	private static final Logger LOG = getLogger(QrCodeDecoder.class.getName());
 
+	private final AndroidExecutor androidExecutor;
+	private final Executor ioExecutor;
 	private final Reader reader = new QRCodeReader();
 	private final ResultCallback callback;
 
 	private Camera camera = null;
 	private int cameraIndex = 0;
 
-	QrCodeDecoder(ResultCallback callback) {
+	public QrCodeDecoder(AndroidExecutor androidExecutor,
+			@IoExecutor Executor ioExecutor, ResultCallback callback) {
+		this.androidExecutor = androidExecutor;
+		this.ioExecutor = ioExecutor;
 		this.callback = callback;
 	}
 
@@ -74,8 +80,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 				if (data.length == size.width * size.height * 3 / 2) {
 					CameraInfo info = new CameraInfo();
 					Camera.getCameraInfo(cameraIndex, info);
-					new DecoderTask(data, size.width, size.height,
-							info.orientation).execute();
+					decode(data, size.width, size.height, info.orientation);
 				} else {
 					// Camera parameters have changed - ask for a new preview
 					LOG.info("Preview size does not match camera parameters");
@@ -89,43 +94,23 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 		}
 	}
 
-	private class DecoderTask extends AsyncTask<Void, Void, Void> {
-
-		private final byte[] data;
-		private final int width, height, orientation;
-
-		private DecoderTask(byte[] data, int width, int height,
-				int orientation) {
-			this.data = data;
-			this.width = width;
-			this.height = height;
-			this.orientation = orientation;
-		}
-
-		@Override
-		protected Void doInBackground(Void... params) {
+	private void decode(byte[] data, int width, int height, int orientation) {
+		ioExecutor.execute(() -> {
 			BinaryBitmap bitmap = binarize(data, width, height, orientation);
 			Result result;
 			try {
 				result = reader.decode(bitmap,
 						singletonMap(CHARACTER_SET, "ISO8859_1"));
+				callback.onQrCodeDecoded(result);
 			} catch (ReaderException e) {
 				// No barcode found
-				return null;
 			} catch (RuntimeException e) {
 				LOG.warning("Invalid preview frame");
-				return null;
 			} finally {
 				reader.reset();
+				androidExecutor.runOnUiThread(this::askForPreviewFrame);
 			}
-			callback.handleResult(result);
-			return null;
-		}
-
-		@Override
-		protected void onPostExecute(Void result) {
-			askForPreviewFrame();
-		}
+		});
 	}
 
 	private static BinaryBitmap binarize(byte[] data, int width, int height,
@@ -142,8 +127,8 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	}
 
 	@NotNullByDefault
-	interface ResultCallback {
-
-		void handleResult(Result result);
+	public interface ResultCallback {
+		@IoExecutor
+		void onQrCodeDecoded(Result result);
 	}
 }