From 68f95333927a4d32953742a6b60deec12d1f4c0f Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Fri, 12 Dec 2025 16:29:01 +0100
Subject: [PATCH 1/2] Allow to add relay from clipboard or image if camera
 permission is not granted

---
 CHANGELOG.md                                                | 4 ++++
 src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4513f399..24bda9601 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Delta Chat Android Changelog
 
+## Unreleased
+
+* Allow to add relay from clipboard or image if camera permission is not granted
+
 ## v2.33.1
 2025-12
 
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
index 4676930e8..26cfdcf6b 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
@@ -109,8 +109,8 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis
                     .withPermanentDenialDialog(getString(R.string.perm_explain_access_to_camera_denied))
                     .onAllGranted(() -> ((QrScanFragment) adapter.getItem(TAB_SCAN)).handleQrScanWithPermissions(QrActivity.this))
                     .onAnyDenied(() -> {
-                        if (scanRelay) {
-                            finish();
+                        if (!scanRelay) {
+                            Toast.makeText(this, getString(R.string.chat_camera_unavailable), Toast.LENGTH_LONG).show();
                         } else {
                             viewPager.setCurrentItem(TAB_SHOW);
                         }
@@ -162,7 +162,7 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis
                 && Manifest.permission.CAMERA.equals(permissions[0])
                 && grantResults[0] == PackageManager.PERMISSION_DENIED) {
             if (scanRelay) {
-                finish();
+                Toast.makeText(this, getString(R.string.chat_camera_unavailable), Toast.LENGTH_LONG).show();
             } else {
                 viewPager.setCurrentItem(TAB_SHOW);
             }

From 12c2237e0045cfb4992d54ef6e804019abd34951 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Fri, 12 Dec 2025 16:30:58 +0100
Subject: [PATCH 2/2] remove leftover

---
 src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
index 26cfdcf6b..44bd08cae 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
@@ -109,7 +109,7 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis
                     .withPermanentDenialDialog(getString(R.string.perm_explain_access_to_camera_denied))
                     .onAllGranted(() -> ((QrScanFragment) adapter.getItem(TAB_SCAN)).handleQrScanWithPermissions(QrActivity.this))
                     .onAnyDenied(() -> {
-                        if (!scanRelay) {
+                        if (scanRelay) {
                             Toast.makeText(this, getString(R.string.chat_camera_unavailable), Toast.LENGTH_LONG).show();
                         } else {
                             viewPager.setCurrentItem(TAB_SHOW);