@capacitor/android 5.4.1-nightly-20230920T150500.0 → 5.4.1

package/capacitor/build.gradle

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

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

@@ -64,8 +64,52 @@ var nativeBridge = (function (exports) {
         }
         return newFormData;
     };
-    const convertBody = async (body) => {
-        if (body instanceof FormData) {
+    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 formData = await convertFormData(body);
             const boundary = `${Date.now()}`;
             return {
@@ -432,9 +476,10 @@ var nativeBridge = (function (exports) {
                         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,
@@ -585,12 +630,22 @@ 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 =
-                                                    typeof nativeResponse.data !== 'string'
-                                                        ? JSON.stringify(nativeResponse.data)
-                                                        : nativeResponse.data;
+                                                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;
                                             }
                                             else {
                                                 this.response = nativeResponse.data;
@@ -657,7 +712,7 @@ var nativeBridge = (function (exports) {
                             }
                             let returnString = '';
                             for (const key in this._headers) {
-                                if (key != 'Set-Cookie') {
+                                if (key.toLowerCase() !== 'set-cookie') {
                                     returnString += key + ': ' + this._headers[key] + '\r\n';
                                 }
                             }
@@ -668,7 +723,12 @@ var nativeBridge = (function (exports) {
                             if (isRelativeURL(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.getResponseHeader.call(this, name);
                             }
-                            return this._headers[name];
+                            for (const key in this._headers) {
+                                if (key.toLowerCase() === name.toLowerCase()) {
+                                    return this._headers[key];
+                                }
+                            }
+                            return null;
                         };
                         Object.setPrototypeOf(xhr, prototype);
                         return xhr;

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

@@ -1,7 +1,7 @@
 package com.getcapacitor.plugin;
 
-import android.util.Log;
 import com.getcapacitor.Bridge;
+import com.getcapacitor.Logger;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.CookieStore;
@@ -64,7 +64,7 @@ public class CapacitorCookieManager extends CookieManager {
             try {
                 new URI(url);
             } catch (Exception error) {
-                Log.e(TAG, "Failed to get sanitized URL.", error);
+                Logger.error(TAG, "Failed to get sanitized URL.", error);
                 throw error;
             }
         }
@@ -85,10 +85,10 @@ public class CapacitorCookieManager extends CookieManager {
     public String getCookieString(String url) {
         try {
             url = getSanitizedDomain(url);
-            Log.i(TAG, "Getting cookies at: '" + url + "'");
+            Logger.info(TAG, "Getting cookies at: '" + url + "'");
             return webkitCookieManager.getCookie(url);
         } catch (Exception error) {
-            Log.e(TAG, "Failed to get cookies at the given URL.", error);
+            Logger.error(TAG, "Failed to get cookies at the given URL.", error);
         }
 
         return null;
@@ -145,11 +145,11 @@ public class CapacitorCookieManager extends CookieManager {
     public void setCookie(String url, String value) {
         try {
             url = getSanitizedDomain(url);
-            Log.i(TAG, "Setting cookie '" + value + "' at: '" + url + "'");
+            Logger.info(TAG, "Setting cookie '" + value + "' at: '" + url + "'");
             webkitCookieManager.setCookie(url, value);
             flush();
         } catch (Exception error) {
-            Log.e(TAG, "Failed to set cookie.", error);
+            Logger.error(TAG, "Failed to set cookie.", error);
         }
     }
 

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

@@ -39,6 +39,11 @@ 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);
@@ -46,34 +51,44 @@ 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);
+        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);
+                                }
                             }
                         }
-                    }
 
-                    call.resolve(cookieMap);
-                }
-            );
+                        call.resolve(cookieMap);
+                    }
+                );
+        }
     }
 
     @PluginMethod

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "5.4.1-nightly-20230920T150500.0",
+  "version": "5.4.1",
   "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-nightly-20230920T150500.0"
+    "@capacitor/core": "^5.4.0"
   },
   "publishConfig": {
     "access": "public"