Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-22 07:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Set maximum amount of custodians in UI

Browse Source
This commit is contained in:
ameba23
2022-02-08 15:06:50 +01:00
parent 386658735c
commit 62988e7769
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,15 +86,19 @@ public class CustodianSelectorFragment extends ContactSelectorFragment {
int n = selectedContacts.size(); int n = selectedContacts.size();
int min = 2; int min = 2;
boolean enough = n >= min; int max = 7;
boolean amountIsValid = (n >= min) && (n <= max);
item.setVisible(enough); item.setVisible(amountIsValid);
if (n == 0) { if (n == 0) {
Toast.makeText(getContext(), String.format(getString(R.string.select_at_least_n_contacts), min), Toast.makeText(getContext(), String.format(getString(R.string.select_at_least_n_contacts), min),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} else if (n < min) { } else if (n < min) {
Toast.makeText(getContext(), String.format(getString(R.string.select_at_least_n_more_contacts), min - n), Toast.makeText(getContext(), String.format(getString(R.string.select_at_least_n_more_contacts), min - n),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} else if (n > max) {
Toast.makeText(getContext(), String.format(getString(R.string.select_no_more_than_n_contacts), max),
Toast.LENGTH_SHORT).show();
} }
} }

1
briar-android/src/main/res/values/strings.xml
View File

@@ -657,6 +657,7 @@
<string name="select_at_least_n_contacts">Please select at least %d contacts</string> <string name="select_at_least_n_contacts">Please select at least %d contacts</string>
<string name="select_at_least_n_more_contacts">Please select at least %d more contacts</string> <string name="select_at_least_n_more_contacts">Please select at least %d more contacts</string>
<string name="select_no_more_than_n_contacts">Too many! Please select no more than %d contacts</string>
<string name="threshold">Choose the minimum number of trusted contacts needed to restore your account</string> <string name="threshold">Choose the minimum number of trusted contacts needed to restore your account</string>
<string name="threshold_disabled">Two trusted contacts will be needed to restore your account</string> <string name="threshold_disabled">Two trusted contacts will be needed to restore your account</string>