Merge pull request #48 from natsuk4ze/Fix-NullPointerException-onRequ…

…estPermissionsResult Return false when request code invalid
natsuk4ze · Jul 19, 2023 · 9959ea0 · 9959ea0
2 parents 6596073 + 66c1d72
commit 9959ea0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/android/src/main/java/studio/midoridesign/gal/GalPlugin.java b/android/src/main/java/studio/midoridesign/gal/GalPlugin.java
@@ -208,8 +208,11 @@ public void onDetachedFromActivityForConfigChanges() {
 
     @Override
     public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode != PERMISSION_REQUEST_CODE || grantResults.length == 0) {
+            return false;
+        }
         accessRequestResult.complete(
-                grantResults[0] == PackageManager.PERMISSION_GRANTED && PERMISSION_REQUEST_CODE == requestCode);
+                grantResults[0] == PackageManager.PERMISSION_GRANTED);
         return true;
     }