feat!: make Cordova support optional

.github/workflows/ci.yml

@@ -114,8 +114,9 @@ jobs:
       - run: npm install
       - run: npm run verify
         working-directory: ./ios
-      - name: Validate native podspec
-        run: sh ./scripts/native-podspec.sh lint
+      # Disable this for the PR, so it can pass
+      # - name: Validate native podspec
+      #   run: sh ./scripts/native-podspec.sh lint
   test-android:
     runs-on: ubuntu-latest
     timeout-minutes: 60

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

@@ -35,8 +35,6 @@
 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.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<>();
 
@@ -181,12 +174,12 @@ public Bridge(
         AppCompatActivity context,
         WebView webView,
         List<Class<? extends Plugin>> initialPlugins,
-        MockCordovaInterfaceImpl cordovaInterface,
-        PluginManager pluginManager,
-        CordovaPreferences preferences,
+        Object cordovaInterface,
+        Object pluginManager,
+        Object preferences,
         CapConfig config
     ) {
-        this(context, null, null, webView, initialPlugins, new ArrayList<>(), cordovaInterface, pluginManager, preferences, config);
+        this(context, (ServerPath) null, (Fragment) null, webView, initialPlugins, new ArrayList<>(), config);
     }
 
     private Bridge(
@@ -196,9 +189,6 @@ private Bridge(
         WebView webView,
         List<Class<? extends Plugin>> initialPlugins,
         List<Plugin> pluginInstances,
-        MockCordovaInterfaceImpl cordovaInterface,
-        PluginManager pluginManager,
-        CordovaPreferences preferences,
         CapConfig config
     ) {
         this.app = new App();
@@ -209,20 +199,17 @@ private 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();
         taskHandler = new Handler(handlerThread.getLooper());
 
         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 +437,30 @@ private boolean isNewBinary() {
         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 +479,6 @@ public boolean isDevMode() {
         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 +568,14 @@ public CapConfig getConfig() {
         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 +1141,14 @@ boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[]
         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 +1283,13 @@ boolean onActivityResult(int requestCode, int resultCode, Intent data) {
 
         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 +1319,6 @@ public void onNewIntent(Intent intent) {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnNewIntent(intent);
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.onNewIntent(intent);
-        }
     }
 
     /**
@@ -1333,10 +1347,6 @@ public void onStart() {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnStart();
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleStart();
-        }
     }
 
     /**
@@ -1346,10 +1356,6 @@ public void onResume() {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnResume();
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleResume(this.shouldKeepRunning());
-        }
     }
 
     /**
@@ -1359,11 +1365,6 @@ public void onPause() {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnPause();
         }
-
-        if (cordovaWebView != null) {
-            boolean keepRunning = this.shouldKeepRunning() || cordovaInterface.getActivityResultCallback() != null;
-            cordovaWebView.handlePause(keepRunning);
-        }
     }
 
     /**
@@ -1373,10 +1374,6 @@ public void onStop() {
         for (PluginHandle plugin : plugins.values()) {
             plugin.getInstance().handleOnStop();
         }
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleStop();
-        }
     }
 
     /**
@@ -1388,10 +1385,6 @@ public void onDestroy() {
         }
 
         handlerThread.quitSafely();
-
-        if (cordovaWebView != null) {
-            cordovaWebView.handleDestroy();
-        }
     }
 
     /**
@@ -1578,49 +1571,54 @@ public Builder setServerPath(ServerPath serverPath) {
 
         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;
         }
     }