@capacitor-plus/android 8.3.10 → 8.3.11

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

@@ -44,6 +44,33 @@ var nativeBridge = (function (exports) {
         reader.onerror = reject;
         reader.readAsBinaryString(file);
     });
+    const readArrayBufferAsBase64 = (arrayBuffer) => {
+        const bytes = new Uint8Array(arrayBuffer);
+        const chunkSize = 0x8000;
+        let binary = '';
+        for (let i = 0; i < bytes.length; i += chunkSize) {
+            binary += String.fromCharCode(...bytes.subarray(i, i + chunkSize));
+        }
+        return btoa(binary);
+    };
+    const readBlobAsBase64 = (blob) => new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onload = () => {
+            const result = reader.result;
+            resolve(result.indexOf(',') >= 0 ? result.split(',')[1] : result);
+        };
+        reader.onerror = reject;
+        reader.readAsDataURL(blob);
+    });
+    const readDataViewAsBase64 = (dataView) => readArrayBufferAsBase64(dataView.buffer.slice(dataView.byteOffset, dataView.byteOffset + dataView.byteLength));
+    const base64StringToArrayBuffer = (base64) => {
+        const binary = atob(base64);
+        const bytes = new Uint8Array(binary.length);
+        for (let i = 0; i < binary.length; i++) {
+            bytes[i] = binary.charCodeAt(i);
+        }
+        return bytes.buffer;
+    };
     const convertFormData = async (formData) => {
         const newFormData = [];
         for (const pair of formData.entries()) {
@@ -65,9 +92,38 @@ var nativeBridge = (function (exports) {
         return newFormData;
     };
     const convertBody = async (body, contentType) => {
-        if (body instanceof ReadableStream || body instanceof Uint8Array) {
+        if (body instanceof File) {
+            const fileData = await readFileAsBase64(body);
+            return {
+                data: fileData,
+                type: 'file',
+                headers: { 'Content-Type': body.type },
+            };
+        }
+        else if (body instanceof Blob) {
+            return {
+                data: await readBlobAsBase64(body),
+                type: 'binary',
+                headers: { 'Content-Type': contentType || body.type || 'application/octet-stream' },
+            };
+        }
+        else if (body instanceof ArrayBuffer) {
+            return {
+                data: readArrayBufferAsBase64(body),
+                type: 'binary',
+                headers: { 'Content-Type': contentType || 'application/octet-stream' },
+            };
+        }
+        else if (ArrayBuffer.isView(body)) {
+            return {
+                data: readDataViewAsBase64(body),
+                type: 'binary',
+                headers: { 'Content-Type': contentType || 'application/octet-stream' },
+            };
+        }
+        if ((typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) || body instanceof Uint8Array) {
             let encodedData;
-            if (body instanceof ReadableStream) {
+            if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) {
                 const reader = body.getReader();
                 const chunks = [];
                 while (true) {
@@ -87,7 +143,9 @@ var nativeBridge = (function (exports) {
             else {
                 encodedData = body;
             }
-            let data = new TextDecoder().decode(encodedData);
+            let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) || contentType === 'application/octet-stream'
+                ? readDataViewAsBase64(encodedData)
+                : new TextDecoder().decode(encodedData);
             let type;
             if (contentType === 'application/json') {
                 try {
@@ -102,7 +160,7 @@ var nativeBridge = (function (exports) {
                 type = 'formData';
             }
             else if (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) {
-                type = 'image';
+                type = 'binary';
             }
             else if (contentType === 'application/octet-stream') {
                 type = 'binary';
@@ -128,14 +186,6 @@ var nativeBridge = (function (exports) {
                 type: 'formData',
             };
         }
-        else if (body instanceof Blob) {
-            const fileData = await readFileAsBase64(body);
-            return {
-                data: fileData,
-                type: 'file',
-                headers: { 'Content-Type': body.type },
-            };
-        }
         return { data: body, type: 'json' };
     };
     const CAPACITOR_HTTP_INTERCEPTOR = '/_capacitor_http_interceptor_';
@@ -535,15 +585,15 @@ var nativeBridge = (function (exports) {
                                 data: requestData,
                                 dataType: type,
                                 headers: nativeHeaders,
+                                responseType: 'arraybuffer',
                             });
                             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;
                             // use null data for 204 No Content HTTP response
-                            if (nativeResponse.status === 204) {
-                                data = null;
-                            }
+                            const data = nativeResponse.status === 204
+                                ? null
+                                : (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('application/json'))
+                                    ? JSON.stringify(nativeResponse.data)
+                                    : base64StringToArrayBuffer(nativeResponse.data);
                             // intercept & parse response before returning
                             const response = new Response(data, {
                                 headers: nativeResponse.headers,

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

@@ -265,8 +265,15 @@ public class Bridge {
         JSInjector injector = getJSInjector();
         if (WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {
             String allowedOrigin = Uri.parse(appUrl).buildUpon().path(null).fragment(null).clearQuery().build().toString();
+            final String finalAllowedOrigin = allowedOrigin;
+            Set<String> allowedOrigins = new HashSet<String>() {
+                {
+                    add(finalAllowedOrigin);
+                    addAll(allowedOriginRules);
+                }
+            };
             try {
-                WebViewCompat.addDocumentStartJavaScript(webView, injector.getScriptString(), Collections.singleton(allowedOrigin));
+                WebViewCompat.addDocumentStartJavaScript(webView, injector.getScriptString(), allowedOrigins);
                 injector = null;
             } catch (IllegalArgumentException ex) {
                 Logger.warn("Invalid url, using fallback");

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

@@ -26,8 +26,7 @@ public class MessageHandler {
         if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER) && !bridge.getConfig().isUsingLegacyBridge()) {
             WebViewCompat.WebMessageListener capListener = (view, message, sourceOrigin, isMainFrame, replyProxy) -> {
                 if (isMainFrame) {
-                    postMessage(message.getData());
-                    javaScriptReplyProxy = replyProxy;
+                    onModernBridgeMessage(message.getData(), replyProxy);
                 } else {
                     Logger.warn("Plugin execution is allowed in Main Frame only");
                 }
@@ -42,6 +41,11 @@ public class MessageHandler {
         }
     }
 
+    void onModernBridgeMessage(String data, JavaScriptReplyProxy replyProxy) {
+        javaScriptReplyProxy = replyProxy;
+        postMessage(data);
+    }
+
     /**
      * The main message handler that will be called from JavaScript
      * to send a message to the native bridge.

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

@@ -348,16 +348,22 @@ public class WebViewLocalServer {
             Map<String, String> tempResponseHeaders = handler.buildDefaultResponseHeaders();
             int statusCode = 206;
             try {
-                int totalRange = responseStream.available();
+                int totalSize = responseStream.available();
                 String[] parts = rangeString.split("=");
                 String[] streamParts = parts[1].split("-");
-                String fromRange = streamParts[0];
-                int range = totalRange - 1;
-                if (streamParts.length > 1) {
-                    range = Integer.parseInt(streamParts[1]);
+                int fromRange = Integer.parseInt(streamParts[0]);
+                int endRange = totalSize - 1;
+                if (streamParts.length > 1 && !streamParts[1].isEmpty()) {
+                    endRange = Integer.parseInt(streamParts[1]);
                 }
+
+                // Truncate the stream at the end of the requested range.
+                // Somewhere in the request pipeline, the stream gets automatically
+                // seeked to the correct start position, so we don't need to skip to the fromRange position here.
+                responseStream = new BoundedInputStream(responseStream, endRange + 1);
+
                 tempResponseHeaders.put("Accept-Ranges", "bytes");
-                tempResponseHeaders.put("Content-Range", "bytes " + fromRange + "-" + range + "/" + totalRange);
+                tempResponseHeaders.put("Content-Range", "bytes " + fromRange + "-" + endRange + "/" + totalSize);
             } catch (IOException e) {
                 statusCode = 404;
             }
@@ -750,6 +756,48 @@ public class WebViewLocalServer {
         }
     }
 
+    /**
+     * An InputStream wrapper that limits the number of bytes that can be read.
+     */
+    static class BoundedInputStream extends InputStream {
+
+        private final InputStream in;
+        private long remaining;
+
+        public BoundedInputStream(InputStream in, long limit) {
+            this.in = in;
+            this.remaining = limit;
+        }
+
+        @Override
+        public int available() throws IOException {
+            int available = in.available();
+            return (int) Math.min(available, remaining);
+        }
+
+        @Override
+        public int read() throws IOException {
+            if (remaining <= 0) return -1;
+            int result = in.read();
+            if (result != -1) remaining--;
+            return result;
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            if (remaining <= 0) return -1;
+            int toRead = (int) Math.min(len, remaining);
+            int result = in.read(b, off, toRead);
+            if (result > 0) remaining -= result;
+            return result;
+        }
+
+        @Override
+        public void close() throws IOException {
+            in.close();
+        }
+    }
+
     // For L and above.
     private static class LollipopLazyInputStream extends LazyInputStream {
 

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

@@ -1,5 +1,6 @@
 package com.getcapacitor.plugin;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.res.Configuration;
@@ -59,6 +60,8 @@ public class SystemBars extends Plugin {
     private String currentStatusBarStyle = STYLE_DEFAULT;
     private String currentGestureBarStyle = STYLE_DEFAULT;
 
+    private boolean navBarVisible = true;
+
     @Override
     public void load() {
         getBridge().getWebView().addJavascriptInterface(this, "CapacitorSystemBarsAndroidInterface");
@@ -76,7 +79,15 @@ public class SystemBars extends Plugin {
                 @Override
                 public void onPageCommitVisible(WebView view, String url) {
                     super.onPageCommitVisible(view, url);
-                    getBridge().getWebView().requestApplyInsets();
+                    View parentView = (View) getBridge().getWebView().getParent();
+                    ViewCompat.requestApplyInsets(parentView);
+                    if (insetHandlingEnabled) {
+                        WindowInsetsCompat rootInsets = ViewCompat.getRootWindowInsets(parentView);
+                        if (rootInsets != null) {
+                            Insets safeArea = calcSafeAreaInsets(rootInsets);
+                            injectSafeAreaCSS(safeArea.top, safeArea.right, safeArea.bottom, safeArea.left);
+                        }
+                    }
                 }
             }
         );
@@ -103,8 +114,17 @@ public class SystemBars extends Plugin {
         initSafeAreaCSSVariables();
 
         getBridge().executeOnMainThread(() -> {
+            Window window = getActivity().getWindow();
+            WindowCompat.setDecorFitsSystemWindows(window, false);
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                window.setNavigationBarColor(android.graphics.Color.TRANSPARENT);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    window.setNavigationBarContrastEnforced(false);
+                }
+            }
             setStyle(style, "");
             setHidden(hidden, "");
+            ViewCompat.requestApplyInsets((View) getBridge().getWebView().getParent());
         });
     }
 
@@ -144,43 +164,82 @@ public class SystemBars extends Plugin {
         call.resolve();
     }
 
+    @Override
+    protected void handleOnResume() {
+        super.handleOnResume();
+        getBridge().executeOnMainThread(() -> {
+            Window window = getActivity().getWindow();
+            WindowCompat.setDecorFitsSystemWindows(window, false);
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                window.setNavigationBarColor(android.graphics.Color.TRANSPARENT);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    window.setNavigationBarContrastEnforced(false);
+                }
+            }
+            setStyle(currentGestureBarStyle, BAR_GESTURE_BAR);
+            setStyle(currentStatusBarStyle, BAR_STATUS_BAR);
+            ViewCompat.requestApplyInsets((View) getBridge().getWebView().getParent());
+        });
+    }
+
     @JavascriptInterface
     public void onDOMReady() {
         getActivity().runOnUiThread(() -> {
             this.bridge.getWebView().evaluateJavascript(viewportMetaJSFunction, (res) -> {
                 hasViewportCover = res.equals("true");
-
-                getBridge().getWebView().requestApplyInsets();
+                ViewCompat.requestApplyInsets((View) getBridge().getWebView().getParent());
             });
         });
     }
 
     private Insets calcSafeAreaInsets(WindowInsetsCompat insets) {
         Insets safeArea = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
-        if (insets.isVisible(WindowInsetsCompat.Type.ime())) {
+
+        int bottom = safeArea.bottom;
+
+        if (bottom == 0 && Build.VERSION.SDK_INT < Build.VERSION_CODES.R && safeArea.left == 0 && safeArea.right == 0) {
+            // skip if nav bar is on a side (landscape)
+            bottom = getNavBarHeightFromResources();
+        }
+
+        boolean imeVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+            ? insets.isVisible(WindowInsetsCompat.Type.ime())
+            : insets.getInsets(WindowInsetsCompat.Type.ime()).bottom > 0;
+
+        if (imeVisible) {
             return Insets.of(safeArea.left, safeArea.top, safeArea.right, 0);
         }
-        return Insets.of(safeArea.left, safeArea.top, safeArea.right, safeArea.bottom);
+        return Insets.of(safeArea.left, safeArea.top, safeArea.right, bottom);
     }
 
-    private void initSafeAreaCSSVariables() {
-        WindowInsetsCompat insets;
+    // Only reached on API < 30 when the window reports no inset on any edge, so the
+    // choice is this approximation or a hardcoded 0. Lint rejects the internal
+    // resource because OEMs may change it; a wrong height still beats no inset.
+    @SuppressLint({ "InternalInsetResource", "DiscouragedApi" })
+    private int getNavBarHeightFromResources() {
+        if (!navBarVisible) return 0;
+        android.content.res.Resources res = getActivity().getResources();
+        int heightId = res.getIdentifier("navigation_bar_height", "dimen", "android");
+        return heightId > 0 ? res.getDimensionPixelSize(heightId) : 0;
+    }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+    private void initSafeAreaCSSVariables() {
+        if (insetHandlingEnabled) {
             View v = (View) this.getBridge().getWebView().getParent();
-            insets = ViewCompat.getRootWindowInsets(v);
-        } else {
-            insets = WindowInsetsCompat.CONSUMED;
-        }
-
-        if (insets != null) {
-            Insets safeAreaInsets = calcSafeAreaInsets(insets);
-            injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+            WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(v);
+            if (insets != null) {
+                Insets safeAreaInsets = calcSafeAreaInsets(insets);
+                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+            }
         }
     }
 
     private void initWindowInsetsListener() {
         ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
+            // getRootWindowInsets() bypasses AppCompat's intermediate view consuming the bottom inset on API < 30
+            WindowInsetsCompat rawInsets = ViewCompat.getRootWindowInsets(v);
+            WindowInsetsCompat safeAreaSource = (rawInsets != null) ? rawInsets : insets;
+
             boolean shouldPassthroughInsets = getWebViewMajorVersion() >= WEBVIEW_VERSION_WITH_SAFE_AREA_FIX && hasViewportCover;
 
             Insets systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
@@ -191,8 +250,10 @@ public class SystemBars extends Plugin {
                 // We need to correct for a possible shown IME
                 v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
 
-                Insets safeAreaInsets = calcSafeAreaInsets(insets);
-                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+                if (hasViewportCover && insetHandlingEnabled) {
+                    Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
+                    injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+                }
 
                 return new WindowInsetsCompat.Builder(insets)
                     .setInsets(
@@ -207,15 +268,7 @@ public class SystemBars extends Plugin {
                     .build();
             }
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                // We need to correct for a possible shown IME
-                v.setPadding(
-                    systemBarsInsets.left,
-                    systemBarsInsets.top,
-                    systemBarsInsets.right,
-                    keyboardVisible ? imeInsets.bottom : systemBarsInsets.bottom
-                );
-            }
+            v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
 
             // Returning `WindowInsetsCompat.CONSUMED` breaks recalculation of safe area insets
             // So we have to explicitly set insets to `0`
@@ -224,8 +277,10 @@ public class SystemBars extends Plugin {
                 .setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(), Insets.of(0, 0, 0, 0))
                 .build();
 
-            Insets safeAreaInsets = calcSafeAreaInsets(newInsets);
-            injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+            if (insetHandlingEnabled) {
+                Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
+                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+            }
 
             return newInsets;
         });
@@ -264,6 +319,7 @@ public class SystemBars extends Plugin {
     }
 
     private void setStyle(String style, String bar) {
+        String requestedStyle = style;
         if (style.equals(STYLE_DEFAULT)) {
             style = getStyleForTheme();
         }
@@ -271,12 +327,12 @@ public class SystemBars extends Plugin {
         Window window = getActivity().getWindow();
         WindowInsetsControllerCompat windowInsetsControllerCompat = WindowCompat.getInsetsController(window, window.getDecorView());
         if (bar.isEmpty() || bar.equals(BAR_STATUS_BAR)) {
-            currentStatusBarStyle = style;
+            currentStatusBarStyle = requestedStyle;
             windowInsetsControllerCompat.setAppearanceLightStatusBars(!style.equals(STYLE_DARK));
         }
 
         if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
-            currentGestureBarStyle = style;
+            currentGestureBarStyle = requestedStyle;
             windowInsetsControllerCompat.setAppearanceLightNavigationBars(!style.equals(STYLE_DARK));
         }
 
@@ -293,6 +349,7 @@ public class SystemBars extends Plugin {
             }
             if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.navigationBars());
+                navBarVisible = false;
             }
             return;
         }
@@ -302,6 +359,7 @@ public class SystemBars extends Plugin {
         }
         if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.navigationBars());
+            navBarVisible = true;
         }
     }
 

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

@@ -1,6 +1,5 @@
 package com.getcapacitor.plugin.util;
 
-import android.os.Build;
 import android.os.LocaleList;
 import android.text.TextUtils;
 import com.getcapacitor.Bridge;
@@ -19,7 +18,6 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.net.UnknownServiceException;
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -209,13 +207,8 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
                 dataString = call.getString("data");
             }
             this.writeRequestBody(dataString != null ? dataString : "");
-        } else if (bodyType != null && bodyType.equals("file")) {
-            try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    os.write(Base64.getDecoder().decode(body.toString()));
-                }
-                os.flush();
-            }
+        } else if (bodyType != null && (bodyType.equals("file") || bodyType.equals("binary"))) {
+            this.writeRequestBody(decodeBase64RequestBody(body.toString()));
         } else if (contentType.contains("application/x-www-form-urlencoded")) {
             try {
                 JSObject obj = body.toJSObject();
@@ -252,6 +245,17 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
         }
     }
 
+    private void writeRequestBody(byte[] body) throws IOException {
+        try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
+            os.write(body);
+            os.flush();
+        }
+    }
+
+    static byte[] decodeBase64RequestBody(String body) {
+        return android.util.Base64.decode(body, android.util.Base64.DEFAULT);
+    }
+
     private void writeObjectRequestBody(JSObject object) throws IOException, JSONException {
         try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
             Iterator<String> keys = object.keys();
@@ -296,11 +300,7 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
                         os.writeBytes("Content-Transfer-Encoding: binary" + lineEnd);
                         os.writeBytes(lineEnd);
 
-                        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.write(decodeBase64RequestBody(value));
 
                         os.writeBytes(lineEnd);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/android",
-  "version": "8.3.10",
+  "version": "8.3.11",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",