WIP: Lock down NavDrawerActivity

bramble-android/build.gradle

@@ -11,8 +11,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10216
-		versionName "1.2.16"
+		versionCode 10214
+		versionName "1.2.14"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@@ -26,11 +26,6 @@ public interface IdentityManager {
 	 */
 	void registerIdentity(Identity i);
 
-	/**
-	 * Returns the cached local identity or loads it from the database.
-	 */
-	Identity getIdentity(Transaction txn) throws DbException;
-
 	/**
 	 * Returns the cached local identity or loads it from the database.
 	 */

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

@@ -74,13 +74,6 @@ public interface TransportPropertyManager {
 	TransportProperties getRemoteProperties(ContactId c, TransportId t)
 			throws DbException;
 
-	/**
-	 * Returns the remote transport properties for the given contact and
-	 * transport.
-	 */
-	TransportProperties getRemoteProperties(Transaction txn, ContactId c,
-			TransportId t) throws DbException;
-
 	/**
 	 * Merges the given properties with the existing local properties for the
 	 * given transport.

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

@@ -1,11 +1,12 @@
-package org.briarproject.bramble.api.crypto;
+package org.briarproject.bramble.crypto;
 
+import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.security.GeneralSecurityException;
 
 @NotNullByDefault
-public interface AuthenticatedCipher {
+interface AuthenticatedCipher {
 
 	/**
 	 * Initializes this cipher for encryption or decryption with a key and an

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

@@ -6,7 +6,6 @@ import net.i2p.crypto.eddsa.KeyPairGenerator;
 
 import org.briarproject.bramble.api.crypto.AgreementPrivateKey;
 import org.briarproject.bramble.api.crypto.AgreementPublicKey;
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.DecryptionException;
 import org.briarproject.bramble.api.crypto.KeyPair;

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyAgreementCrypto;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.StreamDecrypter;
 import org.briarproject.bramble.api.crypto.StreamDecrypterFactory;

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

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.crypto;
 
 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.StreamDecrypter;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.StreamEncrypter;

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.StreamEncrypter;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.spongycastle.crypto.DataLengthException;

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

@@ -118,11 +118,6 @@ class IdentityManagerImpl implements IdentityManager, OpenDatabaseHook {
 		return cached.getLocalAuthor();
 	}
 
-	@Override
-	public Identity getIdentity(Transaction txn) throws DbException {
-		return getCachedIdentity(txn);
-	}
-
 	@Override
 	public LocalAuthor getLocalAuthor(Transaction txn) throws DbException {
 		return getCachedIdentity(txn).getLocalAuthor();

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

@@ -179,6 +179,13 @@ class LifecycleManagerImpl implements LifecycleManager, MigrationListener {
 			LOG.info("Stopping services");
 			state = STOPPING;
 			eventBus.broadcast(new LifecycleEvent(STOPPING));
+			LOG.info("Sleeping a bit to simulate slowness");
+			try {
+				Thread.sleep(5000);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			LOG.info("Done simulating slowness");
 			for (Service s : services) {
 				long start = now();
 				s.stopService();

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

@@ -294,13 +294,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	public TransportProperties getRemoteProperties(ContactId c, TransportId t)
 			throws DbException {
 		return db.transactionWithResult(true, txn ->
-				getRemoteProperties(txn, c, t));
-	}
-
-	@Override
-	public TransportProperties getRemoteProperties(Transaction txn,
-			ContactId c, TransportId t) throws DbException {
-		return getRemoteProperties(txn, db.getContact(txn, c), t);
+				getRemoteProperties(txn, db.getContact(txn, c), t));
 	}
 
 	@Override

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.TestUtils;

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.TestUtils;

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AuthenticatedCipher;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.util.StringUtils;

briar-android/build.gradle

@@ -22,9 +22,9 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10216
-		versionName "1.2.16"
-		applicationId "org.briarproject.briar.socialbackup"
+		versionCode 10214
+		versionName "1.2.14"
+		applicationId "org.briarproject.briar.android"
 
 		vectorDrawables.useSupportLibrary = true
 		buildConfigField "String", "GitHash",
@@ -101,7 +101,6 @@ dependencies {
 	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 	implementation 'com.google.android.material:material:1.2.1'
 	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0-rc03'
-	implementation 'org.magmacollective.darkcrystal:dark-crystal-secret-sharing-wrapper:1.1.0'
 
 	implementation 'info.guardianproject.panic:panic:1.0'
 	implementation 'info.guardianproject.trustedintents:trustedintents:0.2'

briar-android/proguard-rules.txt

@@ -40,5 +40,3 @@
 
 # Dependency injection annotations, needed for UI tests on older API levels
 -keep class javax.inject.**
-
--keep class com.sun.jna.** { *; }

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name" translatable="false">Briar SB Debug</string>
-	<string name="app_package" translatable="false">org.briarproject.briar.socialbackup.debug</string>
+	<string name="app_name" translatable="false">Briar Debug</string>
+	<string name="app_package" translatable="false">org.briarproject.briar.android.debug</string>
 </resources>

briar-android/src/main/AndroidManifest.xml

@@ -117,58 +117,9 @@
 
 		<activity
 			android:name="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
+			android:exported="false"
 			android:launchMode="singleTask"
-			android:theme="@style/BriarTheme.NoActionBar">
-			<intent-filter android:label="@string/add_contact_remotely_title_case">
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-
-				<data android:scheme="briar" />
-			</intent-filter>
-			<intent-filter android:label="@string/add_contact_remotely_title_case">
-				<action android:name="android.intent.action.SEND" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:mimeType="text/plain" />
-			</intent-filter>
-		</activity>
-
-		<activity
-			android:name="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:label="@string/activity_name_distributed_backup"
-			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
-		</activity>
-
-		<activity
-			android:name="org.briarproject.briar.android.socialbackup.RecoverActivity"
-			android:label="@string/activity_name_recovery"
-			android:parentActivityName="org.briarproject.briar.android.account.NewOrRecoverActivity">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" />
-		</activity>
-
-		<activity
-			android:name="org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity"
-			android:label="@string/activity_name_custodian_help_recovery"
-			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
-		</activity>
+			android:theme="@style/BriarTheme.NoActionBar" />
 
 		<activity
 			android:name="org.briarproject.briar.android.conversation.ConversationActivity"
@@ -476,8 +427,27 @@
 		<activity
 			android:name=".android.contact.add.remote.AddContactActivity"
 			android:label="@string/add_contact_remotely_title_case"
+			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
 			android:theme="@style/BriarTheme"
-			android:windowSoftInputMode="adjustResize|stateHidden" />
+			android:windowSoftInputMode="adjustResize|stateHidden">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
+
+			<intent-filter android:label="@string/add_contact_remotely_title_case">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="briar" />
+			</intent-filter>
+			<intent-filter android:label="@string/add_contact_remotely_title_case">
+				<action android:name="android.intent.action.SEND" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:mimeType="text/plain" />
+			</intent-filter>
+		</activity>
 
 		<activity
 			android:name=".android.contact.add.remote.PendingContactListActivity"

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

@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.contact.ContactExchangeManager;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
-import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.EventBus;
@@ -60,9 +59,7 @@ import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
-import org.briarproject.briar.api.socialbackup.SocialBackupManager;
 import org.briarproject.briar.api.test.TestDataCreator;
-import org.briarproject.briar.socialbackup.SocialBackupManagerImpl_Factory;
 
 import java.util.concurrent.Executor;
 
@@ -187,10 +184,6 @@ public interface AndroidComponent
 
 	Thread.UncaughtExceptionHandler exceptionHandler();
 
-	SocialBackupManager socialBackupManager();
-
-    DatabaseComponent databaseComponent();
-
 	void inject(SignInReminderReceiver briarService);
 
 	void inject(BriarService briarService);

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

@@ -48,7 +48,6 @@ import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
 import org.briarproject.briar.api.test.TestAvatarCreator;
-import org.briarproject.briar.socialbackup.AndroidDarkCrystalModule;
 
 import java.io.File;
 import java.security.GeneralSecurityException;
@@ -83,7 +82,6 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		SettingsModule.class,
 		DevReportModule.class,
 		ContactListModule.class,
-		AndroidDarkCrystalModule.class,
 		// below need to be within same scope as ViewModelProvider.Factory
 		ForumModule.class,
 		GroupListModule.class,

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

@@ -37,7 +37,7 @@ import javax.inject.Inject;
 import androidx.core.app.NotificationCompat;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
-import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.content.Intent.ACTION_SHUTDOWN;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
@@ -46,7 +46,6 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
 import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Process.myPid;
 import static androidx.core.app.NotificationCompat.VISIBILITY_SECRET;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
@@ -57,10 +56,8 @@ import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_ID;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_OLD_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.LockManager.ACTION_LOCK;
-import static org.briarproject.briar.api.android.LockManager.EXTRA_PID;
 
 public class BriarService extends Service {
 
@@ -123,17 +120,11 @@ public class BriarService extends Service {
 			if (SDK_INT >= 26) {
 				NotificationManager nm = (NotificationManager)
 						requireNonNull(getSystemService(NOTIFICATION_SERVICE));
-				// Delete the old notification channel, which had
-				// IMPORTANCE_NONE and showed a badge
-				nm.deleteNotificationChannel(ONGOING_CHANNEL_OLD_ID);
-				// Use IMPORTANCE_LOW so the system doesn't show its own
-				// notification on API 26-27
 				NotificationChannel ongoingChannel = new NotificationChannel(
 						ONGOING_CHANNEL_ID,
 						getString(R.string.ongoing_notification_title),
-						IMPORTANCE_LOW);
+						IMPORTANCE_NONE);
 				ongoingChannel.setLockscreenVisibility(VISIBILITY_SECRET);
-				ongoingChannel.setShowBadge(false);
 				nm.createNotificationChannel(ongoingChannel);
 				NotificationChannel failureChannel = new NotificationChannel(
 						FAILURE_CHANNEL_ID,
@@ -212,12 +203,7 @@ public class BriarService extends Service {
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		if (ACTION_LOCK.equals(intent.getAction())) {
-			int pid = intent.getIntExtra(EXTRA_PID, -1);
-			if (pid == myPid()) lockManager.setLocked(true);
-			else if (LOG.isLoggable(WARNING)) {
-				LOG.warning("Tried to lock process " + pid + " but this is " +
-						myPid());
-			}
+			lockManager.setLocked(true);
 		}
 		return START_NOT_STICKY; // Don't restart automatically if killed
 	}

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

@@ -32,10 +32,8 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import static android.app.AlarmManager.ELAPSED_REALTIME;
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.app.PendingIntent.getService;
 import static android.content.Context.ALARM_SERVICE;
-import static android.os.Process.myPid;
 import static android.os.SystemClock.elapsedRealtime;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.WARNING;
@@ -77,25 +75,23 @@ public class LockManagerImpl implements LockManager, Service, EventListener {
 	LockManagerImpl(Application app, SettingsManager settingsManager,
 			AndroidNotificationManager notificationManager,
 			@DatabaseExecutor Executor dbExecutor) {
-		appContext = app.getApplicationContext();
+		this.appContext = app.getApplicationContext();
 		this.settingsManager = settingsManager;
 		this.notificationManager = notificationManager;
 		this.dbExecutor = dbExecutor;
-		alarmManager =
+		this.alarmManager =
 				(AlarmManager) appContext.getSystemService(ALARM_SERVICE);
 		Intent i =
 				new Intent(ACTION_LOCK, null, appContext, BriarService.class);
-		i.putExtra(EXTRA_PID, myPid());
-		// When not using FLAG_UPDATE_CURRENT, the intent might have no extras
-		lockIntent = getService(appContext, 0, i, FLAG_UPDATE_CURRENT);
-		timeoutNever = Integer.parseInt(
+		this.lockIntent = getService(appContext, 0, i, 0);
+		this.timeoutNever = Integer.valueOf(
 				appContext.getString(R.string.pref_lock_timeout_value_never));
-		timeoutDefault = Integer.parseInt(
+		this.timeoutDefault = Integer.valueOf(
 				appContext.getString(R.string.pref_lock_timeout_value_default));
-		timeoutMinutes = timeoutNever;
+		this.timeoutMinutes = timeoutNever;
 
 		// setting this in the constructor makes #getValue() @NonNull
-		lockable.setValue(false);
+		this.lockable.setValue(false);
 	}
 
 	@Override
@@ -152,7 +148,7 @@ public class LockManagerImpl implements LockManager, Service, EventListener {
 		boolean oldValue = lockable.getValue();
 		boolean newValue = hasScreenLock(appContext) && lockableSetting;
 		if (oldValue != newValue) {
-			lockable.setValue(newValue);
+			this.lockable.setValue(newValue);
 		}
 	}
 

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

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

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

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

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

@@ -1,8 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import androidx.annotation.UiThread;
-
-public interface RecoverAccountListener {
-	@UiThread
-	void recoverAccountChosen();
-}

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

@@ -1,8 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import androidx.annotation.UiThread;
-
-public interface SetupNewAccountChosenListener {
-	@UiThread
-	void setupNewAccountChosen();
-}

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

@@ -77,7 +77,7 @@ public class UnlockActivity extends BaseActivity {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode,
-			@Nullable Intent data) {
+			Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		if (requestCode == REQUEST_KEYGUARD_UNLOCK) {
 			if (resultCode == RESULT_OK) unlock();

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

@@ -2,13 +2,10 @@ package org.briarproject.briar.android.activity;
 
 import android.app.Activity;
 
-import org.briarproject.bramble.api.db.DatabaseComponent;
 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,32 +77,20 @@ import org.briarproject.briar.android.sharing.ShareBlogFragment;
 import org.briarproject.briar.android.sharing.ShareForumActivity;
 import org.briarproject.briar.android.sharing.ShareForumFragment;
 import org.briarproject.briar.android.sharing.SharingModule;
-//import org.briarproject.briar.android.socialbackup.CustodianDisplayFragment;
-import org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity;
-import org.briarproject.briar.android.socialbackup.CustodianSelectorFragment;
-import org.briarproject.briar.android.socialbackup.DistributedBackupActivity;
-import org.briarproject.briar.android.socialbackup.ExistingBackupFragment;
-import org.briarproject.briar.android.socialbackup.OwnerRecoveryModeExplainerFragment;
-import org.briarproject.briar.android.socialbackup.RecoverActivity;
-import org.briarproject.briar.android.socialbackup.ShardQrCodeFragment;
-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.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
 
 import dagger.Component;
 
 @ActivityScope
-@Component(modules ={
+@Component(modules = {
 		ActivityModule.class,
 		BlogModule.class,
 		CreateGroupModule.class,
 		GroupInvitationModule.class,
 		GroupMemberModule.class,
 		GroupRevealModule.class,
-		SharingModule.SharingLegacyModule.class,
-		CreateBackupModule.class
+		SharingModule.SharingLegacyModule.class
 }, dependencies = AndroidComponent.class)
 public interface ActivityComponent {
 
@@ -197,10 +182,6 @@ public interface ActivityComponent {
 
 	void inject(CrashReportActivity crashReportActivity);
 
-	void inject(NewOrRecoverActivity newOrRecoverActivity);
-
-	void inject(CustodianHelpRecoverActivity custodianHelpRecoverActivity);
-
 	// Fragments
 
 	void inject(AuthorNameFragment fragment);
@@ -257,23 +238,4 @@ public interface ActivityComponent {
 
 	void inject(ConfirmAvatarDialogFragment fragment);
 
-	void inject(ThresholdSelectorFragment thresholdSelectorFragment);
-
-	void inject(ShardQrCodeFragment shardQrCodeFragment);
-
-	void inject(DistributedBackupActivity distributedBackupActivity);
-
-	void inject(RecoverActivity recoverActivity);
-
-	void inject(DatabaseComponent databaseComponent);
-
-	void inject(CustodianSelectorFragment custodianSelectorFragment);
-
-	void inject(ShardsSentFragment shardsSentFragment);
-
-	void inject(OwnerRecoveryModeExplainerFragment ownerRecoveryModeExplainerFragment);
-
-	void inject(ExistingBackupFragment existingBackupFragment);
-
-	void inject(NewOrRecoverFragment newOrRecoverFragment);
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java

@@ -11,6 +11,7 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -102,4 +103,11 @@ public class AddContactActivity extends BriarActivity implements
 		return super.onOptionsItemSelected(item);
 	}
 
+	@Override
+	public void onBackPressed() {
+		Intent i = new Intent(this, NavDrawerActivity.class);
+		startActivity(i);
+		finish();
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java

@@ -56,11 +56,8 @@ public abstract class BaseContactSelectorFragment<I extends SelectableContactIte
 
 		Bundle args = requireArguments();
 		byte[] b = args.getByteArray(GROUP_ID);
-//		if (b == null) throw new IllegalStateException("No GroupId");
-		// TODO find what the groupId should be when selecting custodians
-		if (b != null) {
-			groupId = new GroupId(b);
-		}
+		if (b == null) throw new IllegalStateException("No GroupId");
+		groupId = new GroupId(b);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java

@@ -18,7 +18,7 @@ public abstract class ContactSelectorFragment extends
 
 	public static final String TAG = ContactSelectorFragment.class.getName();
 
-	protected Menu menu;
+	private Menu menu;
 
 	@Override
 	protected ContactSelectorAdapter getAdapter(Context context,

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

@@ -52,7 +52,6 @@ import org.briarproject.briar.android.conversation.ConversationVisitor.TextCache
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
-import org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.android.view.ImagePreview;
@@ -397,12 +396,6 @@ public class ConversationActivity extends BriarActivity
 			case R.id.action_social_remove_person:
 				askToRemoveContact();
 				return true;
-			case R.id.action_help_recover_account:
-				if (contactId == null) return false;
-				Intent i = new Intent(this, CustodianHelpRecoverActivity.class);
-				i.putExtra(CONTACT_ID, contactId.getInt());
-				startActivity(i);
-				return true;
 			default:
 				return super.onOptionsItemSelected(item);
 		}

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

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.conversation;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.conversation.ConversationRequest;
 import org.briarproject.briar.api.conversation.ConversationResponse;
-import org.briarproject.briar.api.socialbackup.ShardMessageHeader;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
@@ -31,13 +30,6 @@ class ConversationNoticeItem extends ConversationItem {
 		this.msgText = null;
 	}
 
-	ConversationNoticeItem(@LayoutRes int layoutRes, String text,
-			ShardMessageHeader r) {
-		super(layoutRes, r);
-		this.text = text;
-		this.msgText = null;
-	}
-
 	@Nullable
 	String getMsgText() {
 		return msgText;

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

@@ -16,7 +16,6 @@ import org.briarproject.briar.api.introduction.IntroductionResponse;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
-import org.briarproject.briar.api.socialbackup.ShardMessageHeader;
 
 import java.util.List;
 
@@ -293,19 +292,6 @@ class ConversationVisitor implements
 		}
 	}
 
-	@Override
-	public ConversationItem visitShardMessage(ShardMessageHeader r) {
-		if (r.isLocal()) {
-			String text = ctx.getString(R.string.social_backup_shard_sent);
-			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text, r);
-		} else {
-			String text = ctx.getString(R.string.social_backup_shard_received);
-			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_in, text, r);
-		}
-	}
-
 	interface TextCache {
 		@Nullable
 		String getText(MessageId m);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java

@@ -2,7 +2,7 @@ package org.briarproject.briar.android.keyagreement;
 
 import java.io.IOException;
 
-public class CameraException extends IOException {
+class CameraException extends IOException {
 
 	CameraException(String message) {
 		super(message);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java

@@ -30,7 +30,7 @@ import static java.util.logging.Level.WARNING;
 @SuppressWarnings("deprecation")
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
+class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 
 	private static final Logger LOG =
 			Logger.getLogger(QrCodeDecoder.class.getName());
@@ -41,7 +41,7 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	private Camera camera = null;
 	private int cameraIndex = 0;
 
-	public QrCodeDecoder(ResultCallback callback) {
+	QrCodeDecoder(ResultCallback callback) {
 		this.callback = callback;
 	}
 
@@ -142,7 +142,7 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	}
 
 	@NotNullByDefault
-	public interface ResultCallback {
+	interface ResultCallback {
 
 		void handleResult(Result result);
 	}

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeUtils.java

@@ -21,13 +21,13 @@ import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @NotNullByDefault
-public class QrCodeUtils {
+class QrCodeUtils {
 
 	private static final Logger LOG =
 			Logger.getLogger(QrCodeUtils.class.getName());
 
 	@Nullable
-	public static Bitmap createQrCode(DisplayMetrics dm, String input) {
+	static Bitmap createQrCode(DisplayMetrics dm, String input) {
 		int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels);
 		try {
 			// Generate QR code

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

@@ -14,6 +14,7 @@ import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_R
 
 class IntentRouter {
 
+	// TODO
 	static void handleExternalIntent(Context ctx, Intent i) {
 		String action = i.getAction();
 		// add remote contact with clicked briar:// link

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

@@ -101,8 +101,6 @@ public class NavDrawerActivity extends BriarActivity implements
 			Uri.parse("briar-content://org.briarproject.briar/blog");
 	public static Uri CONTACT_ADDED_URI =
 			Uri.parse("briar-content://org.briarproject.briar/contact/added");
-	public static Uri SIGN_OUT_URI =
-			Uri.parse("briar-content://org.briarproject.briar/sign-out");
 
 	private final List<Transport> transports = new ArrayList<>(3);
 	private final MutableLiveData<ImageView> torIcon = new MutableLiveData<>();
@@ -236,8 +234,6 @@ public class NavDrawerActivity extends BriarActivity implements
 			startFragment(ForumListFragment.newInstance(), R.id.nav_btn_forums);
 		} else if (BLOG_URI.equals(uri)) {
 			startFragment(FeedFragment.newInstance(), R.id.nav_btn_blogs);
-		} else if (SIGN_OUT_URI.equals(uri)) {
-			signOut(false, false);
 		}
 	}
 

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

@@ -46,11 +46,16 @@ public class SettingsActivity extends BriarActivity {
 
 		setContentView(R.layout.activity_settings);
 
-		if (featureFlags.shouldEnableProfilePictures()) {
-			ViewModelProvider provider =
-					new ViewModelProvider(this, viewModelFactory);
-			settingsViewModel = provider.get(SettingsViewModel.class);
+		ViewModelProvider provider =
+				new ViewModelProvider(this, viewModelFactory);
+		settingsViewModel = provider.get(SettingsViewModel.class);
 
+		settingsViewModel.getLanguageChange().observeEvent(this, b -> {
+			signOut(false, false);
+			finishAffinity();
+		});
+
+		if (featureFlags.shouldEnableProfilePictures()) {
 			TextView textViewUserName = findViewById(R.id.username);
 			CircleImageView imageViewAvatar =
 					findViewById(R.id.avatarImage);

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

@@ -45,6 +45,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
 import androidx.core.text.TextUtilsCompat;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
@@ -54,7 +55,6 @@ import androidx.preference.SwitchPreference;
 
 import static android.app.Activity.RESULT_OK;
 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.media.RingtoneManager.ACTION_RINGTONE_PICKER;
 import static android.media.RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI;
@@ -89,7 +89,6 @@ import static org.briarproject.bramble.util.LogUtils.now;
 import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
 import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_RINGTONE;
-import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.SIGN_OUT_URI;
 import static org.briarproject.briar.android.util.UiUtils.getCountryDisplayName;
 import static org.briarproject.briar.android.util.UiUtils.hasScreenLock;
 import static org.briarproject.briar.android.util.UiUtils.triggerFeedback;
@@ -165,12 +164,19 @@ public class SettingsFragment extends PreferenceFragmentCompat
 	LocationUtils locationUtils;
 	@Inject
 	CircumventionProvider circumventionProvider;
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private SettingsViewModel viewModel;
 
 	@Override
 	public void onAttach(Context context) {
 		super.onAttach(context);
 		listener = (SettingsActivity) context;
 		listener.getActivityComponent().inject(this);
+
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(SettingsViewModel.class);
 	}
 
 	@Override
@@ -638,11 +644,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		builder.setPositiveButton(R.string.sign_out_button,
 				(dialogInterface, i) -> {
 					language.setValue(newValue);
-					Intent intent = new Intent(getContext(), ENTRY_ACTIVITY);
-					intent.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-					intent.setData(SIGN_OUT_URI);
-					requireActivity().startActivity(intent);
-					requireActivity().finish();
+					viewModel.languageChanged();
 				});
 		builder.setNegativeButton(R.string.cancel, null);
 		builder.setCancelable(false);

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

@@ -56,6 +56,9 @@ class SettingsViewModel extends AndroidViewModel {
 	private final MutableLiveEvent<Boolean> setAvatarFailed =
 			new MutableLiveEvent<>();
 
+	private final MutableLiveEvent<Boolean> languageChanged =
+			new MutableLiveEvent<>();
+
 	@Inject
 	SettingsViewModel(Application application,
 			IdentityManager identityManager,
@@ -83,6 +86,10 @@ class SettingsViewModel extends AndroidViewModel {
 		return setAvatarFailed;
 	}
 
+	LiveEvent<Boolean> getLanguageChange() {
+		return languageChanged;
+	}
+
 	private void loadOwnIdentityInfo() {
 		dbExecutor.execute(() -> {
 			try {
@@ -131,4 +138,8 @@ class SettingsViewModel extends AndroidViewModel {
 		});
 	}
 
+	void languageChanged() {
+		languageChanged.setEvent(true);
+	}
+
 }

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

@@ -1,67 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import android.content.Intent;
-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.fragment.BaseFragment;
-import org.briarproject.briar.api.socialbackup.SocialBackupManager;
-
-import javax.inject.Inject;
-
-import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
-
-public class CustodianHelpRecoverActivity extends BriarActivity implements
-		BaseFragment.BaseFragmentListener, CustodianScanQrButtonListener {
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Inject
-	public SocialBackupManager socialBackupManager;
-
-	@Inject
-	public DatabaseComponent db;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_recover); // TODO change this
-
-		Intent intent = getIntent();
-		int id = intent.getIntExtra(CONTACT_ID, -1);
-		if (id == -1) throw new IllegalStateException("No ContactId");
-		ContactId contactId = new ContactId(id);
-
-		// check if we have a shard for this secret owner
-		try {
-			db.transaction(false, txn -> {
-				if (!socialBackupManager.amCustodian(txn, contactId)) {
-					throw new DbException();
-				}
-				CustodianRecoveryModeExplainerFragment fragment =
-						new CustodianRecoveryModeExplainerFragment();
-				showInitialFragment(fragment);
-			});
-		} catch (DbException e) {
-			// TODO improve this
-			Toast.makeText(this,
-					"You do not hold a backup shard from this contact",
-					Toast.LENGTH_SHORT).show();
-			finish();
-		}
-	}
-
-	@Override
-	public void scanQrButtonClicked() {
-		// TODO scan qr code
-		finish();
-	}
-}

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

@@ -1,51 +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.android.fragment.BaseFragment;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import org.briarproject.briar.R;
-
-public class CustodianRecoveryModeExplainerFragment extends BaseFragment {
-
-	protected CustodianScanQrButtonListener listener;
-
-	public static final String TAG = CustodianRecoveryModeExplainerFragment.class.getName();
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		requireActivity().setTitle(R.string.title_help_recover);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable
-			ViewGroup container, @Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_recovery_custodian_explainer,
-				container, false);
-
-		Button button = view.findViewById(R.id.button);
-		button.setOnClickListener(e -> listener.scanQrButtonClicked());
-		return view;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		listener = (CustodianScanQrButtonListener) context;
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-}
-

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

@@ -1,8 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import androidx.annotation.UiThread;
-
-public interface CustodianScanQrButtonListener {
-	@UiThread
-	void scanQrButtonClicked();
-}

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

@@ -1,93 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.socialbackup.creation.CreateBackupController;
-import org.briarproject.briar.android.contactselection.BaseContactSelectorAdapter;
-import org.briarproject.briar.android.contactselection.ContactSelectorController;
-import org.briarproject.briar.android.contactselection.ContactSelectorFragment;
-import org.briarproject.briar.android.contactselection.SelectableContactItem;
-import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-
-import static java.util.Objects.requireNonNull;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class CustodianSelectorFragment extends ContactSelectorFragment {
-
-	public static final String TAG = CustodianSelectorFragment.class.getName();
-
-	@Inject
-	CreateBackupController controller;
-
-	public static CustodianSelectorFragment newInstance() {
-		Bundle args = new Bundle();
-
-		CustodianSelectorFragment fragment = new CustodianSelectorFragment();
-		fragment.setArguments(args);
-
-		return fragment;
-	}
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		requireActivity().setTitle(R.string.title_select_custodians);
-	}
-
-	@Override
-	protected ContactSelectorController<SelectableContactItem> getController() {
-		return controller;
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Override
-	protected void onSelectionChanged() {
-		super.onSelectionChanged();
-		if (menu == null) return;
-		MenuItem item = menu.findItem(R.id.action_contacts_selected);
-		if (item == null) return;
-
-		BaseContactSelectorAdapter a = adapter;
-		selectedContacts = a.getSelectedContactIds();
-
-		int n = selectedContacts.size();
-		int min = 2;
-		boolean enough = n >= min;
-
-		item.setVisible(enough);
-		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();
-		}
-	}
-
-}

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

@@ -1,56 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.api.socialbackup.Shard;
-import org.briarproject.briar.api.socialbackup.DarkCrystal;
-import org.magmacollective.darkcrystal.secretsharingwrapper.SecretSharingWrapper;
-
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-import javax.inject.Inject;
-
-import dagger.Provides;
-
-import static org.briarproject.briar.socialbackup.SocialBackupConstants.SECRET_ID_BYTES;
-
-@NotNullByDefault
-public class DarkCrystalImpl implements DarkCrystal {
-
-    @Inject
-	DarkCrystalImpl() {
-	}
-
-	@Override
-	public List<Shard> createShards(SecretKey secret, int numShards,
-			int threshold) {
-		Random random = new Random();
-		byte[] secretId = new byte[SECRET_ID_BYTES];
-		random.nextBytes(secretId);
-		List<byte[]> shardsBytes = SecretSharingWrapper.share(secret.getBytes(), numShards, threshold);
-		List<Shard> shards = new ArrayList<>(numShards);
-		for (byte[] shardBytes : shardsBytes) {
-			shards.add(new Shard(secretId, shardBytes));
-		}
-		return shards;
-	}
-
-	@Override
-	public SecretKey combineShards(List<Shard> shards) throws
-			GeneralSecurityException {
-		// Check each shard has the same secret Id
-		byte[] secretId = shards.get(0).getSecretId();
-		for (Shard shard : shards) {
-			if (!Arrays.equals(shard.getSecretId(), secretId)) throw new GeneralSecurityException();
-		}
-        List<byte[]> shardsBytes = new ArrayList<>(shards.size());
-		for (Shard shard : shards) {
-			shardsBytes.add(shard.getShard());
-		}
-		byte[] secretBytes = SecretSharingWrapper.combine(shardsBytes);
-		return new SecretKey(secretBytes);
-	}
-}

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

@@ -1,91 +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) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void shardsSentDismissed() {
-		finish();
-	}
-}

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

@@ -1,85 +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.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.fragment.BaseFragment;
-import org.briarproject.briar.api.socialbackup.BackupMetadata;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public class ExistingBackupFragment extends BaseFragment {
-
-	private static final String THRESHOLD = "threshold";
-	private static final String CUSTODIANS = "custodians";
-	public static final String TAG = ExistingBackupFragment.class.getName();
-
-	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;
-	}
-	@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_existing_backup,
-				container, false);
-		Bundle args = requireArguments();
-        ArrayList<String> custodianNames = args.getStringArrayList(CUSTODIANS);
-        String custodianNamesString = "";
-        for (String custodianName : custodianNames) {
-          	custodianNamesString += custodianName + ", ";
-        }
-        TextView textViewThreshold = view.findViewById(R.id.textViewThreshold);
-        textViewThreshold.setText(String.format("%d of %d contacts needed to restore account", args.getInt(THRESHOLD), custodianNames.size()));
-        TextView textViewCustodians = view.findViewById(R.id.textViewCustodians);
-        textViewCustodians.setText(custodianNamesString);
-		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);
-	}
-
-}

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

@@ -1,8 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import androidx.annotation.UiThread;
-
-public interface ExplainerDismissedListener {
-	@UiThread
-	void explainerDismissed();
-}

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

@@ -1,58 +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;
-
-public class OwnerRecoveryModeExplainerFragment extends BaseFragment {
-
-	protected ExplainerDismissedListener listener;
-	public static final String TAG =
-			OwnerRecoveryModeExplainerFragment.class.getName();
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		requireActivity().setTitle(R.string.title_recovery_mode);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_recovery_owner_explainer,
-				container, false);
-		Button button = view.findViewById(R.id.beginButton);
-		button.setOnClickListener(e -> listener.explainerDismissed());
-
-		return view;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		listener = (ExplainerDismissedListener) context;
-	}
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-}

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

@@ -1,73 +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 android.widget.TextView;
-
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.fragment.BaseFragment;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public class OwnerRecoveryModeMainFragment extends BaseFragment {
-
-	protected ScanQrButtonListener listener;
-
-	public static final String NUM_RECOVERED = "num_recovered";
-
-	public static final String TAG =
-			OwnerRecoveryModeMainFragment.class.getName();
-
-	public static OwnerRecoveryModeMainFragment newInstance(int numRecovered) {
-		Bundle args = new Bundle();
-		args.putInt(NUM_RECOVERED, numRecovered);
-		OwnerRecoveryModeMainFragment fragment =
-				new OwnerRecoveryModeMainFragment();
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	private int numShards;
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		requireActivity().setTitle(R.string.title_recovery_mode);
-
-		Bundle args = requireArguments();
-		numShards = args.getInt(NUM_RECOVERED);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_recovery_owner_main,
-				container, false);
-
-		TextView textViewCount = view.findViewById(R.id.textViewShardCount);
-		textViewCount.setText(String.format("%d", numShards));
-
-		Button button = view.findViewById(R.id.button);
-		button.setOnClickListener(e -> listener.scanQrButtonClicked());
-		return view;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		listener = (ScanQrButtonListener) context;
-	}
-
-}

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

@@ -1,179 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import android.os.Bundle;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
-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 javax.annotation.Nullable;
-
-import androidx.annotation.UiThread;
-import androidx.core.app.ActivityCompat;
-
-import static android.Manifest.permission.CAMERA;
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA_LOCATION;
-
-public class RecoverActivity extends BaseActivity implements
-		BaseFragment.BaseFragmentListener, ExplainerDismissedListener,
-		ScanQrButtonListener, ShardQrCodeFragment.ShardQrCodeEventListener {
-
-	@Override
-	public void keyAgreementFailed() {
-
-	}
-
-	@Nullable
-	@Override
-	public String keyAgreementWaiting() {
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public String keyAgreementStarted() {
-		return null;
-	}
-
-	@Override
-	public void keyAgreementAborted(boolean remoteAborted) {
-
-	}
-
-	@Nullable
-	@Override
-	public String keyAgreementFinished(KeyAgreementResult result) {
-		return null;
-	}
-
-	private enum Permission {
-		UNKNOWN, GRANTED, SHOW_RATIONALE, PERMANENTLY_DENIED
-	}
-
-	private Permission cameraPermission = Permission.UNKNOWN;
-
-
-	private int numRecovered;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_recover);
-
-		numRecovered = 0; // TODO - retrieve this from somewhere
-
-		// only show the explainer if we have no shards
-		if (numRecovered == 0) {
-			OwnerRecoveryModeExplainerFragment fragment =
-					new OwnerRecoveryModeExplainerFragment();
-			showInitialFragment(fragment);
-		} else {
-			OwnerRecoveryModeMainFragment fragment =
-					OwnerRecoveryModeMainFragment.newInstance(numRecovered);
-			showInitialFragment(fragment);
-		}
-	}
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public void explainerDismissed() {
-		OwnerRecoveryModeMainFragment fragment =
-				OwnerRecoveryModeMainFragment.newInstance(numRecovered);
-		showNextFragment(fragment);
-	}
-
-	@Override
-	public void scanQrButtonClicked() {
-		if (checkPermissions()) showQrCodeFragment();
-	}
-
-
-	private void showQrCodeFragment() {
-		ShardQrCodeFragment f = ShardQrCodeFragment.newInstance();
-		showNextFragment(f);
-	}
-
-	private void requestPermissions() {
-		String[] permissions = new String[] {CAMERA};
-		ActivityCompat.requestPermissions(this, permissions,
-				REQUEST_PERMISSION_CAMERA_LOCATION);
-	}
-
-	@Override
-	@UiThread
-	public void onRequestPermissionsResult(int requestCode,
-			String[] permissions, int[] grantResults) {
-		if (requestCode != REQUEST_PERMISSION_CAMERA_LOCATION)
-			throw new AssertionError();
-		if (gotPermission(CAMERA, permissions, grantResults)) {
-			cameraPermission = Permission.GRANTED;
-		} else if (shouldShowRationale(CAMERA)) {
-			cameraPermission = Permission.SHOW_RATIONALE;
-		} else {
-			cameraPermission = Permission.PERMANENTLY_DENIED;
-		}
-		// If a permission dialog has been shown, showing the QR code fragment
-		// on this call path would cause a crash due to
-		// https://code.google.com/p/android/issues/detail?id=190966.
-		// In that case the isResumed flag prevents the fragment from being
-		// shown here, and showQrCodeFragmentIfAllowed() will be called again
-		// from onPostResume().
-		if (checkPermissions()) showQrCodeFragment();
-	}
-
-	private boolean gotPermission(String permission, String[] permissions,
-			int[] grantResults) {
-		for (int i = 0; i < permissions.length; i++) {
-			if (permission.equals(permissions[i]))
-				return grantResults[i] == PERMISSION_GRANTED;
-		}
-		return false;
-	}
-
-	private boolean shouldShowRationale(String permission) {
-		return ActivityCompat.shouldShowRequestPermissionRationale(this,
-				permission);
-	}
-
-	private boolean checkPermissions() {
-		if (areEssentialPermissionsGranted()) return true;
-		// If an essential permission has been permanently denied, ask the
-		// user to change the setting
-		if (cameraPermission == Permission.PERMANENTLY_DENIED) {
-			Toast.makeText(this,
-					"camera permission is denied",
-					Toast.LENGTH_SHORT).show();
-//			showDenialDialog(R.string.permission_camera_title,
-//					R.string.permission_camera_denied_body);
-			return false;
-		}
-		if (cameraPermission == Permission.SHOW_RATIONALE) {
-//			showRationale(R.string.permission_camera_title,
-//					R.string.permission_camera_request_body);
-			Toast.makeText(this,
-					"camera permission - show rationale",
-					Toast.LENGTH_SHORT).show();
-		} else {
-			requestPermissions();
-		}
-		return false;
-	}
-
-	@Override
-	@Deprecated
-	public void runOnDbThread(Runnable runnable) {
-		throw new RuntimeException("Don't use this deprecated method here.");
-	}
-
-	private boolean areEssentialPermissionsGranted() {
-		return cameraPermission == Permission.GRANTED;
-	}
-}

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

@@ -1,8 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import androidx.annotation.UiThread;
-
-public interface ScanQrButtonListener {
-	@UiThread
-	void scanQrButtonClicked();
-}

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

@@ -1,381 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.zxing.Result;
-
-import org.briarproject.bramble.api.UnsupportedVersionException;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementTask;
-import org.briarproject.bramble.api.keyagreement.Payload;
-import org.briarproject.bramble.api.keyagreement.PayloadEncoder;
-import org.briarproject.bramble.api.keyagreement.PayloadParser;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementAbortedEvent;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementFailedEvent;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementFinishedEvent;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStartedEvent;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementWaitingEvent;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-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.BaseEventFragment;
-import org.briarproject.briar.android.keyagreement.CameraException;
-import org.briarproject.briar.android.keyagreement.CameraView;
-import org.briarproject.briar.android.keyagreement.ContactExchangeErrorFragment;
-import org.briarproject.briar.android.keyagreement.QrCodeDecoder;
-import org.briarproject.briar.android.keyagreement.QrCodeUtils;
-import org.briarproject.briar.android.view.QrCodeView;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-import androidx.annotation.UiThread;
-
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.widget.LinearLayout.HORIZONTAL;
-import static android.widget.Toast.LENGTH_LONG;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class ShardQrCodeFragment extends BaseEventFragment
-		implements QrCodeDecoder.ResultCallback, QrCodeView.FullscreenListener {
-
-	static final String TAG = org.briarproject.briar.android.keyagreement.KeyAgreementFragment.class.getName();
-
-	private static final Logger LOG = Logger.getLogger(TAG);
-	@SuppressWarnings("CharsetObjectCanBeUsed") // Requires minSdkVersion >= 19
-	private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
-
-	@Inject
-	Provider<KeyAgreementTask> keyAgreementTaskProvider;
-	@Inject
-	PayloadEncoder payloadEncoder;
-	@Inject
-	PayloadParser payloadParser;
-	@Inject
-	@IoExecutor
-	Executor ioExecutor;
-	@Inject
-	EventBus eventBus;
-
-	private CameraView cameraView;
-	private LinearLayout cameraOverlay;
-	private View statusView;
-	private QrCodeView qrCodeView;
-	private TextView status;
-
-	private boolean gotRemotePayload;
-	private volatile boolean gotLocalPayload;
-	private KeyAgreementTask task;
-	private ShardQrCodeEventListener
-			listener;
-
-	public static ShardQrCodeFragment newInstance() {
-		Bundle args = new Bundle();
-		ShardQrCodeFragment
-				fragment = new ShardQrCodeFragment();
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		listener = (ShardQrCodeEventListener) context;
-	}
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		return inflater.inflate(R.layout.fragment_keyagreement_qr, container,
-				false);
-	}
-
-	@Override
-	public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-		cameraView = view.findViewById(R.id.camera_view);
-		cameraOverlay = view.findViewById(R.id.camera_overlay);
-		statusView = view.findViewById(R.id.status_container);
-		status = view.findViewById(R.id.connect_status);
-		qrCodeView = view.findViewById(R.id.qr_code_view);
-		qrCodeView.setFullscreenListener(this);
-	}
-
-	@Override
-	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		requireActivity().setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR);
-		cameraView.setPreviewConsumer(new QrCodeDecoder(this));
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		try {
-			cameraView.start();
-		} catch (CameraException e) {
-			logCameraExceptionAndFinish(e);
-		}
-		startListening();
-	}
-
-	@Override
-	public void setFullscreen(boolean fullscreen) {
-		LinearLayout.LayoutParams statusParams, qrCodeParams;
-		if (fullscreen) {
-			// Grow the QR code view to fill its parent
-			statusParams = new LinearLayout.LayoutParams(0, 0, 0f);
-			qrCodeParams = new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 1f);
-		} else {
-			// Shrink the QR code view to fill half its parent
-			if (cameraOverlay.getOrientation() == HORIZONTAL) {
-				statusParams = new LinearLayout.LayoutParams(0, MATCH_PARENT, 1f);
-				qrCodeParams = new LinearLayout.LayoutParams(0, MATCH_PARENT, 1f);
-			} else {
-				statusParams = new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1f);
-				qrCodeParams = new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1f);
-			}
-		}
-		statusView.setLayoutParams(statusParams);
-		qrCodeView.setLayoutParams(qrCodeParams);
-		cameraOverlay.invalidate();
-	}
-
-	@Override
-	public void onStop() {
-		super.onStop();
-		stopListening();
-		try {
-			cameraView.stop();
-		} catch (CameraException e) {
-			logCameraExceptionAndFinish(e);
-		}
-	}
-
-	@UiThread
-	private void logCameraExceptionAndFinish(CameraException e) {
-		logException(LOG, WARNING, e);
-		Toast.makeText(getActivity(), R.string.camera_error,
-				LENGTH_LONG).show();
-		finish();
-	}
-
-	@UiThread
-	private void startListening() {
-		KeyAgreementTask oldTask = task;
-		KeyAgreementTask newTask = keyAgreementTaskProvider.get();
-		task = newTask;
-		ioExecutor.execute(() -> {
-			if (oldTask != null) oldTask.stopListening();
-			newTask.listen();
-		});
-	}
-
-	@UiThread
-	private void stopListening() {
-		KeyAgreementTask oldTask = task;
-		ioExecutor.execute(() -> {
-			if (oldTask != null) oldTask.stopListening();
-		});
-	}
-
-	@UiThread
-	private void reset() {
-		// If we've stopped the camera view, restart it
-		if (gotRemotePayload) {
-			try {
-				cameraView.start();
-			} catch (CameraException e) {
-				logCameraExceptionAndFinish(e);
-				return;
-			}
-		}
-		statusView.setVisibility(INVISIBLE);
-		cameraView.setVisibility(VISIBLE);
-		gotRemotePayload = false;
-		gotLocalPayload = false;
-		startListening();
-	}
-
-	@UiThread
-	private void qrCodeScanned(String content) {
-		try {
-			byte[] payloadBytes = content.getBytes(ISO_8859_1);
-			if (LOG.isLoggable(INFO))
-				LOG.info("Remote payload is " + payloadBytes.length + " bytes");
-			Payload remotePayload = payloadParser.parse(payloadBytes);
-			gotRemotePayload = true;
-			cameraView.stop();
-			cameraView.setVisibility(INVISIBLE);
-			statusView.setVisibility(VISIBLE);
-			status.setText(R.string.connecting_to_device);
-			task.connectAndRunProtocol(remotePayload);
-		} catch (UnsupportedVersionException e) {
-			reset();
-			String msg;
-			if (e.isTooOld()) {
-				msg = getString(R.string.qr_code_too_old,
-						getString(R.string.app_name));
-			} else {
-				msg = getString(R.string.qr_code_too_new,
-						getString(R.string.app_name));
-			}
-			showNextFragment(ContactExchangeErrorFragment.newInstance(msg));
-		} catch (CameraException e) {
-			logCameraExceptionAndFinish(e);
-		} catch (IOException | IllegalArgumentException e) {
-			LOG.log(WARNING, "QR Code Invalid", e);
-			reset();
-			Toast.makeText(getActivity(), R.string.qr_code_invalid,
-					LENGTH_LONG).show();
-		}
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof KeyAgreementListeningEvent) {
-			KeyAgreementListeningEvent event = (KeyAgreementListeningEvent) e;
-			gotLocalPayload = true;
-			setQrCode(event.getLocalPayload());
-		} else if (e instanceof KeyAgreementFailedEvent) {
-			keyAgreementFailed();
-		} else if (e instanceof KeyAgreementWaitingEvent) {
-			keyAgreementWaiting();
-		} else if (e instanceof KeyAgreementStartedEvent) {
-			keyAgreementStarted();
-		} else if (e instanceof KeyAgreementAbortedEvent) {
-			KeyAgreementAbortedEvent event = (KeyAgreementAbortedEvent) e;
-			keyAgreementAborted(event.didRemoteAbort());
-		} else if (e instanceof KeyAgreementFinishedEvent) {
-			keyAgreementFinished(((KeyAgreementFinishedEvent) e).getResult());
-		}
-	}
-
-	@UiThread
-	private void keyAgreementFailed() {
-		reset();
-		listener.keyAgreementFailed();
-	}
-
-	@UiThread
-	private void keyAgreementWaiting() {
-		status.setText(listener.keyAgreementWaiting());
-	}
-
-	@UiThread
-	private void keyAgreementStarted() {
-		qrCodeView.setVisibility(INVISIBLE);
-		statusView.setVisibility(VISIBLE);
-		status.setText(listener.keyAgreementStarted());
-	}
-
-	@UiThread
-	private void keyAgreementAborted(boolean remoteAborted) {
-		reset();
-		listener.keyAgreementAborted(remoteAborted);
-	}
-
-	@UiThread
-	private void keyAgreementFinished(KeyAgreementResult result) {
-		statusView.setVisibility(VISIBLE);
-		status.setText(listener.keyAgreementFinished(result));
-	}
-
-	private void setQrCode(Payload localPayload) {
-		Context context = getContext();
-		if (context == null) return;
-		DisplayMetrics dm = context.getResources().getDisplayMetrics();
-		ioExecutor.execute(() -> {
-			byte[] payloadBytes = payloadEncoder.encode(localPayload);
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Local payload is " + payloadBytes.length
-						+ " bytes");
-			}
-			// Use ISO 8859-1 to encode bytes directly as a string
-			String content = new String(payloadBytes, ISO_8859_1);
-			Bitmap qrCode = QrCodeUtils.createQrCode(dm, content);
-			runOnUiThreadUnlessDestroyed(() -> qrCodeView.setQrCode(qrCode));
-		});
-	}
-
-	@Override
-	public void handleResult(Result result) {
-		runOnUiThreadUnlessDestroyed(() -> {
-			LOG.info("Got result from decoder");
-			// Ignore results until the KeyAgreementTask is ready
-			if (!gotLocalPayload) return;
-			if (!gotRemotePayload) qrCodeScanned(result.getText());
-		});
-	}
-
-	@Override
-	protected void finish() {
-		getActivity().getSupportFragmentManager().popBackStack();
-	}
-
-	@NotNullByDefault
-	interface ShardQrCodeEventListener {
-
-		@UiThread
-		void keyAgreementFailed();
-
-		// Should return a string to be displayed as status.
-		@UiThread
-		@Nullable
-		String keyAgreementWaiting();
-
-		// Should return a string to be displayed as status.
-		@UiThread
-		@Nullable
-		String keyAgreementStarted();
-
-		// Will show an error fragment.
-		@UiThread
-		void keyAgreementAborted(boolean remoteAborted);
-
-		// Should return a string to be displayed as status.
-		@UiThread
-		@Nullable
-		String keyAgreementFinished(KeyAgreementResult result);
-	}
-}

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

@@ -1,70 +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);
-	}
-
-}

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

@@ -1,182 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-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.magmacollective.darkcrystal.secretsharingwrapper.SecretSharingWrapper;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-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;
-	private SeekBar seekBar;
-	private TextView thresholdRepresentation;
-	private TextView message;
-	private TextView mOfn;
-
-	public static ThresholdSelectorFragment newInstance(int numberCustodians) {
-		Bundle bundle = new Bundle();
-		bundle.putInt(NUMBER_CUSTODIANS, numberCustodians);
-		ThresholdSelectorFragment fragment = new ThresholdSelectorFragment();
-		fragment.setArguments(bundle);
-		return fragment;
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		requireActivity().setTitle(R.string.title_define_threshold);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_select_threshold,
-				container, false);
-		Bundle args = requireArguments();
-		numberOfCustodians = args.getInt(NUMBER_CUSTODIANS);
-		seekBar = view.findViewById(R.id.seekBar);
-		thresholdRepresentation =
-				view.findViewById(R.id.textViewThresholdRepresentation);
-		message = view.findViewById(R.id.textViewMessage);
-		mOfn = view.findViewById(R.id.textViewmOfn);
-
-		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;
-
-		} else {
-			seekBar.setEnabled(false);
-			threshold = 2;
-			seekBar.setMax(numberOfCustodians);
-			seekBar.setProgress(threshold);
-			TextView t = view.findViewById(R.id.title_threshold);
-			t.setText(R.string.threshold_disabled);
-		}
-		thresholdRepresentation.setText(buildThresholdRepresentationString());
-		setmOfnText();
-		return view;
-//        return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
-	private void setmOfnText() {
-		mOfn.setText(String.format(
-				getString(R.string.threshold_m_of_n), threshold,
-				numberOfCustodians));
-	}
-
-	@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);
-		super.onCreateOptionsMenu(menu, inflater);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.action_threshold_defined:
-				try {
-					listener.thresholdDefined(threshold);
-				} catch (DbException e) {
-					e.printStackTrace();
-				}
-				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);
-		}
-		for (int i = 0; i < (numberOfCustodians - threshold); i++) {
-			thresholdRepresentationText += getString(R.string.linear_bullet);
-		}
-		return thresholdRepresentationText;
-	}
-
-	private class SeekBarListener implements SeekBar.OnSeekBarChangeListener {
-
-		@Override
-		public void onProgressChanged(SeekBar seekBar, int progress,
-				boolean fromUser) {
-			threshold = progress + 2;
-
-			thresholdRepresentation.setText(
-					buildThresholdRepresentationString()
-			);
-			setmOfnText();
-
-			int sanityLevel = SecretSharingWrapper
-					.thresholdSanity(threshold, numberOfCustodians);
-			int text = R.string.threshold_secure;
-			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;
-			message.setText(text);
-			// TODO change colour of thresholdRepresentation to green/red based on sanityLevel
-		}
-
-		@Override
-		public void onStartTrackingTouch(SeekBar seekBar) {
-			// do nothing
-		}
-
-		@Override
-		public void onStopTrackingTouch(SeekBar seekBar) {
-			// do nothing
-		}
-
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/creation/CreateBackupController.java

@@ -1,26 +0,0 @@
-package org.briarproject.briar.android.socialbackup.creation;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.briar.android.contactselection.ContactSelectorController;
-import org.briarproject.briar.android.contactselection.SelectableContactItem;
-import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
-
-import java.util.Collection;
-
-import androidx.annotation.Nullable;
-
-@NotNullByDefault
-public interface CreateBackupController
-		extends ContactSelectorController<SelectableContactItem> {
-
-	void createGroup(String name,
-			ResultExceptionHandler<GroupId, DbException> result);
-
-	void sendInvitation(GroupId g, Collection<ContactId> contacts,
-			@Nullable String text,
-			ResultExceptionHandler<Void, DbException> result);
-
-}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/creation/CreateBackupControllerImpl.java

@@ -1,206 +0,0 @@
-package org.briarproject.briar.android.socialbackup.creation;
-
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.ContactManager;
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.NoSuchContactException;
-import org.briarproject.bramble.api.identity.IdentityManager;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl;
-import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
-import org.briarproject.briar.api.identity.AuthorManager;
-import org.briarproject.briar.api.privategroup.GroupMessage;
-import org.briarproject.briar.api.privategroup.GroupMessageFactory;
-import org.briarproject.briar.api.privategroup.PrivateGroup;
-import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
-import org.briarproject.briar.api.privategroup.PrivateGroupManager;
-import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory;
-import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-
-import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@Immutable
-@NotNullByDefault
-/**
- * Derived from {@link org.briarproject.briar.android.privategroup.invitation.GroupInvitationControllerImpl}
- */
-class CreateBackupControllerImpl extends ContactSelectorControllerImpl
-		implements CreateBackupController {
-
-	private static final Logger LOG =
-			Logger.getLogger(
-					CreateBackupControllerImpl.class.getName());
-
-	private final Executor cryptoExecutor;
-	private final ContactManager contactManager;
-	private final IdentityManager identityManager;
-	private final PrivateGroupFactory groupFactory;
-	private final GroupMessageFactory groupMessageFactory;
-	private final PrivateGroupManager groupManager;
-	private final GroupInvitationFactory groupInvitationFactory;
-	private final GroupInvitationManager groupInvitationManager;
-	private final Clock clock;
-
-	@Inject
-	CreateBackupControllerImpl(@DatabaseExecutor Executor dbExecutor,
-			@CryptoExecutor Executor cryptoExecutor,
-			LifecycleManager lifecycleManager, ContactManager contactManager,
-			IdentityManager identityManager, PrivateGroupFactory groupFactory,
-			GroupMessageFactory groupMessageFactory,
-			PrivateGroupManager groupManager,
-			GroupInvitationFactory groupInvitationFactory,
-			GroupInvitationManager groupInvitationManager, Clock clock, AuthorManager authorManager) {
-		super(dbExecutor, lifecycleManager, contactManager, authorManager);
-		this.cryptoExecutor = cryptoExecutor;
-		this.contactManager = contactManager;
-		this.identityManager = identityManager;
-		this.groupFactory = groupFactory;
-		this.groupMessageFactory = groupMessageFactory;
-		this.groupManager = groupManager;
-		this.groupInvitationFactory = groupInvitationFactory;
-		this.groupInvitationManager = groupInvitationManager;
-		this.clock = clock;
-	}
-
-	@Override
-	public void createGroup(String name,
-			ResultExceptionHandler<GroupId, DbException> handler) {
-		runOnDbThread(() -> {
-			try {
-				LocalAuthor author = identityManager.getLocalAuthor();
-				createGroupAndMessages(author, name, handler);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				handler.onException(e);
-			}
-		});
-	}
-
-	private void createGroupAndMessages(LocalAuthor author, String name,
-			ResultExceptionHandler<GroupId, DbException> handler) {
-		cryptoExecutor.execute(() -> {
-			LOG.info("Creating group...");
-			PrivateGroup group =
-					groupFactory.createPrivateGroup(name, author);
-			LOG.info("Creating new join announcement...");
-			GroupMessage joinMsg =
-					groupMessageFactory.createJoinMessage(group.getId(),
-							clock.currentTimeMillis(), author);
-			storeGroup(group, joinMsg, handler);
-		});
-	}
-
-	private void storeGroup(PrivateGroup group, GroupMessage joinMsg,
-			ResultExceptionHandler<GroupId, DbException> handler) {
-		runOnDbThread(() -> {
-			LOG.info("Adding group to database...");
-			try {
-				groupManager.addPrivateGroup(group, joinMsg, true);
-				handler.onResult(group.getId());
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				handler.onException(e);
-			}
-		});
-	}
-
-	@Override
-	protected boolean isDisabled(GroupId g, Contact c) {
-		return false;
-	}
-
-	@Override
-	public void sendInvitation(GroupId g, Collection<ContactId> contactIds,
-			@Nullable String text,
-			ResultExceptionHandler<Void, DbException> handler) {
-		runOnDbThread(() -> {
-			try {
-				LocalAuthor localAuthor = identityManager.getLocalAuthor();
-				List<Contact> contacts = new ArrayList<>();
-				for (ContactId c : contactIds) {
-					try {
-						contacts.add(contactManager.getContact(c));
-					} catch (NoSuchContactException e) {
-						// Continue
-					}
-				}
-				signInvitations(g, localAuthor, contacts, text, handler);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				handler.onException(e);
-			}
-		});
-	}
-
-	private void signInvitations(GroupId g, LocalAuthor localAuthor,
-			Collection<Contact> contacts, @Nullable String text,
-			ResultExceptionHandler<Void, DbException> handler) {
-		cryptoExecutor.execute(() -> {
-			long timestamp = clock.currentTimeMillis();
-			List<InvitationContext> contexts = new ArrayList<>();
-			for (Contact c : contacts) {
-				byte[] signature = groupInvitationFactory.signInvitation(c, g,
-						timestamp, localAuthor.getPrivateKey());
-				contexts.add(new InvitationContext(c.getId(), timestamp,
-						signature));
-			}
-			sendInvitations(g, contexts, text, handler);
-		});
-	}
-
-	private void sendInvitations(GroupId g,
-			Collection<InvitationContext> contexts, @Nullable String text,
-			ResultExceptionHandler<Void, DbException> handler) {
-		runOnDbThread(() -> {
-			try {
-				for (InvitationContext context : contexts) {
-					try {
-						groupInvitationManager.sendInvitation(g,
-								context.contactId, text, context.timestamp,
-								context.signature);
-					} catch (NoSuchContactException e) {
-						// Continue
-					}
-				}
-				//noinspection ConstantConditions
-				handler.onResult(null);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				handler.onException(e);
-			}
-		});
-	}
-
-	private static class InvitationContext {
-
-		private final ContactId contactId;
-		private final long timestamp;
-		private final byte[] signature;
-
-		private InvitationContext(ContactId contactId, long timestamp,
-				byte[] signature) {
-			this.contactId = contactId;
-			this.timestamp = timestamp;
-			this.signature = signature;
-		}
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/creation/CreateBackupModule.java

@@ -1,18 +0,0 @@
-package org.briarproject.briar.android.socialbackup.creation;
-
-import org.briarproject.briar.android.activity.ActivityScope;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class CreateBackupModule {
-
-	@ActivityScope
-	@Provides
-	CreateBackupController provideCreateGroupController(
-			CreateBackupControllerImpl createBackupController) {
-		return createBackupController;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java

@@ -197,10 +197,6 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	 */
 	@UiThread
 	protected void addItem(I item, boolean scrollToItem) {
-		// If items haven't loaded, we need to wait until they have.
-		// Since this was a R/W DB transaction, the load will pick up this item.
-		if (items.getValue() == null) return;
-
 		messageTree.add(item);
 		if (scrollToItem) this.scrollToItem.set(item.getId());
 		items.setValue(new LiveResult<>(messageTree.depthFirstOrder()));

briar-android/src/main/java/org/briarproject/briar/api/android/AndroidNotificationManager.java

@@ -39,8 +39,7 @@ public interface AndroidNotificationManager {
 	String BLOG_CHANNEL_ID = "blogs";
 	// Channels are sorted by channel ID in the Settings app, so use IDs
 	// that will sort below the main channels such as contacts
-	String ONGOING_CHANNEL_OLD_ID = "zForegroundService";
-	String ONGOING_CHANNEL_ID = "zForegroundService2";
+	String ONGOING_CHANNEL_ID = "zForegroundService";
 	String FAILURE_CHANNEL_ID = "zStartupFailure";
 	String REMINDER_CHANNEL_ID = "zSignInReminder";
 

briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java

@@ -8,7 +8,6 @@ import androidx.lifecycle.LiveData;
 public interface LockManager {
 
 	String ACTION_LOCK = "lock";
-	String EXTRA_PID = "PID";
 
 	/**
 	 * Stops the inactivity timer when the user interacts with the app.

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

@@ -1,16 +0,0 @@
-package org.briarproject.briar.socialbackup;
-
-import org.briarproject.briar.android.socialbackup.DarkCrystalImpl;
-import org.briarproject.briar.api.socialbackup.DarkCrystal;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidDarkCrystalModule {
-
-	@Provides
-	DarkCrystal darkCrystal(DarkCrystalImpl darkCrystal) {
-		return darkCrystal;
-	}
-}

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#29C400"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19.77,5.03l1.4,1.4L8.43,19.17l-5.6,-5.6 1.4,-1.4 4.2,4.2L19.77,5.03m0,-2.83L8.43,13.54l-4.2,-4.2L0,13.57 8.43,22 24,6.43 19.77,2.2z"/>
-</vector>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragmentContainer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/title_help_recover"
-		app:titleTextColor="@android:color/white" />
-
-	<include layout="@layout/fragment_recovery_custodian_explainer" />
-
-</LinearLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/title_help_recover"
-		app:titleTextColor="@android:color/white" />
-
-	<include layout="@layout/fragment_recovery_custodian_error_explainer" />
-
-</LinearLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/title_recovery_mode"
-		app:titleTextColor="@android:color/white" />
-
-	<include layout="@layout/fragment_recovery_owner_explainer" />
-
-</LinearLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/title_recovery_mode"
-		app:titleTextColor="@android:color/white" />
-
-	<include layout="@layout/fragment_recovery_owner_error_explainer" />
-
-</LinearLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/title_recovery_mode"
-		app:titleTextColor="@android:color/white" />
-
-	<include layout="@layout/fragment_recovery_owner_main" />
-
-</LinearLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/title_recovery_mode"
-		app:titleTextColor="@android:color/white" />
-
-	<include layout="@layout/fragment_recovery_owner_recovering" />
-
-</LinearLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/setup_title"
-		app:titleTextColor="@android:color/white" />
-
-	<include layout="@layout/fragment_start" />
-
-</LinearLayout>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/fragmentContainer"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fitsSystemWindows="true"
-	android:orientation="vertical">
-
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?attr/colorPrimary"
-		android:minHeight="?attr/actionBarSize"
-		app:title="@string/setup_title"
-		app:titleTextColor="@android:color/white" />
-
-</LinearLayout>

briar-android/src/main/res/layout/fragment_account_recovered.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/backup_done_dismiss"
-        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/recovery_account_recovered"
-        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_existing_backup.xml

@@ -1,35 +0,0 @@
-<?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"
-
-	android:paddingLeft="@dimen/margin_large"
-	android:paddingTop="@dimen/margin_large"
-	android:paddingRight="@dimen/margin_large"
-	android:paddingBottom="@dimen/margin_medium"
-	android:layout_height="match_parent">
-
-	<TextView
-		android:id="@+id/textViewThreshold"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:text="placeholder threshold"
-		android:textSize="16sp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
-	<TextView
-		android:id="@+id/textViewCustodians"
-		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" />
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView 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:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<LinearLayout
-		android:id="@+id/linearLayout"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:paddingLeft="@dimen/margin_large"
-		android:paddingTop="@dimen/margin_medium"
-		android:paddingRight="@dimen/margin_large"
-		android:paddingBottom="@dimen/margin_medium">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Backup creation" />
-
-		<Button
-			android:id="@+id/buttonSelectThreshold"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Select Threshold" />
-
-		<Button
-			android:id="@+id/buttonShardsSent"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Shards sent" />
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Setup" />
-
-		<Button
-			android:id="@+id/buttonWelcome"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Welcome" />
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Recovery from secrect owner's point of view" />
-
-		<Button
-			android:id="@+id/buttonOwnerRecoveryExplainer"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Explainer" />
-
-		<Button
-			android:id="@+id/buttonOwnerRecoveryReceivedShard"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Shard received" />
-
-		<Button
-			android:id="@+id/buttonOwnerRecoveryMain1"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Main (0 shards)" />
-
-		<Button
-			android:id="@+id/buttonOwnerRecoveryMain2"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Main (1 shard)" />
-
-		<Button
-			android:id="@+id/buttonOwnerRecoveryMain3"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Recovering account…" />
-
-		<Button
-			android:id="@+id/buttonOwnerRecoveryAccountRecovered"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Account recovered" />
-
-		<Button
-			android:id="@+id/buttonOwnerRecoveryErrorExplainer"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Error" />
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Recovery from custodian's point of view" />
-
-		<Button
-			android:id="@+id/buttonCustodianRecoveryExplainer"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Explainer" />
-
-		<Button
-			android:id="@+id/buttonCustodianRecoveryErrorExplainer"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Error" />
-
-		<Button
-			android:id="@+id/buttonCustodianRecoveryDone"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_security"
-			android:text="Done" />
-
-	</LinearLayout>
-</ScrollView>

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

@@ -1,34 +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"
-	tools:showIn="@layout/activity_preview_welcome">
-
-	<Button
-		android:id="@+id/buttonSetupNewAccount"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:drawableLeft="@drawable/ic_contacts"
-		android:text="@string/setup_new_account"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
-	<Button
-		android:id="@+id/buttonRestoreAccount"
-		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" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,39 +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">
-
-	<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"
-		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_recovery_custodian_error_explainer.xml

@@ -1,60 +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"
-	tools:ignore="VectorDrawableCompat"
-	tools:showIn="@layout/activity_preview_recovery_custodian2">
-
-	<TextView
-		android:id="@+id/textView1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:gravity="center"
-		android:text="@string/custodian_recovery_failed_to_send"
-		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="24dp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView1"
-		app:srcCompat="@drawable/qr_code_error" />
-
-	<TextView
-		android:id="@+id/textView2"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:gravity="center"
-		android:text="@string/recovery_helpful_suggestions"
-		android:textSize="24sp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-	<Button
-		android:id="@+id/button"
-		android:layout_marginTop="24dp"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/recovery_retry"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,47 +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"
-	tools:ignore="VectorDrawableCompat"
-	tools:showIn="@layout/activity_preview_recovery_custodian1">
-
-	<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/custodian_recovery_explainer"
-		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="24dp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView"
-		app:srcCompat="@drawable/qr_code_intro" />
-
-	<Button
-		android:id="@+id/button"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:text="@string/custodian_scan_code"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,59 +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"
-	tools:ignore="VectorDrawableCompat"
-	tools:showIn="@layout/activity_preview_recovery_owner2">
-
-	<TextView
-		android:id="@+id/textView1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:gravity="center"
-		android:text="@string/recovery_failed_to_receive"
-		android:textSize="24sp"
-		app:layout_constraintTop_toTopOf="parent" />
-
-	<ImageView
-		android:id="@+id/imageView"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView1"
-		app:srcCompat="@drawable/qr_code_error" />
-
-	<TextView
-		android:id="@+id/textView2"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:gravity="center"
-		android:text="@string/recovery_helpful_suggestions"
-		android:textSize="24sp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-	<Button
-		android:id="@+id/button"
-		android:layout_marginTop="24dp"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/recovery_retry"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,47 +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"
-	tools:ignore="VectorDrawableCompat"
-	tools:showIn="@layout/activity_preview_recovery_owner1">
-
-	<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/recovery_explainer"
-		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="24dp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView"
-		app:srcCompat="@drawable/qr_code_intro" />
-
-	<Button
-		android:id="@+id/beginButton"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:text="@string/recovery_begin"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,47 +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"
-	tools:ignore="VectorDrawableCompat"
-	tools:showIn="@layout/activity_preview_recovery_owner3">
-
-	<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/recovery_recovered_shards"
-		android:textSize="24sp"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:layout_editor_absoluteX="16dp" />
-
-	<TextView
-		android:id="@+id/textViewShardCount"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:gravity="center"
-		android:text="0"
-		android:textSize="24sp"
-		app:layout_constraintTop_toBottomOf="@+id/textView"
-		tools:layout_editor_absoluteX="16dp" />
-
-	<Button
-		android:id="@+id/button"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/recovery_scan_qr_code"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,58 +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"
-	tools:ignore="VectorDrawableCompat"
-	tools:showIn="@layout/activity_preview_recovery_owner4">
-
-	<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/recovery_recovered_shards"
-		android:textSize="24sp"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:layout_editor_absoluteX="16dp" />
-
-	<TextView
-		android:id="@+id/textViewShardCount"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:gravity="center"
-		android:text="3"
-		android:textSize="24sp"
-		app:layout_constraintTop_toBottomOf="@+id/textView"
-		tools:layout_editor_absoluteX="16dp" />
-
-	<ProgressBar
-		android:id="@+id/progressBar"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center"
-		android:layout_marginTop="144dp"
-		android:indeterminate="true"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textViewShardCount" />
-
-	<TextView
-		android:id="@+id/textView3"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="24dp"
-		android:gravity="center"
-		android:text="@string/recovery_recovering_account"
-		android:textSize="24sp"
-		app:layout_constraintTop_toBottomOf="@+id/progressBar" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,69 +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">
-
-    <TextView
-        android:id="@+id/title_threshold"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/threshold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <SeekBar
-        android:id="@+id/seekBar"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:max="5"
-        android:paddingTop="10dp"
-        android:progress="3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title_threshold" />
-
-
-    <TextView
-        android:id="@+id/textViewThresholdRepresentation"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="placeholder"
-        android:textSize="64dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/seekBar" />
-
-    <TextView
-        android:id="@+id/textViewmOfn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="m of n contacts needed to recover your account"
-        android:textSize="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewThresholdRepresentation" />
-
-    <TextView
-        android:id="@+id/textViewMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/threshold_secure"
-        android:textSize="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewmOfn" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/fragment_shards_received.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/backup_done_dismiss"
-        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/recovery_shard_received"
-        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_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/backup_done_dismiss"
-        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_start.xml

@@ -1,34 +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"
-	tools:showIn="@layout/activity_preview_welcome">
-
-	<Button
-		android:id="@+id/buttonSelectThreshold"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:drawableLeft="@drawable/ic_contacts"
-		android:text="@string/setup_new_account"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
-	<Button
-		android:id="@+id/buttonShardsSent"
-		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/buttonSelectThreshold" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <CheckBox
-        android:id="@+id/checkBox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Bob"
-        tools:text="@sample/names.json/names/short_names/name" />
-
-</LinearLayout>

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

@@ -27,9 +27,4 @@
 		android:title="@string/delete_contact"
 		app:showAsAction="never"/>
 
-	<item
-		android:id="@+id/action_help_recover_account"
-		android:icon="@drawable/introduction_white"
-		android:title="@string/help_recover_account"
-		app:showAsAction="never"/>
 </menu>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<item
-		android:id="@+id/action_threshold_defined"
-		android:icon="@drawable/ic_check_white"
-		android:title="@string/threshold_defined"
-		app:showAsAction="always"/>
-
-</menu>

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

@@ -67,11 +67,8 @@
   <string name="lock_button">قفل کردن برنامه</string>
   <string name="settings_button">تنظیمات</string>
   <string name="sign_out_button">خروج</string>
-  <string name="transports_onboarding_text">برای کنترل چگونگی اتصال Briar (برایر) به مخاطبین خود، اینجا را لمس کنید.</string>
   <!--Transports: Tor-->
   <string name="transport_tor">اینترنت</string>
-  <string name="tor_device_status_online_wifi">تلفن شما از طریق Wi-Fi به اینترنت دسترسی دارد.</string>
-  <string name="tor_device_status_online_mobile">تلفن شما از طریق دیتا سیمکارت به اینترنت دسترسی دارد.</string>
   <string name="tor_device_status_offline">تلفن شما دارای دسترسی اینترنتی نیست</string>
   <string name="tor_plugin_status_enabling">Briar در حال اتصال به اینترنت می باشد</string>
   <string name="tor_plugin_status_active">Briar به اینترنت متصل شد</string>
@@ -465,10 +462,6 @@
 برای وارد کردن خوراک روی آیکون + ضربه بزنید</string>
   <string name="blogs_rss_feeds_manage_error">مشکلی با بارگذاری فیدهای شما وجود داشت. لطفا بعدا امتحان کنید.</string>
   <!--Settings Profile Picture-->
-  <string name="change_profile_picture">برای تغییر تصویر نمایه خود اینجا را لمس کنید.</string>
-  <string name="dialog_confirm_profile_picture_title">تغییر تصویر نمایه</string>
-  <string name="dialog_confirm_profile_picture_remark">تنها مخاطبین شما می‌توانند تصویر نمایه شما را مشاهده کنند.</string>
-  <string name="change_profile_picture_failed_message">تاسفیم اما هنگام بروزرسانی تصویر نمایه شما مشکلی رخ داد.</string>
   <!--Settings Display-->
   <string name="pref_language_title">زبان و منطقه</string>
   <string name="pref_language_changed">این تنظیمات زمانی که Briar (برایر) را ری استارت کنید تاثیر خود را می گذارند. لطفا خارج شوید و Briar (برایر) را دوباره راه اندازی کنید.</string>
@@ -578,20 +571,17 @@
   <string name="include_debug_report_feedback">قرار دادن داده های ناشناس درباره این دستگاه</string>
   <string name="dev_report_basic_info">اطلاعات پایه</string>
   <string name="dev_report_device_info">اطلاعات دستگاه</string>
-  <string name="dev_report_stacktrace">Stacktrace</string>
   <string name="dev_report_time_info">اطلاعات زمانی</string>
   <string name="dev_report_memory">حافظه</string>
   <string name="dev_report_storage">حافظه</string>
   <string name="dev_report_connectivity">اتصال</string>
   <string name="dev_report_build_config">پیکربندی ساخت</string>
-  <string name="dev_report_logcat">لاگ برنامه</string>
   <string name="dev_report_device_features">ویژگی‌های دستگاه</string>
   <string name="send_report">ارسال گزارش</string>
   <string name="close">بستن</string>
   <string name="dev_report_sending">در حال فرستادن نظر...</string>
   <string name="dev_report_sent">بازخورد ارسال شد</string>
   <string name="dev_report_saved">گزارش ذخیره شد. دفعه بعدی که وارد Briar (برایر) شدید فرستاده خواهد شد.</string>
-  <string name="dev_report_error">خطا در ارسال گزارش</string>
   <!--Sign Out-->
   <string name="progress_title_logout">خروج از Briar (برایر)...</string>
   <!--Screen Filters & Tapjacking-->
@@ -601,9 +591,7 @@
 این برنامه ها ممکن است روی Briar (برایر) قرار گرفته باشند:
 
 %1$s</string>
-  <string name="screen_filter_body_api_30">برنامه دیگری بر روی برنامه Briar (برایر) قرار دارد. برای محافظت از امنیت شما، Briar (برایر) هنگامی که برنامه دیگری روی آن باز است، به لمس پاسخ نخواهد داد. \n\nبرای یافتن برنامه مذکور، برنامه‌های زیر را بررسی کنید.</string>
   <string name="screen_filter_allow">به این برنامه ها اجازه بده تا روی Briar (برایر) قرار بگیرند</string>
-  <string name="screen_filter_review_apps">بررسی برنامه‌ها</string>
   <!--Permission Requests-->
   <string name="permission_camera_title">دسترسی به دوربین</string>
   <string name="permission_camera_request_body">برای اسکن کردن کد کیوآر دسترسی به دوربین لازم است.</string>
@@ -620,7 +608,6 @@ Briar (برایر) موقعیت شما را ذخیره نمی‌کند و آن
   <string name="permission_camera_denied_body">شما دسترسی به دوربین را رد کرده اید، اما افزودن مخاطب نیاز به دوربین دارد.
 
 لطفا اجازه دسترسی را بدهید.</string>
-  <string name="permission_location_denied_body">شما دسترسی به موقعیت خود را نداده‌اید اما Briar (برایر) برای یافتن دستگاه‌های بلوتوث نیاز به این دسترسی دارد.\n\nلطفا این دسترسی را فراهم کنید.</string>
   <string name="qr_code">کد کیوآر</string>
   <string name="show_qr_code_fullscreen">نمایش کد کیوآر به صورت فول اسکرین</string>
   <!--App Locking-->
@@ -631,7 +618,6 @@ Briar (برایر) موقعیت شما را ذخیره نمی‌کند و آن
   <string name="lock_is_locked">Briar (برایر) قفل می باشد</string>
   <string name="lock_tap_to_unlock">برای آنلاک کردن کلیک کنید</string>
   <!--Connections Screen-->
-  <string name="transports_help_text">Briar (برایر) می‌تواند از طریق اینترنت، Wi-Fi و یا بلوتوث به مخاطبین شما متصل گردد.\n\nارتباط با اینترنت از طریق شبکه‌ی تور صورت می‌پذیرد.\n\nاگر دسترسی به مخاطب شما از روش‌های مختلفی ممکن باشد، Briar (برایر) به صورت موازی از آن‌ها استفاده خواهد کرد.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">آلیس</string>