Allow not showing the scanned text #5

EddyVerbruggen · Dec 22, 2016 · 4fc064b · 4fc064b
1 parent a35cee7
commit 4fc064b
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/barcodescanner/src/main/java/com/google/zxing/client/android/CaptureActivity.java b/barcodescanner/src/main/java/com/google/zxing/client/android/CaptureActivity.java
@@ -665,12 +665,18 @@ private void handleDecodeExternally(Result rawResult, ResultHandler resultHandle
       viewfinderView.drawResultBitmap(barcode);
     }
 
-    long resultDurationMS;
-    if (getIntent() == null) {
-      resultDurationMS = DEFAULT_INTENT_RESULT_DURATION_MS;
-    } else {
-      resultDurationMS = getIntent().getLongExtra(Intents.Scan.RESULT_DISPLAY_DURATION_MS,
-                                                  DEFAULT_INTENT_RESULT_DURATION_MS);
+    long resultDurationMS = DEFAULT_INTENT_RESULT_DURATION_MS;
+    if (getIntent() != null) {
+      if (getIntent().hasExtra(Intents.Scan.RESULT_DISPLAY_DURATION_MS)) {
+        final String durationStr = getIntent().getStringExtra(Intents.Scan.RESULT_DISPLAY_DURATION_MS);
+        if (durationStr != null) {
+          try {
+            resultDurationMS = Long.parseLong(durationStr);
+          } catch (NumberFormatException e) {
+            Log.e(TAG, "Could not parse " + durationStr + " to Long", e);
+          }
+        }
+      }
     }
 
     if (resultDurationMS > 0) {