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..44bd08cae 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java @@ -110,7 +110,7 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis .onAllGranted(() -> ((QrScanFragment) adapter.getItem(TAB_SCAN)).handleQrScanWithPermissions(QrActivity.this)) .onAnyDenied(() -> { if (scanRelay) { - finish(); + 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); }