diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java index eaadaea0c..da7f71377 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java @@ -148,7 +148,7 @@ public class AddNearbyContactActivity extends BriarActivity } else if (state instanceof WrongQrCodeType) { QrCodeType qrCodeType = ((WrongQrCodeType) state).qrCodeType; if (qrCodeType == MAILBOX) onMailboxQrCodeScanned(); - else showErrorFragment(); + else onWrongQrCodeType(); } else if (state instanceof WrongQrCodeVersion) { boolean qrCodeTooOld = ((WrongQrCodeVersion) state).qrCodeTooOld; onWrongQrCodeVersion(qrCodeTooOld); @@ -187,6 +187,13 @@ public class AddNearbyContactActivity extends BriarActivity AddNearbyContactErrorFragment.newInstance(title, msg, false)); } + private void onWrongQrCodeType() { + String title = getString(R.string.qr_code_invalid); + String msg = getString(R.string.qr_code_format_unknown); + showNextFragment( + AddNearbyContactErrorFragment.newInstance(title, msg, false)); + } + private void onWrongQrCodeVersion(boolean qrCodeTooOld) { String title = getString(R.string.qr_code_invalid); String msg; diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 46d3b6329..f4cd43168 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -253,6 +253,7 @@ 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. The QR code you have scanned comes from a newer version of Briar.\n\nPlease upgrade to the latest version and then try again. The QR code you have scanned comes from Briar Mailbox.\n\nIf you want to link a Mailbox, please choose Settings > Mailbox from the Briar menu. + The QR code you have scanned does not come from Briar.\n\nPlease scan the QR code shown on your contact\'s screen. Camera error Connecting to device\u2026 Authenticating with device\u2026