From 6197f5a44c189b06ddb81ed9b9b1ecda110e9764 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 15 Apr 2016 17:06:05 +0100
Subject: [PATCH] Catch runtime exceptions from QR code decoder. #298
---
.../src/org/briarproject/android/util/QrCodeDecoder.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java b/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
index 5fdc54c394..207adf368c 100644
--- a/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
+++ b/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
@@ -77,6 +77,8 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
result = reader.decode(bitmap);
} catch (ReaderException e) {
return null; // No barcode found
+ } catch (RuntimeException e) {
+ return null; // Decoding failed due to bug in decoder
} finally {
reader.reset();
}
--
GitLab