Merge pull request #2 from Chuckytuh/patch-1

Prevents NPE after second checkDevice() call
agmv · Apr 10, 2018 · 71eacc6 · 71eacc6
2 parents 223c1b5 + 6dfab77
commit 71eacc6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/android/secureDevice.java b/src/android/secureDevice.java
@@ -71,9 +71,12 @@ private void checkDevice() {
         if (_isDeviceRooted || !_isPasscodeSet) {
             // Remove View
             View v = this.view.getView();
-            ViewGroup viewParent = (ViewGroup) v.getParent();
-            viewParent.removeView(v);
-
+            if (v != null) {
+                ViewGroup viewParent = (ViewGroup) v.getParent();
+                if (viewParent != null) {
+                    viewParent.removeView(v);
+                }
+            }
             // Show message and quit
             Application app = cordova.getActivity().getApplication();
             String package_name = app.getPackageName();