fix(android): calls re-saved during permission/activity result callba…

…cks were being released
ionic-team · Mar 4, 2021 · 502a2d1 · 502a2d1
1 parent e433691
commit 502a2d1
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/Plugin.java b/android/capacitor/src/main/java/com/getcapacitor/Plugin.java
@@ -140,16 +140,16 @@ private void triggerPermissionCallback(Method method, Map<String, Boolean> permi
 
         // validate permissions and invoke the permission result callback
         if (bridge.validatePermissions(this, savedCall, permissionResultMap)) {
+            if (!savedCall.isKeptAlive()) {
+                savedCall.release(bridge);
+            }
+
             try {
                 method.setAccessible(true);
                 method.invoke(this, savedCall);
             } catch (IllegalAccessException | InvocationTargetException e) {
                 e.printStackTrace();
             }
-
-            if (!savedCall.isKeptAlive()) {
-                savedCall.release(bridge);
-            }
         }
     }
 
@@ -159,17 +159,17 @@ private void triggerActivityCallback(Method method, ActivityResult result) {
             savedCall = bridge.getPluginCallForLastActivity();
         }
 
+        if (!savedCall.isKeptAlive()) {
+            savedCall.release(bridge);
+        }
+
         // invoke the activity result callback
         try {
             method.setAccessible(true);
             method.invoke(this, savedCall, result);
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
-
-        if (!savedCall.isKeptAlive()) {
-            savedCall.release(bridge);
-        }
     }
 
     /**