From 7df10d9324fdd76da41d3451232b8d4acd0c34e2 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Fri, 4 Mar 2022 10:09:57 +0100 Subject: [PATCH] Improve existing backup fragment --- .../briar/android/socialbackup/ExistingBackupFragment.java | 5 ++--- .../src/main/res/layout/fragment_existing_backup.xml | 1 - briar-android/src/main/res/values/strings.xml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java index 35bfe339f..7962f04d1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java @@ -58,7 +58,7 @@ public class ExistingBackupFragment extends BaseFragment implements public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { // change toolbar text (relevant when navigating back to this fragment) - requireActivity().setTitle(R.string.social_backup_trusted_contacts); +// requireActivity().setTitle(R.string.social_backup_trusted_contacts); View view = inflater.inflate(R.layout.fragment_existing_backup, container, false); @@ -79,8 +79,7 @@ public class ExistingBackupFragment extends BaseFragment implements TextView mOfn = view.findViewById(R.id.textViewThreshold); mOfn.setText(String.format( - getString(R.string.threshold_m_of_n), threshold, - numberOfCustodians)); + getString(R.string.existing_backup_explain), threshold)); TextView thresholdRepresentation = view.findViewById(R.id.textViewThresholdRepresentation); diff --git a/briar-android/src/main/res/layout/fragment_existing_backup.xml b/briar-android/src/main/res/layout/fragment_existing_backup.xml index 6fc28568a..68efc37eb 100644 --- a/briar-android/src/main/res/layout/fragment_existing_backup.xml +++ b/briar-android/src/main/res/layout/fragment_existing_backup.xml @@ -1,7 +1,6 @@ Create new account or recover existing account Recover Account Help recover account - %d of the following contacts are needed to restore your account: + Any %d of the following contacts are needed to restore your Briar account, should you lose access to it. To make a social backup, you need at least 2 contacts in your contacts list There was an error reading your contacts list