fix NPE

bitpay · Feb 22, 2022 · 2c33816 · 2c33816
1 parent 1fc7d67
commit 2c33816
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/android/QRScanner.java b/src/android/QRScanner.java
@@ -777,7 +777,10 @@ public void run() {
             this.cordova.getActivity().runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    ((ViewGroup) mBarcodeView.getParent()).removeView(mBarcodeView);
+                    ViewGroup parent = (ViewGroup) mBarcodeView.getParent();
+                    if (parent != null) {
+                     parent.removeView(mBarcodeView);
+                    }
                     cameraPreviewing = false;
                 }
             });

diff --git a/src/common/src/createQRScannerAdapter.js b/src/common/src/createQRScannerAdapter.js
@@ -165,6 +165,7 @@ return {
       throw new Error('No callback provided to scan method.');
     }
     var success = function(result) {
+      // TODO: If there's an error code, then add message.
       callback(null, result);
     };
     cordova.exec(success, errorCallback(callback), 'QRScanner', 'scan', []);