Improve existing backup fragment

bramble-android/build.gradle

@@ -50,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/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,6 +1,6 @@
 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.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',
@@ -31,6 +31,7 @@ dependencyVerification {
         '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.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.dagger:dagger-compiler:2.24:dagger-compiler-2.24.jar:3c5afb955fb188da485cb2c048eff37dce0e1530b9780a0f2f7187d16d1ccc1f',
@@ -63,16 +64,16 @@ dependencyVerification {
         '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.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',
@@ -85,8 +86,9 @@ dependencyVerification {
         '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.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.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',
@@ -94,17 +96,18 @@ dependencyVerification {
         '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.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.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:stax-ex-1.8.jar:95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77',
-        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        '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',
     ]
 }

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/contact/ContactManager.java

@@ -214,13 +214,14 @@ public interface ContactManager {
 	 * Sets the contact's handshake public key
 	 */
 	void setHandshakePublicKey(Transaction txn, ContactId c,
-			PublicKey handshakePublicKey) throws DbException;
+			PublicKey handshakePublicKey) throws DbException,
+			GeneralSecurityException;
 
 	/**
 	 * Sets the contact's handshake public key
 	 */
 	void setHandshakePublicKey(ContactId c, PublicKey handshakePublicKey)
-			throws DbException;
+			throws DbException, GeneralSecurityException;
 
 	/**
 	 * Returns true if a contact with this {@code remoteAuthorId} belongs to

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

@@ -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/contact/ContactManagerImpl.java

@@ -249,17 +249,19 @@ class ContactManagerImpl implements ContactManager, EventListener {
 
 	@Override
 	public void setHandshakePublicKey(Transaction txn, ContactId c,
-			PublicKey handshakePublicKey) throws DbException {
+			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 {
+			throws DbException, GeneralSecurityException {
 		db.transaction(false,
 				txn -> setHandshakePublicKey(txn, c, handshakePublicKey));
 	}

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/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',
@@ -19,11 +20,12 @@ 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.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.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',
@@ -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

@@ -23,10 +23,9 @@ dependencies {
 
 	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/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-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

@@ -137,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

@@ -139,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
@@ -168,10 +159,11 @@
 		<activity
 			android:name="org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity"
 			android:label="@string/activity_name_recovery"
-			android:parentActivityName="org.briarproject.briar.android.account.NewOrRecoverActivity">
+
+			android:parentActivityName="org.briarproject.briar.android.account.SetupActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" />
+				android:value="org.briarproject.briar.android.account.SetupActivity" />
 		</activity>
 
 		<activity

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

@@ -42,6 +42,7 @@ import org.briarproject.briar.android.privategroup.list.GroupListModule;
 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;
@@ -94,7 +95,8 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		GroupConversationModule.class,
 		SharingModule.class,
 		OwnerReturnShardModule.class,
-		CustodianReturnShardModule.class
+		CustodianReturnShardModule.class,
+		SocialBackupSetupModule.class
 })
 public class AppModule {
 

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/NewOrRecoverActivity.java

@@ -1,60 +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.recover.OwnerReturnShardActivity;
-
-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
-		// TODO the fade in is not working
-		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, OwnerReturnShardActivity.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/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/SetupViewModel.java

@@ -25,13 +25,14 @@ 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
 @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());
@@ -117,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;
@@ -80,20 +78,19 @@ 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.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.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.CustodianReturnShardSuccessFragment;
 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.ShardsSentFragment;
 import org.briarproject.briar.android.socialbackup.ThresholdSelectorFragment;
 import org.briarproject.briar.android.socialbackup.creation.CreateBackupModule;
 import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardSuccessFragment;
@@ -102,7 +99,6 @@ import org.briarproject.briar.android.socialbackup.recover.RestoreAccountDozeFra
 import org.briarproject.briar.android.socialbackup.recover.RestoreAccountSetPasswordFragment;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
-import org.briarproject.briar.api.socialbackup.recovery.RestoreAccount;
 
 import dagger.Component;
 
@@ -205,8 +201,6 @@ public interface ActivityComponent {
 
 	void inject(CrashReportActivity crashReportActivity);
 
-	void inject(NewOrRecoverActivity newOrRecoverActivity);
-
 	void inject(CustodianReturnShardActivity custodianReturnShardActivity);
 
     void inject(OwnerReturnShardActivity ownerReturnShardActivity);
@@ -275,28 +269,22 @@ public interface ActivityComponent {
 
 	void inject(ThresholdSelectorFragment thresholdSelectorFragment);
 
-	void inject(DistributedBackupActivity distributedBackupActivity);
+	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(CustodianReturnShardSuccessFragment custodianReturnShardSuccessFragment);
-
 	void inject(RestoreAccountSetPasswordFragment restoreAccountSetPasswordFragment);
 
 	void inject(RestoreAccountDozeFragment restoreAccountDozeFragment);
@@ -306,4 +294,6 @@ public interface ActivityComponent {
 	void inject(OwnerRecoveryModeErrorFragment ownerRecoveryModeErrorFragment);
 
 	void inject(CustodianReturnShardErrorFragment custodianReturnShardErrorFragment);
+
+	void inject(SetupExplainerFragment setupExplainerFragment);
 }

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

@@ -371,6 +371,13 @@ public class ConversationActivity extends BriarActivity
 		observeOnce(viewModel.getContactItem(), this, contact ->
 				menu.findItem(R.id.action_set_alias).setEnabled(true));
 
+		// enable help recover account action if available
+		observeOnce(viewModel.amCustodian(), this, enable -> {
+			if (enable) {
+				menu.findItem(R.id.action_help_recover_account).setEnabled(true);
+			}
+		});
+
 		return super.onCreateOptionsMenu(menu);
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java

@@ -40,6 +40,8 @@ import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent;
+import org.briarproject.briar.api.socialbackup.SocialBackup;
+import org.briarproject.briar.api.socialbackup.SocialBackupManager;
 
 import java.util.Collection;
 import java.util.List;
@@ -84,6 +86,7 @@ public class ConversationViewModel extends DbViewModel
 	private final PrivateMessageFactory privateMessageFactory;
 	private final AttachmentRetriever attachmentRetriever;
 	private final AttachmentCreator attachmentCreator;
+	private final SocialBackupManager socialBackupManager;
 
 	@Nullable
 	private ContactId contactId = null;
@@ -104,6 +107,7 @@ public class ConversationViewModel extends DbViewModel
 			new MutableLiveData<>();
 	private final MutableLiveEvent<PrivateMessageHeader> addedHeader =
 			new MutableLiveEvent<>();
+    private final MutableLiveData<Boolean> amCustodian = new MutableLiveData<>();
 
 	@Inject
 	ConversationViewModel(Application application,
@@ -118,7 +122,8 @@ public class ConversationViewModel extends DbViewModel
 			SettingsManager settingsManager,
 			PrivateMessageFactory privateMessageFactory,
 			AttachmentRetriever attachmentRetriever,
-			AttachmentCreator attachmentCreator) {
+			AttachmentCreator attachmentCreator,
+			SocialBackupManager socialBackupManager) {
 		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
 		this.db = db;
 		this.eventBus = eventBus;
@@ -129,6 +134,7 @@ public class ConversationViewModel extends DbViewModel
 		this.privateMessageFactory = privateMessageFactory;
 		this.attachmentRetriever = attachmentRetriever;
 		this.attachmentCreator = attachmentCreator;
+		this.socialBackupManager = socialBackupManager;
 		messagingGroupId = map(contactItem, c ->
 				messagingManager.getContactGroup(c.getContact()).getId());
 		contactDeleted.setValue(false);
@@ -296,6 +302,12 @@ public class ConversationViewModel extends DbViewModel
 			onOnboardingShown(SHOW_ONBOARDING_INTRODUCTION);
 			showIntroductionOnboarding.postEvent(true);
 		}
+
+		// Check if we are a social backup custodian for this contact
+		boolean amCustodianBool = db.transactionWithResult(true,
+				txn -> socialBackupManager.amCustodian(txn, c));
+		amCustodian.postValue(amCustodianBool);
+
 	}
 
 	@DatabaseExecutor
@@ -381,6 +393,10 @@ public class ConversationViewModel extends DbViewModel
 		return addedHeader;
 	}
 
+	LiveData<Boolean> amCustodian() {
+		return amCustodian;
+	}
+
 	@UiThread
 	void recheckFeaturesAndOnboarding(ContactId contactId) {
 		runOnDbThread(() -> {

briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java

@@ -7,7 +7,6 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarService;
-import org.briarproject.briar.android.account.NewOrRecoverActivity;
 import org.briarproject.briar.android.account.SetupActivity;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BaseActivity;
@@ -108,7 +107,7 @@ public class StartupActivity extends BaseActivity implements
 	private void onAccountDeleted() {
 		setResult(RESULT_CANCELED);
 		finish();
-		Intent i = new Intent(this, NewOrRecoverActivity.class);
+		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);

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java

@@ -158,7 +158,8 @@ public class NavDrawerActivity extends BriarActivity implements
 			@Override
 			public void onDrawerOpened(View drawerView) {
 				super.onDrawerOpened(drawerView);
-				navDrawerViewModel.checkTransportsOnboarding();
+//				navDrawerViewModel.checkTransportsOnboarding();
+				navDrawerViewModel.checkSocialBackupOnboarding();
 			}
 		};
 		drawerLayout.addDrawerListener(drawerToggle);
@@ -167,9 +168,12 @@ public class NavDrawerActivity extends BriarActivity implements
 		initializeTransports();
 		transportsView.setAdapter(transportsAdapter);
 
-		observeOnce(navDrawerViewModel.showTransportsOnboarding(), this, show ->
-				observeOnce(torIcon, this, imageView ->
-						showTransportsOnboarding(show, imageView)));
+//		observeOnce(navDrawerViewModel.showTransportsOnboarding(), this, show ->
+//				observeOnce(torIcon, this, imageView ->
+//						showTransportsOnboarding(show, imageView)));
+
+		observeOnce(navDrawerViewModel.showSocialBackupOnboarding(), this,
+				this::showSocialBackupOnboarding);
 
 		lockManager.isLockable().observe(this, this::setLockVisible);
 
@@ -468,6 +472,22 @@ public class NavDrawerActivity extends BriarActivity implements
 		}
 	}
 
+	private void showSocialBackupOnboarding(boolean show) {
+		if (show) {
+			new MaterialTapTargetPrompt.Builder(NavDrawerActivity.this,
+					R.style.OnboardingDialogTheme)
+					.setTarget(R.id.nav_btn_settings)
+					.setPrimaryText(R.string.social_backup_onboarding_title)
+					.setSecondaryText(R.string.social_backup_onboarding_long)
+					.setFocalRadius((float) 350)
+					.setFocalPadding((float) 100)
+					.setBackgroundColour(
+							ContextCompat.getColor(this, R.color.briar_primary))
+					.show();
+			navDrawerViewModel.socialBackupOnboardingShown();
+		}
+	}
+
 	private static class Transport {
 
 		private final TransportId id;

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerViewModel.java

@@ -39,6 +39,8 @@ public class NavDrawerViewModel extends DbViewModel {
 	private static final String EXPIRY_DATE_WARNING = "expiryDateWarning";
 	private static final String SHOW_TRANSPORTS_ONBOARDING =
 			"showTransportsOnboarding";
+	private static final String SHOW_SOCIAL_BACKUP_ONBOARDING =
+			"showSocialBackupOnboarding";
 
 	private final SettingsManager settingsManager;
 
@@ -48,6 +50,8 @@ public class NavDrawerViewModel extends DbViewModel {
 			new MutableLiveData<>();
 	private final MutableLiveData<Boolean> showTransportsOnboarding =
 			new MutableLiveData<>();
+	private final MutableLiveData<Boolean> showSocialBackupOnboarding =
+			new MutableLiveData<>();
 
 	@Inject
 	NavDrawerViewModel(Application app,
@@ -142,6 +146,11 @@ public class NavDrawerViewModel extends DbViewModel {
 		return showTransportsOnboarding;
 	}
 
+	@UiThread
+	LiveData<Boolean> showSocialBackupOnboarding() {
+		return showSocialBackupOnboarding;
+	}
+
 	@UiThread
 	void checkTransportsOnboarding() {
 		if (showTransportsOnboarding.getValue() != null) return;
@@ -171,4 +180,35 @@ public class NavDrawerViewModel extends DbViewModel {
 			}
 		});
 	}
+
+	@UiThread
+	void checkSocialBackupOnboarding() {
+		if (showSocialBackupOnboarding.getValue() != null) return;
+		runOnDbThread(() -> {
+			try {
+				Settings settings =
+						settingsManager.getSettings(SETTINGS_NAMESPACE);
+				boolean show =
+						settings.getBoolean(SHOW_SOCIAL_BACKUP_ONBOARDING,
+								true);
+				showSocialBackupOnboarding.postValue(show);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
+	}
+
+	@UiThread
+	void socialBackupOnboardingShown() {
+		showSocialBackupOnboarding.setValue(false);
+		runOnDbThread(() -> {
+			try {
+				Settings settings = new Settings();
+				settings.putBoolean(SHOW_SOCIAL_BACKUP_ONBOARDING, false);
+				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java

@@ -1,10 +1,12 @@
 package org.briarproject.briar.android.settings;
 
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -12,6 +14,7 @@ import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.briarproject.briar.android.util.UiUtils;
 import org.briarproject.briar.android.view.AuthorView;
 
@@ -19,11 +22,15 @@ import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import de.hdodenhof.circleimageview.CircleImageView;
+import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
 import static android.widget.Toast.LENGTH_LONG;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_AVATAR_IMAGE;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
 
 public class SettingsActivity extends BriarActivity {
 

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/CustodianSelectorFragment.java

@@ -23,6 +23,7 @@ import java.util.Collection;
 import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProvider;
 
 import static java.util.Objects.requireNonNull;
 
@@ -32,6 +33,18 @@ public class CustodianSelectorFragment extends ContactSelectorFragment {
 
 	public static final String TAG = CustodianSelectorFragment.class.getName();
 
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private SocialBackupSetupViewModel viewModel;
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(SocialBackupSetupViewModel.class);
+	}
+
 	@Inject
 	CreateBackupController controller;
 
@@ -44,11 +57,6 @@ public class CustodianSelectorFragment extends ContactSelectorFragment {
 		return fragment;
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -78,15 +86,19 @@ public class CustodianSelectorFragment extends ContactSelectorFragment {
 
 		int n = selectedContacts.size();
 		int min = 2;
-		boolean enough = n >= min;
+		int max = 7;
+		boolean amountIsValid = (n >= min) && (n <= max);
 
-		item.setVisible(enough);
+		item.setVisible(amountIsValid);
 		if (n == 0) {
 			Toast.makeText(getContext(), String.format(getString(R.string.select_at_least_n_contacts), min),
 					Toast.LENGTH_SHORT).show();
 		} else if (n < min) {
 			Toast.makeText(getContext(), String.format(getString(R.string.select_at_least_n_more_contacts), min - n),
 					Toast.LENGTH_SHORT).show();
+		} else if (n > max) {
+			Toast.makeText(getContext(), String.format(getString(R.string.select_no_more_than_n_contacts), max),
+					Toast.LENGTH_SHORT).show();
 		}
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java

@@ -1,94 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import android.os.Bundle;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.activity.BriarActivity;
-import org.briarproject.briar.android.contactselection.ContactSelectorListener;
-import org.briarproject.briar.android.fragment.BaseFragment;
-import org.briarproject.briar.api.socialbackup.BackupMetadata;
-import org.briarproject.briar.api.socialbackup.SocialBackupManager;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-
-public class DistributedBackupActivity extends BriarActivity implements
-		BaseFragment.BaseFragmentListener, ContactSelectorListener,
-		ThresholdDefinedListener,
-		ShardsSentFragment.ShardsSentDismissedListener {
-
-	private Collection<ContactId> custodians;
-
-	@Inject
-	public SocialBackupManager socialBackupManager;
-
-	@Inject
-	public DatabaseComponent db;
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_distributed_backup);
-
-		try {
-			db.transaction(false, txn -> {
-				BackupMetadata backupMetadata =
-						socialBackupManager.getBackupMetadata(txn);
-				if (backupMetadata == null) throw new DbException();
-				ExistingBackupFragment fragment =
-						ExistingBackupFragment.newInstance(backupMetadata);
-				showInitialFragment(fragment);
-			});
-		} catch (DbException e) {
-			CustodianSelectorFragment fragment =
-					CustodianSelectorFragment.newInstance();
-			showInitialFragment(fragment);
-		}
-	}
-
-	@Override
-	public void contactsSelected(Collection<ContactId> contacts) {
-		Toast.makeText(this,
-				String.format("Selected %d contacts", contacts.size()),
-				Toast.LENGTH_SHORT).show();
-		custodians = contacts;
-		ThresholdSelectorFragment fragment =
-				ThresholdSelectorFragment.newInstance(contacts.size());
-		showNextFragment(fragment);
-	}
-
-	@Override
-	public void thresholdDefined(int threshold) {
-		try {
-			db.transaction(false, txn -> {
-				socialBackupManager
-						.createBackup(txn, (List<ContactId>) custodians,
-								threshold);
-				ShardsSentFragment fragment = new ShardsSentFragment();
-				showNextFragment(fragment);
-			});
-		} catch (DbException e) {
-			Toast.makeText(this,
-					"There was an error when creating the backup",
-					Toast.LENGTH_LONG).show();
-			finish();
-		}
-	}
-
-	@Override
-	public void shardsSentDismissed() {
-		finish();
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java

@@ -2,42 +2,48 @@ package org.briarproject.briar.android.socialbackup;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.ImageSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.contact.ContactListAdapter;
+import org.briarproject.briar.android.contact.ContactListItem;
+import org.briarproject.briar.android.contact.OnContactClickListener;
 import org.briarproject.briar.android.fragment.BaseFragment;
-import org.briarproject.briar.api.socialbackup.BackupMetadata;
+import org.briarproject.briar.android.view.BriarRecyclerView;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
+
+import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
-public class ExistingBackupFragment extends BaseFragment {
+public class ExistingBackupFragment extends BaseFragment implements
+		OnContactClickListener<ContactListItem> {
 
-	private static final String THRESHOLD = "threshold";
-	private static final String CUSTODIANS = "custodians";
 	public static final String TAG = ExistingBackupFragment.class.getName();
+	private final ContactListAdapter adapter = new ContactListAdapter(this);
+	private BriarRecyclerView list;
 
-	public static ExistingBackupFragment newInstance(
-			BackupMetadata backupMetadata) {
-		Bundle bundle = new Bundle();
-		List<Author> custodians = backupMetadata.getCustodians();
-		ArrayList custodianNames = new ArrayList();
-		for (Author custodian : custodians) {
-			custodianNames.add(custodian.getName());
-		}
-		bundle.putStringArrayList(CUSTODIANS, custodianNames);
-		bundle.putInt(THRESHOLD, backupMetadata.getThreshold());
-		ExistingBackupFragment fragment = new ExistingBackupFragment();
-		fragment.setArguments(bundle);
-		return fragment;
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private SocialBackupSetupViewModel viewModel;
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(SocialBackupSetupViewModel.class);
 	}
 
 	@Override
@@ -51,43 +57,69 @@ public class ExistingBackupFragment extends BaseFragment {
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable
 			ViewGroup container, @Nullable Bundle savedInstanceState) {
+		// change toolbar text (relevant when navigating back to this fragment)
+//		requireActivity().setTitle(R.string.social_backup_trusted_contacts);
+
 		View view = inflater.inflate(R.layout.fragment_existing_backup,
 				container, false);
-		Bundle args = requireArguments();
-		ArrayList<String> custodianNames = args.getStringArrayList(CUSTODIANS);
+		viewModel.loadCustodianList();
+		list = view.findViewById(R.id.custodianList);
+		list.setLayoutManager(new LinearLayoutManager(getActivity()));
+		list.setAdapter(adapter);
+		list.setEmptyText(R.string.no_contacts);
 
-		StringBuilder custodianNamesString = new StringBuilder();
-		for (String custodianName : custodianNames) {
-			custodianNamesString
-					.append("• ")
-					.append(custodianName)
-					.append("\n");
-		}
+		viewModel.getContactListItems().observe(getViewLifecycleOwner(),
+				result -> result.onError(this::handleException)
+						.onSuccess(adapter::submitList)
+		);
 
-		TextView textViewThreshold = view.findViewById(R.id.textViewThreshold);
-		textViewThreshold.setText(getString(R.string.existing_backup_explain,
-				args.getInt(THRESHOLD)));
-		TextView textViewCustodians =
-				view.findViewById(R.id.textViewCustodians);
-		textViewCustodians.setText(custodianNamesString);
+		int threshold = viewModel.getThresholdFromExistingBackup();
+		int numberOfCustodians =
+				viewModel.getNumberOfCustodiansFromExistingBackup();
+
+		TextView mOfn = view.findViewById(R.id.textViewThreshold);
+		mOfn.setText(String.format(
+				getString(R.string.existing_backup_explain), threshold));
+
+		TextView thresholdRepresentation =
+				view.findViewById(R.id.textViewThresholdRepresentation);
+		thresholdRepresentation.setText(
+				buildThresholdRepresentationString(threshold,
+						numberOfCustodians));
 		return view;
 	}
 
 	@Override
 	public void onAttach(Context context) {
 		super.onAttach(context);
-//		listener = (ShardsSentDismissedListener) context;
 	}
 
-
 	@Override
 	public String getUniqueTag() {
 		return TAG;
 	}
 
 	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
+	public void onItemClick(View view, ContactListItem item) {
 	}
 
+	private SpannableStringBuilder buildThresholdRepresentationString(
+			int threshold, int numberOfCustodians) {
+		char[] charArray = new char[numberOfCustodians];
+		Arrays.fill(charArray, ' ');
+		SpannableStringBuilder string =
+				new SpannableStringBuilder(new String(charArray));
+
+		for (int i = 0; i < numberOfCustodians; i++) {
+			int drawable = i < threshold
+					? R.drawable.ic_custodian_required
+					: R.drawable.ic_custodian_optional;
+			string.setSpan(new ImageSpan(getContext(), drawable), i,
+					i + 1,
+					Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+		}
+		// If we have more than 6, split it on two lines
+		if (numberOfCustodians > 6) string.insert(4, "\n");
+		return string;
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SetupExplainerFragment.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.socialbackup.recover;
+package org.briarproject.briar.android.socialbackup;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -6,8 +6,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-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;
@@ -18,37 +16,33 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class CustodianReturnShardSuccessFragment extends
-		BaseFragment {
+public class SetupExplainerFragment extends BaseFragment {
 
 	public static final String TAG =
-			CustodianReturnShardFragment.class.getName();
+			SetupExplainerFragment.class.getName();
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
 
-	private CustodianReturnShardViewModel viewModel;
+	private SocialBackupSetupViewModel viewModel;
 
 	@Override
 	public void injectFragment(ActivityComponent component) {
 		component.inject(this);
 		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
-				.get(CustodianReturnShardViewModel.class);
+				.get(SocialBackupSetupViewModel.class);
 	}
 
 	@Nullable
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_recovery_custodian_done,
-				container, false);
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable
+			ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view =
+				inflater.inflate(R.layout.fragment_social_backup_setup_explainer,
+						container, false);
 
 		Button button = view.findViewById(R.id.button);
-		button.setOnClickListener(e -> viewModel.onSuccessDismissed());
-
+		button.setOnClickListener(e -> viewModel.onExplainerDismissed());
 		return view;
 	}
 
@@ -57,3 +51,4 @@ public class CustodianReturnShardSuccessFragment extends
 		return TAG;
 	}
 }
+

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java

@@ -1,74 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-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;
-import androidx.annotation.UiThread;
-
-public class ShardsSentFragment extends BaseFragment {
-
-	public static final String TAG = ShardsSentFragment.class.getName();
-
-	interface ShardsSentDismissedListener {
-
-		@UiThread
-		void shardsSentDismissed();
-
-	}
-
-	protected ShardsSentDismissedListener listener;
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		requireActivity().setTitle(R.string.title_distributed_backup);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_shards_sent,
-				container, false);
-
-		Button button = view.findViewById(R.id.button);
-		button.setOnClickListener(e -> {
-			listener.shardsSentDismissed();
-		});
-
-		return view;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		listener = (ShardsSentDismissedListener) context;
-	}
-
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
-    public void onBackPressed() {
-	    listener.shardsSentDismissed();
-    }
-
-}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java

@@ -0,0 +1,94 @@
+package org.briarproject.briar.android.socialbackup;
+
+import android.os.Bundle;
+import android.widget.Toast;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.contactselection.ContactSelectorListener;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import androidx.lifecycle.ViewModelProvider;
+
+public class SocialBackupSetupActivity extends BriarActivity implements
+		BaseFragment.BaseFragmentListener, ContactSelectorListener {
+
+	private SocialBackupSetupViewModel viewModel;
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+		viewModel = new ViewModelProvider(this, viewModelFactory)
+				.get(SocialBackupSetupViewModel.class);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_distributed_backup);
+
+		if (viewModel.haveExistingBackup()) {
+			showInitialFragment(new ExistingBackupFragment());
+		} else {
+			try {
+				if (!viewModel.haveEnoughContacts()) {
+					Toast.makeText(this,
+							R.string.social_backup_not_enough_contacts,
+							Toast.LENGTH_LONG).show();
+					finish();
+				}
+			} catch (DbException dbException) {
+				Toast.makeText(this,
+						R.string.reading_contacts_error,
+						Toast.LENGTH_LONG).show();
+				finish();
+			}
+			showInitialFragment(new SetupExplainerFragment());
+		}
+
+		viewModel.getState()
+				.observe(this, this::onStateChanged);
+	}
+
+	private void onStateChanged(SocialBackupSetupViewModel.State state) {
+		switch (state) {
+			case SUCCESS:
+				finish();
+				break;
+			case FAILURE:
+				Toast.makeText(this,
+						"There was an error when creating the backup",
+						Toast.LENGTH_LONG).show();
+				finish();
+				break;
+			case CHOOSING_CUSTODIANS:
+				CustodianSelectorFragment fragment =
+						CustodianSelectorFragment.newInstance();
+				showNextFragment(fragment);
+				break;
+		}
+	}
+
+	@Override
+	public void contactsSelected(Collection<ContactId> contacts) {
+		Toast.makeText(this,
+				String.format("Selected %d contacts", contacts.size()),
+				Toast.LENGTH_SHORT).show();
+		viewModel.setCustodians((List<ContactId>) contacts);
+		ThresholdSelectorFragment fragment =
+				ThresholdSelectorFragment.newInstance(contacts.size());
+		showNextFragment(fragment);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupModule.java

@@ -0,0 +1,20 @@
+package org.briarproject.briar.android.socialbackup;
+
+import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardViewModel;
+import org.briarproject.briar.android.viewmodel.ViewModelKey;
+
+import androidx.lifecycle.ViewModel;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class SocialBackupSetupModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(SocialBackupSetupViewModel.class)
+	abstract ViewModel bindSocialBackupSetupViewModel(
+			SocialBackupSetupViewModel socialBackupSetupViewModel);
+
+}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupViewModel.java

@@ -0,0 +1,147 @@
+package org.briarproject.briar.android.socialbackup;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.connection.ConnectionRegistry;
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.db.DatabaseComponent;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.briar.android.contact.ContactsViewModel;
+import org.briarproject.briar.api.conversation.ConversationManager;
+import org.briarproject.briar.api.identity.AuthorManager;
+import org.briarproject.briar.api.socialbackup.BackupMetadata;
+import org.briarproject.briar.api.socialbackup.SocialBackupManager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+import javax.inject.Inject;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+public class SocialBackupSetupViewModel extends ContactsViewModel {
+
+	private final SocialBackupManager socialBackupManager;
+	private final DatabaseComponent db;
+	private final ContactManager contactManager;
+	private BackupMetadata backupMetadata;
+	private List<ContactId> custodians;
+	private int threshold;
+
+
+	public enum State {
+		EXPLAINING,
+		CHOOSING_CUSTODIANS,
+		GETTING_THRESHOLD,
+		SUCCESS,
+		FAILURE
+	}
+
+	private final MutableLiveData<State> state =
+			new MutableLiveData<>();
+	@Inject
+	public SocialBackupSetupViewModel(
+			@NonNull Application app,
+			DatabaseComponent db,
+			@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager,
+			AuthorManager authorManager,
+			ConversationManager conversationManager,
+			ConnectionRegistry connectionRegistry,
+			EventBus eventBus,
+			AndroidExecutor androidExecutor,
+			SocialBackupManager socialBackupManager,
+			ContactManager contactManager
+	) {
+		super(app, dbExecutor, lifecycleManager, db, androidExecutor,
+				contactManager, authorManager, conversationManager,
+				connectionRegistry, eventBus);
+
+		this.socialBackupManager = socialBackupManager;
+		this.db = db;
+		this.contactManager = contactManager;
+	}
+
+    public void loadCustodianList() {
+	    try {
+		    custodians = db.transactionWithResult(true,
+				    socialBackupManager::getCustodianContactIds);
+	    } catch (DbException e) {
+	    	custodians = new ArrayList<>();
+	    }
+	    loadContacts();
+    }
+
+	public boolean haveExistingBackup() {
+		try {
+			backupMetadata = db.transactionWithNullableResult(true,
+					socialBackupManager::getBackupMetadata);
+		} catch (DbException e) {
+			return false;
+		}
+		return (backupMetadata != null);
+	}
+
+//	public BackupMetadata getBackupMetadata() {
+//		return backupMetadata;
+//	}
+
+	public boolean haveEnoughContacts() throws DbException {
+		return (contactManager.getContacts().size() > 1);
+	}
+
+	public void setCustodians(List<ContactId> contacts) {
+		custodians = contacts;
+	}
+
+	public void createBackup() {
+		try {
+			db.transaction(false, txn -> {
+				socialBackupManager
+						.createBackup(txn, (List<ContactId>) custodians,
+								threshold);
+			});
+		} catch (DbException e) {
+			state.postValue(State.FAILURE);
+		}
+	}
+
+	public void setThreshold(int threshold) {
+		this.threshold = threshold;
+		createBackup();
+	}
+
+	public void onSuccessDismissed() {
+		state.postValue(State.SUCCESS);
+	}
+
+	public MutableLiveData<State> getState() {
+		return state;
+	}
+
+	public void onExplainerDismissed() {
+		state.postValue(State.CHOOSING_CUSTODIANS);
+	}
+
+	@Override
+	protected boolean displayContact(ContactId contactId) {
+		// Check if contact holds a backup piece
+		return custodians.contains(contactId);
+	}
+
+	public int getThresholdFromExistingBackup() {
+		return backupMetadata.getThreshold();
+	}
+
+	public int getNumberOfCustodiansFromExistingBackup() {
+		return backupMetadata.getCustodians().size();
+	}
+}
+

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdDefinedListener.java

@@ -1,12 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import org.briarproject.bramble.api.db.DbException;
-
-import androidx.annotation.UiThread;
-
-public interface ThresholdDefinedListener {
-
-	@UiThread
-	void thresholdDefined(int threshold) throws DbException;
-
-}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdSelectorFragment.java

@@ -2,6 +2,10 @@ package org.briarproject.briar.android.socialbackup;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.style.ImageSpan;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -11,22 +15,28 @@ import android.view.ViewGroup;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.login.StrengthMeter;
 import org.magmacollective.darkcrystal.secretsharingwrapper.SecretSharingWrapper;
 
+import java.util.Arrays;
+
+import javax.inject.Inject;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.lifecycle.ViewModelProvider;
+
+import static android.view.View.GONE;
 
 public class ThresholdSelectorFragment extends BaseFragment {
 
 	public static final String TAG = ThresholdSelectorFragment.class.getName();
 	private static final String NUMBER_CUSTODIANS = "numberCustodians";
 
-	protected ThresholdDefinedListener listener;
-
 	private int numberOfCustodians;
 	private int threshold;
 	private int recommendedThreshold;
@@ -34,6 +44,19 @@ public class ThresholdSelectorFragment extends BaseFragment {
 	private TextView thresholdRepresentation;
 	private TextView message;
 	private TextView mOfn;
+	private StrengthMeter strengthMeter;
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private SocialBackupSetupViewModel viewModel;
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(SocialBackupSetupViewModel.class);
+	}
 
 	public static ThresholdSelectorFragment newInstance(int numberCustodians) {
 		Bundle bundle = new Bundle();
@@ -62,21 +85,21 @@ public class ThresholdSelectorFragment extends BaseFragment {
 		thresholdRepresentation =
 				view.findViewById(R.id.textViewThresholdRepresentation);
 		message = view.findViewById(R.id.textViewMessage);
-		mOfn = view.findViewById(R.id.textViewmOfn);
+		mOfn = view.findViewById(R.id.text_view_m_of_n);
+		strengthMeter = view.findViewById(R.id.strength_meter);
 
-		if (numberOfCustodians == 2) {
-			message.setText(R.string.threshold_too_few_custodians);
-		}
 		if (numberOfCustodians > 3) {
 			seekBar.setMax(numberOfCustodians -3);
-			seekBar.setProgress(threshold - 2);
 			seekBar.setOnSeekBarChangeListener(new SeekBarListener());
 			recommendedThreshold =
 					SecretSharingWrapper.defaultThreshold(numberOfCustodians);
 			threshold = recommendedThreshold;
-
+			seekBar.setProgress(threshold - 2);
+			strengthMeter.setStrength(1);
 		} else {
 			seekBar.setEnabled(false);
+			seekBar.setVisibility(GONE);
+			strengthMeter.setVisibility(GONE);
 			threshold = 2;
 			seekBar.setMax(numberOfCustodians);
 			seekBar.setProgress(threshold);
@@ -98,20 +121,13 @@ public class ThresholdSelectorFragment extends BaseFragment {
 	@Override
 	public void onAttach(Context context) {
 		super.onAttach(context);
-		listener = (ThresholdDefinedListener) context;
 	}
 
-
 	@Override
 	public String getUniqueTag() {
 		return TAG;
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		inflater.inflate(R.menu.define_threshold_actions, menu);
@@ -122,26 +138,42 @@ public class ThresholdSelectorFragment extends BaseFragment {
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case R.id.action_threshold_defined:
-				try {
-					listener.thresholdDefined(threshold);
-				} catch (DbException e) {
-					e.printStackTrace();
-				}
+				viewModel.setThreshold(threshold);
+				showSuccessDialog();
 				return true;
 			default:
 				return super.onOptionsItemSelected(item);
 		}
 	}
 
-	private String buildThresholdRepresentationString() {
-		String thresholdRepresentationText = "";
-		for (int i = 0; i < threshold; i++) {
-			thresholdRepresentationText += getString(R.string.filled_bullet);
+	private void showSuccessDialog() {
+		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
+				R.style.BriarDialogTheme);
+		builder.setTitle(R.string.backup_created);
+		builder.setMessage(R.string.backup_done_info);
+		builder.setPositiveButton(R.string.ok,
+				(dialog, which) -> viewModel.onSuccessDismissed());
+		builder.setIcon(R.drawable.ic_baseline_done_outline_24);
+				AlertDialog dialog = builder.create();
+		dialog.show();
+	}
+
+	private SpannableStringBuilder buildThresholdRepresentationString() {
+		char[] charArray = new char[numberOfCustodians];
+		Arrays.fill(charArray, ' ');
+		SpannableStringBuilder string = new SpannableStringBuilder(new String(charArray));
+
+		for (int i = 0; i < numberOfCustodians; i++) {
+			int drawable = i < threshold
+					? R.drawable.ic_custodian_required
+					: R.drawable.ic_custodian_optional;
+			string.setSpan(new ImageSpan(getContext(), drawable), i,
+					i+1,
+					Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		}
-		for (int i = 0; i < (numberOfCustodians - threshold); i++) {
-			thresholdRepresentationText += getString(R.string.linear_bullet);
-		}
-		return thresholdRepresentationText;
+		// If we have more than 6, split it on two lines
+		if (numberOfCustodians > 6) string.insert(4, "\n");
+        return string;
 	}
 
 	private class SeekBarListener implements SeekBar.OnSeekBarChangeListener {
@@ -159,12 +191,23 @@ public class ThresholdSelectorFragment extends BaseFragment {
 			int sanityLevel = SecretSharingWrapper
 					.thresholdSanity(threshold, numberOfCustodians);
 			int text = R.string.threshold_secure;
-			if (threshold == recommendedThreshold)
+			float strength = 1;
+			if (threshold == recommendedThreshold) {
 				text = R.string.threshold_recommended;
-			if (sanityLevel < -1) text = R.string.threshold_low_insecure;
-			if (sanityLevel > 0) text = R.string.threshold_high_insecure;
+			}
+			if (sanityLevel < -1) {
+                strength = 0.75f;
+				text = R.string.threshold_low_insecure;
+			}
+			if (sanityLevel < -2) {
+				strength = 0.5f;
+			}
+			if (sanityLevel > 0) {
+				strength = 0.75f;
+				text = R.string.threshold_high_insecure;
+			}
+			strengthMeter.setStrength(strength);
 			message.setText(text);
-			// TODO change colour of thresholdRepresentation to green/red based on sanityLevel
 		}
 
 		@Override

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianRecoveryModeExplainerFragment.java

@@ -32,11 +32,6 @@ public class CustodianRecoveryModeExplainerFragment extends BaseFragment {
 		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
 				.get(CustodianReturnShardViewModel.class);
 	}
-//	@Override
-//	public void onCreate(@Nullable Bundle savedInstanceState) {
-//		super.onCreate(savedInstanceState);
-//		requireActivity().setTitle(R.string.title_help_recover);
-//	}
 
 	@Nullable
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardActivity.java

@@ -13,7 +13,6 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.api.socialbackup.recovery.CustodianTask;
 
 import java.io.IOException;
-import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -21,17 +20,12 @@ import javax.inject.Inject;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
 
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 
 public class CustodianReturnShardActivity extends BriarActivity
 		implements BaseFragment.BaseFragmentListener {
 
 	private CustodianReturnShardViewModel viewModel;
-	private static final Logger LOG =
-			getLogger(CustodianReturnShardActivity.class.getName());
-	private ContactId contactId;
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -52,7 +46,7 @@ public class CustodianReturnShardActivity extends BriarActivity
 			Intent intent = getIntent();
 			int id = intent.getIntExtra(CONTACT_ID, -1);
 			if (id == -1) throw new IllegalStateException("No ContactId");
-			contactId = new ContactId(id);
+			ContactId contactId = new ContactId(id);
 
 			try {
 				viewModel.start(contactId);
@@ -96,7 +90,8 @@ public class CustodianReturnShardActivity extends BriarActivity
 					"It looks like you are not connected to a Wifi network",
 					Toast.LENGTH_SHORT).show();
 			FragmentManager fm = getSupportFragmentManager();
-			if (fm.findFragmentByTag(CustodianReturnShardFragment.TAG) == null) {
+			if (fm.findFragmentByTag(CustodianReturnShardFragment.TAG) ==
+					null) {
 				BaseFragment f = new CustodianReturnShardErrorFragment();
 				fm.beginTransaction()
 						.replace(R.id.fragmentContainer, f, f.getUniqueTag())
@@ -106,19 +101,15 @@ public class CustodianReturnShardActivity extends BriarActivity
 		}
 	}
 
-
 	private void onReturnShardStateChanged(CustodianTask.State state) {
-        if (state instanceof CustodianTask.State.Success) {
-	        CustodianReturnShardSuccessFragment fragment = new CustodianReturnShardSuccessFragment();
-	        showNextFragment(fragment);
-        } else if (state instanceof CustodianTask.State.Failure) {
-        	// TODO error fragment here
-	        // TODO handle reason
-	        Toast.makeText(this,
-			        "Backup piece transfer failed",
-			        Toast.LENGTH_SHORT).show();
-	        finish();
-        }
+		if (state instanceof CustodianTask.State.Failure) {
+			// TODO error fragment here
+			// TODO handle reason
+			Toast.makeText(this,
+					"Backup piece transfer failed",
+					Toast.LENGTH_SHORT).show();
+			finish();
+		}
 	}
 
 	private void showCameraFragment() {

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardFragment.java

@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -24,6 +25,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.annotation.UiThread;
+import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.ViewModelProvider;
 
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
@@ -53,6 +55,7 @@ public class CustodianReturnShardFragment extends BaseFragment
 	private LinearLayout cameraOverlay;
 	private View statusView;
 	private TextView status;
+	private ProgressBar bottomSpinner;
 
 	public static CustodianReturnShardFragment newInstance() {
 		Bundle args = new Bundle();
@@ -84,6 +87,7 @@ public class CustodianReturnShardFragment extends BaseFragment
 		cameraOverlay = view.findViewById(R.id.camera_overlay);
 		statusView = view.findViewById(R.id.status_container);
 		status = view.findViewById(R.id.connect_status);
+		bottomSpinner = view.findViewById(R.id.qr_code_progress_bar);
 
 		viewModel.getState().observe(getViewLifecycleOwner(),
 				this::onReturnShardStateChanged);
@@ -141,7 +145,6 @@ public class CustodianReturnShardFragment extends BaseFragment
 
 	@UiThread
 	private void onReturnShardStateChanged(@Nullable CustodianTask.State state) {
-		LOG.info("State changed");
 //		if (state instanceof CustodianTask.State.Connecting) {
 //			try {
 //				cameraView.stop();
@@ -163,8 +166,9 @@ public class CustodianReturnShardFragment extends BaseFragment
 		} else if (state instanceof CustodianTask.State.ReceivingAck) {
 			status.setText("Receiving Ack");
 		} else if (state instanceof CustodianTask.State.Success) {
-			// TODO
-			status.setText(R.string.exchanging_contact_details);
+			statusView.setVisibility(INVISIBLE);
+			bottomSpinner.setVisibility(INVISIBLE);
+			showSuccessDialog();
 		} else if (state instanceof CustodianTask.State.Failure) {
 			// the activity will replace this fragment with an error fragment
 			statusView.setVisibility(INVISIBLE);
@@ -190,4 +194,15 @@ public class CustodianReturnShardFragment extends BaseFragment
 		requireActivity().getSupportFragmentManager().popBackStack();
 	}
 
+	private void showSuccessDialog() {
+		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
+				R.style.BriarDialogTheme);
+		builder.setTitle(R.string.custodian_shard_sent);
+		//builder.setMessage();
+		builder.setPositiveButton(R.string.ok,
+				(dialog, which) -> viewModel.onSuccessDismissed());
+		builder.setIcon(R.drawable.ic_baseline_done_outline_24);
+		AlertDialog dialog = builder.create();
+		dialog.show();
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardViewModel.java

@@ -53,7 +53,7 @@ public class CustodianReturnShardViewModel extends AndroidViewModel
 	final QrCodeDecoder qrCodeDecoder;
 	private boolean qrCodeRead = false;
 	private WifiManager wifiManager;
-	private final MutableLiveEvent<Boolean > continueClicked = new MutableLiveEvent<>();
+	private final MutableLiveEvent<Boolean> continueClicked = new MutableLiveEvent<>();
 	private final MutableLiveEvent<Boolean> showCameraFragment =
 			new MutableLiveEvent<>();
 	private final MutableLiveEvent<Boolean> successDismissed =
@@ -177,7 +177,6 @@ public class CustodianReturnShardViewModel extends AndroidViewModel
 		successDismissed.setEvent(true);
 	}
 
-
 	QrCodeDecoder getQrCodeDecoder() {
 		return qrCodeDecoder;
 	}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java

@@ -44,13 +44,6 @@ public class OwnerReturnShardActivity extends BaseActivity
 
 	private OwnerReturnShardViewModel viewModel;
 
-//	private final ActivityResultLauncher<String[]> permissionLauncher =
-//			registerForActivityResult(
-//					new ActivityResultContracts.RequestMultiplePermissions(),
-//					r ->
-//							permissionManager.onRequestPermissionResult(r,
-//									viewModel::showQrCodeFragmentIfAllowed));
-
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
@@ -154,7 +147,8 @@ public class OwnerReturnShardActivity extends BaseActivity
 						"WARNING: Mismatched backup piece!",
 						Toast.LENGTH_LONG).show();
 			}
-			boolean added = (result != RestoreAccount.AddReturnShardPayloadResult.DUPLICATE) ? true : false;
+			boolean added = result !=
+					RestoreAccount.AddReturnShardPayloadResult.DUPLICATE;
 			Toast.makeText(this,
 					"Success - got backup piece" + (added ? "" : " duplicate"),
 					Toast.LENGTH_SHORT).show();

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java

@@ -27,7 +27,6 @@ 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;
 
@@ -158,5 +157,4 @@ public class OwnerReturnShardFragment extends BaseFragment
 	protected void finish() {
 		requireActivity().getSupportFragmentManager().popBackStack();
 	}
-
 }

briar-android/src/main/res/drawable/button_positive_tiny_disable.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/briar_button_text_positive" android:state_enabled="true"/>
+	<item android:color="@color/briar_button_text_disabled" />
+</selector>

briar-android/src/main/res/drawable/ic_custodian_optional.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#660066"
+	android:viewportHeight="24.0" android:viewportWidth="24.0"
+	android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+	<path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

briar-android/src/main/res/drawable/ic_custodian_required.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#FF00FF"
+android:viewportHeight="24.0" android:viewportWidth="24.0"
+android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

briar-android/src/main/res/drawable/ic_social_backup_group.xml

@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:height="72dp"
+	android:width="72dp"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path android:fillColor="#000" android:pathData="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
+</vector>

briar-android/src/main/res/layout/activity_preview_welcome.xml

@@ -16,6 +16,7 @@
 		app:title="@string/setup_title"
 		app:titleTextColor="@android:color/white" />
 
-	<include layout="@layout/fragment_start" />
+<!--	<include layout="@layout/fragment_start" />-->
+	<include layout="@layout/fragment_new_or_recover" />
 
 </LinearLayout>

briar-android/src/main/res/layout/fragment_existing_backup.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 
@@ -11,25 +10,35 @@
 	android:paddingBottom="@dimen/margin_medium"
 	android:layout_height="match_parent">
 
+
 	<TextView
-		android:id="@+id/textViewThreshold"
+		android:id="@+id/textViewThresholdRepresentation"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:gravity="center"
-		android:text="placeholder threshold"
-		android:textSize="16sp"
+		android:textSize="64sp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
 
 	<TextView
-		android:id="@+id/textViewCustodians"
+		android:id="@+id/textViewThreshold"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:gravity="center"
-		android:text="@string/backup_done_info"
 		android:textSize="16sp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textViewThreshold" />
+		app:layout_constraintTop_toBottomOf="@+id/textViewThresholdRepresentation" />
+
+	<org.briarproject.briar.android.view.BriarRecyclerView
+		android:id="@+id/custodianList"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/textViewThreshold"
+		app:scrollToEnd="false" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/fragment_new_or_recover.xml

@@ -13,22 +13,38 @@
 
 	<Button
 		android:id="@+id/buttonSetupNewAccount"
+		style="@style/BriarButton"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:drawableLeft="@drawable/ic_contacts"
 		android:text="@string/setup_new_account"
+		android:drawableLeft="@drawable/ic_contacts"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
+		app:layout_constraintTop_toTopOf="parent"
+		android:drawableStart="@drawable/ic_contacts" />
+	<TextView
+		android:id="@+id/textViewExplain"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		android:gravity="center"
+		android:text="@string/custodian_recovery_explainer_extra"
+		android:textSize="20sp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/buttonSetupNewAccount"
+		tools:layout_editor_absoluteX="16dp" />
 	<Button
-		android:id="@+id/buttonRestoreAccount"
+		android:id="@+id/buttonRestoreAccount2"
+		style="@style/BriarButton"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:drawableLeft="@drawable/ic_repeat"
 		android:text="@string/setup_restore_account"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/buttonSetupNewAccount" />
+		app:layout_constraintTop_toBottomOf="@+id/textViewExplain"
+		tools:enabled="true"
+		android:drawableStart="@drawable/ic_repeat" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/fragment_select_threshold.xml

@@ -45,7 +45,7 @@
         app:layout_constraintTop_toBottomOf="@+id/seekBar" />
 
     <TextView
-        android:id="@+id/textViewmOfn"
+        android:id="@+id/text_view_m_of_n"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
@@ -55,6 +55,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewThresholdRepresentation" />
 
+    <org.briarproject.briar.android.login.StrengthMeter
+        android:id="@+id/strength_meter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_m_of_n"
+        tools:visibility="visible" />
+
     <TextView
         android:id="@+id/textViewMessage"
         android:layout_width="wrap_content"
@@ -64,6 +75,6 @@
         android:textSize="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewmOfn" />
+        app:layout_constraintTop_toBottomOf="@+id/strength_meter" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/fragment_setup_author_name.xml

@@ -47,14 +47,28 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/margin_activity_horizontal"
 			android:enabled="false"
-			android:text="@string/setup_next"
-			app:layout_constraintBottom_toBottomOf="parent"
+			android:text="@string/setup_new_account"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/nickname_entry_wrapper"
 			app:layout_constraintVertical_bias="1.0"
 			tools:enabled="true" />
 
+		<Button
+			android:id="@+id/buttonRestoreAccount"
+			style="@style/BriarButtonFlat.Positive.Tiny"
+			android:textColor="@drawable/button_positive_tiny_disable"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/margin_activity_horizontal"
+			android:text="@string/setup_restore_account"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/next"
+			app:layout_constraintVertical_bias="1.0"
+			tools:enabled="true" />
+
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>

briar-android/src/main/res/layout/fragment_shards_sent.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/linearLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="@dimen/margin_large"
-    android:paddingTop="@dimen/margin_medium"
-    android:paddingRight="@dimen/margin_large"
-    android:paddingBottom="@dimen/margin_medium">
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="@string/ok"
-        android:textSize="24sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/backup_done_info"
-        android:gravity="center"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-    <ImageView
-        android:id="@+id/imageView2"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginLeft="32dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_baseline_done_outline_24" />
-</androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml

@@ -8,43 +8,52 @@
 	android:paddingLeft="@dimen/margin_large"
 	android:paddingTop="@dimen/margin_medium"
 	android:paddingRight="@dimen/margin_large"
-	android:paddingBottom="@dimen/margin_medium">
+	android:paddingBottom="@dimen/margin_medium"
+	tools:ignore="VectorDrawableCompat">
+
+	<TextView
+		android:id="@+id/textView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		android:gravity="center"
+		android:text="@string/social_backup_setup_explainer_title"
+		android:textSize="24sp"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:layout_editor_absoluteX="16dp" />
+
+	<ImageView
+		android:id="@+id/imageView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="12dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/textView"
+		app:srcCompat="@drawable/ic_social_backup_group" />
+
+	<TextView
+		android:id="@+id/textViewExplain"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="12dp"
+		android:gravity="center"
+		android:text="@string/social_backup_setup_explainer_long"
+		android:textSize="20sp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/imageView"
+		tools:layout_editor_absoluteX="16dp" />
 
 	<Button
 		android:id="@+id/button"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="32dp"
-		android:text="@string/ok"
-		android:textSize="24sp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-	<TextView
-		android:id="@+id/textView2"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="16dp"
-		android:gravity="center"
-		android:text="@string/custodian_shard_sent"
-		android:textSize="30sp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-	<ImageView
-		android:id="@+id/imageView2"
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_marginStart="32dp"
-		android:layout_marginLeft="32dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="32dp"
-		android:layout_marginRight="32dp"
-		app:layout_constraintDimensionRatio="1:1"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="24dp"
+		android:text="@string/social_backup_setup_explainer_button"
 		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.0"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:srcCompat="@drawable/ic_baseline_done_outline_24" />
+		app:layout_constraintTop_toBottomOf="@+id/textViewExplain" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/qr_code_view.xml

@@ -6,6 +6,7 @@
 
 	<ProgressBar
 		style="?android:attr/progressBarStyleLarge"
+		android:id="@+id/qr_code_progress_bar"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center" />

briar-android/src/main/res/menu/conversation_actions.xml

@@ -31,5 +31,6 @@
 		android:id="@+id/action_help_recover_account"
 		android:icon="@drawable/introduction_white"
 		android:title="@string/help_recover_account"
+		android:enabled="false"
 		app:showAsAction="never"/>
 </menu>

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

@@ -9,7 +9,7 @@
 	<string name="setup_name_explanation">Your nickname will be shown next to any content you post. You can\'t change it after creating your account.</string>
 	<string name="setup_next">Next</string>
 	<string name="setup_password_intro">Choose a Password</string>
-	<string name="setup_password_explanation">Your Briar account is stored encrypted on your device, not in the cloud. If you forget your password or uninstall Briar, there\'s no way to recover your account.\n\nChoose a long password that\'s hard to guess, such as four random words, or ten random letters, numbers and symbols.</string>
+	<string name="setup_password_explanation">Your Briar account is stored encrypted on your device, not in the cloud. If you forget your password or uninstall Briar, your account will be lost.\n\nTo avoid this, use the \'Social Backup\' feature in settings menu to make a backup.</string>
 	<string name="setup_doze_title">Background Connections</string>
 	<string name="setup_doze_intro">To receive messages, Briar needs to stay connected in the background.</string>
 	<string name="setup_doze_explanation">To receive messages, Briar needs to stay connected in the background. Please disable battery optimizations so Briar can stay connected.</string>
@@ -37,7 +37,7 @@
 	<string name="sign_in_button">Sign In</string>
 	<string name="forgotten_password">I have forgotten my password</string>
 	<string name="dialog_title_lost_password">Lost Password</string>
-	<string name="dialog_message_lost_password">Your Briar account is stored encrypted on your device, not in the cloud, so we can\'t reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.</string>
+	<string name="dialog_message_lost_password">Your Briar account is stored encrypted on your device, not in the cloud, so we can\'t reset your password. If you have made a social backup, you can delete your account and set a new password when you restore it. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost if you do not have a backup.</string>
 	<string name="startup_failed_notification_title">Briar could not start</string>
 	<string name="startup_failed_notification_text">Tap for more information.</string>
 	<string name="startup_failed_activity_title">Briar Startup Failure</string>
@@ -653,24 +653,30 @@
 
 	<!-- social backup procedure -->
 
-	<string name="select_custodians">Select Trusted Contacts:</string>
+	<string name="select_custodians">Select Trusted Contacts</string>
 
 	<string name="select_at_least_n_contacts">Please select at least %d contacts</string>
 	<string name="select_at_least_n_more_contacts">Please select at least %d more contacts</string>
+	<string name="select_no_more_than_n_contacts">Too many! Please select no more than %d contacts</string>
 
-	<string name="threshold">Choose the minimum number of trusted contacts needed to restore your account</string>
+	<string name="threshold">Set the minimum number of trusted contacts needed</string>
 	<string name="threshold_disabled">Two trusted contacts will be needed to restore your account</string>
 	<string name="threshold_secure">Secure</string>
 	<string name="threshold_recommended">Secure - recommended threshold</string>
 	<string name="threshold_low_insecure">Insecure – higher threshold recommended</string>
 	<string name="threshold_high_insecure">Danger of loss – lower threshold recommended</string>
-	<string name="threshold_too_few_custodians">Danger of loss - more contacts recommended</string>
-	<string name="threshold_defined">Choose Threshold</string>
+	<string name="threshold_defined">Choose Minimum Needed</string>
 	<string name="threshold_m_of_n">%d of %d contacts needed to recover your account</string>
 
+	<string name="backup_created">Social Backup created</string>
 	<string name="backup_done_info">Backup pieces sent to trusted contacts</string>
 
-	<string name="backup_created">Backup created 1/6/2020</string>
+	<string name="social_backup_setup_explainer_title">Backup your Briar identity and contacts list</string>
+	<string name="social_backup_setup_explainer_long">Choose a set of trusted contacts to send backup pieces to.\n\nYou decide how many of these contacts must help you recover your account.\n\nFor example, you can choose three trusted contacts and that any two of them are needed to recover.</string>
+	<string name="social_backup_setup_explainer_button">Choose trusted contacts</string>
+
+	<string name="social_backup_onboarding_title">Backup your Briar account</string>
+	<string name="social_backup_onboarding_long">Social backup feature allows you to recover your account with the help of trusted contacts</string>
 
 	<!-- recovery from the secret owner's POV -->
 
@@ -700,7 +706,7 @@
 
 	<string name="title_distributed_backup">Social Backup</string>
 	<string name="title_select_custodians">Select Trusted Contacts</string>
-	<string name="title_define_threshold">Threshold</string>
+	<string name="title_define_threshold">Minimum Needed</string>
 	<string name="title_recovery_mode">Recovery Mode</string>
 	<string name="title_help_recover">Help recover account</string>
 
@@ -713,10 +719,6 @@
 	<string name="setup_new_account">Create new account</string>
 	<string name="setup_restore_account">Restore account from backup</string>
 
-	<!-- Symbols for visualising threshold values for social backup -->
-	<string name="filled_bullet">\u25CF</string>
-	<string name="linear_bullet">\u25CB</string>
-
 	<!-- activity names -->
 	<string name="activity_name_distributed_backup">Social Backup</string>
 	<string name="activity_name_restore_account">Restore Account</string>
@@ -728,5 +730,11 @@
 	<string name="activity_name_new_or_recover_account">Create new account or recover existing account</string>
 	<string name="activity_name_recovery">Recover Account</string>
 	<string name="activity_name_custodian_help_recovery">Help recover account</string>
-	<string name="existing_backup_explain">%d of the following contacts are needed to restore your account:</string>
+	<string name="existing_backup_explain">Any %d of the following contacts are needed to restore your Briar account, should you lose access to it.</string>
+
+	<string name="social_backup_not_enough_contacts">To make a social backup, you need at least 2 contacts in your contacts list</string>
+	<string name="reading_contacts_error">There was an error reading your contacts list</string>
+
+	<!-- Display existing backup -->
+	<string name="social_backup_trusted_contacts">Trusted Contacts</string>
 </resources>

briar-android/src/main/res/xml/settings.xml

@@ -96,7 +96,7 @@
 			app:iconSpaceReserved="false">
 
 			<intent
-				android:targetClass="org.briarproject.briar.android.socialbackup.DistributedBackupActivity"
+				android:targetClass="org.briarproject.briar.android.socialbackup.SocialBackupSetupActivity"
 				android:targetPackage="@string/app_package" />
 
 		</Preference>

briar-android/src/test/java/org/briarproject/briar/android/account/SetupViewModelTest.java

@@ -9,7 +9,7 @@ import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.briar.android.account.SetupViewModel.State;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -36,7 +36,7 @@ public class SetupViewModelTest extends BrambleMockTestCase {
 	private final DozeHelper dozeHelper;
 
 	public SetupViewModelTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		app = context.mock(Application.class);
 		appContext = context.mock(Context.class);
 		accountManager = context.mock(AccountManager.class);

briar-android/src/test/java/org/briarproject/briar/android/attachment/AttachmentRetrieverTest.java

@@ -11,7 +11,7 @@ import org.briarproject.briar.api.attachment.Attachment;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.attachment.AttachmentReader;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -36,7 +36,7 @@ public class AttachmentRetrieverTest extends BrambleMockTestCase {
 	private final AttachmentRetriever retriever;
 
 	public AttachmentRetrieverTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		AttachmentReader attachmentReader =
 				context.mock(AttachmentReader.class);
 		imageSizeCalculator = context.mock(ImageSizeCalculator.class);

briar-android/src/test/java/org/briarproject/briar/android/privategroup/list/GroupListViewModelTest.java

@@ -26,7 +26,7 @@ import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -95,7 +95,7 @@ public class GroupListViewModelTest extends BrambleMockTestCase {
 			new GroupItem(privateGroup2, authorInfo2, groupCount2, false);
 
 	public GroupListViewModelTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		Application app = context.mock(Application.class);
 		context.checking(new Expectations() {{
 			oneOf(eventBus).addListener(with(any(EventListener.class)));

briar-android/witness.gradle

@@ -64,7 +64,7 @@ dependencyVerification {
         'androidx.viewpager2:viewpager2:1.0.0:viewpager2-1.0.0.aar:e95c0031d4cc247cd48196c6287e58d2cee54d9c79b85afea7c90920330275af',
         'androidx.viewpager:viewpager:1.0.0:viewpager-1.0.0.aar:147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682',
         'backport-util-concurrent:backport-util-concurrent:3.1:backport-util-concurrent-3.1.jar:f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902',
-        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
         'classworlds:classworlds:1.1-alpha-2:classworlds-1.1-alpha-2.jar:2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3',
         'com.almworks.sqlite4java:sqlite4java:0.282:sqlite4java-0.282.jar:9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05',
         'com.android.tools.analytics-library:protos:27.1.1:protos-27.1.1.jar:13f77e73762e58ab372d140b3a6be6903aea9775b62dd14fbc62d4cc7069c9a4',
@@ -108,6 +108,7 @@ dependencyVerification {
         'com.google.android.material:material:1.2.1:material-1.2.1.aar:d3d0cc776f2341da8e572586c7d390a5b356ce39a0deb2768071dc40b364ac80',
         'com.google.auto.service:auto-service:1.0-rc4:auto-service-1.0-rc4.jar:e422d49c312fd2031222e7306e8108c1b4118eb9c049f1b51eca280bed87e924',
         'com.google.auto:auto-common:0.8:auto-common-0.8.jar:97db1709f57b91b32edacb596ef4641872f227b7d99ad90e467f0d77f5ba134a',
+        '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',
@@ -155,18 +156,21 @@ dependencyVerification {
         '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',
         'junit:junit:4.13.1:junit-4.13.1.jar:c30719db974d6452793fe191b3638a5777005485bae145924044530ffa5f6122',
         'nekohtml:nekohtml:1.9.6.2:nekohtml-1.9.6.2.jar:fdff6cfa9ed9cc911c842a5d2395f209ec621ef1239d46810e9e495809d3ae09',
         'nekohtml:xercesMinimal:1.9.6.2:xercesMinimal-1.9.6.2.jar:95b8b357d19f63797dd7d67622fd3f18374d64acbc6584faba1c7759a31e8438',
-        'net.bytebuddy:byte-buddy-agent:1.9.10:byte-buddy-agent-1.9.10.jar:8ed739d29132103250d307d2e8e3c95f07588ef0543ab11d2881d00768a5e182',
-        'net.bytebuddy:byte-buddy:1.9.10:byte-buddy-1.9.10.jar:2936debc4d7b6c534848d361412e2d0f8bd06f7f27a6f4e728a20e97648d2bf3',
+        'net.bytebuddy:byte-buddy-agent:1.10.20:byte-buddy-agent-1.10.20.jar:b592a6c43e752bf41659717956c57fbb790394d2ee5f8941876659f9c5c0e7e8',
+        'net.bytebuddy:byte-buddy:1.10.20:byte-buddy-1.10.20.jar:5fcad05da791e9a22811c255a4a74b7ea094b7243d9dbf3e6fc578c8c94290ac',
         'net.i2p.crypto:eddsa:0.2.0:eddsa-0.2.0.jar:a7cb1b85c16e2f0730b9204106929a1d9aaae1df728adc7041a8b8b605692140',
         'net.java.dev.jna:jna:5.5.0:jna-5.5.0.aar:12ef4a3c2ea685c9c816caa6a77ae8f17bb7727d8460f249925409acda270101',
+        '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.ant:ant-launcher:1.8.0:ant-launcher-1.8.0.jar:da9fd92eacdf63daf0be52eb71accc10ff7943a85d7aac9ea96cf7e03ee3d3cc',
+        'org.apache.ant:ant:1.8.0:ant-1.8.0.jar:0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e',
         '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',
@@ -185,7 +189,6 @@ dependencyVerification {
         'org.apache.maven:maven-project:2.2.1:maven-project-2.2.1.jar:24ddb65b7a6c3befb6267ce5f739f237c84eba99389265c30df67c3dd8396a40',
         'org.apache.maven:maven-repository-metadata:2.2.1:maven-repository-metadata-2.2.1.jar:5fe283f47b0e7f7d95a4252af3fa7a0db4d8f080cd9df308608c0472b8f168a1',
         'org.apache.maven:maven-settings:2.2.1:maven-settings-2.2.1.jar:9a9f556713a404e770c9dbdaed7eb086078014c989291960c76fdde6db4192f7',
-        '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.52:bcprov-jdk15on-1.52.jar:0dc4d181e4d347893c2ddbd2e6cd5d7287fc651c03648fa64b2341c7366b1773',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
@@ -202,8 +205,11 @@ dependencyVerification {
         '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-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
         'org.hamcrest:hamcrest-integration:1.3:hamcrest-integration-1.3.jar:70f418efbb506c5155da5f9a5a33262ea08a9e4d7fea186aa9015c41a7224ac2',
         'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+        'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
+        'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
         'org.jetbrains.kotlin:kotlin-reflect:1.3.72:kotlin-reflect-1.3.72.jar:a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40',
         'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50:kotlin-stdlib-common-1.3.50.jar:8ce678e88e4ba018b66dacecf952471e4d7dfee156a8a819760a5a5ff29d323c',
         'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72:kotlin-stdlib-common-1.3.72.jar:5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a',
@@ -215,21 +221,23 @@ dependencyVerification {
         'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0:kotlinx-coroutines-core-1.3.0.jar:6f3a60fea2403b80385b399952aeb3a4cf0985a45b8da04b6f31825171901a1d',
         'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
         'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
-        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-        '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.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:stax-ex-1.8.jar:95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77',
         'org.magmacollective.darkcrystal:dark-crystal-key-backup-crypto:1.0.0:dark-crystal-key-backup-crypto-1.0.0.jar:7c808f30314f7bc0c715b53415b07bd7e9a6bbcc55e5f672a296e5298d335f78',
         'org.magmacollective.darkcrystal:dark-crystal-secret-sharing-wrapper:1.1.0:dark-crystal-secret-sharing-wrapper-1.1.0.aar:b8cac2348b9e652de413fa587168e9bb6ff36f6eea4bd1c72d3ecd56fc186e09',
         'org.magmacollective.darkcrystal:shamir-secret-sharing-jna:1.0.0:shamir-secret-sharing-jna-1.0.0.aar:cdccfaf74dc1fcf30799a45d034c406315ce8507a8f4382eee118a66fb229ced',
-        'org.mockito:mockito-core:3.1.0:mockito-core-3.1.0.jar:89b09e518e04f5c35f5ccf7abe45e72f594070a53d95cc2579001bd392c5afa6',
-        'org.objenesis:objenesis:2.6:objenesis-2.6.jar:5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d',
+        'org.mockito:mockito-core:3.9.0:mockito-core-3.9.0.jar:a1f64211407b8dc4cf80b16e07cc11aa9e5228d53dc4a5357326d66825f6a4ac',
+        'org.objenesis:objenesis:3.2:objenesis-3.2.jar:03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3',
         '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:7.0:asm-7.0.jar:b88ef66468b3c978ad0c97fd6e90979e56155b4ac69089ba7a44e9aa7ffe9acf',
+        'org.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de',
         'org.robolectric:annotations:4.3.1:annotations-4.3.1.jar:ce679af70c22620b5752aa6c1555d0653198d6370e9a93fe71b8eaaebc5ffaf6',
         'org.robolectric:junit:4.3.1:junit-4.3.1.jar:60c85ea7fd652bc4e57567cbd3c41c5d32f2c678e212b713cefa6c63570451ce',
         'org.robolectric:pluginapi:4.3.1:pluginapi-4.3.1.jar:229256a260a1d8e8d33613a3de7ccd639661a7061251c1974975ed427428b468',

briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupManager.java

@@ -78,4 +78,11 @@ public interface SocialBackupManager extends
 	 */
 	byte[] getReturnShardPayloadBytes(Transaction txn, ContactId contactId)
 			throws DbException;
+
+
+	/**
+	 * Get a list of the contact ids of your custodians, or an empty
+	 * list if no backup exists.
+	 */
+	List<ContactId> getCustodianContactIds(Transaction txn);
 }

briar-core/build.gradle

@@ -22,10 +22,10 @@ dependencies {
 	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
 	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	testImplementation 'net.jodah:concurrentunit:0.4.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"
+	testImplementation "org.jmock:jmock-imposters:$jmock_version"
 
 	testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

briar-core/src/main/java/org/briarproject/briar/handshakekeyexchange/HandshakeKeyExchangeManagerImpl.java

@@ -29,6 +29,7 @@ import org.briarproject.briar.api.conversation.DeletionResult;
 import org.briarproject.briar.api.handshakekeyexchange.HandshakeKeyExchangeManager;
 import org.briarproject.briar.client.ConversationClientImpl;
 
+import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
@@ -163,8 +164,14 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
 		}
 		LOG.info("Adding contact's handshake public key");
 		PublicKey handshakePublicKey = new AgreementPublicKey(body.getRaw(0));
-		contactManager
-				.setHandshakePublicKey(txn, contactId, handshakePublicKey);
+
+		try {
+			contactManager
+					.setHandshakePublicKey(txn, contactId, handshakePublicKey);
+		} catch (GeneralSecurityException e) {
+			LOG.warning("Security exception when adding remote handshake public key");
+			e.printStackTrace();
+		}
 		return false;
 	}
 

briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java

@@ -612,4 +612,30 @@ class SocialBackupManagerImpl extends ConversationClientImpl
 				results.entrySet().iterator().next();
 		return new Pair<>(e.getKey(), e.getValue());
 	}
+
+	public List<ContactId> getCustodianContactIds(Transaction txn) {
+		ArrayList<ContactId> contactIds = new ArrayList<>();
+		try {
+			BackupMetadata b = getBackupMetadata(txn);
+		    if (b == null) throw new DbException();
+			List<Author> custodians = b.getCustodians();
+			for (Author custodian : custodians) {
+				contactIds.add(authorToContactId(txn, custodian));
+			}
+		} catch (DbException ignored) {
+			// Will return an empty list
+		}
+		return contactIds;
+	}
+
+	private ContactId authorToContactId(Transaction txn, Author author)
+			throws DbException {
+		ArrayList<Contact> contacts =
+				(ArrayList<Contact>) contactManager.getContacts(txn);
+		for (Contact c : contacts) {
+			if (c.getAuthor().equals(author)) return c.getId();
+		}
+		throw new DbException();
+	}
+
 }

briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java

@@ -33,7 +33,7 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
 import org.jmock.AbstractExpectations;
 import org.jmock.Expectations;
-import org.jmock.lib.legacy.ClassImposteriser;
+import org.jmock.imposters.ByteBuddyClassImposteriser;
 import org.junit.Test;
 
 import java.util.Collection;
@@ -120,7 +120,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
 
 
 	public GroupInvitationManagerImplTest() {
-		context.setImposteriser(ClassImposteriser.INSTANCE);
+		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
 		creatorEngine = context.mock(CreatorProtocolEngine.class);
 		inviteeEngine = context.mock(InviteeProtocolEngine.class);
 		peerEngine = context.mock(PeerProtocolEngine.class);

briar-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',
@@ -21,28 +22,30 @@ 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.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.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.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
         '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.jdom:jdom2:2.0.6:jdom2-2.0.6.jar:1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5',
-        '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.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.jsoup:jsoup:1.11.3:jsoup-1.11.3.jar:df2c71a4240ecbdae7cdcd1667bcf0d747e4e3dcefe8161e787adcff7e5f2fa0',
-        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        '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.slf4j:slf4j-api:1.7.16:slf4j-api-1.7.16.jar:e56288031f5e60652c06e7bb6e9fa410a61231ab54890f7b708fc6adc4107c5b',
     ]
 }

build.gradle

@@ -33,4 +33,7 @@ buildscript {
 		classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0'
 		classpath files('libs/gradle-witness.jar')
 	}
+//	ext.dagger_version = "2.33"
+	ext.junit_version = "4.12"
+	ext.jmock_version = '2.12.0'
 }