From ab8734e37336fe6ad9f5eea5b0c5c76f92787c33 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 19 Dec 2022 10:12:01 +0000
Subject: [PATCH] Show relevant message when contact QR code has unknown
 format.

---
 .../contact/add/nearby/AddNearbyContactActivity.java     | 9 ++++++++-
 briar-android/src/main/res/values/strings.xml            | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

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 @@
 	<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="mailbox_qr_code_for_contact">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.</string>
+	<string name="qr_code_format_unknown">The QR code you have scanned does not come from Briar.\n\nPlease scan the QR code shown on your contact\'s screen.</string>
 	<string name="camera_error">Camera error</string>
 	<string name="connecting_to_device">Connecting to device\u2026</string>
 	<string name="authenticating_with_device">Authenticating with device\u2026</string>