summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2019-06-02 13:50:59 +0200
committerBjørn Mork <bjorn@mork.no>2019-06-02 13:50:59 +0200
commit188e9e75fe7b040972a918e4e96d342086772bb1 (patch)
tree40b067d33bf3ce795daabfeecd165e00125977fa
parent3508196de5539f31f5c35146d4fef4ea9c5d74b1 (diff)
fix crash on cancelled QR scan
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--Defogger/src/no/mork/android/defogger/MainActivity.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java
index 4703900..f8679cd 100644
--- a/Defogger/src/no/mork/android/defogger/MainActivity.java
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -150,6 +150,11 @@ public class MainActivity extends Activity {
}
private void handleQRScanResult(IntentResult res) {
+ if (res.getContents() == null) {
+ setStatus("No QR code scanned");
+ return;
+ }
+
Log.d(msg, "QR scan resturned: " + res.toString());
// DCS-8000LH,A3,12345678,B0C554AABBCC,DCS-8000LH-BBCC,123456