From c9140195ccc9e2aa349a85dd69af264873431239 Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Fri, 4 Feb 2022 09:01:53 +0100
Subject: [PATCH] Rename social backup setup activity

---
 briar-android/src/main/AndroidManifest.xml                   | 2 +-
 .../briar/android/activity/ActivityComponent.java            | 5 ++---
 ...tedBackupActivity.java => SocialBackupSetupActivity.java} | 2 +-
 briar-android/src/main/res/values/strings.xml                | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename briar-android/src/main/java/org/briarproject/briar/android/socialbackup/{DistributedBackupActivity.java => SocialBackupSetupActivity.java} (98%)

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 5f0972bdc..6c1f14900 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -148,7 +148,7 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.socialbackup.DistributedBackupActivity"
+			android:name="org.briarproject.briar.android.socialbackup.SocialBackupSetupActivity"
 			android:label="@string/activity_name_distributed_backup"
 			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
 			<meta-data
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
index 0edf8be1f..7c563867e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
@@ -83,7 +83,7 @@ import org.briarproject.briar.android.sharing.SharingModule;
 import org.briarproject.briar.android.socialbackup.SetupExplainerFragment;
 import org.briarproject.briar.android.socialbackup.recover.CustodianRecoveryModeExplainerFragment;
 import org.briarproject.briar.android.socialbackup.CustodianSelectorFragment;
-import org.briarproject.briar.android.socialbackup.DistributedBackupActivity;
+import org.briarproject.briar.android.socialbackup.SocialBackupSetupActivity;
 import org.briarproject.briar.android.socialbackup.ExistingBackupFragment;
 import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity;
 import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardErrorFragment;
@@ -103,7 +103,6 @@ import org.briarproject.briar.android.socialbackup.recover.RestoreAccountDozeFra
 import org.briarproject.briar.android.socialbackup.recover.RestoreAccountSetPasswordFragment;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
-import org.briarproject.briar.api.socialbackup.recovery.RestoreAccount;
 
 import dagger.Component;
 
@@ -276,7 +275,7 @@ public interface ActivityComponent {
 
 	void inject(ThresholdSelectorFragment thresholdSelectorFragment);
 
-	void inject(DistributedBackupActivity distributedBackupActivity);
+	void inject(SocialBackupSetupActivity distributedBackupActivity);
 
 	void inject(DatabaseComponent databaseComponent);
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java
rename to briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java
index 4070ebed9..ea83ad1d9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java
@@ -24,7 +24,7 @@ import javax.inject.Inject;
 
 import androidx.lifecycle.ViewModelProvider;
 
-public class DistributedBackupActivity extends BriarActivity implements
+public class SocialBackupSetupActivity extends BriarActivity implements
 		BaseFragment.BaseFragmentListener, ContactSelectorListener,
 		ShardsSentFragment.ShardsSentDismissedListener {
 
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 5aaccf979..dad2f8292 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -672,8 +672,8 @@
 	<string name="backup_created">Backup created 1/6/2020</string>
 
 	<string name="social_backup_setup_explainer_title">Setup social backup</string>
-	<string name="social_backup_setup_explainer_long">Choose some trusted contacts</string>
-	<string name="social_backup_setup_explainer_button">Select trusted contacts</string>
+	<string name="social_backup_setup_explainer_long">Backup your Briar identity and contacts list using trusted contact</string>
+	<string name="social_backup_setup_explainer_button">You must choose a set of contacts to send backup pieces to.</string>
 
 	<!-- recovery from the secret owner's POV -->