@capacitor/android 8.1.0 → 8.1.1-dev-20260305T150856.0

package/capacitor/src/main/java/com/getcapacitor/Bridge.java

@@ -35,8 +35,6 @@ import androidx.webkit.WebViewFeature;
 import com.getcapacitor.android.R;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
-import com.getcapacitor.cordova.MockCordovaInterfaceImpl;
-import com.getcapacitor.cordova.MockCordovaWebViewImpl;
 import com.getcapacitor.util.HostMask;
 import com.getcapacitor.util.InternalUtils;
 import com.getcapacitor.util.PermissionHelper;
@@ -53,13 +51,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.cordova.ConfigXmlParser;
-import org.apache.cordova.CordovaPreferences;
-import org.apache.cordova.CordovaWebView;
-import org.apache.cordova.PluginEntry;
-import org.apache.cordova.PluginManager;
 import org.json.JSONException;
 
 /**
@@ -125,9 +119,6 @@ public class Bridge {
     private Boolean canInjectJS = true;
     // A reference to the main WebView for the app
     private final WebView webView;
-    public final MockCordovaInterfaceImpl cordovaInterface;
-    private CordovaWebView cordovaWebView;
-    private CordovaPreferences preferences;
     private BridgeWebViewClient webViewClient;
     private App app;
 
@@ -147,6 +138,8 @@ public class Bridge {
     // A map of Plugin Id's to PluginHandle's
     private Map<String, PluginHandle> plugins = new HashMap<>();
 
+    private Map<String, MessageHandler.Interceptor> interceptors = new HashMap<>();
+
     // Stored plugin calls that we're keeping around to call again someday
     private Map<String, PluginCall> savedCalls = new HashMap<>();
 
@@ -169,26 +162,6 @@ public class Bridge {
     // A pre-determined path to load the bridge
     private ServerPath serverPath;
 
-    /**
-     * Create the Bridge with a reference to the main {@link Activity} for the
-     * app, and a reference to the {@link WebView} our app will use.
-     * @param context
-     * @param webView
-     * @deprecated Use {@link Bridge.Builder} to create Bridge instances
-     */
-    @Deprecated
-    public Bridge(
-        AppCompatActivity context,
-        WebView webView,
-        List<Class<? extends Plugin>> initialPlugins,
-        MockCordovaInterfaceImpl cordovaInterface,
-        PluginManager pluginManager,
-        CordovaPreferences preferences,
-        CapConfig config
-    ) {
-        this(context, null, null, webView, initialPlugins, new ArrayList<>(), cordovaInterface, pluginManager, preferences, config);
-    }
-
     private Bridge(
         AppCompatActivity context,
         ServerPath serverPath,
@@ -196,9 +169,6 @@ public class Bridge {
         WebView webView,
         List<Class<? extends Plugin>> initialPlugins,
         List<Plugin> pluginInstances,
-        MockCordovaInterfaceImpl cordovaInterface,
-        PluginManager pluginManager,
-        CordovaPreferences preferences,
         CapConfig config
     ) {
         this.app = new App();
@@ -209,8 +179,6 @@ public class Bridge {
         this.webViewClient = new BridgeWebViewClient(this);
         this.initialPlugins = initialPlugins;
         this.pluginInstances = pluginInstances;
-        this.cordovaInterface = cordovaInterface;
-        this.preferences = preferences;
 
         // Start our plugin execution threads and handlers
         handlerThread.start();
@@ -218,11 +186,10 @@ public class Bridge {
 
         this.config = config != null ? config : CapConfig.loadDefault(getActivity());
         Logger.init(this.config);
-
         // Initialize web view and message handler for it
         this.initWebView();
         this.setAllowedOriginRules();
-        this.msgHandler = new MessageHandler(this, webView, pluginManager);
+        this.msgHandler = new MessageHandler(this, webView);
 
         // Grab any intent info that our app was launched with
         Intent intent = context.getIntent();
@@ -450,12 +417,30 @@ public class Bridge {
         return false;
     }
 
+    private Plugin cordova() {
+        PluginHandle handle = getPlugin("__CordovaHandle");
+        if (handle != null) {
+            return handle.getInstance();
+        }
+        return null;
+    }
+
     public boolean isDeployDisabled() {
-        return preferences.getBoolean("DisableDeploy", false);
+        Plugin cordova = this.cordova();
+        if (cordova != null) {
+            return cordova.hasPermission("DisableDeploy");
+        } else {
+            return false;
+        }
     }
 
     public boolean shouldKeepRunning() {
-        return preferences.getBoolean("KeepRunning", true);
+        Plugin cordova = this.cordova();
+        if (cordova != null) {
+            return cordova.hasPermission("KeepRunning");
+        } else {
+            return false;
+        }
     }
 
     public void handleAppUrlLoadError(Exception ex) {
@@ -474,10 +459,6 @@ public class Bridge {
         return (getActivity().getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
     }
 
-    protected void setCordovaWebView(CordovaWebView cordovaWebView) {
-        this.cordovaWebView = cordovaWebView;
-    }
-
     /**
      * Get the Context for the App
      * @return
@@ -567,6 +548,14 @@ public class Bridge {
         return this.config;
     }
 
+    public MessageHandler.Interceptor getCallInterceptor(String type) {
+        return this.interceptors.get(type);
+    }
+
+    public void registerInterceptor(String type, MessageHandler.Interceptor interceptor) {
+        this.interceptors.put(type, interceptor);
+    }
+
     public void reset() {
         savedCalls = new HashMap<>();
         for (PluginHandle handle : this.plugins.values()) {
@@ -1132,11 +1121,14 @@ public class Bridge {
         if (plugin == null) {
             boolean permissionHandled = false;
             Logger.debug("Unable to find a Capacitor plugin to handle permission requestCode, trying Cordova plugins " + requestCode);
-            try {
-                permissionHandled = cordovaInterface.handlePermissionResult(requestCode, permissions, grantResults);
-            } catch (JSONException e) {
-                Logger.debug("Error on Cordova plugin permissions request " + e.getMessage());
+            PluginHandle cordovaHandle = getPlugin("__CordovaPlugin");
+
+            if (cordovaHandle != null) {
+                Plugin cordovaPlugin = cordovaHandle.getInstance();
+                cordovaPlugin.handleRequestPermissionsResult(requestCode, permissions, grantResults);
+                permissionHandled = cordovaPlugin.hasDefinedRequiredPermissions();
             }
+
             return permissionHandled;
         }
 
@@ -1271,7 +1263,13 @@ public class Bridge {
 
         if (plugin == null || plugin.getInstance() == null) {
             Logger.debug("Unable to find a Capacitor plugin to handle requestCode, trying Cordova plugins " + requestCode);
-            return cordovaInterface.onActivityResult(requestCode, resultCode, data);
+            PluginHandle cordovaHandle = getPlugin("__CordovaPlugin");
+            if (cordovaHandle != null) {
+                Plugin cordovaPlugin = cordovaHandle.getInstance();
+                cordovaPlugin.handleOnActivityResult(requestCode, resultCode, data);
+                // This is a bit hacky but required to return the boolean out of the cordova interface
+                return cordovaPlugin.hasRequiredPermissions();
+            }
         }
 
         // deprecated, to be removed
@@ -1301,10 +1299,6 @@ public class Bridge {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnNewIntent(intent);
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.onNewIntent(intent);
-        }
     }
 
     /**
@@ -1333,10 +1327,6 @@ public class Bridge {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnStart();
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleStart();
-        }
     }
 
     /**
@@ -1346,10 +1336,6 @@ public class Bridge {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnResume();
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleResume(this.shouldKeepRunning());
-        }
     }
 
     /**
@@ -1359,11 +1345,6 @@ public class Bridge {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnPause();
         }
-
-        if (cordovaWebView != null) {
-            boolean keepRunning = this.shouldKeepRunning() || cordovaInterface.getActivityResultCallback() != null;
-            cordovaWebView.handlePause(keepRunning);
-        }
     }
 
     /**
@@ -1373,10 +1354,6 @@ public class Bridge {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnStop();
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleStop();
-        }
     }
 
     /**
@@ -1388,10 +1365,6 @@ public class Bridge {
         }
 
         handlerThread.quitSafely();
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleDestroy();
-        }
     }
 
     /**
@@ -1578,49 +1551,54 @@ public class Bridge {
 
         public Bridge create() {
             // Cordova initialization
-            ConfigXmlParser parser = new ConfigXmlParser();
-            parser.parse(activity.getApplicationContext());
-            CordovaPreferences preferences = parser.getPreferences();
-            preferences.setPreferencesBundle(activity.getIntent().getExtras());
-            List<PluginEntry> pluginEntries = parser.getPluginEntries();
-
-            MockCordovaInterfaceImpl cordovaInterface = new MockCordovaInterfaceImpl(activity);
-            if (instanceState != null) {
-                cordovaInterface.restoreInstanceState(instanceState);
-            }
-
             WebView webView = this.fragment != null ? fragment.getView().findViewById(R.id.webview) : activity.findViewById(R.id.webview);
-            MockCordovaWebViewImpl mockWebView = new MockCordovaWebViewImpl(activity.getApplicationContext());
-            mockWebView.init(cordovaInterface, pluginEntries, preferences, webView);
-            PluginManager pluginManager = mockWebView.getPluginManager();
-            cordovaInterface.onCordovaInit(pluginManager);
 
             // Bridge initialization
-            Bridge bridge = new Bridge(
-                activity,
-                serverPath,
-                fragment,
-                webView,
-                plugins,
-                pluginInstances,
-                cordovaInterface,
-                pluginManager,
-                preferences,
-                config
-            );
+            Bridge bridge = new Bridge(activity, serverPath, fragment, webView, plugins, pluginInstances, config);
 
             if (webView instanceof CapacitorWebView capacitorWebView) {
                 capacitorWebView.setBridge(bridge);
             }
 
-            bridge.setCordovaWebView(mockWebView);
             bridge.setWebViewListeners(webViewListeners);
             bridge.setRouteProcessor(routeProcessor);
 
             if (instanceState != null) {
+                PluginHandle maybeCordova = bridge.getPlugin("__CordovaPlugin");
+                if (maybeCordova != null) {
+                    maybeCordova.getInstance().restoreState(instanceState);
+                }
                 bridge.restoreInstanceState(instanceState);
             }
 
+            bridge.registerInterceptor("message", (postData) -> {
+                try {
+                    String callbackId = postData.getString("callbackId");
+                    String pluginId = postData.getString("pluginId");
+                    String methodName = postData.getString("methodName");
+                    JSObject methodData = postData.getJSObject("options", new JSObject());
+
+                    Logger.verbose(
+                        Logger.tags("Plugin"),
+                        "To native (Capacitor plugin): callbackId: " +
+                            callbackId +
+                            ", pluginId: " +
+                            pluginId +
+                            ", methodName: " +
+                            methodName
+                    );
+
+                    PluginCall call = new PluginCall(bridge.msgHandler, pluginId, callbackId, methodName, methodData);
+                    bridge.callPluginMethod(pluginId, methodName, call);
+                } catch (JSONException e) {
+                    Logger.error(e.getMessage());
+                }
+            });
+
+            bridge.registerInterceptor("js.error", (postData) -> {
+                Logger.error("JavaScript Error: " + postData.toString());
+            });
+
             return bridge;
         }
     }

package/capacitor/src/main/java/com/getcapacitor/BridgeActivity.java

@@ -66,7 +66,9 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        bridge.saveInstanceState(outState);
+        if (bridge != null) {
+            bridge.saveInstanceState(outState);
+        }
     }
 
     @Override
@@ -82,8 +84,10 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onRestart() {
         super.onRestart();
-        this.bridge.onRestart();
-        Logger.debug("App restarted");
+        if (this.bridge != null) {
+            this.bridge.onRestart();
+            Logger.debug("App restarted");
+        }
     }
 
     @Override
@@ -131,7 +135,9 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        this.bridge.onDetachedFromWindow();
+        if (this.bridge != null) {
+            this.bridge.onDetachedFromWindow();
+        }
     }
 
     /**

package/capacitor/src/main/java/com/getcapacitor/MessageHandler.java

@@ -5,7 +5,7 @@ import android.webkit.WebView;
 import androidx.webkit.JavaScriptReplyProxy;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
-import org.apache.cordova.PluginManager;
+import java.util.function.Function;
 
 /**
  * MessageHandler handles messages from the WebView, dispatching them
@@ -13,15 +13,18 @@ import org.apache.cordova.PluginManager;
  */
 public class MessageHandler {
 
+    @FunctionalInterface
+    public interface Interceptor {
+        void intercept(JSObject object);
+    }
+
     private Bridge bridge;
     private WebView webView;
-    private PluginManager cordovaPluginManager;
     private JavaScriptReplyProxy javaScriptReplyProxy;
 
-    public MessageHandler(Bridge bridge, WebView webView, PluginManager cordovaPluginManager) {
+    public MessageHandler(Bridge bridge, WebView webView) {
         this.bridge = bridge;
         this.webView = webView;
-        this.cordovaPluginManager = cordovaPluginManager;
 
         if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER) && !bridge.getConfig().isUsingLegacyBridge()) {
             WebViewCompat.WebMessageListener capListener = (view, message, sourceOrigin, isMainFrame, replyProxy) -> {
@@ -42,6 +45,11 @@ public class MessageHandler {
         }
     }
 
+    @Deprecated
+    public MessageHandler(Bridge bridge, WebView webView, Object cordovaPluginManager) {
+        this(bridge, webView);
+    }
+
     /**
      * The main message handler that will be called from JavaScript
      * to send a message to the native bridge.
@@ -55,43 +63,11 @@ public class MessageHandler {
 
             String type = postData.getString("type");
 
-            boolean typeIsNotNull = type != null;
-            boolean isCordovaPlugin = typeIsNotNull && type.equals("cordova");
-            boolean isJavaScriptError = typeIsNotNull && type.equals("js.error");
-
-            String callbackId = postData.getString("callbackId");
-
-            if (isCordovaPlugin) {
-                String service = postData.getString("service");
-                String action = postData.getString("action");
-                String actionArgs = postData.getString("actionArgs");
-
-                Logger.verbose(
-                    Logger.tags("Plugin"),
-                    "To native (Cordova plugin): callbackId: " +
-                        callbackId +
-                        ", service: " +
-                        service +
-                        ", action: " +
-                        action +
-                        ", actionArgs: " +
-                        actionArgs
-                );
-
-                this.callCordovaPluginMethod(callbackId, service, action, actionArgs);
-            } else if (isJavaScriptError) {
-                Logger.error("JavaScript Error: " + jsonStr);
-            } else {
-                String pluginId = postData.getString("pluginId");
-                String methodName = postData.getString("methodName");
-                JSObject methodData = postData.getJSObject("options", new JSObject());
-
-                Logger.verbose(
-                    Logger.tags("Plugin"),
-                    "To native (Capacitor plugin): callbackId: " + callbackId + ", pluginId: " + pluginId + ", methodName: " + methodName
-                );
+            if (type == null) type = "message";
 
-                this.callPluginMethod(callbackId, pluginId, methodName, methodData);
+            Interceptor interceptor = bridge.getCallInterceptor(type);
+            if (interceptor != null) {
+                interceptor.intercept(postData);
             }
         } catch (Exception ex) {
             Logger.error("Post message error:", ex);
@@ -148,10 +124,4 @@ public class MessageHandler {
         PluginCall call = new PluginCall(this, pluginId, callbackId, methodName, methodData);
         bridge.callPluginMethod(pluginId, methodName, call);
     }
-
-    private void callCordovaPluginMethod(String callbackId, String service, String action, String actionArgs) {
-        bridge.execute(() -> {
-            cordovaPluginManager.exec(service, action, callbackId, actionArgs);
-        });
-    }
 }

package/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java

@@ -128,9 +128,22 @@ public class WebViewLocalServer {
             return reasonPhrase;
         }
 
+        /**
+         * @deprecated This method may return incorrect headers in concurrent range requests.
+         * <p>
+         * Use {@link #buildDefaultResponseHeaders()} instead, which returns a copy of the map.
+         * </p>
+         * This method will be removed in a future major version of Capacitor.
+         * </p>
+         */
+        @Deprecated(forRemoval = true) // adjust version as appropriate
         public Map<String, String> getResponseHeaders() {
             return responseHeaders;
         }
+
+        public Map<String, String> buildDefaultResponseHeaders() {
+            return new HashMap<>(responseHeaders);
+        }
     }
 
     WebViewLocalServer(Context context, Bridge bridge, JSInjector jsInjector, ArrayList<String> authorities, boolean html5mode) {
@@ -329,7 +342,7 @@ public class WebViewLocalServer {
         if (request.getRequestHeaders().get("Range") != null) {
             InputStream responseStream = new LollipopLazyInputStream(handler, request);
             String mimeType = getMimeType(path, responseStream);
-            Map<String, String> tempResponseHeaders = handler.getResponseHeaders();
+            Map<String, String> tempResponseHeaders = handler.buildDefaultResponseHeaders();
             int statusCode = 206;
             try {
                 int totalRange = responseStream.available();
@@ -337,6 +350,13 @@ public class WebViewLocalServer {
                 String[] parts = rangeString.split("=");
                 String[] streamParts = parts[1].split("-");
                 String fromRange = streamParts[0];
+                int bytesToSkip;
+                try {
+                    bytesToSkip = Integer.parseInt(fromRange);
+                    if (bytesToSkip > 0) {
+                        responseStream.skip(bytesToSkip);
+                    }
+                } catch (NumberFormatException ignored) {}
                 int range = totalRange - 1;
                 if (streamParts.length > 1) {
                     range = Integer.parseInt(streamParts[1]);
@@ -365,7 +385,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -376,7 +396,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 handler.getStatusCode(),
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 null
             );
         }
@@ -411,7 +431,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -442,7 +462,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -517,7 +537,7 @@ public class WebViewLocalServer {
                             handler.getEncoding(),
                             handler.getStatusCode(),
                             handler.getReasonPhrase(),
-                            handler.getResponseHeaders(),
+                            handler.buildDefaultResponseHeaders(),
                             responseStream
                         );
                     }

package/capacitor/src/main/java/com/getcapacitor/cordova/CordovaPlugin.java

@@ -0,0 +1,148 @@
+package com.getcapacitor.cordova;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.webkit.WebView;
+import com.getcapacitor.Logger;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.android.R;
+import com.getcapacitor.annotation.CapacitorPlugin;
+import java.util.List;
+import org.apache.cordova.ConfigXmlParser;
+import org.apache.cordova.CordovaInterface;
+import org.apache.cordova.CordovaPreferences;
+import org.apache.cordova.CordovaWebView;
+import org.apache.cordova.PluginEntry;
+import org.apache.cordova.PluginManager;
+import org.json.JSONException;
+
+@CapacitorPlugin(name = "__CordovaPlugin")
+public class CordovaPlugin extends Plugin {
+
+    private MockCordovaInterfaceImpl cordovaInterface;
+    private CordovaWebView webView;
+    private CordovaPreferences preferences;
+
+    private boolean pluginHadActivityResult = false;
+    private boolean pluginHadPermissionResult = false;
+
+    @Override
+    public void load() {
+        ConfigXmlParser parser = new ConfigXmlParser();
+        parser.parse(getActivity().getApplicationContext());
+        preferences = parser.getPreferences();
+        preferences.setPreferencesBundle(getActivity().getIntent().getExtras());
+        List<PluginEntry> pluginEntries = parser.getPluginEntries();
+
+        cordovaInterface = new MockCordovaInterfaceImpl(getActivity());
+
+        MockCordovaWebViewImpl mockWebView = new MockCordovaWebViewImpl(getActivity().getApplicationContext());
+        mockWebView.init(cordovaInterface, pluginEntries, preferences, bridge.getWebView());
+        webView = mockWebView;
+        PluginManager pluginManager = mockWebView.getPluginManager();
+        cordovaInterface.onCordovaInit(pluginManager);
+
+        bridge.registerInterceptor("cordova", (postData) -> {
+            String callbackId = postData.getString("callbackId");
+
+            String service = postData.getString("service");
+            String action = postData.getString("action");
+            String actionArgs = postData.getString("actionArgs");
+
+            Logger.verbose(
+                Logger.tags("Plugin"),
+                "To native (Cordova plugin): callbackId: " +
+                    callbackId +
+                    ", service: " +
+                    service +
+                    ", action: " +
+                    action +
+                    ", actionArgs: " +
+                    actionArgs
+            );
+
+            bridge.execute(() -> {
+                pluginManager.exec(service, action, callbackId, actionArgs);
+            });
+        });
+    }
+
+    @Override
+    protected void restoreState(Bundle state) {
+        if (state != null) {
+            cordovaInterface.restoreInstanceState(state);
+        }
+    }
+
+    @Override
+    protected void handleRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        try {
+            pluginHadPermissionResult = cordovaInterface.handlePermissionResult(requestCode, permissions, grantResults);
+        } catch (JSONException e) {
+            Logger.debug("Error on Cordova plugin permissions request " + e.getMessage());
+        }
+    }
+
+    @Override
+    public boolean hasPermission(String permission) {
+        if (permission.equals("DisableDeploy")) {
+            return preferences.getBoolean(permission, false);
+        }
+
+        if (permission.equals("KeepRunning")) {
+            return preferences.getBoolean(permission, true);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean hasDefinedRequiredPermissions() {
+        boolean currentPermissionResult = pluginHadPermissionResult;
+        pluginHadPermissionResult = false;
+        return currentPermissionResult;
+    }
+
+    @Override
+    protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
+        pluginHadActivityResult = cordovaInterface.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
+    public boolean hasRequiredPermissions() {
+        boolean currentActivityResult = pluginHadActivityResult;
+        pluginHadActivityResult = false;
+        return currentActivityResult;
+    }
+
+    @Override
+    protected void handleOnNewIntent(Intent intent) {
+        webView.onNewIntent(intent);
+    }
+
+    @Override
+    protected void handleOnStart() {
+        webView.handleStart();
+    }
+
+    @Override
+    protected void handleOnResume() {
+        webView.handleResume(bridge.shouldKeepRunning());
+    }
+
+    @Override
+    protected void handleOnPause() {
+        boolean keepRunning = bridge.shouldKeepRunning() || cordovaInterface.getActivityResultCallback() != null;
+        webView.handlePause(keepRunning);
+    }
+
+    @Override
+    protected void handleOnStop() {
+        webView.handleStop();
+    }
+
+    @Override
+    protected void handleOnDestroy() {
+        webView.handleDestroy();
+    }
+}

package/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaInterfaceImpl.java

@@ -7,7 +7,7 @@ import org.apache.cordova.CordovaInterfaceImpl;
 import org.apache.cordova.CordovaPlugin;
 import org.json.JSONException;
 
-public class MockCordovaInterfaceImpl extends CordovaInterfaceImpl {
+class MockCordovaInterfaceImpl extends CordovaInterfaceImpl {
 
     public MockCordovaInterfaceImpl(AppCompatActivity activity) {
         super(activity, Executors.newCachedThreadPool());

package/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaWebViewImpl.java

@@ -20,7 +20,7 @@ import org.apache.cordova.PluginEntry;
 import org.apache.cordova.PluginManager;
 import org.apache.cordova.PluginResult;
 
-public class MockCordovaWebViewImpl implements CordovaWebView {
+class MockCordovaWebViewImpl implements CordovaWebView {
 
     private Context context;
     private PluginManager pluginManager;
@@ -32,7 +32,7 @@ public class MockCordovaWebViewImpl implements CordovaWebView {
     private WebView webView;
     private boolean hasPausedEver;
 
-    public MockCordovaWebViewImpl(Context context) {
+    MockCordovaWebViewImpl(Context context) {
         this.context = context;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "8.1.0",
+  "version": "8.1.1-dev-20260305T150856.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -23,7 +23,7 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor/core": "^8.1.0"
+    "@capacitor/core": "^8.1.0-dev-20260305T150856.0"
   },
   "publishConfig": {
     "access": "public"