🐛 fix call.getBoolean bugs and NullPointerExpections

capacitor-community · Jun 30, 2021 · fc9ce35 · fc9ce35
1 parent 874466c
commit fc9ce35
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/android/src/main/java/com/dutchconcepts/capacitor/barcodescanner/BarcodeScanner.java b/android/src/main/java/com/dutchconcepts/capacitor/barcodescanner/BarcodeScanner.java
@@ -329,11 +329,12 @@ public void startScan(PluginCall call) {
 
     @PluginMethod
     public void stopScan(PluginCall call) {
-        if (call.hasOption("resolveScan") && call.getBool("resolveScan") && getSavedCall() != null) {
-            JSObject jsObject = new JSObject();
-            jsObject.put("hasContent", false);
+        if (call.hasOption("resolveScan") && getSavedCall() != null) {
+            Boolean resolveScan = call.getBoolean("resolveScan", false);
+            if (resolveScan != null && resolveScan) {
+                JSObject jsObject = new JSObject();
+                jsObject.put("hasContent", false);
 
-            if (getSavedCall() != null) {
                 getSavedCall().resolve(jsObject);
             }
         }
@@ -466,7 +467,10 @@ private void cameraPermsCallback(PluginCall call) {
     public void checkPermission(PluginCall call) {
         Boolean force = call.getBoolean("force", false);
 
-        _checkPermission(call, force);
+        if (force != null && force) {
+            _checkPermission(call, true);
+        }
+        _checkPermission(call, false);
     }
 
     @PluginMethod