@capacitor/android 6.2.0 → 7.0.0-alpha.2

package/capacitor/build.gradle

@@ -1,13 +1,13 @@
 ext {
-    androidxActivityVersion = project.hasProperty('androidxActivityVersion') ? rootProject.ext.androidxActivityVersion : '1.8.0'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
+    androidxActivityVersion = project.hasProperty('androidxActivityVersion') ? rootProject.ext.androidxActivityVersion : '1.9.2'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
     androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.2.0'
-    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.12.0'
-    androidxFragmentVersion = project.hasProperty('androidxFragmentVersion') ? rootProject.ext.androidxFragmentVersion : '1.6.2'
-    androidxWebkitVersion = project.hasProperty('androidxWebkitVersion') ? rootProject.ext.androidxWebkitVersion : '1.9.0'
+    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.15.0'
+    androidxFragmentVersion = project.hasProperty('androidxFragmentVersion') ? rootProject.ext.androidxFragmentVersion : '1.8.4'
+    androidxWebkitVersion = project.hasProperty('androidxWebkitVersion') ? rootProject.ext.androidxWebkitVersion : '1.12.1'
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
     cordovaAndroidVersion = project.hasProperty('cordovaAndroidVersion') ? rootProject.ext.cordovaAndroidVersion : '10.1.1'
 }
 
@@ -22,7 +22,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.0'
 
         if (System.getenv("CAP_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
@@ -42,10 +42,10 @@ if (System.getenv("CAP_PUBLISH") == "true") {
 
 android {
     namespace "com.getcapacitor.android"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
         versionCode 1
         versionName "1.0"
         consumerProguardFiles 'proguard-rules.pro'
@@ -90,7 +90,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation "org.apache.cordova:framework:$cordovaAndroidVersion"
-    testImplementation 'org.json:json:20231013'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.json:json:20240303'
+    testImplementation 'org.mockito:mockito-core:5.14.1'
 }
 

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

@@ -142,9 +142,7 @@ var nativeBridge = (function (exports) {
     const CAPACITOR_HTTP_INTERCEPTOR = '/_capacitor_http_interceptor_';
     const CAPACITOR_HTTP_INTERCEPTOR_URL_PARAM = 'u';
     // TODO: export as Cap function
-    const isRelativeOrProxyUrl = (url) => !url ||
-        !(url.startsWith('http:') || url.startsWith('https:')) ||
-        url.indexOf(CAPACITOR_HTTP_INTERCEPTOR) > -1;
+    const isRelativeOrProxyUrl = (url) => !url || !(url.startsWith('http:') || url.startsWith('https:')) || url.indexOf(CAPACITOR_HTTP_INTERCEPTOR) > -1;
     // TODO: export as Cap function
     const createProxyUrl = (url, win) => {
         var _a, _b;
@@ -174,11 +172,10 @@ var nativeBridge = (function (exports) {
                     return webviewServerUrl + '/_capacitor_file_' + filePath;
                 }
                 else if (filePath.startsWith('file://')) {
-                    return (webviewServerUrl + filePath.replace('file://', '/_capacitor_file_'));
+                    return webviewServerUrl + filePath.replace('file://', '/_capacitor_file_');
                 }
                 else if (filePath.startsWith('content://')) {
-                    return (webviewServerUrl +
-                        filePath.replace('content:/', '/_capacitor_content_'));
+                    return webviewServerUrl + filePath.replace('content:/', '/_capacitor_content_');
                 }
             }
             return filePath;
@@ -289,9 +286,6 @@ var nativeBridge = (function (exports) {
                     return docAddEventListener.apply(doc, args);
                 };
             }
-            // deprecated in v3, remove from v4
-            cap.platform = cap.getPlatform();
-            cap.isNative = cap.isNativePlatform();
             win.Capacitor = cap;
         };
         const initVendor = (win, cap) => {
@@ -321,27 +315,14 @@ var nativeBridge = (function (exports) {
             win.Ionic.WebView = IonicWebView;
         };
         const initLogger = (win, cap) => {
-            const BRIDGED_CONSOLE_METHODS = [
-                'debug',
-                'error',
-                'info',
-                'log',
-                'trace',
-                'warn',
-            ];
+            const BRIDGED_CONSOLE_METHODS = ['debug', 'error', 'info', 'log', 'trace', 'warn'];
             const createLogFromNative = (c) => (result) => {
                 if (isFullConsole(c)) {
                     const success = result.success === true;
                     const tagStyles = success
                         ? 'font-style: italic; font-weight: lighter; color: gray'
                         : 'font-style: italic; font-weight: lighter; color: red';
-                    c.groupCollapsed('%cresult %c' +
-                        result.pluginId +
-                        '.' +
-                        result.methodName +
-                        ' (#' +
-                        result.callbackId +
-                        ')', tagStyles, 'font-style: italic; font-weight: bold; color: #444');
+                    c.groupCollapsed('%cresult %c' + result.pluginId + '.' + result.methodName + ' (#' + result.callbackId + ')', tagStyles, 'font-style: italic; font-weight: bold; color: #444');
                     if (result.success === false) {
                         c.error(result.error);
                     }
@@ -361,13 +342,7 @@ var nativeBridge = (function (exports) {
             };
             const createLogToNative = (c) => (call) => {
                 if (isFullConsole(c)) {
-                    c.groupCollapsed('%cnative %c' +
-                        call.pluginId +
-                        '.' +
-                        call.methodName +
-                        ' (#' +
-                        call.callbackId +
-                        ')', 'font-weight: lighter; color: gray', 'font-weight: bold; color: #000');
+                    c.groupCollapsed('%cnative %c' + call.pluginId + '.' + call.methodName + ' (#' + call.callbackId + ')', 'font-weight: lighter; color: gray', 'font-weight: bold; color: #000');
                     c.dir(call);
                     c.groupEnd();
                 }
@@ -379,9 +354,7 @@ var nativeBridge = (function (exports) {
                 if (!c) {
                     return false;
                 }
-                return (typeof c.groupCollapsed === 'function' ||
-                    typeof c.groupEnd === 'function' ||
-                    typeof c.dir === 'function');
+                return typeof c.groupCollapsed === 'function' || typeof c.groupEnd === 'function' || typeof c.dir === 'function';
             };
             const serializeConsoleMessage = (msg) => {
                 try {
@@ -440,9 +413,7 @@ var nativeBridge = (function (exports) {
                         set: function (val) {
                             const cookiePairs = val.split(';');
                             const domainSection = val.toLowerCase().split('domain=')[1];
-                            const domain = cookiePairs.length > 1 &&
-                                domainSection != null &&
-                                domainSection.length > 0
+                            const domain = cookiePairs.length > 1 && domainSection != null && domainSection.length > 0
                                 ? domainSection.split(';')[0].trim()
                                 : '';
                             if (platform === 'ios') {
@@ -527,8 +498,7 @@ var nativeBridge = (function (exports) {
                                 dataType: type,
                                 headers: Object.assign(Object.assign({}, headers), optionHeaders),
                             });
-                            const contentType = nativeResponse.headers['Content-Type'] ||
-                                nativeResponse.headers['content-type'];
+                            const contentType = nativeResponse.headers['Content-Type'] || nativeResponse.headers['content-type'];
                             let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('application/json'))
                                 ? JSON.stringify(nativeResponse.data)
                                 : nativeResponse.data;
@@ -570,8 +540,7 @@ var nativeBridge = (function (exports) {
                             },
                         });
                         const prototype = win.CapacitorWebXMLHttpRequest.prototype;
-                        const isProgressEventAvailable = () => typeof ProgressEvent !== 'undefined' &&
-                            ProgressEvent.prototype instanceof Event;
+                        const isProgressEventAvailable = () => typeof ProgressEvent !== 'undefined' && ProgressEvent.prototype instanceof Event;
                         // XHR patch abort
                         prototype.abort = function () {
                             if (isRelativeOrProxyUrl(this._url)) {
@@ -652,9 +621,7 @@ var nativeBridge = (function (exports) {
                                     },
                                 });
                                 convertBody(body).then(({ data, type, headers }) => {
-                                    const otherHeaders = this._headers != null && Object.keys(this._headers).length > 0
-                                        ? this._headers
-                                        : undefined;
+                                    const otherHeaders = this._headers != null && Object.keys(this._headers).length > 0 ? this._headers : undefined;
                                     // intercept request & pass to the bridge
                                     cap
                                         .nativePromise('CapacitorHttp', 'request', {
@@ -678,8 +645,7 @@ var nativeBridge = (function (exports) {
                                             }
                                             this._headers = nativeResponse.headers;
                                             this.status = nativeResponse.status;
-                                            if (this.responseType === '' ||
-                                                this.responseType === 'text') {
+                                            if (this.responseType === '' || this.responseType === 'text') {
                                                 this.response =
                                                     typeof nativeResponse.data !== 'string'
                                                         ? JSON.stringify(nativeResponse.data)
@@ -688,8 +654,7 @@ var nativeBridge = (function (exports) {
                                             else {
                                                 this.response = nativeResponse.data;
                                             }
-                                            this.responseText = ((_a = (nativeResponse.headers['Content-Type'] ||
-                                                nativeResponse.headers['content-type'])) === null || _a === void 0 ? void 0 : _a.startsWith('application/json'))
+                                            this.responseText = ((_a = (nativeResponse.headers['Content-Type'] || nativeResponse.headers['content-type'])) === null || _a === void 0 ? void 0 : _a.startsWith('application/json'))
                                                 ? JSON.stringify(nativeResponse.data)
                                                 : nativeResponse.data;
                                             this.responseURL = nativeResponse.url;
@@ -805,7 +770,7 @@ var nativeBridge = (function (exports) {
             };
             cap.logToNative = createLogToNative(win.console);
             cap.logFromNative = createLogFromNative(win.console);
-            cap.handleError = err => win.console.error(err);
+            cap.handleError = (err) => win.console.error(err);
             win.Capacitor = cap;
         };
         function initNativeBridge(win) {
@@ -814,7 +779,7 @@ var nativeBridge = (function (exports) {
             const callbacks = new Map();
             const webviewServerUrl = typeof win.WEBVIEW_SERVER_URL === 'string' ? win.WEBVIEW_SERVER_URL : '';
             cap.getServerUrl = () => webviewServerUrl;
-            cap.convertFileSrc = filePath => convertFileSrcServerUrl(webviewServerUrl, filePath);
+            cap.convertFileSrc = (filePath) => convertFileSrcServerUrl(webviewServerUrl, filePath);
             // Counter of callback ids, randomized to avoid
             // any issues during reloads if a call comes back with
             // an existing callback id from an old session
@@ -823,12 +788,12 @@ var nativeBridge = (function (exports) {
             const isNativePlatform = () => true;
             const getPlatform = () => getPlatformId(win);
             cap.getPlatform = getPlatform;
-            cap.isPluginAvailable = name => Object.prototype.hasOwnProperty.call(cap.Plugins, name);
+            cap.isPluginAvailable = (name) => Object.prototype.hasOwnProperty.call(cap.Plugins, name);
             cap.isNativePlatform = isNativePlatform;
             // create the postToNative() fn if needed
             if (getPlatformId(win) === 'android') {
                 // android platform
-                postToNative = data => {
+                postToNative = (data) => {
                     var _a;
                     try {
                         win.androidBridge.postMessage(JSON.stringify(data));
@@ -840,7 +805,7 @@ var nativeBridge = (function (exports) {
             }
             else if (getPlatformId(win) === 'ios') {
                 // ios platform
-                postToNative = data => {
+                postToNative = (data) => {
                     var _a;
                     try {
                         data.type = data.type ? data.type : 'message';
@@ -885,8 +850,7 @@ var nativeBridge = (function (exports) {
                     if (typeof postToNative === 'function') {
                         let callbackId = '-1';
                         if (storedCallback &&
-                            (typeof storedCallback.callback === 'function' ||
-                                typeof storedCallback.resolve === 'function')) {
+                            (typeof storedCallback.callback === 'function' || typeof storedCallback.resolve === 'function')) {
                             // store the call for later lookup
                             callbackId = String(++callbackIdCount);
                             callbacks.set(callbackId, storedCallback);
@@ -921,7 +885,7 @@ var nativeBridge = (function (exports) {
             /**
              * Process a response from the native layer.
              */
-            cap.fromNative = result => {
+            cap.fromNative = (result) => {
                 returnResult(result);
             };
             const returnResult = (result) => {

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

@@ -75,7 +75,6 @@ import org.json.JSONException;
  */
 public class Bridge {
 
-    private static final String PREFS_NAME = "CapacitorSettings";
     private static final String PERMISSION_PREFS_NAME = "PluginPermStates";
     private static final String BUNDLE_LAST_PLUGIN_ID_KEY = "capacitorLastActivityPluginId";
     private static final String BUNDLE_LAST_PLUGIN_CALL_METHOD_NAME_KEY = "capacitorLastActivityPluginMethod";
@@ -563,7 +562,6 @@ public class Bridge {
         settings.setJavaScriptEnabled(true);
         settings.setDomStorageEnabled(true);
         settings.setGeolocationEnabled(true);
-        settings.setDatabaseEnabled(true);
         settings.setMediaPlaybackRequiresUserGesture(false);
         settings.setJavaScriptCanOpenWindowsAutomatically(true);
         if (this.config.isMixedContentAllowed()) {
@@ -1026,8 +1024,13 @@ public class Bridge {
                 try {
                     JSObject options = new JSObject(lastOptionsJson);
 
-                    pluginCallForLastActivity =
-                        new PluginCall(msgHandler, lastPluginId, PluginCall.CALLBACK_ID_DANGLING, lastPluginCallMethod, options);
+                    pluginCallForLastActivity = new PluginCall(
+                        msgHandler,
+                        lastPluginId,
+                        PluginCall.CALLBACK_ID_DANGLING,
+                        lastPluginCallMethod,
+                        options
+                    );
                 } catch (JSONException ex) {
                     Logger.error("Unable to restore plugin call, unable to parse persisted JSON object", ex);
                 }

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

@@ -77,13 +77,12 @@ public class BridgeFragment extends Fragment {
             startDir = getArguments().getString(ARG_START_DIR);
         }
 
-        bridge =
-            new Bridge.Builder(this)
-                .setInstanceState(savedInstanceState)
-                .setPlugins(initialPlugins)
-                .setConfig(config)
-                .addWebViewListeners(webViewListeners)
-                .create();
+        bridge = new Bridge.Builder(this)
+            .setInstanceState(savedInstanceState)
+            .setPlugins(initialPlugins)
+            .setConfig(config)
+            .addWebViewListeners(webViewListeners)
+            .create();
 
         if (startDir != null) {
             bridge.setServerAssetPath(startDir);

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

@@ -67,15 +67,11 @@ public class BridgeWebChromeClient extends WebChromeClient {
         };
 
         permissionLauncher = bridge.registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), permissionCallback);
-        activityLauncher =
-            bridge.registerForActivityResult(
-                new ActivityResultContracts.StartActivityForResult(),
-                result -> {
-                    if (activityListener != null) {
-                        activityListener.onActivityResult(result);
-                    }
-                }
-            );
+        activityLauncher = bridge.registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            if (activityListener != null) {
+                activityListener.onActivityResult(result);
+            }
+        });
     }
 
     /**
@@ -104,8 +100,6 @@ public class BridgeWebChromeClient extends WebChromeClient {
 
     @Override
     public void onPermissionRequest(final PermissionRequest request) {
-        boolean isRequestPermissionRequired = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M;
-
         List<String> permissionList = new ArrayList<>();
         if (Arrays.asList(request.getResources()).contains("android.webkit.resource.VIDEO_CAPTURE")) {
             permissionList.add(Manifest.permission.CAMERA);
@@ -114,16 +108,15 @@ public class BridgeWebChromeClient extends WebChromeClient {
             permissionList.add(Manifest.permission.MODIFY_AUDIO_SETTINGS);
             permissionList.add(Manifest.permission.RECORD_AUDIO);
         }
-        if (!permissionList.isEmpty() && isRequestPermissionRequired) {
+        if (!permissionList.isEmpty()) {
             String[] permissions = permissionList.toArray(new String[0]);
-            permissionListener =
-                isGranted -> {
-                    if (isGranted) {
-                        request.grant(request.getResources());
-                    } else {
-                        request.deny();
-                    }
-                };
+            permissionListener = isGranted -> {
+                if (isGranted) {
+                    request.grant(request.getResources());
+                } else {
+                    request.deny();
+                }
+            };
             permissionLauncher.launch(permissions);
         } else {
             request.grant(request.getResources());
@@ -147,19 +140,14 @@ public class BridgeWebChromeClient extends WebChromeClient {
         AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
         builder
             .setMessage(message)
-            .setPositiveButton(
-                "OK",
-                (dialog, buttonIndex) -> {
-                    dialog.dismiss();
-                    result.confirm();
-                }
-            )
-            .setOnCancelListener(
-                dialog -> {
-                    dialog.dismiss();
-                    result.cancel();
-                }
-            );
+            .setPositiveButton("OK", (dialog, buttonIndex) -> {
+                dialog.dismiss();
+                result.confirm();
+            })
+            .setOnCancelListener(dialog -> {
+                dialog.dismiss();
+                result.cancel();
+            });
 
         AlertDialog dialog = builder.create();
 
@@ -186,26 +174,18 @@ public class BridgeWebChromeClient extends WebChromeClient {
 
         builder
             .setMessage(message)
-            .setPositiveButton(
-                "OK",
-                (dialog, buttonIndex) -> {
-                    dialog.dismiss();
-                    result.confirm();
-                }
-            )
-            .setNegativeButton(
-                "Cancel",
-                (dialog, buttonIndex) -> {
-                    dialog.dismiss();
-                    result.cancel();
-                }
-            )
-            .setOnCancelListener(
-                dialog -> {
-                    dialog.dismiss();
-                    result.cancel();
-                }
-            );
+            .setPositiveButton("OK", (dialog, buttonIndex) -> {
+                dialog.dismiss();
+                result.confirm();
+            })
+            .setNegativeButton("Cancel", (dialog, buttonIndex) -> {
+                dialog.dismiss();
+                result.cancel();
+            })
+            .setOnCancelListener(dialog -> {
+                dialog.dismiss();
+                result.cancel();
+            });
 
         AlertDialog dialog = builder.create();
 
@@ -235,28 +215,20 @@ public class BridgeWebChromeClient extends WebChromeClient {
         builder
             .setMessage(message)
             .setView(input)
-            .setPositiveButton(
-                "OK",
-                (dialog, buttonIndex) -> {
-                    dialog.dismiss();
-
-                    String inputText1 = input.getText().toString().trim();
-                    result.confirm(inputText1);
-                }
-            )
-            .setNegativeButton(
-                "Cancel",
-                (dialog, buttonIndex) -> {
-                    dialog.dismiss();
-                    result.cancel();
-                }
-            )
-            .setOnCancelListener(
-                dialog -> {
-                    dialog.dismiss();
-                    result.cancel();
-                }
-            );
+            .setPositiveButton("OK", (dialog, buttonIndex) -> {
+                dialog.dismiss();
+
+                String inputText1 = input.getText().toString().trim();
+                result.confirm(inputText1);
+            })
+            .setNegativeButton("Cancel", (dialog, buttonIndex) -> {
+                dialog.dismiss();
+                result.cancel();
+            })
+            .setOnCancelListener(dialog -> {
+                dialog.dismiss();
+                result.cancel();
+            });
 
         AlertDialog dialog = builder.create();
 
@@ -277,22 +249,21 @@ public class BridgeWebChromeClient extends WebChromeClient {
         final String[] geoPermissions = { Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION };
 
         if (!PermissionHelper.hasPermissions(bridge.getContext(), geoPermissions)) {
-            permissionListener =
-                isGranted -> {
-                    if (isGranted) {
+            permissionListener = isGranted -> {
+                if (isGranted) {
+                    callback.invoke(origin, true, false);
+                } else {
+                    final String[] coarsePermission = { Manifest.permission.ACCESS_COARSE_LOCATION };
+                    if (
+                        Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+                        PermissionHelper.hasPermissions(bridge.getContext(), coarsePermission)
+                    ) {
                         callback.invoke(origin, true, false);
                     } else {
-                        final String[] coarsePermission = { Manifest.permission.ACCESS_COARSE_LOCATION };
-                        if (
-                            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-                            PermissionHelper.hasPermissions(bridge.getContext(), coarsePermission)
-                        ) {
-                            callback.invoke(origin, true, false);
-                        } else {
-                            callback.invoke(origin, false, false);
-                        }
+                        callback.invoke(origin, false, false);
                     }
-                };
+                }
+            };
             permissionLauncher.launch(geoPermissions);
         } else {
             // permission is already granted
@@ -315,15 +286,14 @@ public class BridgeWebChromeClient extends WebChromeClient {
             if (isMediaCaptureSupported()) {
                 showMediaCaptureOrFilePicker(filePathCallback, fileChooserParams, captureVideo);
             } else {
-                permissionListener =
-                    isGranted -> {
-                        if (isGranted) {
-                            showMediaCaptureOrFilePicker(filePathCallback, fileChooserParams, captureVideo);
-                        } else {
-                            Logger.warn(Logger.tags("FileChooser"), "Camera permission not granted");
-                            filePathCallback.onReceiveValue(null);
-                        }
-                    };
+                permissionListener = isGranted -> {
+                    if (isGranted) {
+                        showMediaCaptureOrFilePicker(filePathCallback, fileChooserParams, captureVideo);
+                    } else {
+                        Logger.warn(Logger.tags("FileChooser"), "Camera permission not granted");
+                        filePathCallback.onReceiveValue(null);
+                    }
+                };
                 final String[] camPermission = { Manifest.permission.CAMERA };
                 permissionLauncher.launch(camPermission);
             }
@@ -375,14 +345,13 @@ public class BridgeWebChromeClient extends WebChromeClient {
             return false;
         }
         takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageFileUri);
-        activityListener =
-            activityResult -> {
-                Uri[] result = null;
-                if (activityResult.getResultCode() == Activity.RESULT_OK) {
-                    result = new Uri[] { imageFileUri };
-                }
-                filePathCallback.onReceiveValue(result);
-            };
+        activityListener = activityResult -> {
+            Uri[] result = null;
+            if (activityResult.getResultCode() == Activity.RESULT_OK) {
+                result = new Uri[] { imageFileUri };
+            }
+            filePathCallback.onReceiveValue(result);
+        };
         activityLauncher.launch(takePictureIntent);
 
         return true;
@@ -395,14 +364,13 @@ public class BridgeWebChromeClient extends WebChromeClient {
             return false;
         }
 
-        activityListener =
-            activityResult -> {
-                Uri[] result = null;
-                if (activityResult.getResultCode() == Activity.RESULT_OK) {
-                    result = new Uri[] { activityResult.getData().getData() };
-                }
-                filePathCallback.onReceiveValue(result);
-            };
+        activityListener = activityResult -> {
+            Uri[] result = null;
+            if (activityResult.getResultCode() == Activity.RESULT_OK) {
+                result = new Uri[] { activityResult.getData().getData() };
+            }
+            filePathCallback.onReceiveValue(result);
+        };
         activityLauncher.launch(takeVideoIntent);
 
         return true;
@@ -421,21 +389,20 @@ public class BridgeWebChromeClient extends WebChromeClient {
             }
         }
         try {
-            activityListener =
-                activityResult -> {
-                    Uri[] result;
-                    Intent resultIntent = activityResult.getData();
-                    if (activityResult.getResultCode() == Activity.RESULT_OK && resultIntent.getClipData() != null) {
-                        final int numFiles = resultIntent.getClipData().getItemCount();
-                        result = new Uri[numFiles];
-                        for (int i = 0; i < numFiles; i++) {
-                            result[i] = resultIntent.getClipData().getItemAt(i).getUri();
-                        }
-                    } else {
-                        result = WebChromeClient.FileChooserParams.parseResult(activityResult.getResultCode(), resultIntent);
+            activityListener = activityResult -> {
+                Uri[] result;
+                Intent resultIntent = activityResult.getData();
+                if (activityResult.getResultCode() == Activity.RESULT_OK && resultIntent.getClipData() != null) {
+                    final int numFiles = resultIntent.getClipData().getItemCount();
+                    result = new Uri[numFiles];
+                    for (int i = 0; i < numFiles; i++) {
+                        result[i] = resultIntent.getClipData().getItemAt(i).getUri();
                     }
-                    filePathCallback.onReceiveValue(result);
-                };
+                } else {
+                    result = WebChromeClient.FileChooserParams.parseResult(activityResult.getResultCode(), resultIntent);
+                }
+                filePathCallback.onReceiveValue(result);
+            };
             activityLauncher.launch(intent);
         } catch (ActivityNotFoundException e) {
             filePathCallback.onReceiveValue(null);

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

@@ -256,18 +256,26 @@ public class CapConfig {
         allowNavigation = JSONUtils.getArray(configJSON, "server.allowNavigation", null);
 
         // Android
-        overriddenUserAgentString =
-            JSONUtils.getString(configJSON, "android.overrideUserAgent", JSONUtils.getString(configJSON, "overrideUserAgent", null));
-        appendedUserAgentString =
-            JSONUtils.getString(configJSON, "android.appendUserAgent", JSONUtils.getString(configJSON, "appendUserAgent", null));
-        backgroundColor =
-            JSONUtils.getString(configJSON, "android.backgroundColor", JSONUtils.getString(configJSON, "backgroundColor", null));
-        allowMixedContent =
-            JSONUtils.getBoolean(
-                configJSON,
-                "android.allowMixedContent",
-                JSONUtils.getBoolean(configJSON, "allowMixedContent", allowMixedContent)
-            );
+        overriddenUserAgentString = JSONUtils.getString(
+            configJSON,
+            "android.overrideUserAgent",
+            JSONUtils.getString(configJSON, "overrideUserAgent", null)
+        );
+        appendedUserAgentString = JSONUtils.getString(
+            configJSON,
+            "android.appendUserAgent",
+            JSONUtils.getString(configJSON, "appendUserAgent", null)
+        );
+        backgroundColor = JSONUtils.getString(
+            configJSON,
+            "android.backgroundColor",
+            JSONUtils.getString(configJSON, "backgroundColor", null)
+        );
+        allowMixedContent = JSONUtils.getBoolean(
+            configJSON,
+            "android.allowMixedContent",
+            JSONUtils.getBoolean(configJSON, "allowMixedContent", allowMixedContent)
+        );
         minWebViewVersion = JSONUtils.getInt(configJSON, "android.minWebViewVersion", DEFAULT_ANDROID_WEBVIEW_VERSION);
         minHuaweiWebViewVersion = JSONUtils.getInt(configJSON, "android.minHuaweiWebViewVersion", DEFAULT_HUAWEI_WEBVIEW_VERSION);
         captureInput = JSONUtils.getBoolean(configJSON, "android.captureInput", captureInput);

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

@@ -150,10 +150,8 @@ public class MessageHandler {
     }
 
     private void callCordovaPluginMethod(String callbackId, String service, String action, String actionArgs) {
-        bridge.execute(
-            () -> {
-                cordovaPluginManager.exec(service, action, callbackId, actionArgs);
-            }
-        );
+        bridge.execute(() -> {
+            cordovaPluginManager.exec(service, action, callbackId, actionArgs);
+        });
     }
 }

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

@@ -50,25 +50,6 @@ public class PluginCall {
         this.msgHandler.sendResponseMessage(this, successResult, null);
     }
 
-    /**
-     * @deprecated
-     * Use {@link #resolve(JSObject data)}
-     */
-    @Deprecated
-    public void success(JSObject data) {
-        PluginResult result = new PluginResult(data);
-        this.msgHandler.sendResponseMessage(this, result, null);
-    }
-
-    /**
-     * @deprecated
-     * Use {@link #resolve()}
-     */
-    @Deprecated
-    public void success() {
-        this.resolve(new JSObject());
-    }
-
     public void resolve(JSObject data) {
         PluginResult result = new PluginResult(data);
         this.msgHandler.sendResponseMessage(this, result, null);
@@ -90,33 +71,6 @@ public class PluginCall {
         this.msgHandler.sendResponseMessage(this, null, errorResult);
     }
 
-    /**
-     * @deprecated
-     * Use {@link #reject(String msg, Exception ex)}
-     */
-    @Deprecated
-    public void error(String msg, Exception ex) {
-        reject(msg, ex);
-    }
-
-    /**
-     * @deprecated
-     * Use {@link #reject(String msg, String code, Exception ex)}
-     */
-    @Deprecated
-    public void error(String msg, String code, Exception ex) {
-        reject(msg, code, ex);
-    }
-
-    /**
-     * @deprecated
-     * Use {@link #reject(String msg)}
-     */
-    @Deprecated
-    public void error(String msg) {
-        reject(msg);
-    }
-
     public void reject(String msg, String code, Exception ex, JSObject data) {
         PluginResult errorResult = new PluginResult();
 

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

@@ -77,7 +77,9 @@ public class UriMatcher {
         UriMatcher node = this;
         for (int i = -2; i < numTokens; i++) {
             String token;
-            if (i == -2) token = scheme; else if (i == -1) token = authority; else token = tokens[i];
+            if (i == -2) token = scheme;
+            else if (i == -1) token = authority;
+            else token = tokens[i];
             ArrayList<UriMatcher> children = node.mChildren;
             int numChildren = children.size();
             UriMatcher child;
@@ -130,7 +132,9 @@ public class UriMatcher {
 
         for (int i = -2; i < li; i++) {
             String u;
-            if (i == -2) u = uri.getScheme(); else if (i == -1) u = uri.getAuthority(); else u = pathSegments.get(i);
+            if (i == -2) u = uri.getScheme();
+            else if (i == -1) u = uri.getAuthority();
+            else u = pathSegments.get(i);
             ArrayList<UriMatcher> list = node.mChildren;
             if (list == null) {
                 break;
@@ -139,7 +143,7 @@ public class UriMatcher {
             int lj = list.size();
             for (int j = 0; j < lj; j++) {
                 UriMatcher n = list.get(j);
-                which_switch:switch (n.mWhich) {
+                which_switch: switch (n.mWhich) {
                     case MASK:
                         if (HostMask.Parser.parse(n.mText).matches(u)) {
                             node = n;

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

@@ -72,14 +72,12 @@ public class MockCordovaWebViewImpl implements CordovaWebView {
         public void onNativeToJsMessageAvailable(final NativeToJsMessageQueue queue) {
             cordova
                 .getActivity()
-                .runOnUiThread(
-                    () -> {
-                        String js = queue.popAndEncodeAsJs();
-                        if (js != null) {
-                            webView.evaluateJavascript(js, null);
-                        }
+                .runOnUiThread(() -> {
+                    String js = queue.popAndEncodeAsJs();
+                    if (js != null) {
+                        webView.evaluateJavascript(js, null);
                     }
-                );
+                });
         }
     }
 

package/capacitor/src/main/java/com/getcapacitor/plugin/CapacitorCookies.java

@@ -46,34 +46,31 @@ public class CapacitorCookies extends Plugin {
 
     @PluginMethod
     public void getCookies(PluginCall call) {
-        this.bridge.eval(
-                "document.cookie",
-                value -> {
-                    String cookies = value.substring(1, value.length() - 1);
-                    String[] cookieArray = cookies.split(";");
-
-                    JSObject cookieMap = new JSObject();
-
-                    for (String cookie : cookieArray) {
-                        if (cookie.length() > 0) {
-                            String[] keyValue = cookie.split("=", 2);
-
-                            if (keyValue.length == 2) {
-                                String key = keyValue[0].trim();
-                                String val = keyValue[1].trim();
-                                try {
-                                    key = URLDecoder.decode(keyValue[0].trim(), StandardCharsets.UTF_8.name());
-                                    val = URLDecoder.decode(keyValue[1].trim(), StandardCharsets.UTF_8.name());
-                                } catch (UnsupportedEncodingException ignored) {}
-
-                                cookieMap.put(key, val);
-                            }
+        this.bridge.eval("document.cookie", value -> {
+                String cookies = value.substring(1, value.length() - 1);
+                String[] cookieArray = cookies.split(";");
+
+                JSObject cookieMap = new JSObject();
+
+                for (String cookie : cookieArray) {
+                    if (cookie.length() > 0) {
+                        String[] keyValue = cookie.split("=", 2);
+
+                        if (keyValue.length == 2) {
+                            String key = keyValue[0].trim();
+                            String val = keyValue[1].trim();
+                            try {
+                                key = URLDecoder.decode(keyValue[0].trim(), StandardCharsets.UTF_8.name());
+                                val = URLDecoder.decode(keyValue[1].trim(), StandardCharsets.UTF_8.name());
+                            } catch (UnsupportedEncodingException ignored) {}
+
+                            cookieMap.put(key, val);
                         }
                     }
-
-                    call.resolve(cookieMap);
                 }
-            );
+
+                call.resolve(cookieMap);
+            });
     }
 
     @PluginMethod

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "6.2.0",
+  "version": "7.0.0-alpha.2",
   "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": "^6.2.0"
+    "@capacitor/core": "^7.0.0-alpha.2"
   },
   "publishConfig": {
     "access": "public"