chore: sync plus with upstream main (upstream-preferred conflicts)

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ concurrency:
 jobs:
   setup:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 30
     steps:
       - name: Get Latest
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -38,7 +38,7 @@ jobs:
           key: ${{ runner.OS }}-bun-dependencies-cache-${{ hashFiles('bun.lock') }}
   lint:
     runs-on: macos-15
-    timeout-minutes: 10
+    timeout-minutes: 30
     steps:
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
@@ -57,7 +57,7 @@ jobs:
       - run: bun run lint
   test-cli:
     runs-on: macos-15
-    timeout-minutes: 10
+    timeout-minutes: 30
     needs:
       - setup
       - lint
@@ -81,7 +81,7 @@ jobs:
         working-directory: ./cli
   test-core:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 30
     needs:
       - setup
       - lint
@@ -105,7 +105,7 @@ jobs:
         working-directory: ./core
   test-ios:
     runs-on: macos-15
-    timeout-minutes: 10
+    timeout-minutes: 30
     needs:
       - setup
       - lint
@@ -136,7 +136,7 @@ jobs:
         run: sh ./scripts/native-podspec.sh lint
   test-android:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 30
     needs:
       - setup
       - lint

CHANGELOG.md

@@ -3,25 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [8.5.1](https://github.com/Cap-go/capacitor-plus/compare/8.3.12...8.5.1) (2026-08-25)
-
-
-### Bug Fixes
-
-* **ci:** fetch upstream objects so plus branch sync works ([#109](https://github.com/Cap-go/capacitor-plus/issues/109)) ([1fa7eee](https://github.com/Cap-go/capacitor-plus/commit/1fa7eeeff9494e9b32afb20a9850389b79d6bcec))
-* **ci:** resolve modify/delete conflicts in sync conflict PRs ([#110](https://github.com/Cap-go/capacitor-plus/issues/110)) ([5c29fb9](https://github.com/Cap-go/capacitor-plus/commit/5c29fb9af001b9aafdcde7b7054585e093f44431))
-
-
-
-
-
 # [8.5.0](https://github.com/ionic-team/capacitor/compare/8.4.2...8.5.0) (2026-07-31)
 
-## Bug Fixes
+### Bug Fixes
 
 - **cli:** support TypeScript 7 when loading capacitor.config.ts ([#8534](https://github.com/ionic-team/capacitor/issues/8534)) ([4c1c870](https://github.com/ionic-team/capacitor/commit/4c1c8709413b9c19b008c99122ca330cc3c90e6f))
 
-## Features
+### Features
 
 - **cli:** add migrator functionality for adopting UIScene ([#8544](https://github.com/ionic-team/capacitor/issues/8544)) ([984fa85](https://github.com/ionic-team/capacitor/commit/984fa85ba0adab0aacf895aed6323bf4b503dccb))
 - **ios:** UIScene Support ([#8536](https://github.com/ionic-team/capacitor/issues/8536)) ([3fa04a3](https://github.com/ionic-team/capacitor/commit/3fa04a357c92af34cd6fccb8124791963804a9dc))
@@ -41,14 +29,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # [8.4.0](https://github.com/ionic-team/capacitor/compare/8.3.4...8.4.0) (2026-06-02)
 
-## Bug Fixes
+### Bug Fixes
 
 - **android:** show only the requested system bar ([#8480](https://github.com/ionic-team/capacitor/issues/8480)) ([4c6c321](https://github.com/ionic-team/capacitor/commit/4c6c3219afb5223211e857457e46283c37eb9424))
 - **cli:** revert live reload config on failure ([#8485](https://github.com/ionic-team/capacitor/issues/8485)) ([1d031a4](https://github.com/ionic-team/capacitor/commit/1d031a4abec2c793079ba8897ad2e40c4cc6c7f9))
 - **SystemBars:** make `safe-area-inset-x` available on API <= 34 ([#8424](https://github.com/ionic-team/capacitor/issues/8424)) ([e456de0](https://github.com/ionic-team/capacitor/commit/e456de083e19644f484bec5a5359cb67960ac8bc))
 - **SystemBars:** respect `insetsHandling` disable ([#8481](https://github.com/ionic-team/capacitor/issues/8481)) ([d4ad7ff](https://github.com/ionic-team/capacitor/commit/d4ad7ffe39daf66e0cfc63af9028d5c05543bde7))
 
-## Features
+### Features
 
 - add method getDouble to plugin config ([#7638](https://github.com/ionic-team/capacitor/issues/7638)) ([93c72de](https://github.com/ionic-team/capacitor/commit/93c72de40a2ec4c78b33659250cb08340083088e))
 - **cli:** add experimental packageOptions ([#8471](https://github.com/ionic-team/capacitor/issues/8471)) ([258867b](https://github.com/ionic-team/capacitor/commit/258867b7bf37b1837b99b02ec9638e5a6df08d97))

android/CHANGELOG.md

@@ -3,14 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [8.5.1](https://github.com/Cap-go/capacitor-plus/compare/8.3.12...8.5.1) (2026-08-25)
-
-**Note:** Version bump only for package @capacitor-plus/android
-
-
-
-
-
 # [8.5.0](https://github.com/ionic-team/capacitor/compare/8.4.2...8.5.0) (2026-07-31)
 
 **Note:** Version bump only for package @capacitor/android

android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java

@@ -412,12 +412,6 @@ private boolean showImageCapturePicker(final ValueCallback<Uri[]> filePathCallba
         }
         takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageFileUri);
         takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-        // Store in static variables to survive activity recreation
-        pendingFilePathCallback = filePathCallback;
-        pendingImageFileUri = imageFileUri;
-        pendingFileChooserType = FileChooserType.IMAGE_CAPTURE;
-
         activityListener = (activityResult) -> {
             Uri[] result = null;
             if (activityResult.getResultCode() == Activity.RESULT_OK) {

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

@@ -756,48 +756,6 @@ public long skip(long n) throws IOException {
         }
     }
 
-    /**
-     * 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 {
 

android/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaWebViewImpl.java

@@ -70,14 +70,12 @@ public CapacitorEvalBridgeMode(WebView webView, CordovaInterface cordova) {
 
         @Override
         public void onNativeToJsMessageAvailable(final NativeToJsMessageQueue queue) {
-            cordova
-                .getActivity()
-                .runOnUiThread(() -> {
-                    String js = queue.popAndEncodeAsJs();
-                    if (js != null) {
-                        webView.evaluateJavascript(js, null);
-                    }
-                });
+            cordova.getActivity().runOnUiThread(() -> {
+                String js = queue.popAndEncodeAsJs();
+                if (js != null) {
+                    webView.evaluateJavascript(js, null);
+                }
+            });
         }
     }
 

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

@@ -44,17 +44,17 @@ public class SystemBars extends Plugin {
     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]");
-            if (meta.length == 0) {
-                return false;
-            }
-            // get the last found meta viewport tag
-            const metaContent = meta[meta.length - 1].content;
-            return metaContent.includes("viewport-fit=cover");
+    function capacitorSystemBarsCheckMetaViewport() {
+        const meta = document.querySelectorAll("meta[name=viewport]");
+        if (meta.length == 0) {
+            return false;
         }
-        capacitorSystemBarsCheckMetaViewport();
-        """;
+        // get the last found meta viewport tag
+        const metaContent = meta[meta.length - 1].content;
+        return metaContent.includes("viewport-fit=cover");
+    }
+    capacitorSystemBarsCheckMetaViewport();
+    """;
 
     private String insetsHandling = INSETS_HANDLING_CSS;
     private boolean hasViewportCover = false;
@@ -272,7 +272,7 @@ private void initWindowInsetsListener() {
                 // We need to correct for a possible shown IME
                 v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
 
-                Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
+                Insets safeAreaInsets = calcSafeAreaInsets(insets);
                 injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
 
                 return new WindowInsetsCompat.Builder(insets)
@@ -297,7 +297,7 @@ private void initWindowInsetsListener() {
                 .setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(), Insets.of(0, 0, 0, 0))
                 .build();
 
-            Insets safeAreaInsets = calcSafeAreaInsets(safeAreaSource);
+            Insets safeAreaInsets = calcSafeAreaInsets(newInsets);
             injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
 
             return newInsets;
@@ -364,7 +364,6 @@ private void setHidden(boolean hide, String bar) {
         if (hide) {
             if (bar.isEmpty()) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.systemBars());
-                navBarVisible = false;
             } else if (bar.equals(BAR_STATUS_BAR)) {
                 windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.statusBars());
             } else if (bar.equals(BAR_GESTURE_BAR)) {
@@ -376,7 +375,6 @@ private void setHidden(boolean hide, String bar) {
 
         if (bar.isEmpty()) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.systemBars());
-            navBarVisible = true;
         } else if (bar.equals(BAR_STATUS_BAR)) {
             windowInsetsControllerCompat.show(WindowInsetsCompat.Type.statusBars());
         } else if (bar.equals(BAR_GESTURE_BAR)) {

android/capacitor/src/test/java/com/getcapacitor/plugin/SystemBarsTest.java

@@ -1,7 +1,5 @@
 package com.getcapacitor.plugin;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.never;
@@ -15,7 +13,6 @@
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 import com.getcapacitor.Bridge;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import org.junit.Test;
 import org.mockito.MockedStatic;
@@ -49,66 +46,8 @@ public void showWithNavigationBarShowsOnlyNavigationBars() throws Exception {
         verify(controller, never()).show(WindowInsetsCompat.Type.statusBars());
     }
 
-    @Test
-    public void hideWithEmptyBarHidesSystemBars() throws Exception {
-        WindowInsetsControllerCompat controller = invokeSetHidden(new SystemBars(), true, "");
-
-        verify(controller).hide(WindowInsetsCompat.Type.systemBars());
-        verify(controller, never()).hide(WindowInsetsCompat.Type.statusBars());
-        verify(controller, never()).hide(WindowInsetsCompat.Type.navigationBars());
-    }
-
-    @Test
-    public void hideWithStatusBarHidesOnlyStatusBars() throws Exception {
-        WindowInsetsControllerCompat controller = invokeSetHidden(new SystemBars(), true, "StatusBar");
-
-        verify(controller).hide(WindowInsetsCompat.Type.statusBars());
-        verify(controller, never()).hide(WindowInsetsCompat.Type.systemBars());
-        verify(controller, never()).hide(WindowInsetsCompat.Type.navigationBars());
-    }
-
-    @Test
-    public void togglingNavigationBarTracksNavBarVisible() throws Exception {
-        SystemBars plugin = new SystemBars();
-
-        invokeSetHidden(plugin, true, "NavigationBar");
-        assertFalse(navBarVisible(plugin));
-
-        invokeSetHidden(plugin, false, "NavigationBar");
-        assertTrue(navBarVisible(plugin));
-    }
-
-    @Test
-    public void togglingAllBarsTracksNavBarVisible() throws Exception {
-        SystemBars plugin = new SystemBars();
-
-        invokeSetHidden(plugin, true, "");
-        assertFalse(navBarVisible(plugin));
-
-        invokeSetHidden(plugin, false, "");
-        assertTrue(navBarVisible(plugin));
-    }
-
-    @Test
-    public void hidingOnlyStatusBarLeavesNavBarVisible() throws Exception {
-        SystemBars plugin = new SystemBars();
-
-        invokeSetHidden(plugin, true, "StatusBar");
-
-        assertTrue(navBarVisible(plugin));
-    }
-
-    private boolean navBarVisible(SystemBars plugin) throws Exception {
-        Field field = SystemBars.class.getDeclaredField("navBarVisible");
-        field.setAccessible(true);
-        return field.getBoolean(plugin);
-    }
-
     private WindowInsetsControllerCompat invokeSetHidden(String bar) throws Exception {
-        return invokeSetHidden(new SystemBars(), false, bar);
-    }
-
-    private WindowInsetsControllerCompat invokeSetHidden(SystemBars plugin, boolean hide, String bar) throws Exception {
+        SystemBars plugin = new SystemBars();
         Bridge bridge = mock(Bridge.class);
         AppCompatActivity activity = mock(AppCompatActivity.class);
         Window window = mock(Window.class);
@@ -126,7 +65,7 @@ private WindowInsetsControllerCompat invokeSetHidden(SystemBars plugin, boolean
 
             Method setHidden = SystemBars.class.getDeclaredMethod("setHidden", boolean.class, String.class);
             setHidden.setAccessible(true);
-            setHidden.invoke(plugin, hide, bar);
+            setHidden.invoke(plugin, false, bar);
         }
 
         return controller;

android/capacitor/src/test/java/com/getcapacitor/plugin/util/HttpRequestHandlerTest.java

@@ -11,8 +11,8 @@ public class HttpRequestHandlerTest {
 
     static final String BASE_URL = "https://httpbin.org/get";
     static final String PARAMS_JSON = """
-        {"k": "a&b"}
-        """;
+    {"k": "a&b"}
+    """;
 
     @Test
     public void testHttpURLConnectionBuilderSetUrlParamsEncoded() throws Exception {

android/package.json

@@ -1,9 +1,9 @@
 {
-  "name": "@capacitor-plus/android",
-  "version": "8.5.1",
-  "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)",
+  "name": "@capacitor/android",
+  "version": "8.5.0",
+  "description": "Capacitor: Cross-platform apps with JavaScript and the web",
+  "homepage": "https://capacitorjs.com",
+  "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,7 +23,6 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor-plus/core": "^8.5.0",
     "@capacitor/core": "^8.5.0"
   },
   "publishConfig": {