diff --git a/CHANGELOG.md b/CHANGELOG.md index 1600e789d..42ebbb45a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Allow to see inbox quota for all relays in connectivity screen * Truncate file names in the middle, not at the end; important information are more often at the end * Remove email address from user profile +* Fix: Show dialog if pasted QR codes are invalid * Update to core 2.36.0 ## v2.35.0 diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java index 8e5900386..bd1f9c841 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java @@ -58,7 +58,9 @@ public class QrCodeHandler { public void handleOnlySecureJoinQr(String rawString, SecurejoinSource source, SecurejoinUiPath uiPath) { final DcLot qrParsed = dcContext.checkQr(rawString); if (!handleSecureJoinQr(qrParsed, rawString, source, uiPath)) { - handleDefault(new AlertDialog.Builder(activity), rawString, qrParsed); + AlertDialog.Builder builder = new AlertDialog.Builder(activity); + handleDefault(builder, rawString, qrParsed); + builder.create().show(); } } @@ -122,7 +124,9 @@ public class QrCodeHandler { public void handleOnlyAddRelayQr(String rawString) { final DcLot qrParsed = dcContext.checkQr(rawString); if (!handleAddRelayQr(qrParsed, rawString)) { - handleDefault(new AlertDialog.Builder(activity), rawString, qrParsed); + AlertDialog.Builder builder = new AlertDialog.Builder(activity); + handleDefault(builder, rawString, qrParsed); + builder.create().show(); } }