@capacitor/android 5.7.5 → 5.7.7

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

@@ -65,22 +65,29 @@ 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);
+        if (body instanceof ReadableStream || body instanceof Uint8Array) {
+            let encodedData;
+            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;
+                }
+                encodedData = concatenated;
             }
-            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;
+            else {
+                encodedData = body;
             }
-            let data = new TextDecoder().decode(concatenated);
+            let data = new TextDecoder().decode(encodedData);
             let type;
             if (contentType === 'application/json') {
                 try {
@@ -569,20 +576,7 @@ var nativeBridge = (function (exports) {
                                 value: xhr.method,
                                 writable: true,
                             },
-                            readyState: {
-                                get: function () {
-                                    var _a;
-                                    return (_a = this._readyState) !== null && _a !== void 0 ? _a : 0;
-                                },
-                                set: function (val) {
-                                    this._readyState = val;
-                                    setTimeout(() => {
-                                        this.dispatchEvent(new Event('readystatechange'));
-                                    });
-                                },
-                            },
                         });
-                        xhr.readyState = 0;
                         const prototype = win.CapacitorWebXMLHttpRequest.prototype;
                         const isProgressEventAvailable = () => typeof ProgressEvent !== 'undefined' &&
                             ProgressEvent.prototype instanceof Event;
@@ -612,6 +606,20 @@ var nativeBridge = (function (exports) {
                                 this._url = createProxyUrl(this._url, win);
                                 return win.CapacitorWebXMLHttpRequest.open.call(this, method, this._url);
                             }
+                            Object.defineProperties(this, {
+                                readyState: {
+                                    get: function () {
+                                        var _a;
+                                        return (_a = this._readyState) !== null && _a !== void 0 ? _a : 0;
+                                    },
+                                    set: function (val) {
+                                        this._readyState = val;
+                                        setTimeout(() => {
+                                            this.dispatchEvent(new Event('readystatechange'));
+                                        });
+                                    },
+                                },
+                            });
                             setTimeout(() => {
                                 this.dispatchEvent(new Event('loadstart'));
                             });

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

@@ -367,7 +367,7 @@ public class Bridge {
             }
         }
 
-        if (url.getScheme().equals("data")) {
+        if (url.getScheme().equals("data") || url.getScheme().equals("blob")) {
             return false;
         }
 

package/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java

@@ -275,7 +275,7 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
                     if (type.equals("string")) {
                         os.writeBytes(twoHyphens + boundary + lineEnd);
                         os.writeBytes("Content-Disposition: form-data; name=\"" + key + "\"" + lineEnd + lineEnd);
-                        os.writeBytes(value);
+                        os.write(value.getBytes(StandardCharsets.UTF_8));
                         os.writeBytes(lineEnd);
                     } else if (type.equals("base64File")) {
                         String fileName = entry.getString("fileName");
@@ -289,6 +289,8 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
 
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                             os.write(Base64.getDecoder().decode(value));
+                        } else {
+                            os.write(android.util.Base64.decode(value, android.util.Base64.DEFAULT));
                         }
 
                         os.writeBytes(lineEnd);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "5.7.5",
+  "version": "5.7.7",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",