@capacitor/android 5.4.1 → 5.4.2-nightly-20231005T150526.0

package/capacitor/build.gradle

@@ -1,10 +1,10 @@
 ext {
-    androidxActivityVersion = project.hasProperty('androidxActivityVersion') ? rootProject.ext.androidxActivityVersion : '1.7.0'
+    androidxActivityVersion = project.hasProperty('androidxActivityVersion') ? rootProject.ext.androidxActivityVersion : '1.7.2'
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
     androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.2.0'
-    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.10.0'
-    androidxFragmentVersion = project.hasProperty('androidxFragmentVersion') ? rootProject.ext.androidxFragmentVersion : '1.5.6'
-    androidxWebkitVersion = project.hasProperty('androidxWebkitVersion') ? rootProject.ext.androidxWebkitVersion : '1.6.1'
+    androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.10.1'
+    androidxFragmentVersion = project.hasProperty('androidxFragmentVersion') ? rootProject.ext.androidxFragmentVersion : '1.6.1'
+    androidxWebkitVersion = project.hasProperty('androidxWebkitVersion') ? rootProject.ext.androidxWebkitVersion : '1.7.0'
     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'
@@ -13,7 +13,7 @@ ext {
 
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.8.20'
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.10'
     repositories {
         google()
         mavenCentral()
@@ -22,7 +22,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
 
         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"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
         consumerProguardFiles 'proguard-rules.pro'

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

@@ -64,52 +64,8 @@ var nativeBridge = (function (exports) {
         }
         return newFormData;
     };
-    const convertBody = async (body, contentType) => {
-        if (body instanceof ReadableStream) {
-            const reader = body.getReader();
-            const chunks = [];
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done)
-                    break;
-                chunks.push(value);
-            }
-            const concatenated = new Uint8Array(chunks.reduce((acc, chunk) => acc + chunk.length, 0));
-            let position = 0;
-            for (const chunk of chunks) {
-                concatenated.set(chunk, position);
-                position += chunk.length;
-            }
-            let data = new TextDecoder().decode(concatenated);
-            let type;
-            if (contentType === 'application/json') {
-                try {
-                    data = JSON.parse(data);
-                }
-                catch (ignored) {
-                    // ignore
-                }
-                type = 'json';
-            }
-            else if (contentType === 'multipart/form-data') {
-                type = 'formData';
-            }
-            else if (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) {
-                type = 'image';
-            }
-            else if (contentType === 'application/octet-stream') {
-                type = 'binary';
-            }
-            else {
-                type = 'text';
-            }
-            return {
-                data,
-                type,
-                headers: { 'Content-Type': contentType || 'application/octet-stream' },
-            };
-        }
-        else if (body instanceof FormData) {
+    const convertBody = async (body) => {
+        if (body instanceof FormData) {
             const formData = await convertFormData(body);
             const boundary = `${Date.now()}`;
             return {
@@ -469,17 +425,15 @@ var nativeBridge = (function (exports) {
                     // fetch patch
                     window.fetch = async (resource, options) => {
                         const request = new Request(resource, options);
-                        if (!(request.url.startsWith('http:') ||
-                            request.url.startsWith('https:'))) {
+                        if (request.url.startsWith(`${cap.getServerUrl()}/`)) {
                             return win.CapacitorWebFetch(resource, options);
                         }
                         const tag = `CapacitorHttp fetch ${Date.now()} ${resource}`;
                         console.time(tag);
                         try {
-                            // intercept request & pass to the bridge
                             const { body, method } = request;
+                            const { data: requestData, type, headers, } = await convertBody(body || undefined);
                             const optionHeaders = Object.fromEntries(request.headers.entries());
-                            const { data: requestData, type, headers, } = await convertBody((options === null || options === void 0 ? void 0 : options.body) || body || undefined, optionHeaders['Content-Type'] || optionHeaders['content-type']);
                             const nativeResponse = await cap.nativePromise('CapacitorHttp', 'request', {
                                 url: request.url,
                                 method: method,
@@ -630,22 +584,12 @@ var nativeBridge = (function (exports) {
                                             }
                                             this._headers = nativeResponse.headers;
                                             this.status = nativeResponse.status;
-                                            const responseString = typeof nativeResponse.data !== 'string'
-                                                ? JSON.stringify(nativeResponse.data)
-                                                : nativeResponse.data;
                                             if (this.responseType === '' ||
                                                 this.responseType === 'text') {
-                                                this.response = responseString;
-                                            }
-                                            else if (this.responseType === 'blob') {
-                                                this.response = new Blob([responseString], {
-                                                    type: 'application/json',
-                                                });
-                                            }
-                                            else if (this.responseType === 'arraybuffer') {
-                                                const encoder = new TextEncoder();
-                                                const uint8Array = encoder.encode(responseString);
-                                                this.response = uint8Array.buffer;
+                                                this.response =
+                                                    typeof nativeResponse.data !== 'string'
+                                                        ? JSON.stringify(nativeResponse.data)
+                                                        : nativeResponse.data;
                                             }
                                             else {
                                                 this.response = nativeResponse.data;
@@ -712,7 +656,7 @@ var nativeBridge = (function (exports) {
                             }
                             let returnString = '';
                             for (const key in this._headers) {
-                                if (key.toLowerCase() !== 'set-cookie') {
+                                if (key != 'Set-Cookie') {
                                     returnString += key + ': ' + this._headers[key] + '\r\n';
                                 }
                             }
@@ -723,12 +667,7 @@ var nativeBridge = (function (exports) {
                             if (isRelativeURL(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.getResponseHeader.call(this, name);
                             }
-                            for (const key in this._headers) {
-                                if (key.toLowerCase() === name.toLowerCase()) {
-                                    return this._headers[key];
-                                }
-                            }
-                            return null;
+                            return this._headers[name];
                         };
                         Object.setPrototypeOf(xhr, prototype);
                         return xhr;

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

@@ -1,6 +1,6 @@
 package com.getcapacitor;
 
-import static com.getcapacitor.Bridge.CAPACITOR_HTTP_SCHEME;
+import static com.getcapacitor.Bridge.CAPACITOR_HTTPS_SCHEME;
 import static com.getcapacitor.Bridge.DEFAULT_ANDROID_WEBVIEW_VERSION;
 import static com.getcapacitor.Bridge.DEFAULT_HUAWEI_WEBVIEW_VERSION;
 import static com.getcapacitor.Bridge.MINIMUM_ANDROID_WEBVIEW_VERSION;
@@ -36,7 +36,7 @@ public class CapConfig {
     private boolean html5mode = true;
     private String serverUrl;
     private String hostname = "localhost";
-    private String androidScheme = CAPACITOR_HTTP_SCHEME;
+    private String androidScheme = CAPACITOR_HTTPS_SCHEME;
     private String[] allowNavigation;
 
     // Android Config
@@ -297,7 +297,7 @@ public class CapConfig {
     private boolean validateScheme(String scheme) {
         List<String> invalidSchemes = Arrays.asList("file", "ftp", "ftps", "ws", "wss", "about", "blob", "data");
         if (invalidSchemes.contains(scheme)) {
-            Logger.warn(scheme + " is not an allowed scheme.  Defaulting to http.");
+            Logger.warn(scheme + " is not an allowed scheme.  Defaulting to https.");
             return false;
         }
 
@@ -531,7 +531,7 @@ public class CapConfig {
         private String serverUrl;
         private String errorPath;
         private String hostname = "localhost";
-        private String androidScheme = CAPACITOR_HTTP_SCHEME;
+        private String androidScheme = CAPACITOR_HTTPS_SCHEME;
         private String[] allowNavigation;
 
         // Android Config Values

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

@@ -39,11 +39,6 @@ public class CapacitorCookies extends Plugin {
         return pluginConfig.getBoolean("enabled", false);
     }
 
-    private boolean isAllowingInsecureCookies() {
-        PluginConfig pluginConfig = getBridge().getConfig().getPluginConfiguration("CapacitorCookies");
-        return pluginConfig.getBoolean("androidCustomSchemeAllowInsecureAccess", false);
-    }
-
     @JavascriptInterface
     public void setCookie(String domain, String action) {
         cookieManager.setCookie(domain, action);
@@ -51,44 +46,34 @@ public class CapacitorCookies extends Plugin {
 
     @PluginMethod
     public void getCookies(PluginCall call) {
-        if (isAllowingInsecureCookies()) {
-            String url = call.getString("url");
-            JSObject cookiesMap = new JSObject();
-            HttpCookie[] cookies = cookieManager.getCookies(url);
-            for (HttpCookie cookie : cookies) {
-                cookiesMap.put(cookie.getName(), cookie.getValue());
-            }
-            call.resolve(cookiesMap);
-        } else {
-            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": "5.4.1",
+  "version": "5.4.2-nightly-20231005T150526.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": "^5.4.0"
+    "@capacitor/core": "^5.4.0-nightly-20231005T150526.0"
   },
   "publishConfig": {
     "access": "public"