@capacitor/android 9.0.0-alpha.6 → 9.0.0-alpha.7

package/capacitor/build.gradle

@@ -1,10 +1,10 @@
 ext {
-    androidxActivityVersion = project.hasProperty('androidxActivityVersion') ? rootProject.ext.androidxActivityVersion : '1.11.0'
+    androidxActivityVersion = project.hasProperty('androidxActivityVersion') ? rootProject.ext.androidxActivityVersion : '1.13.0'
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
     androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.3.0'
-    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.17.0'
+    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.19.0'
     androidxFragmentVersion = project.hasProperty('androidxFragmentVersion') ? rootProject.ext.androidxFragmentVersion : '1.8.9'
-    androidxWebkitVersion = project.hasProperty('androidxWebkitVersion') ? rootProject.ext.androidxWebkitVersion : '1.14.0'
+    androidxWebkitVersion = project.hasProperty('androidxWebkitVersion') ? rootProject.ext.androidxWebkitVersion : '1.16.0'
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'

package/capacitor/proguard-rules.pro

@@ -14,9 +14,3 @@
  }
 
  -keep public class * extends com.getcapacitor.Plugin { *; }
-
-# Rules for Capacitor v2 plugins and annotations
-# These are deprecated but can still be used with Capacitor for now
--keep @com.getcapacitor.NativePlugin public class * {
-  @com.getcapacitor.PluginMethod public <methods>;
-}

package/capacitor/src/main/assets/native-bridge.js

@@ -367,12 +367,6 @@ var nativeBridge = (function (exports) {
                 }
             };
             const platform = getPlatformId(win);
-            if (platform == 'android' && typeof win.CapacitorSystemBarsAndroidInterface !== 'undefined') {
-                // add DOM ready listener for System Bars
-                document.addEventListener('DOMContentLoaded', function () {
-                    win.CapacitorSystemBarsAndroidInterface.onDOMReady();
-                });
-            }
             if (platform == 'android' || platform == 'ios') {
                 // patch document.cookie on Android/iOS
                 win.CapacitorCookiesDescriptor =

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

@@ -87,11 +87,6 @@ public class Bridge {
     public static final String CAPACITOR_FILE_START = "/_capacitor_file_";
     public static final String CAPACITOR_CONTENT_START = "/_capacitor_content_";
     public static final String CAPACITOR_HTTP_INTERCEPTOR_START = "/_capacitor_http_interceptor_";
-
-    /** @deprecated CAPACITOR_HTTPS_INTERCEPTOR_START is no longer required. All proxied requests are handled via CAPACITOR_HTTP_INTERCEPTOR_START instead */
-    @Deprecated
-    public static final String CAPACITOR_HTTPS_INTERCEPTOR_START = "/_capacitor_https_interceptor_";
-
     public static final String CAPACITOR_HTTP_INTERCEPTOR_URL_PARAM = "u";
 
     public static final int DEFAULT_ANDROID_WEBVIEW_VERSION = 60;
@@ -308,6 +303,12 @@ public class Bridge {
     }
 
     public boolean launchIntent(Uri url) {
+        // The proxy returns a remote body at the app origin, so block it before plugins can allow it.
+        String path = url.getPath();
+        if (path != null && path.startsWith(CAPACITOR_HTTP_INTERCEPTOR_START)) {
+            return true;
+        }
+
         /*
          * Give plugins the chance to handle the url
          */
@@ -379,22 +380,20 @@ public class Bridge {
         return null;
     }
 
-    public boolean isDeployDisabled() {
+    public boolean shouldKeepRunning() {
         Plugin cordova = this.cordova();
-        if (cordova != null) {
-            return cordova.hasPermission("DisableDeploy");
-        } else {
-            return false;
+        if (cordova instanceof CordovaBridgeConfig) {
+            return ((CordovaBridgeConfig) cordova).shouldKeepRunning();
         }
+        return false;
     }
 
-    public boolean shouldKeepRunning() {
+    public boolean isDeployDisabled() {
         Plugin cordova = this.cordova();
-        if (cordova != null) {
-            return cordova.hasPermission("KeepRunning");
-        } else {
-            return false;
+        if (cordova instanceof CordovaBridgeConfig) {
+            return ((CordovaBridgeConfig) cordova).isDeployDisabled();
         }
+        return false;
     }
 
     public void handleAppUrlLoadError(Exception ex) {
@@ -625,17 +624,6 @@ public class Bridge {
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private String getLegacyPluginName(Class<? extends Plugin> pluginClass) {
-        NativePlugin legacyPluginAnnotation = pluginClass.getAnnotation(NativePlugin.class);
-        if (legacyPluginAnnotation == null) {
-            Logger.error("Plugin doesn't have the @CapacitorPlugin annotation. Please add it");
-            return null;
-        }
-
-        return legacyPluginAnnotation.name();
-    }
-
     /**
      * Register a plugin class
      * @param pluginClass a class inheriting from Plugin
@@ -678,20 +666,17 @@ public class Bridge {
     }
 
     private String pluginName(Class<? extends Plugin> clazz) {
-        String pluginName;
         CapacitorPlugin pluginAnnotation = clazz.getAnnotation(CapacitorPlugin.class);
         if (pluginAnnotation == null) {
-            pluginName = this.getLegacyPluginName(clazz);
-        } else {
-            pluginName = pluginAnnotation.name();
+            Logger.error("Plugin doesn't have the @CapacitorPlugin annotation. Please add it");
+            return null;
         }
-
-        return pluginName;
+        return pluginAnnotation.name();
     }
 
     private void logInvalidPluginException(Class<? extends Plugin> clazz) {
         Logger.error(
-            "NativePlugin " +
+            "Plugin " +
                 clazz.getName() +
                 " is invalid. Ensure the @CapacitorPlugin annotation exists on the plugin class and" +
                 " the class extends Plugin"
@@ -699,7 +684,7 @@ public class Bridge {
     }
 
     private void logPluginLoadException(Class<? extends Plugin> clazz, Exception ex) {
-        Logger.error("NativePlugin " + clazz.getName() + " failed to load", ex);
+        Logger.error("Plugin " + clazz.getName() + " failed to load", ex);
     }
 
     public PluginHandle getPlugin(String pluginId) {
@@ -713,38 +698,16 @@ public class Bridge {
      * @return
      */
     @Deprecated
-    @SuppressWarnings("deprecation")
     public PluginHandle getPluginWithRequestCode(int requestCode) {
         for (PluginHandle handle : this.plugins.values()) {
-            int[] requestCodes;
-
             CapacitorPlugin pluginAnnotation = handle.getPluginAnnotation();
             if (pluginAnnotation == null) {
-                // Check for legacy plugin annotation, @NativePlugin
-                NativePlugin legacyPluginAnnotation = handle.getLegacyPluginAnnotation();
-                if (legacyPluginAnnotation == null) {
-                    continue;
-                }
-
-                if (legacyPluginAnnotation.permissionRequestCode() == requestCode) {
+                continue;
+            }
+            for (int rc : pluginAnnotation.requestCodes()) {
+                if (rc == requestCode) {
                     return handle;
                 }
-
-                requestCodes = legacyPluginAnnotation.requestCodes();
-
-                for (int rc : requestCodes) {
-                    if (rc == requestCode) {
-                        return handle;
-                    }
-                }
-            } else {
-                requestCodes = pluginAnnotation.requestCodes();
-
-                for (int rc : requestCodes) {
-                    if (rc == requestCode) {
-                        return handle;
-                    }
-                }
             }
         }
         return null;
@@ -1049,18 +1012,8 @@ public class Bridge {
         }
     }
 
-    @Deprecated
-    @SuppressWarnings("deprecation")
-    public void startActivityForPluginWithResult(PluginCall call, Intent intent, int requestCode) {
-        Logger.debug("Starting activity for result");
-
-        pluginCallForLastActivity = call;
-
-        getActivity().startActivityForResult(intent, requestCode);
-    }
-
     /**
-     * Check for legacy Capacitor or Cordova plugins that may have registered to handle a permission
+     * Check for Cordova plugins that may have registered to handle a permission
      * request, and handle them if so. If not handled, false is returned.
      *
      * @param requestCode the code that was requested
@@ -1086,12 +1039,6 @@ public class Bridge {
             return permissionHandled;
         }
 
-        // Call deprecated method if using deprecated NativePlugin annotation
-        if (plugin.getPluginAnnotation() == null) {
-            plugin.getInstance().handleRequestPermissionsResult(requestCode, permissions, grantResults);
-            return true;
-        }
-
         return false;
     }
 
@@ -1160,45 +1107,51 @@ public class Bridge {
     protected Map<String, PermissionState> getPermissionStates(Plugin plugin) {
         Map<String, PermissionState> permissionsResults = new HashMap<>();
         CapacitorPlugin annotation = plugin.getPluginHandle().getPluginAnnotation();
-        for (Permission perm : annotation.permissions()) {
-            // If a permission is defined with no permission constants, return GRANTED for it.
-            // Otherwise, get its true state.
-            if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
-                String key = perm.alias();
-                if (!key.isEmpty()) {
-                    PermissionState existingResult = permissionsResults.get(key);
-
-                    // auto set permission state to GRANTED if the alias is empty.
-                    if (existingResult == null) {
-                        permissionsResults.put(key, PermissionState.GRANTED);
-                    }
-                }
-            } else {
-                for (String permString : perm.strings()) {
-                    String key = perm.alias().isEmpty() ? permString : perm.alias();
-                    PermissionState permissionStatus;
-                    if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
-                        permissionStatus = PermissionState.GRANTED;
-                    } else {
-                        permissionStatus = PermissionState.PROMPT;
-
-                        // Check if there is a cached permission state for the "Never ask again" state
-                        SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
-                        String state = prefs.getString(permString, null);
-
-                        if (state != null) {
-                            permissionStatus = PermissionState.byState(state);
+        if (annotation != null) {
+            for (Permission perm : annotation.permissions()) {
+                // If a permission is defined with no permission constants, return GRANTED for it.
+                // Otherwise, get its true state.
+                if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
+                    String key = perm.alias();
+                    if (!key.isEmpty()) {
+                        PermissionState existingResult = permissionsResults.get(key);
+
+                        // auto set permission state to GRANTED if the alias is empty.
+                        if (existingResult == null) {
+                            permissionsResults.put(key, PermissionState.GRANTED);
                         }
                     }
+                } else {
+                    for (String permString : perm.strings()) {
+                        String key = perm.alias().isEmpty() ? permString : perm.alias();
+                        PermissionState permissionStatus;
+                        if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
+                            permissionStatus = PermissionState.GRANTED;
+                        } else {
+                            permissionStatus = PermissionState.PROMPT;
+
+                            // Check if there is a cached permission state for the "Never ask again" state
+                            SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
+                            String state = prefs.getString(permString, null);
+
+                            if (state != null) {
+                                permissionStatus = PermissionState.byState(state);
+                            }
+                        }
 
-                    PermissionState existingResult = permissionsResults.get(key);
+                        PermissionState existingResult = permissionsResults.get(key);
 
-                    // multiple permissions with the same alias must all be true, otherwise all false.
-                    if (existingResult == null || existingResult == PermissionState.GRANTED) {
-                        permissionsResults.put(key, permissionStatus);
+                        // multiple permissions with the same alias must all be true, otherwise all false.
+                        if (existingResult == null || existingResult == PermissionState.GRANTED) {
+                            permissionsResults.put(key, permissionStatus);
+                        }
                     }
                 }
             }
+        } else {
+            Logger.warn(
+                String.format("getPermissionStates: missing @CapacitorPlugin annotation for plugin %s", plugin.getPluginHandle().getId())
+            );
         }
 
         return permissionsResults;
@@ -1227,22 +1180,8 @@ public class Bridge {
             return false;
         }
 
-        // deprecated, to be removed
-        PluginCall lastCall = plugin.getInstance().getSavedCall();
-
-        // If we don't have a saved last call (because our app was killed and restarted, for example),
-        // Then we should see if we have any saved plugin call information and generate a new,
-        // "dangling" plugin call (a plugin call that doesn't have a corresponding web callback)
-        // and then send that to the plugin
-        if (lastCall == null && pluginCallForLastActivity != null) {
-            plugin.getInstance().saveCall(pluginCallForLastActivity);
-        }
-
         plugin.getInstance().handleOnActivityResult(requestCode, resultCode, data);
 
-        // Clear the plugin call we may have re-hydrated on app launch
-        pluginCallForLastActivity = null;
-
         return true;
     }
 

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

@@ -69,27 +69,6 @@ public class CapConfig {
      */
     private CapConfig() {}
 
-    /**
-     * Get an instance of the Config file object.
-     * @deprecated use {@link #loadDefault(Context)} to load an instance of the Config object
-     * from the capacitor.config.json file, or use the {@link CapConfig.Builder} to construct
-     * a CapConfig for embedded use.
-     *
-     * @param assetManager The AssetManager used to load the config file
-     * @param config JSON describing a configuration to use
-     */
-    @Deprecated
-    public CapConfig(AssetManager assetManager, JSONObject config) {
-        if (config != null) {
-            this.configJSON = config;
-        } else {
-            // Load the capacitor.config.json
-            loadConfigFromAssets(assetManager, null);
-        }
-
-        deserializeConfig(null);
-    }
-
     /**
      * Constructs a Capacitor Configuration from config.json file.
      *
@@ -429,104 +408,6 @@ public class CapConfig {
         return pluginConfig;
     }
 
-    /**
-     * Get a JSON object value from the Capacitor config.
-     * @deprecated use {@link PluginConfig#getObject(String)}  to access plugin config values.
-     * For main Capacitor config values, use the appropriate getter.
-     *
-     * @param key A key to fetch from the config
-     * @return The value from the config, if exists. Null if not
-     */
-    @Deprecated
-    public JSONObject getObject(String key) {
-        try {
-            return configJSON.getJSONObject(key);
-        } catch (Exception ex) {}
-        return null;
-    }
-
-    /**
-     * Get a string value from the Capacitor config.
-     * @deprecated use {@link PluginConfig#getString(String, String)} to access plugin config
-     * values. For main Capacitor config values, use the appropriate getter.
-     *
-     * @param key A key to fetch from the config
-     * @return The value from the config, if exists. Null if not
-     */
-    @Deprecated
-    public String getString(String key) {
-        return JSONUtils.getString(configJSON, key, null);
-    }
-
-    /**
-     * Get a string value from the Capacitor config.
-     * @deprecated use {@link PluginConfig#getString(String, String)} to access plugin config
-     * values. For main Capacitor config values, use the appropriate getter.
-     *
-     * @param key A key to fetch from the config
-     * @param defaultValue A default value to return if the key does not exist in the config
-     * @return The value from the config, if key exists. Default value returned if not
-     */
-    @Deprecated
-    public String getString(String key, String defaultValue) {
-        return JSONUtils.getString(configJSON, key, defaultValue);
-    }
-
-    /**
-     * Get a boolean value from the Capacitor config.
-     * @deprecated use {@link PluginConfig#getBoolean(String, boolean)} to access plugin config
-     * values. For main Capacitor config values, use the appropriate getter.
-     *
-     * @param key A key to fetch from the config
-     * @param defaultValue A default value to return if the key does not exist in the config
-     * @return The value from the config, if key exists. Default value returned if not
-     */
-    @Deprecated
-    public boolean getBoolean(String key, boolean defaultValue) {
-        return JSONUtils.getBoolean(configJSON, key, defaultValue);
-    }
-
-    /**
-     * Get an integer value from the Capacitor config.
-     * @deprecated use {@link PluginConfig#getInt(String, int)}  to access the plugin config
-     * values. For main Capacitor config values, use the appropriate getter.
-     *
-     * @param key A key to fetch from the config
-     * @param defaultValue A default value to return if the key does not exist in the config
-     * @return The value from the config, if key exists. Default value returned if not
-     */
-    @Deprecated
-    public int getInt(String key, int defaultValue) {
-        return JSONUtils.getInt(configJSON, key, defaultValue);
-    }
-
-    /**
-     * Get a string array value from the Capacitor config.
-     * @deprecated use {@link PluginConfig#getArray(String)}  to access the plugin config
-     * values. For main Capacitor config values, use the appropriate getter.
-     *
-     * @param key A key to fetch from the config
-     * @return The value from the config, if exists. Null if not
-     */
-    @Deprecated
-    public String[] getArray(String key) {
-        return JSONUtils.getArray(configJSON, key, null);
-    }
-
-    /**
-     * Get a string array value from the Capacitor config.
-     * @deprecated use {@link PluginConfig#getArray(String, String[])}  to access the plugin
-     * config values. For main Capacitor config values, use the appropriate getter.
-     *
-     * @param key A key to fetch from the config
-     * @param defaultValue A default value to return if the key does not exist in the config
-     * @return The value from the config, if key exists. Default value returned if not
-     */
-    @Deprecated
-    public String[] getArray(String key, String[] defaultValue) {
-        return JSONUtils.getArray(configJSON, key, defaultValue);
-    }
-
     private static Map<String, PluginConfig> deserializePluginsConfig(JSONObject pluginsConfig) {
         Map<String, PluginConfig> pluginsMap = new HashMap<>();
 

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

@@ -0,0 +1,6 @@
+package com.getcapacitor;
+
+public interface CordovaBridgeConfig {
+    boolean isDeployDisabled();
+    boolean shouldKeepRunning();
+}

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

@@ -45,11 +45,6 @@ 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.