Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2245-toast-name-wrong' into 'master'

Browse Source 
Remove wrong name from "Contact already exists"

Closes #2245

See merge request briar/briar!1780
This commit is contained in:
akwizgran
2023-02-27 14:26:27 +00:00
parent 3bdbabf38a 3c40c11dfb
commit 2657e2bc08
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
View File

@@ -171,7 +171,7 @@ public class NicknameFragment extends BaseFragment {
private void handleExistingContact(String name, Author existing) { private void handleExistingContact(String name, Author existing) {
OnClickListener listener = (d, w) -> { OnClickListener listener = (d, w) -> {
d.dismiss(); d.dismiss();
String str = getString(R.string.contact_already_exists, name); String str = getString(R.string.contact_already_exists_general);
Toast.makeText(getContext(), str, LENGTH_LONG).show(); Toast.makeText(getContext(), str, LENGTH_LONG).show();
finish(); finish();
}; };

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

@@ -249,6 +249,7 @@
<string name="exchanging_contact_details">Exchanging contact details\u2026</string> <string name="exchanging_contact_details">Exchanging contact details\u2026</string>
<string name="contact_added_toast">Contact added: %s</string> <string name="contact_added_toast">Contact added: %s</string>
<string name="contact_already_exists">Contact %s already exists</string> <string name="contact_already_exists">Contact %s already exists</string>
<string name="contact_already_exists_general">Contact already exists</string>
<string name="qr_code_invalid">The QR code is invalid</string> <string name="qr_code_invalid">The QR code is invalid</string>
<string name="qr_code_too_old_1">The QR code you have scanned comes from an older version of Briar.\n\nPlease ask your contact to upgrade to the latest version and then try again.</string> <string name="qr_code_too_old_1">The QR code you have scanned comes from an older version of Briar.\n\nPlease ask your contact to upgrade to the latest version and then try again.</string>
<string name="qr_code_too_new_1">The QR code you have scanned comes from a newer version of Briar.\n\nPlease upgrade to the latest version and then try again.</string> <string name="qr_code_too_new_1">The QR code you have scanned comes from a newer version of Briar.\n\nPlease upgrade to the latest version and then try again.</string>