fix(android): save activity result launcher calls (#5004)

ionic-team · Sep 3, 2021 · 2c1eb60 · 2c1eb60
1 parent 8a08579
commit 2c1eb60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/Bridge.java b/android/capacitor/src/main/java/com/getcapacitor/Bridge.java
@@ -690,6 +690,10 @@ PluginCall getPluginCallForLastActivity() {
         return pluginCallForLastActivity;
     }
 
+    void setPluginCallForLastActivity(PluginCall pluginCallForLastActivity) {
+        this.pluginCallForLastActivity = pluginCallForLastActivity;
+    }
+
     /**
      * Release a retained call
      * @param call a call to release

diff --git a/android/capacitor/src/main/java/com/getcapacitor/Plugin.java b/android/capacitor/src/main/java/com/getcapacitor/Plugin.java
@@ -175,7 +175,7 @@ public void startActivityForResult(PluginCall call, Intent intent, String callba
             // return when null since call was rejected in getLauncherOrReject
             return;
         }
-
+        bridge.setPluginCallForLastActivity(call);
         lastPluginCallId = call.getCallbackId();
         bridge.saveCall(call);
         activityResultLauncher.launch(intent);
@@ -894,7 +894,7 @@ protected void handleRequestPermissionsResult(int requestCode, String[] permissi
      * @return a new {@link Bundle} with fields set from the options of the last saved {@link PluginCall}
      */
     protected Bundle saveInstanceState() {
-        PluginCall savedCall = getSavedCall();
+        PluginCall savedCall = bridge.getSavedCall(lastPluginCallId);
 
         if (savedCall == null) {
             return null;