@capacitor-plus/android 8.0.6 → 8.3.2

package/capacitor/build.gradle

@@ -53,7 +53,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     lintOptions {

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

@@ -505,6 +505,10 @@ var nativeBridge = (function (exports) {
                             if (typeof resource === 'string') {
                                 return await win.CapacitorWebFetch(createProxyUrl(resource, win), options);
                             }
+                            else if (resource instanceof URL) {
+                                const modifiedURL = new URL(createProxyUrl(resource.toString(), win));
+                                return await win.CapacitorWebFetch(modifiedURL, options);
+                            }
                             else if (resource instanceof Request) {
                                 const modifiedRequest = new Request(createProxyUrl(resource.url, win), resource);
                                 return await win.CapacitorWebFetch(modifiedRequest, options);

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

@@ -434,7 +434,7 @@ public class Bridge {
             PackageManager pm = getContext().getPackageManager();
             PackageInfo pInfo = InternalUtils.getPackageInfo(pm, getContext().getPackageName());
             versionCode = Integer.toString((int) PackageInfoCompat.getLongVersionCode(pInfo));
-            versionName = pInfo.versionName;
+            versionName = pInfo.versionName != null ? pInfo.versionName : "";
         } catch (Exception ex) {
             Logger.error("Unable to get package info", ex);
         }
@@ -628,11 +628,11 @@ public class Bridge {
             try {
                 URL appUrlObject = new URL(appUrlConfig);
                 authorities.add(appUrlObject.getAuthority());
+                localUrl = appUrlObject.getProtocol() + "://" + appUrlObject.getAuthority();
             } catch (Exception ex) {
                 Logger.error("Provided server url is invalid: " + ex.getMessage());
                 return;
             }
-            localUrl = appUrlConfig;
             appUrl = appUrlConfig;
         } else {
             appUrl = localUrl;

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

@@ -66,7 +66,9 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        bridge.saveInstanceState(outState);
+        if (bridge != null) {
+            bridge.saveInstanceState(outState);
+        }
     }
 
     @Override
@@ -82,8 +84,10 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onRestart() {
         super.onRestart();
-        this.bridge.onRestart();
-        Logger.debug("App restarted");
+        if (this.bridge != null) {
+            this.bridge.onRestart();
+            Logger.debug("App restarted");
+        }
     }
 
     @Override
@@ -131,7 +135,9 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        this.bridge.onDetachedFromWindow();
+        if (this.bridge != null) {
+            this.bridge.onDetachedFromWindow();
+        }
     }
 
     /**

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

@@ -128,9 +128,22 @@ public class WebViewLocalServer {
             return reasonPhrase;
         }
 
+        /**
+         * @deprecated This method may return incorrect headers in concurrent range requests.
+         * <p>
+         * Use {@link #buildDefaultResponseHeaders()} instead, which returns a copy of the map.
+         * </p>
+         * This method will be removed in a future major version of Capacitor.
+         * </p>
+         */
+        @Deprecated(forRemoval = true) // adjust version as appropriate
         public Map<String, String> getResponseHeaders() {
             return responseHeaders;
         }
+
+        public Map<String, String> buildDefaultResponseHeaders() {
+            return new HashMap<>(responseHeaders);
+        }
     }
 
     WebViewLocalServer(Context context, Bridge bridge, JSInjector jsInjector, ArrayList<String> authorities, boolean html5mode) {
@@ -326,14 +339,16 @@ public class WebViewLocalServer {
     private WebResourceResponse handleLocalRequest(WebResourceRequest request, PathHandler handler) {
         String path = request.getUrl().getPath();
 
-        if (request.getRequestHeaders().get("Range") != null) {
+        Map<String, String> requestHeaders = request.getRequestHeaders();
+        String rangeString = requestHeaders.get("Range") != null ? requestHeaders.get("Range") : requestHeaders.get("range");
+
+        if (rangeString != null) {
             InputStream responseStream = new LollipopLazyInputStream(handler, request);
             String mimeType = getMimeType(path, responseStream);
-            Map<String, String> tempResponseHeaders = handler.getResponseHeaders();
+            Map<String, String> tempResponseHeaders = handler.buildDefaultResponseHeaders();
             int statusCode = 206;
             try {
                 int totalRange = responseStream.available();
-                String rangeString = request.getRequestHeaders().get("Range");
                 String[] parts = rangeString.split("=");
                 String[] streamParts = parts[1].split("-");
                 String fromRange = streamParts[0];
@@ -365,7 +380,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -376,7 +391,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 handler.getStatusCode(),
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 null
             );
         }
@@ -411,7 +426,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -442,7 +457,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -517,7 +532,7 @@ public class WebViewLocalServer {
                             handler.getEncoding(),
                             handler.getStatusCode(),
                             handler.getReasonPhrase(),
-                            handler.getResponseHeaders(),
+                            handler.buildDefaultResponseHeaders(),
                             responseStream
                         );
                     }

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

@@ -1,9 +1,12 @@
 package com.getcapacitor.plugin;
 
+import android.content.Context;
+import android.content.pm.PackageInfo;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Build;
+import android.util.TypedValue;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
@@ -12,6 +15,7 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
+import androidx.webkit.WebViewCompat;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
@@ -31,6 +35,11 @@ public class SystemBars extends Plugin {
     static final String INSETS_HANDLING_CSS = "css";
     static final String INSETS_HANDLING_DISABLE = "disable";
 
+    // https://issues.chromium.org/issues/40699457
+    private static final int WEBVIEW_VERSION_WITH_SAFE_AREA_FIX = 140;
+    // https://issues.chromium.org/issues/457682720
+    private static final int WEBVIEW_VERSION_WITH_SAFE_AREA_KEYBOARD_FIX = 144;
+
     static final String viewportMetaJSFunction = """
         function capacitorSystemBarsCheckMetaViewport() {
             const meta = document.querySelectorAll("meta[name=viewport]");
@@ -47,6 +56,9 @@ public class SystemBars extends Plugin {
     private boolean insetHandlingEnabled = true;
     private boolean hasViewportCover = false;
 
+    private String currentStatusBarStyle = STYLE_DEFAULT;
+    private String currentGestureBarStyle = STYLE_DEFAULT;
+
     @Override
     public void load() {
         getBridge().getWebView().addJavascriptInterface(this, "CapacitorSystemBarsAndroidInterface");
@@ -73,7 +85,9 @@ public class SystemBars extends Plugin {
     @Override
     protected void handleOnConfigurationChanged(Configuration newConfig) {
         super.handleOnConfigurationChanged(newConfig);
-        setStyle(STYLE_DEFAULT, "");
+
+        setStyle(currentGestureBarStyle, BAR_GESTURE_BAR);
+        setStyle(currentStatusBarStyle, BAR_STATUS_BAR);
     }
 
     private void initSystemBars() {
@@ -86,7 +100,7 @@ public class SystemBars extends Plugin {
         }
 
         initWindowInsetsListener();
-        initSafeAreaInsets();
+        initSafeAreaCSSVariables();
 
         getBridge().executeOnMainThread(() -> {
             setStyle(style, "");
@@ -143,10 +157,13 @@ public class SystemBars extends Plugin {
 
     private Insets calcSafeAreaInsets(WindowInsetsCompat insets) {
         Insets safeArea = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+        if (insets.isVisible(WindowInsetsCompat.Type.ime())) {
+            return Insets.of(safeArea.left, safeArea.top, safeArea.right, 0);
+        }
         return Insets.of(safeArea.left, safeArea.top, safeArea.right, safeArea.bottom);
     }
 
-    private void initSafeAreaInsets() {
+    private void initSafeAreaCSSVariables() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && insetHandlingEnabled) {
             View v = (View) this.getBridge().getWebView().getParent();
             WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(v);
@@ -158,37 +175,59 @@ public class SystemBars extends Plugin {
     }
 
     private void initWindowInsetsListener() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && insetHandlingEnabled) {
-            ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
-                if (hasViewportCover) {
-                    Insets safeAreaInsets = calcSafeAreaInsets(insets);
-                    boolean keyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
+        ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
+            boolean shouldPassthroughInsets = getWebViewMajorVersion() >= WEBVIEW_VERSION_WITH_SAFE_AREA_FIX && hasViewportCover;
 
-                    if (keyboardVisible) {
-                        safeAreaInsets = Insets.of(safeAreaInsets.left, safeAreaInsets.top, safeAreaInsets.right, 0);
+            Insets systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+            Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
+            boolean keyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
 
-                        Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
-                        setViewMargins(v, Insets.of(0, 0, 0, imeInsets.bottom));
-                    } else {
-                        setViewMargins(v, Insets.NONE);
-                    }
+            if (shouldPassthroughInsets) {
+                // We need to correct for a possible shown IME
+                v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
 
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
+                    Insets safeAreaInsets = calcSafeAreaInsets(insets);
                     injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
-                    return WindowInsetsCompat.CONSUMED;
                 }
 
-                return insets;
-            });
-        }
-    }
+                return new WindowInsetsCompat.Builder(insets)
+                    .setInsets(
+                        WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(),
+                        Insets.of(
+                            systemBarsInsets.left,
+                            systemBarsInsets.top,
+                            systemBarsInsets.right,
+                            getBottomInset(systemBarsInsets, keyboardVisible)
+                        )
+                    )
+                    .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
+                );
+            }
+
+            // Returning `WindowInsetsCompat.CONSUMED` breaks recalculation of safe area insets
+            // So we have to explicitly set insets to `0`
+            // See: https://issues.chromium.org/issues/461332423
+            WindowInsetsCompat newInsets = new WindowInsetsCompat.Builder(insets)
+                .setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(), Insets.of(0, 0, 0, 0))
+                .build();
 
-    private void setViewMargins(View v, Insets insets) {
-        ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-        mlp.leftMargin = insets.left;
-        mlp.bottomMargin = insets.bottom;
-        mlp.rightMargin = insets.right;
-        mlp.topMargin = insets.top;
-        v.setLayoutParams(mlp);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
+                Insets safeAreaInsets = calcSafeAreaInsets(newInsets);
+                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+            }
+
+            return newInsets;
+        });
     }
 
     private void injectSafeAreaCSS(int top, int right, int bottom, int left) {
@@ -231,12 +270,16 @@ 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;
             windowInsetsControllerCompat.setAppearanceLightStatusBars(!style.equals(STYLE_DARK));
         }
 
         if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
+            currentGestureBarStyle = style;
             windowInsetsControllerCompat.setAppearanceLightNavigationBars(!style.equals(STYLE_DARK));
         }
+
+        getActivity().getWindow().getDecorView().setBackgroundColor(getThemeColor(getContext(), android.R.attr.windowBackground));
     }
 
     private void setHidden(boolean hide, String bar) {
@@ -268,4 +311,36 @@ public class SystemBars extends Plugin {
         }
         return STYLE_DARK;
     }
+
+    public int getThemeColor(Context context, int attrRes) {
+        TypedValue typedValue = new TypedValue();
+
+        Resources.Theme theme = context.getTheme();
+        theme.resolveAttribute(attrRes, typedValue, true);
+        return typedValue.data;
+    }
+
+    private Integer getWebViewMajorVersion() {
+        PackageInfo info = WebViewCompat.getCurrentWebViewPackage(getContext());
+        if (info != null && info.versionName != null) {
+            String[] versionSegments = info.versionName.split("\\.");
+            return Integer.valueOf(versionSegments[0]);
+        }
+
+        return 0;
+    }
+
+    private int getBottomInset(Insets systemBarsInsets, boolean keyboardVisible) {
+        if (getWebViewMajorVersion() < WEBVIEW_VERSION_WITH_SAFE_AREA_KEYBOARD_FIX) {
+            // This is a workaround for webview versions that have a bug
+            // that causes the bottom inset to be incorrect if the IME is visible
+            // See: https://issues.chromium.org/issues/457682720
+
+            if (keyboardVisible) {
+                return 0;
+            }
+        }
+
+        return systemBarsInsets.bottom;
+    }
 }

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

@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.UUID;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 import org.json.JSONException;
@@ -224,7 +225,16 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
                 this.writeRequestBody(body.toString());
             }
         } else if (bodyType != null && bodyType.equals("formData")) {
-            this.writeFormDataRequestBody(contentType, body.toJSArray());
+            String boundary = extractBoundaryFromContentType(contentType);
+            if (boundary == null) {
+                // If no boundary is provided, generate a random one and set the Content-Type header accordingly
+                // or otherwise servers will not be able to parse the request body. Browsers do this automatically
+                // but here we need to do this manually in order to comply with browser api behavior.
+                boundary = UUID.randomUUID().toString();
+                connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
+            }
+
+            this.writeFormDataRequestBody(boundary, body.toJSArray());
         } else {
             this.writeRequestBody(body.toString());
         }
@@ -260,9 +270,8 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
         }
     }
 
-    private void writeFormDataRequestBody(String contentType, JSArray entries) throws IOException, JSONException {
+    private void writeFormDataRequestBody(String boundary, JSArray entries) throws IOException, JSONException {
         try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
-            String boundary = contentType.split(";")[1].split("=")[1];
             String lineEnd = "\r\n";
             String twoHyphens = "--";
 
@@ -303,6 +312,39 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
         }
     }
 
+    /**
+     * Extracts the boundary value from the `Content-Type` header for multipart/form-data requests, if provided.
+     *
+     * The boundary value might be surrounded by double quotes (") which will be stripped away.
+     *
+     * @param contentType The `Content-Type` header string.
+     * @return The boundary value if found, otherwise `null`.
+     */
+    public static String extractBoundaryFromContentType(String contentType) {
+        String boundaryPrefix = "boundary=";
+        int boundaryIndex = contentType.indexOf(boundaryPrefix);
+        if (boundaryIndex == -1) {
+            return null;
+        }
+
+        // Extract the substring starting right after "boundary="
+        String boundary = contentType.substring(boundaryIndex + boundaryPrefix.length());
+
+        // Find the end of the boundary value by looking for the next ";"
+        int endIndex = boundary.indexOf(";");
+        if (endIndex != -1) {
+            boundary = boundary.substring(0, endIndex);
+        }
+
+        // Remove surrounding double quotes if present
+        boundary = boundary.trim();
+        if (boundary.startsWith("\"") && boundary.endsWith("\"")) {
+            boundary = boundary.substring(1, boundary.length() - 1);
+        }
+
+        return boundary;
+    }
+
     /**
      * Opens a communications link to the resource referenced by this
      * URL, if such a connection has not already been established.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/android",
-  "version": "8.0.6",
+  "version": "8.3.2",
   "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)",
@@ -23,8 +23,8 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor-plus/core": "^8.0.0",
-    "@capacitor/core": "^8.0.0"
+    "@capacitor-plus/core": "^8.3.0",
+    "@capacitor/core": "^8.3.0"
   },
   "publishConfig": {
     "access": "public"