@capgo/capacitor-inappbrowser 8.22.2 → 8.22.4

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/FullscreenWindowState.java

@@ -4,7 +4,6 @@ import android.os.Build;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 
@@ -14,26 +13,14 @@ final class FullscreenWindowState {
     private final Window window;
     private final WindowManager.LayoutParams attributes = new WindowManager.LayoutParams();
     private final int visibility;
-    private final int behavior;
-    private final boolean statusVisible;
-    private final boolean navigationVisible;
+    private final SystemBarsControllerState systemBars;
 
     FullscreenWindowState(Window window) {
         this.window = window;
         attributes.copyFrom(window.getAttributes());
         View decor = window.getDecorView();
         visibility = decor.getSystemUiVisibility();
-        WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, decor);
-        behavior = controller.getSystemBarsBehavior();
-        WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decor);
-        statusVisible =
-            insets != null
-                ? insets.isVisible(WindowInsetsCompat.Type.statusBars())
-                : (attributes.flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) == 0;
-        navigationVisible =
-            insets != null
-                ? insets.isVisible(WindowInsetsCompat.Type.navigationBars())
-                : (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
+        systemBars = SystemBarsControllerState.capture(window);
     }
 
     void enter() {
@@ -60,12 +47,7 @@ final class FullscreenWindowState {
     }
 
     void restore() {
-        WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, window.getDecorView());
-        if (statusVisible) controller.show(WindowInsetsCompat.Type.statusBars());
-        else controller.hide(WindowInsetsCompat.Type.statusBars());
-        if (navigationVisible) controller.show(WindowInsetsCompat.Type.navigationBars());
-        else controller.hide(WindowInsetsCompat.Type.navigationBars());
-        controller.setSystemBarsBehavior(behavior);
+        systemBars.applyTo(window);
         window.setAttributes(attributes);
         window.getDecorView().setSystemUiVisibility(visibility);
     }

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/SystemBarsControllerState.java

@@ -0,0 +1,76 @@
+package ee.forgr.capacitor_inappbrowser;
+
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
+
+/** Captures status/navigation bar visibility and transient behavior for one window. */
+final class SystemBarsControllerState {
+
+    private final int behavior;
+    private final boolean statusVisible;
+    private final boolean navigationVisible;
+
+    SystemBarsControllerState(int behavior, boolean statusVisible, boolean navigationVisible) {
+        this.behavior = behavior;
+        this.statusVisible = statusVisible;
+        this.navigationVisible = navigationVisible;
+    }
+
+    static SystemBarsControllerState capture(Window window) {
+        if (window == null) {
+            return new SystemBarsControllerState(WindowInsetsControllerCompat.BEHAVIOR_DEFAULT, true, true);
+        }
+
+        View decor = window.getDecorView();
+        WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, decor);
+        int behavior = controller.getSystemBarsBehavior();
+        WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decor);
+        WindowManager.LayoutParams attributes = window.getAttributes();
+        int visibility = decor.getSystemUiVisibility();
+        boolean statusVisible =
+            insets != null
+                ? insets.isVisible(WindowInsetsCompat.Type.statusBars()) && (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0
+                : (attributes.flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) == 0 &&
+                  (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0;
+        boolean navigationVisible =
+            insets != null
+                ? insets.isVisible(WindowInsetsCompat.Type.navigationBars()) && (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0
+                : (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
+        return new SystemBarsControllerState(behavior, statusVisible, navigationVisible);
+    }
+
+    void applyTo(Window window) {
+        if (window == null) {
+            return;
+        }
+
+        WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, window.getDecorView());
+        if (statusVisible) {
+            controller.show(WindowInsetsCompat.Type.statusBars());
+        } else {
+            controller.hide(WindowInsetsCompat.Type.statusBars());
+        }
+        if (navigationVisible) {
+            controller.show(WindowInsetsCompat.Type.navigationBars());
+        } else {
+            controller.hide(WindowInsetsCompat.Type.navigationBars());
+        }
+        controller.setSystemBarsBehavior(behavior);
+    }
+
+    int getBehavior() {
+        return behavior;
+    }
+
+    boolean isStatusVisible() {
+        return statusVisible;
+    }
+
+    boolean isNavigationVisible() {
+        return navigationVisible;
+    }
+}

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -458,11 +458,75 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             }
             fullscreenContentBehavior = null;
             baseline.restore();
+            syncDialogSystemBarsFromHost();
             reapplyInsetsFromWindowRoot();
         }
         if (fullscreenChangeListener != null) fullscreenChangeListener.accept(enabled);
     }
 
+    private void syncDialogSystemBarsFromHost() {
+        if (isFullscreen()) {
+            return;
+        }
+
+        if (activity == null) {
+            return;
+        }
+
+        Window hostWindow = activity.getWindow();
+        Window dialogWindow = getWindow();
+        if (hostWindow == null || dialogWindow == null) {
+            return;
+        }
+
+        if (customFullscreenView != null && customFullscreenWindow == dialogWindow) {
+            return;
+        }
+
+        SystemBarsControllerState hostState = SystemBarsControllerState.capture(hostWindow);
+        hostState.applyTo(dialogWindow);
+        applyStatusBarColorViewForHostVisibility(hostState.isStatusVisible());
+    }
+
+    private void applyStatusBarColorViewForHostVisibility(boolean statusBarVisible) {
+        if (_options != null && TextUtils.equals(_options.getToolbarType(), "blank")) {
+            return;
+        }
+
+        View statusBarColorView = findViewById(R.id.status_bar_color_view);
+        if (statusBarColorView == null) {
+            return;
+        }
+
+        ViewGroup.LayoutParams params = statusBarColorView.getLayoutParams();
+        if (!statusBarVisible) {
+            statusBarColorView.setVisibility(View.GONE);
+            if (params != null) {
+                params.height = 0;
+                statusBarColorView.setLayoutParams(params);
+            }
+            return;
+        }
+
+        statusBarColorView.setVisibility(View.VISIBLE);
+        if (params != null) {
+            params.height = getSystemStatusBarHeight();
+            statusBarColorView.setLayoutParams(params);
+            statusBarColorView.requestLayout();
+        }
+    }
+
+    private boolean isHostStatusBarVisible() {
+        if (activity == null) {
+            return true;
+        }
+        Window hostWindow = activity.getWindow();
+        if (hostWindow == null) {
+            return true;
+        }
+        return SystemBarsControllerState.capture(hostWindow).isStatusVisible();
+    }
+
     private void updateFullscreenExitInsets(WindowInsetsCompat insets) {
         if (fullscreenExitButton == null || insets == null) return;
         // Hidden status bars need no space in landscape; cutouts and navigation gestures always do.
@@ -630,6 +694,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     @Override
     protected void onStart() {
         super.onStart();
+        syncDialogSystemBarsFromHost();
         applyStartupFullscreen();
         // ComponentDialog registers its own back callback in onCreate; re-add ours last so
         // handleBrowserBackNavigation runs before the built-in cancel callback (LIFO order).
@@ -2398,6 +2463,11 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
 
                     // Set the height of the status bar color view
                     if (statusBarColorView != null) {
+                        if (!isHostStatusBarVisible()) {
+                            applyStatusBarColorViewForHostVisibility(false);
+                            return;
+                        }
+
                         statusBarColorView.getLayoutParams().height = statusBarHeight;
                         statusBarColorView.requestLayout();
 
@@ -2501,7 +2571,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         }
 
         // Set web view background color
-        int backgroundColor = _options.getBackgroundColor().equals("white") ? Color.WHITE : Color.BLACK;
+        int backgroundColor = TextUtils.equals(_options.getBackgroundColor(), "white") ? Color.WHITE : Color.BLACK;
         _webView.setBackgroundColor(backgroundColor);
 
         // Set text zoom if specified in options
@@ -3554,6 +3624,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                 statusBarColor,
                 lightStatusBars
             );
+            decorView.post(this::syncDialogSystemBarsFromHost);
         }
 
         requestSafeAreaInsets();
@@ -3743,6 +3814,11 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             return;
         }
 
+        if (!isHostStatusBarVisible()) {
+            applyStatusBarColorViewForHostVisibility(false);
+            return;
+        }
+
         params.height = statusBarHeight;
         statusBarColorView.setLayoutParams(params);
         statusBarColorView.requestLayout();
@@ -3776,18 +3852,24 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             }
 
             int statusBarHeight = getSystemStatusBarHeight();
+            boolean hostStatusBarVisible = isHostStatusBarVisible();
 
             if (statusBarColorView != null) {
-                ViewGroup.LayoutParams params = statusBarColorView.getLayoutParams();
-                if (params != null) {
-                    params.height = statusBarHeight;
-                    statusBarColorView.setLayoutParams(params);
+                if (!hostStatusBarVisible) {
+                    applyStatusBarColorViewForHostVisibility(false);
+                } else {
+                    ViewGroup.LayoutParams params = statusBarColorView.getLayoutParams();
+                    if (params != null) {
+                        params.height = statusBarHeight;
+                        statusBarColorView.setLayoutParams(params);
+                    }
+                    statusBarColorView.setBackgroundColor(finalBgColor);
+                    statusBarColorView.setVisibility(View.VISIBLE);
                 }
-                statusBarColorView.setBackgroundColor(finalBgColor);
-                statusBarColorView.setVisibility(View.VISIBLE);
             }
 
-            applyAppBarTopInset(appBarLayout, appBarHandlesTopInset(toolbarView) ? statusBarHeight : 0);
+            int appBarTopInset = appBarHandlesTopInset(toolbarView) && hostStatusBarVisible ? statusBarHeight : 0;
+            applyAppBarTopInset(appBarLayout, appBarTopInset);
             appBarLayout.setBackgroundColor(finalBgColor);
 
             Window window = getWindow();
@@ -3973,12 +4055,13 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             isEdgeToEdge,
             layoutBehindNavigationBar
         );
+        boolean hostStatusBarVisible = isHostStatusBarVisible();
         int statusBarTop = SafeAreaInsetsSupport.resolveStatusBarTop(
             bars.top,
             bars.bottom,
             bars.left,
             bars.right,
-            getSystemStatusBarHeight()
+            hostStatusBarVisible ? getSystemStatusBarHeight() : 0
         );
         int fallbackBottomInset = applyBottomInset ? getSystemNavigationBarHeight() : 0;
         int safeBottomInset = SafeAreaInsetsSupport.resolveSafeBottomInsetWithFallback(
@@ -4014,7 +4097,8 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             // instead of the status_bar_height resource used for the initial layout.
             View toolbarView = findBrowserContentDescendant(R.id.tool_bar);
             if (toolbarView != null && toolbarView.getParent() instanceof com.google.android.material.appbar.AppBarLayout appBarLayout) {
-                applyAppBarTopInset(appBarLayout, statusBarTop);
+                int appBarTopInset = hostStatusBarVisible ? statusBarTop : 0;
+                applyAppBarTopInset(appBarLayout, appBarTopInset);
             }
         }
 

package/ios/Sources/InAppBrowserPlugin/BundledAssetSchemeHandler.swift

@@ -179,9 +179,11 @@ private var bundledAssetStoppedKey: UInt8 = 0
 private extension WKURLSchemeTask {
     var stopped: Bool {
         get {
+            // appstore-2.5.2-allow: track WKURLSchemeTask stopped state across async completions
             objc_getAssociatedObject(self, &bundledAssetStoppedKey) as? Bool ?? false
         }
         set {
+            // appstore-2.5.2-allow: track WKURLSchemeTask stopped state across async completions
             objc_setAssociatedObject(self, &bundledAssetStoppedKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
         }
     }

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -446,7 +446,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.22.2"
+    private let pluginVersion: String = "8.22.4"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [

package/ios/Sources/InAppBrowserPlugin/WKWebView+SchemeHandling.swift

@@ -3,6 +3,11 @@ import ObjectiveC
 import WebKit
 
 extension WKWebView {
+    private enum HandlesURLSchemePrivateAPI {
+        static let originalSelector = #selector(WKWebView.handlesURLScheme(_:))
+        static let swizzledSelector = #selector(WKWebView._capgo_handlesURLScheme(_:))
+    }
+
     private static var _overriddenSchemes = Set<String>()
     private static let _overriddenSchemesLock = NSLock()
     private static var _originalHandlesURLSchemeIMP: IMP?
@@ -11,18 +16,24 @@ extension WKWebView {
     private typealias HandlesURLSchemeIMP = @convention(c) (AnyClass, Selector, NSString) -> Bool
 
     private static let _swizzleOnce: Void = {
-        let original = class_getClassMethod(WKWebView.self, #selector(WKWebView.handlesURLScheme(_:)))
-        let swizzled = class_getClassMethod(
-            WKWebView.self,
-            #selector(WKWebView._capgo_handlesURLScheme(_:))
-        )
+        guard WKWebView.responds(to: HandlesURLSchemePrivateAPI.originalSelector) else {
+            print("[InAppBrowser][Proxy] WARNING: WKWebView does not respond to handlesURLScheme; swizzle skipped")
+            return
+        }
+
+        // appstore-2.5.2-allow: resolve WKWebView class methods for proxy scheme registration
+        let original = class_getClassMethod(WKWebView.self, HandlesURLSchemePrivateAPI.originalSelector)
+        // appstore-2.5.2-allow: resolve swizzled class method for proxy scheme registration
+        let swizzled = class_getClassMethod(WKWebView.self, HandlesURLSchemePrivateAPI.swizzledSelector)
 
         guard let original, let swizzled else {
             print("[InAppBrowser][Proxy] WARNING: Could not get methods for swizzle")
             return
         }
 
+        // appstore-2.5.2-allow: preserve original handlesURLScheme IMP before exchange
         _originalHandlesURLSchemeIMP = method_getImplementation(original)
+        // appstore-2.5.2-allow: route handlesURLScheme through proxy override for http/https
         method_exchangeImplementations(original, swizzled)
     }()
 
@@ -39,8 +50,9 @@ extension WKWebView {
             return false
         }
 
+        // appstore-2.5.2-allow: call saved handlesURLScheme IMP without re-entering swizzled Swift entry
         let original: HandlesURLSchemeIMP = unsafeBitCast(imp, to: HandlesURLSchemeIMP.self)
-        return original(WKWebView.self, #selector(WKWebView.handlesURLScheme(_:)), urlScheme as NSString)
+        return original(WKWebView.self, HandlesURLSchemePrivateAPI.originalSelector, urlScheme as NSString)
     }
 
     static func enableCustomSchemeHandling(for schemes: [String]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.22.2",
+  "version": "8.22.4",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -37,7 +37,7 @@
     "verify:web": "bun run build && bun run test:web",
     "test:web": "bun test src/proxy-bridge-support.test.ts src/bundled-asset-support.test.ts src/fullscreen-web.test.ts",
     "test:maestro:android": "./scripts/test-maestro-android.sh",
-    "lint": "bun run eslint && bun run prettier -- --check && bun run swiftlint -- lint",
+    "lint": "bun run eslint && bun run prettier -- --check && bun run check:appstore-2-5-2-ios && bun run swiftlint -- lint",
     "fmt": "bun run eslint -- --fix && bun run prettier -- --write && bun run swiftlint -- --fix --format",
     "eslint": "eslint .",
     "prettier": "prettier-pretty-check \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
@@ -55,6 +55,7 @@
     "maestro:test:android:keyboard": "export MAESTRO_DRIVER_STARTUP_TIMEOUT=300000 MAESTRO_CLI_NO_ANALYTICS=1 && sh ./scripts/prepare-android-maestro-device.sh && sh ./scripts/install-android-apk-with-retry.sh example-app/android/app/build/outputs/apk/debug/app-debug.apk && sh ./scripts/start-android-maestro-app.sh app.capgo.inappbrowser app.capgo.inappbrowser/.MainActivity && $HOME/.maestro/bin/maestro test -e APP_ID=app.capgo.inappbrowser example-app/.maestro/keyboard-regression-android.yaml",
     "check:wiring": "node scripts/check-capacitor-plugin-wiring.mjs",
     "check:cap9-deprecated": "node scripts/check-cap9-deprecated.mjs",
+    "check:appstore-2-5-2-ios": "node scripts/check-appstore-2-5-2-ios.mjs",
     "example:install": "cd example-app && bun install --frozen-lockfile",
     "example:build": "bun run build && cd example-app && bun install --frozen-lockfile && bun run build",
     "changelog:ai": "node scripts/generate-ai-changelog.mjs"