From 12683e3ff0843e9868fe26a057f7df5a51079a12 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Sat, 3 Dec 2022 21:26:31 +0100 Subject: [PATCH] Don't process QR code if ScannerActivity is finished --- .../java/com/beemdevelopment/aegis/ui/ScannerActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java index d534c3dd..c5762bbd 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java @@ -178,6 +178,10 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis @Override public void onQrCodeDetected(Result result) { new Handler(getMainLooper()).post(() -> { + if (isFinishing()) { + return; + } + if (_analysis != null) { try { Uri uri = Uri.parse(result.getText().trim()); @@ -190,6 +194,7 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis e.printStackTrace(); unbindPreview(_cameraProvider); + Dialogs.showErrorDialog(this, e.isPhoneFactor() ? R.string.read_qr_error_phonefactor : R.string.read_qr_error, e, ((dialog, which) -> bindPreview(_cameraProvider)));