fix(android): Release the call after reject/resolve (#4318)

ionic-team · Mar 17, 2021 · a9f30a8 · a9f30a8
1 parent 5bc82f6
commit a9f30a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/MessageHandler.java b/android/capacitor/src/main/java/com/getcapacitor/MessageHandler.java
@@ -109,6 +109,9 @@ public void sendResponseMessage(PluginCall call, PluginResult successResult, Plu
         } catch (Exception ex) {
             Logger.error("sendResponseMessage: error: " + ex);
         }
+        if (!call.isKeptAlive()) {
+            call.release(bridge);
+        }
     }
 
     private void callPluginMethod(String callbackId, String pluginId, String methodName, JSObject methodData) {

diff --git a/android/capacitor/src/main/java/com/getcapacitor/Plugin.java b/android/capacitor/src/main/java/com/getcapacitor/Plugin.java
@@ -140,10 +140,6 @@ 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);
@@ -158,11 +154,6 @@ private void triggerActivityCallback(Method method, ActivityResult result) {
         if (savedCall == null) {
             savedCall = bridge.getPluginCallForLastActivity();
         }
-
-        if (!savedCall.isKeptAlive()) {
-            savedCall.release(bridge);
-        }
-
         // invoke the activity result callback
         try {
             method.setAccessible(true);