@capgo/capacitor-inappbrowser 8.14.2 → 8.15.0

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

@@ -81,6 +81,7 @@ import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.webkit.WebMessageCompat;
 import androidx.webkit.WebSettingsCompat;
+import androidx.webkit.WebViewAssetLoader;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 import com.caverock.androidsvg.SVG;
@@ -344,6 +345,8 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
     private String instanceId = "";
     private final Map<String, ProxiedRequest> proxiedRequestsHashmap = new ConcurrentHashMap<>();
     private ProxyBridge proxyBridge;
+    private volatile WebViewAssetLoader bundledAssetLoader;
+    private final Object bundledAssetLoaderLock = new Object();
     private String proxyBridgeScript;
     private String proxyAccessToken;
     private final ExecutorService executorService = Executors.newCachedThreadPool();
@@ -358,6 +361,10 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
     private boolean cachedTitleIconResolved;
     private boolean isHiddenModeActive = false;
     private boolean toolbarHideInProgress = false;
+    private int injectedSafeAreaTop = Integer.MIN_VALUE;
+    private int injectedSafeAreaBottom = Integer.MIN_VALUE;
+    private int injectedSafeAreaLeft = Integer.MIN_VALUE;
+    private int injectedSafeAreaRight = Integer.MIN_VALUE;
     private boolean configurationCallbacksRegistered = false;
     private Configuration lastConfiguration;
     private final ComponentCallbacks2 configurationCallbacks = new ComponentCallbacks2() {
@@ -675,6 +682,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         if (isShowing()) {
             super.hide();
         }
+        refreshInsetsForHostingLayer();
         return true;
     }
 
@@ -688,6 +696,18 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             show();
         }
         applyDimensions();
+        refreshInsetsForHostingLayer();
+    }
+
+    /**
+     * The container padding is computed for the window hosting the content, and the two windows inset
+     * differently: the dialog is edge-to-edge on Android 15+, while the host activity fits its own
+     * system windows. Recompute after a layer change so padding from the previous host is not left
+     * behind (which would stack on top of the host offset).
+     */
+    private void refreshInsetsForHostingLayer() {
+        reapplyInsetsFromWindowRoot();
+        mainHandler.post(this::reapplyInsetsFromWindowRoot);
     }
 
     private boolean showAccordingToLayerMode() {
@@ -2215,6 +2235,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             _webView.addJavascriptInterface(proxyBridge, "__capgoProxy");
             proxyBridgeScript = loadProxyBridgeScript();
         }
+        ensureBundledAssetLoader();
         _webView.getSettings().setJavaScriptEnabled(true);
         _webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
         _webView.getSettings().setDatabaseEnabled(true);
@@ -3087,8 +3108,8 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
 
         requestSafeAreaInsets();
 
-        mainHandler.postDelayed(this::applyContainerInsetsSnapshot, 300);
-        mainHandler.postDelayed(this::applyContainerInsetsSnapshot, 1200);
+        mainHandler.postDelayed(this::reapplyInsetsFromWindowRoot, 300);
+        mainHandler.postDelayed(this::reapplyInsetsFromWindowRoot, 1200);
     }
 
     private void registerConfigurationCallbacks() {
@@ -3312,15 +3333,49 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                 statusBarColorView.setVisibility(View.VISIBLE);
             }
 
-            ViewGroup.LayoutParams appBarParams = appBarLayout.getLayoutParams();
-            if (appBarParams instanceof ViewGroup.MarginLayoutParams marginParams) {
-                marginParams.topMargin = statusBarHeight;
-                appBarLayout.setLayoutParams(marginParams);
-            }
+            applyAppBarTopInset(appBarLayout, appBarHandlesTopInset(toolbarView) ? statusBarHeight : 0);
             appBarLayout.setBackgroundColor(finalBgColor);
         });
     }
 
+    /**
+     * Whether a visible AppBarLayout consumes the top inset itself. It is the only alternative to
+     * padding the WebView container for the status bar, so both mechanisms share this condition and
+     * can never inset the top twice.
+     */
+    private boolean appBarHandlesTopInset(View toolbarView) {
+        return (
+            Build.VERSION.SDK_INT >= 35 &&
+            _options != null &&
+            !TextUtils.equals(_options.getToolbarType(), "blank") &&
+            toolbarView != null &&
+            toolbarView.getVisibility() == View.VISIBLE &&
+            toolbarView.getParent() instanceof com.google.android.material.appbar.AppBarLayout
+        );
+    }
+
+    /**
+     * The appbar must sit below the status bar on edge-to-edge windows. A top margin does that
+     * visually, but CoordinatorLayout's scrolling-view behavior sizes the content container from the
+     * appbar height only and positions it below the appbar margin, so a margin pushes the container
+     * bottom off-screen by the status-bar height (#641). Padding grows the appbar height instead,
+     * which the behavior does account for, keeping the container inside the window.
+     */
+    private void applyAppBarTopInset(com.google.android.material.appbar.AppBarLayout appBarLayout, int statusBarTop) {
+        ViewGroup.LayoutParams appBarParams = appBarLayout.getLayoutParams();
+        if (appBarParams instanceof ViewGroup.MarginLayoutParams marginParams && marginParams.topMargin != 0) {
+            marginParams.topMargin = 0;
+            appBarLayout.setLayoutParams(marginParams);
+        }
+
+        appBarLayout.setPadding(
+            appBarLayout.getPaddingLeft(),
+            Math.max(0, statusBarTop),
+            appBarLayout.getPaddingRight(),
+            appBarLayout.getPaddingBottom()
+        );
+    }
+
     private void applyWindowInsetsToWebView(WindowInsetsCompat windowInsets, boolean isAndroid15Plus, View toolbarView) {
         if (windowInsets == null || _options == null) {
             return;
@@ -3333,53 +3388,73 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         Insets ime = windowInsets.getInsets(WindowInsetsCompat.Type.ime());
         boolean keyboardVisible = windowInsets.isVisible(WindowInsetsCompat.Type.ime());
 
-        boolean appBarHandlesTopInset =
-            isAndroid15Plus &&
-            !TextUtils.equals(_options.getToolbarType(), "blank") &&
-            toolbarView != null &&
-            toolbarView.getVisibility() == View.VISIBLE &&
-            toolbarView.getParent() instanceof com.google.android.material.appbar.AppBarLayout;
-
-        applySafeAreaMargins(
+        applySafeAreaInsets(
             bars,
             navigationBars,
             systemGestures,
             mandatoryGestures,
             ime,
             keyboardVisible,
-            appBarHandlesTopInset,
+            appBarHandlesTopInset(toolbarView),
             isAndroid15Plus
         );
     }
 
     /**
-     * Re-read root window insets and apply WebView margins plus container padding.
+     * Re-read root window insets and apply the container padding.
      * Dialog windows may not re-dispatch inset listeners after rotation, leaving stale
-     * portrait margins that break vertical scrolling in landscape.
+     * portrait insets that break vertical scrolling in landscape.
      */
     private void reapplyInsetsFromWindowRoot() {
         if (_webView == null || _options == null) {
             return;
         }
 
-        Window window = getWindow();
-        View decorView = window != null ? window.getDecorView() : null;
-        if (decorView == null) {
+        View insetsSourceView = resolveHostedInsetsSourceView();
+        if (insetsSourceView == null) {
             return;
         }
 
-        WindowInsetsCompat windowInsets = ViewCompat.getRootWindowInsets(decorView);
+        WindowInsetsCompat windowInsets = ViewCompat.getRootWindowInsets(insetsSourceView);
         if (windowInsets == null) {
-            // Root insets not ready yet; do not mutate margins/padding (would desync WebView
-            // margins from container padding). Delayed retries and requestApplyInsets will retry.
+            // Root insets not ready yet; do not mutate the container padding. Delayed retries and
+            // requestApplyInsets will retry.
             return;
         }
 
         boolean isAndroid15Plus = Build.VERSION.SDK_INT >= 35;
-        View toolbarView = findViewById(R.id.tool_bar);
+        View toolbarView = findBrowserContentDescendant(R.id.tool_bar);
         applyWindowInsetsToWebView(windowInsets, isAndroid15Plus, toolbarView);
     }
 
+    /**
+     * Insets must come from the window that currently hosts the content. In back-layer mode the
+     * content lives in the host activity's window and this dialog's window is hidden, so its decor
+     * would report stale insets.
+     */
+    private View resolveHostedInsetsSourceView() {
+        if (backLayerActive) {
+            View contentView = getBrowserContentView();
+            if (contentView != null && contentView.isAttachedToWindow()) {
+                return contentView;
+            }
+        }
+
+        Window window = getWindow();
+        return window != null ? window.getDecorView() : null;
+    }
+
+    /**
+     * Back-layer mode reparents the browser content out of the dialog window, so {@link
+     * #findViewById(int)} no longer reaches it. Resolve through the content view, which owns these
+     * views in both layers.
+     */
+    private View findBrowserContentDescendant(int id) {
+        View contentView = getBrowserContentView();
+        View view = contentView != null ? contentView.findViewById(id) : null;
+        return view != null ? view : findViewById(id);
+    }
+
     private void requestWebViewContentRelayout() {
         View container = findViewById(R.id.content_browser_layout);
         if (container != null) {
@@ -3395,7 +3470,12 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         _webView.invalidate();
     }
 
-    private void applySafeAreaMargins(
+    /**
+     * The WebView is the content child of a SwipeRefreshLayout, which lays that child out inside its
+     * own padding and ignores child margins entirely. Safe-area insets are therefore applied as
+     * padding on the container instead of margins on the WebView (#641).
+     */
+    private void applySafeAreaInsets(
         Insets bars,
         Insets navigationBars,
         Insets systemGestures,
@@ -3403,88 +3483,25 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         Insets ime,
         boolean keyboardVisible,
         boolean appBarHandlesTopInset,
-        boolean applyImeAsLayoutMargin
+        boolean isEdgeToEdge
     ) {
         if (_webView == null || _options == null) {
             return;
         }
 
-        ViewGroup.LayoutParams layoutParams = _webView.getLayoutParams();
-        if (!(layoutParams instanceof ViewGroup.MarginLayoutParams mlp)) {
+        View container = findBrowserContentDescendant(R.id.content_browser_layout);
+        if (container == null) {
             return;
         }
 
-        int fallbackBottomInset = _options.getEnabledSafeMargin() ? getSystemNavigationBarHeight() : 0;
-        int safeBottomInset = SafeAreaInsetsSupport.resolveSafeBottomInsetWithFallback(
+        boolean applyBottomInset = SafeAreaInsetsSupport.shouldInsetBottomForContainer(_options.getEnabledSafeMargin(), isEdgeToEdge);
+        int statusBarTop = SafeAreaInsetsSupport.resolveStatusBarTop(
+            bars.top,
             bars.bottom,
-            navigationBars.bottom,
-            systemGestures.bottom,
-            mandatoryGestures.bottom,
             bars.left,
             bars.right,
-            navigationBars.left,
-            navigationBars.right,
-            fallbackBottomInset,
-            _options.getEnabledSafeMargin()
-        );
-        // Android 15+ uses edge-to-edge (decorFitsSystemWindows=false) and needs IME as margin.
-        // Older dialogs still resize for the keyboard; re-applying decor IME creates a black gap (#622).
-        int imeBottom = SafeAreaInsetsSupport.resolveImeBottomInset(keyboardVisible, ime.bottom, applyImeAsLayoutMargin);
-        boolean applyTopFallback = _options.getEnabledSafeTopMargin() && _options.getUseTopInset();
-        int fallbackTopInset = applyTopFallback ? getSystemStatusBarHeight() : 0;
-        int navTop = SafeAreaInsetsSupport.resolveTopMarginWithFallback(
-            _options.getEnabledSafeTopMargin(),
-            _options.getUseTopInset(),
-            bars.top,
-            appBarHandlesTopInset,
-            fallbackTopInset,
-            applyTopFallback
+            getSystemStatusBarHeight()
         );
-        int bottomMargin = SafeAreaInsetsSupport.resolveBottomMargin(_options.getEnabledSafeMargin(), safeBottomInset, imeBottom);
-
-        mlp.topMargin = navTop;
-        mlp.bottomMargin = bottomMargin;
-        mlp.leftMargin = bars.left;
-        mlp.rightMargin = bars.right;
-        _webView.setLayoutParams(mlp);
-        injectSafeAreaCssVariables(navTop, bottomMargin, bars.left, bars.right);
-        applyContainerInsetsSnapshot();
-    }
-
-    private void applyContainerInsetsSnapshot() {
-        if (_options == null || _webView == null) {
-            return;
-        }
-
-        View container = findViewById(R.id.content_browser_layout);
-        if (container == null) {
-            return;
-        }
-
-        Window window = getWindow();
-        View decorView = window != null ? window.getDecorView() : null;
-        WindowInsetsCompat windowInsets = decorView != null ? ViewCompat.getRootWindowInsets(decorView) : null;
-
-        Insets bars = windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) : Insets.NONE;
-        Insets navigationBars = windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars()) : Insets.NONE;
-        Insets systemGestures = windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures()) : Insets.NONE;
-        Insets mandatoryGestures =
-            windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures()) : Insets.NONE;
-        Insets ime = windowInsets != null ? windowInsets.getInsets(WindowInsetsCompat.Type.ime()) : Insets.NONE;
-        boolean keyboardVisible = windowInsets != null && windowInsets.isVisible(WindowInsetsCompat.Type.ime());
-
-        boolean isAndroid15Plus = Build.VERSION.SDK_INT >= 35;
-        View toolbarView = findViewById(R.id.tool_bar);
-        boolean appBarHandlesTopInset =
-            isAndroid15Plus &&
-            !TextUtils.equals(_options.getToolbarType(), "blank") &&
-            toolbarView != null &&
-            toolbarView.getVisibility() == View.VISIBLE &&
-            toolbarView.getParent() instanceof com.google.android.material.appbar.AppBarLayout;
-
-        boolean applyBottomInset = SafeAreaInsetsSupport.shouldInsetBottomForContainer(_options.getEnabledSafeMargin(), isAndroid15Plus);
-
-        int statusBarTop = bars.top > 0 ? bars.top : getSystemStatusBarHeight();
         int fallbackBottomInset = applyBottomInset ? getSystemNavigationBarHeight() : 0;
         int safeBottomInset = SafeAreaInsetsSupport.resolveSafeBottomInsetWithFallback(
             bars.bottom,
@@ -3498,32 +3515,41 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             fallbackBottomInset,
             applyBottomInset
         );
+        // Android 15+ uses edge-to-edge (decorFitsSystemWindows=false) and needs the IME inset applied.
+        // Older dialogs still resize for the keyboard; re-applying decor IME creates a black gap (#622).
+        int imeBottom = SafeAreaInsetsSupport.resolveImeBottomInset(keyboardVisible, ime.bottom, isEdgeToEdge);
 
+        // In back-layer mode the content is reparented into the host activity's window, which this
+        // plugin never puts in edge-to-edge, so the host owns the top inset and the useTopInset opt-in
+        // still decides there.
         int padTop = SafeAreaInsetsSupport.resolveContainerTopPadding(
             _options.getEnabledSafeTopMargin(),
             _options.getUseTopInset(),
             statusBarTop,
-            appBarHandlesTopInset
-        );
-        int imeBottom = SafeAreaInsetsSupport.resolveImeBottomInset(keyboardVisible, ime.bottom, isAndroid15Plus);
-        int padBottom = SafeAreaInsetsSupport.resolveContainerBottomPadding(
-            applyBottomInset,
-            safeBottomInset,
-            imeBottom,
             appBarHandlesTopInset,
-            statusBarTop
+            isEdgeToEdge && !backLayerActive
         );
+        int padBottom = SafeAreaInsetsSupport.resolveContainerBottomPadding(applyBottomInset, safeBottomInset, imeBottom);
 
-        if (
-            container.getPaddingLeft() == bars.left &&
-            container.getPaddingTop() == padTop &&
-            container.getPaddingRight() == bars.right &&
-            container.getPaddingBottom() == padBottom
-        ) {
-            return;
+        if (appBarHandlesTopInset) {
+            // Keep the appbar inset in sync with the reported inset (cutouts, rotation, multi-window)
+            // 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);
+            }
+        }
+
+        boolean paddingChanged =
+            container.getPaddingLeft() != bars.left ||
+            container.getPaddingTop() != padTop ||
+            container.getPaddingRight() != bars.right ||
+            container.getPaddingBottom() != padBottom;
+        if (paddingChanged) {
+            container.setPadding(bars.left, padTop, bars.right, padBottom);
         }
 
-        container.setPadding(bars.left, padTop, bars.right, padBottom);
+        injectSafeAreaCssVariables(padTop, padBottom, bars.left, bars.right);
     }
 
     private void configureBlankToolbarLayout() {
@@ -3554,27 +3580,62 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         return getContext().getResources().getDimensionPixelSize(resourceId);
     }
 
+    private void resetInjectedSafeAreaCssVariables() {
+        injectedSafeAreaTop = Integer.MIN_VALUE;
+        injectedSafeAreaBottom = Integer.MIN_VALUE;
+        injectedSafeAreaLeft = Integer.MIN_VALUE;
+        injectedSafeAreaRight = Integer.MIN_VALUE;
+    }
+
     private void injectSafeAreaCssVariables(int top, int bottom, int left, int right) {
         if (_webView == null) {
             return;
         }
 
+        // Insets are dispatched on every layout pass; only touch the document when they differ from
+        // what it already holds. Cleared on page load so a new document is served again.
+        if (
+            injectedSafeAreaTop == top && injectedSafeAreaBottom == bottom && injectedSafeAreaLeft == left && injectedSafeAreaRight == right
+        ) {
+            return;
+        }
+
+        // Recorded before posting so passes that repeat within the same frame are suppressed too.
+        injectedSafeAreaTop = top;
+        injectedSafeAreaBottom = bottom;
+        injectedSafeAreaLeft = left;
+        injectedSafeAreaRight = right;
+
         String script = String.format(
             Locale.US,
             "(function(){var root=document.documentElement;" +
                 "root.style.setProperty('--safe-area-inset-top','%dpx');" +
                 "root.style.setProperty('--safe-area-inset-bottom','%dpx');" +
                 "root.style.setProperty('--safe-area-inset-left','%dpx');" +
-                "root.style.setProperty('--safe-area-inset-right','%dpx');})();",
+                "root.style.setProperty('--safe-area-inset-right','%dpx');" +
+                "return root.style.getPropertyValue('--safe-area-inset-top')?1:0;})();",
             top,
             bottom,
             left,
             right
         );
         _webView.post(() -> {
-            if (_webView != null) {
-                _webView.evaluateJavascript(script, null);
+            if (_webView == null) {
+                resetInjectedSafeAreaCssVariables();
+                return;
             }
+            _webView.evaluateJavascript(script, (value) -> {
+                boolean cacheStillHoldsTheseValues =
+                    injectedSafeAreaTop == top &&
+                    injectedSafeAreaBottom == bottom &&
+                    injectedSafeAreaLeft == left &&
+                    injectedSafeAreaRight == right;
+                // The document did not take the variables, so let a later pass inject them again.
+                // A newer injection may already have replaced them, in which case it owns the cache.
+                if (!"1".equals(value) && cacheStillHoldsTheseValues) {
+                    resetInjectedSafeAreaCssVariables();
+                }
+            });
         });
     }
 
@@ -4307,6 +4368,60 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         return proxyHeaders;
     }
 
+    private void ensureBundledAssetLoader() {
+        synchronized (bundledAssetLoaderLock) {
+            ensureBundledAssetLoaderLocked();
+        }
+    }
+
+    private void ensureBundledAssetLoaderLocked() {
+        if (bundledAssetLoader != null || _options == null || !_options.getServeBundledAssets()) {
+            return;
+        }
+
+        bundledAssetLoader = BundledAssetSupport.createAssetLoader(
+            _context,
+            _options.getBundledAssetHost(),
+            _options.getBundledAssetScheme()
+        );
+    }
+
+    public void applyBundledAssetResolution(BundledAssetSupport.Resolution resolution, String localUrl) {
+        if (_options == null || resolution == null) {
+            return;
+        }
+
+        synchronized (bundledAssetLoaderLock) {
+            bundledAssetLoader = null;
+            _options.setUrl(resolution.url);
+            if (resolution.needsAssetLoader) {
+                BundledAssetSupport.LocalConfig localConfig = BundledAssetSupport.parseLocalConfig(localUrl);
+                _options.setBundledAssetHost(localConfig != null ? localConfig.host : "localhost");
+                _options.setBundledAssetScheme(localConfig != null ? BundledAssetSupport.assetLoaderScheme(localConfig) : "https");
+                _options.setServeBundledAssets(true);
+            } else {
+                _options.setServeBundledAssets(false);
+            }
+        }
+    }
+
+    private WebResourceResponse interceptBundledAssetRequest(WebResourceRequest request) {
+        final WebViewAssetLoader loader;
+        synchronized (bundledAssetLoaderLock) {
+            if (_options == null || !_options.getServeBundledAssets()) {
+                return null;
+            }
+
+            ensureBundledAssetLoaderLocked();
+            loader = bundledAssetLoader;
+        }
+
+        if (loader == null) {
+            return null;
+        }
+        return loader.shouldInterceptRequest(request.getUrl());
+    }
+
     public void setUrl(String url) {
         if (_webView == null) {
             Log.w("InAppBrowser", "Cannot set URL - WebView is null");
@@ -5529,186 +5644,254 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                     if (view == null || _webView == null) {
                         return null;
                     }
-                    if (!shouldUseNativeProxy()) {
-                        return null;
-                    }
 
-                    String requestUrl = request.getUrl().toString();
-                    boolean bridgeBackedRequest = ProxyRequestSupport.isBridgeMarkerRequestUrl(requestUrl);
-                    String originalUrl;
-                    String method;
-                    Map<String, String> requestHeaders = new HashMap<>();
-                    String base64Body = "";
-                    String credentialsMode = "same-origin";
-
-                    if (bridgeBackedRequest) {
-                        Uri uri = request.getUrl();
-                        originalUrl = uri.getQueryParameter("u");
-                        String requestId = uri.getQueryParameter("rid");
-                        if (originalUrl == null || requestId == null) {
-                            return null;
-                        }
+                    if (shouldUseNativeProxy()) {
+                        String requestUrl = request.getUrl().toString();
+                        boolean bridgeBackedRequest = ProxyRequestSupport.isBridgeMarkerRequestUrl(requestUrl);
+                        String originalUrl;
+                        String method;
+                        Map<String, String> requestHeaders = new HashMap<>();
+                        String base64Body = "";
+                        String credentialsMode = "same-origin";
+
+                        if (bridgeBackedRequest) {
+                            Uri uri = request.getUrl();
+                            originalUrl = uri.getQueryParameter("u");
+                            String requestId = uri.getQueryParameter("rid");
+                            if (originalUrl == null || requestId == null) {
+                                return null;
+                            }
 
-                        if (
-                            ProxyRequestSupport.usesLegacyJsProxyMode(_options) &&
-                            !ProxyRequestSupport.shouldDelegateLegacyJsProxyRequest(_options, originalUrl)
-                        ) {
-                            if (proxyBridge != null) {
-                                proxyBridge.getAndRemove(requestId);
+                            if (
+                                ProxyRequestSupport.usesLegacyJsProxyMode(_options) &&
+                                !ProxyRequestSupport.shouldDelegateLegacyJsProxyRequest(_options, originalUrl)
+                            ) {
+                                if (proxyBridge != null) {
+                                    proxyBridge.getAndRemove(requestId);
+                                }
+                                Log.w("InAppBrowserProxy", "Ignoring legacy regex miss for bridge-backed request: " + originalUrl);
+                                return createCanceledResponse();
                             }
-                            Log.w("InAppBrowserProxy", "Ignoring legacy regex miss for bridge-backed request: " + originalUrl);
-                            return createCanceledResponse();
-                        }
 
-                        ProxyBridge.StoredRequest stored = proxyBridge != null ? proxyBridge.getAndRemove(requestId) : null;
-                        if (stored == null) {
-                            Log.e("InAppBrowserProxy", "Missing stored proxy bridge payload for request id: " + requestId);
-                            return createCanceledResponse();
-                        }
-                        method = stored.method;
-                        base64Body = stored.base64Body;
-                        credentialsMode = stored.credentialsMode;
-                        Map<String, String> safeMarkerHeaders = ProxyRequestSupport.extractSafeMarkerHeaders(request.getRequestHeaders());
-                        try {
-                            requestHeaders = ProxyRequestSupport.mergeRequestHeaders(null, stored.headersJson);
-                            requestHeaders = ProxyRequestSupport.mergeMissingHeaders(requestHeaders, safeMarkerHeaders);
-                        } catch (JSONException error) {
-                            Log.e("InAppBrowserProxy", "Failed to parse stored proxy headers", error);
-                            return createCanceledResponse();
-                        }
-                        String initiatorUrl = request.getRequestHeaders().get("Referer");
-                        if (initiatorUrl == null || initiatorUrl.isBlank()) {
-                            initiatorUrl = getWebViewUrlOrFallback(
-                                _options != null && _options.getUrl() != null ? _options.getUrl() : originalUrl
+                            ProxyBridge.StoredRequest stored = proxyBridge != null ? proxyBridge.getAndRemove(requestId) : null;
+                            if (stored == null) {
+                                Log.e("InAppBrowserProxy", "Missing stored proxy bridge payload for request id: " + requestId);
+                                return createCanceledResponse();
+                            }
+                            method = stored.method;
+                            base64Body = stored.base64Body;
+                            credentialsMode = stored.credentialsMode;
+                            Map<String, String> safeMarkerHeaders = ProxyRequestSupport.extractSafeMarkerHeaders(
+                                request.getRequestHeaders()
                             );
+                            try {
+                                requestHeaders = ProxyRequestSupport.mergeRequestHeaders(null, stored.headersJson);
+                                requestHeaders = ProxyRequestSupport.mergeMissingHeaders(requestHeaders, safeMarkerHeaders);
+                            } catch (JSONException error) {
+                                Log.e("InAppBrowserProxy", "Failed to parse stored proxy headers", error);
+                                return createCanceledResponse();
+                            }
+                            String initiatorUrl = request.getRequestHeaders().get("Referer");
+                            if (initiatorUrl == null || initiatorUrl.isBlank()) {
+                                initiatorUrl = getWebViewUrlOrFallback(
+                                    _options != null && _options.getUrl() != null ? _options.getUrl() : originalUrl
+                                );
+                            }
+                            String targetCookies = CookieManager.getInstance().getCookie(originalUrl);
+                            if (
+                                targetCookies != null &&
+                                !targetCookies.isBlank() &&
+                                ProxyRequestSupport.shouldInjectCookies(credentialsMode, initiatorUrl, originalUrl, requestHeaders)
+                            ) {
+                                requestHeaders.put("Cookie", targetCookies);
+                            }
+                        } else {
+                            if (!ProxyRequestSupport.shouldHandleNonBridgeRequest(_options, requestUrl)) {
+                                return interceptBundledAssetRequest(request);
+                            }
+
+                            originalUrl = requestUrl;
+                            method = request.getMethod();
+                            if (request.getRequestHeaders() != null) {
+                                requestHeaders.putAll(request.getRequestHeaders());
+                            }
                         }
-                        String targetCookies = CookieManager.getInstance().getCookie(originalUrl);
+
+                        NativeRequestContext requestContext = new NativeRequestContext(
+                            originalUrl,
+                            method,
+                            requestHeaders,
+                            base64Body,
+                            request.isForMainFrame(),
+                            credentialsMode
+                        );
+
                         if (
-                            targetCookies != null &&
-                            !targetCookies.isBlank() &&
-                            ProxyRequestSupport.shouldInjectCookies(credentialsMode, initiatorUrl, originalUrl, requestHeaders)
+                            ProxyRequestSupport.shouldLetWebViewHandleMissingBody(
+                                requestUrl,
+                                requestContext.method,
+                                requestContext.base64Body
+                            )
                         ) {
-                            requestHeaders.put("Cookie", targetCookies);
-                        }
-                    } else {
-                        if (!ProxyRequestSupport.shouldHandleNonBridgeRequest(_options, requestUrl)) {
+                            Log.w("InAppBrowserProxy", "Allowing WebView to handle request with uncaptured body: " + requestContext.url);
                             return null;
                         }
 
-                        originalUrl = requestUrl;
-                        method = request.getMethod();
-                        if (request.getRequestHeaders() != null) {
-                            requestHeaders.putAll(request.getRequestHeaders());
+                        boolean legacyProxyMode = ProxyRequestSupport.usesLegacyJsProxyMode(_options);
+                        boolean shouldDelegateLegacyRequest = ProxyRequestSupport.shouldDelegateLegacyJsProxyRequest(
+                            _options,
+                            requestContext.url
+                        );
+                        NativeResponseData directResponseData = null;
+
+                        NativeProxyRule outboundRule =
+                            legacyProxyMode && shouldDelegateLegacyRequest
+                                ? new NativeProxyRule(
+                                      null,
+                                      null,
+                                      null,
+                                      null,
+                                      null,
+                                      null,
+                                      null,
+                                      null,
+                                      false,
+                                      NativeProxyRule.Action.DELEGATE_TO_JS
+                                  )
+                                : findMatchingRule(_options.getOutboundProxyRules(), requestContext, null);
+
+                        if (outboundRule != null && outboundRule.getAction() == NativeProxyRule.Action.CANCEL) {
+                            return createCanceledResponse();
                         }
-                    }
-
-                    NativeRequestContext requestContext = new NativeRequestContext(
-                        originalUrl,
-                        method,
-                        requestHeaders,
-                        base64Body,
-                        request.isForMainFrame(),
-                        credentialsMode
-                    );
-
-                    if (
-                        ProxyRequestSupport.shouldLetWebViewHandleMissingBody(requestUrl, requestContext.method, requestContext.base64Body)
-                    ) {
-                        Log.w("InAppBrowserProxy", "Allowing WebView to handle request with uncaptured body: " + requestContext.url);
-                        return null;
-                    }
 
-                    boolean legacyProxyMode = ProxyRequestSupport.usesLegacyJsProxyMode(_options);
-                    boolean shouldDelegateLegacyRequest = ProxyRequestSupport.shouldDelegateLegacyJsProxyRequest(
-                        _options,
-                        requestContext.url
-                    );
-                    NativeResponseData directResponseData = null;
-
-                    NativeProxyRule outboundRule =
-                        legacyProxyMode && shouldDelegateLegacyRequest
-                            ? new NativeProxyRule(
-                                  null,
-                                  null,
-                                  null,
-                                  null,
-                                  null,
-                                  null,
-                                  null,
-                                  null,
-                                  false,
-                                  NativeProxyRule.Action.DELEGATE_TO_JS
-                              )
-                            : findMatchingRule(_options.getOutboundProxyRules(), requestContext, null);
-
-                    if (outboundRule != null && outboundRule.getAction() == NativeProxyRule.Action.CANCEL) {
-                        return createCanceledResponse();
-                    }
-
-                    if (outboundRule != null && outboundRule.getAction() == NativeProxyRule.Action.DELEGATE_TO_JS) {
-                        String proxyId = UUID.randomUUID().toString();
-                        ProxiedRequest proxiedRequest = new ProxiedRequest();
-                        proxiedRequest.requestContext = requestContext;
-                        addProxiedRequest(proxyId, proxiedRequest);
-
-                        String dialogId = instanceId != null ? instanceId : "";
-                        _options
-                            .getCallbacks()
-                            .proxyRequestEvent(
-                                proxyId,
-                                "outbound",
-                                requestContext.url,
-                                requestContext.method,
-                                serializeHeaders(requestContext.headers),
-                                requestContext.base64Body.isEmpty() ? null : requestContext.base64Body,
-                                null,
-                                null,
-                                null,
-                                dialogId
-                            );
+                        if (outboundRule != null && outboundRule.getAction() == NativeProxyRule.Action.DELEGATE_TO_JS) {
+                            String proxyId = UUID.randomUUID().toString();
+                            ProxiedRequest proxiedRequest = new ProxiedRequest();
+                            proxiedRequest.requestContext = requestContext;
+                            addProxiedRequest(proxyId, proxiedRequest);
+
+                            String dialogId = instanceId != null ? instanceId : "";
+                            _options
+                                .getCallbacks()
+                                .proxyRequestEvent(
+                                    proxyId,
+                                    "outbound",
+                                    requestContext.url,
+                                    requestContext.method,
+                                    serializeHeaders(requestContext.headers),
+                                    requestContext.base64Body.isEmpty() ? null : requestContext.base64Body,
+                                    null,
+                                    null,
+                                    null,
+                                    dialogId
+                                );
 
-                        try {
-                            if (proxiedRequest.semaphore.tryAcquire(1, 10, TimeUnit.SECONDS)) {
-                                if (proxiedRequest.canceled) {
-                                    return createCanceledResponse();
-                                }
-                                if (proxiedRequest.response != null) {
-                                    return proxiedRequest.response;
-                                }
-                                if (proxiedRequest.nativeResponse != null) {
-                                    directResponseData = proxiedRequest.nativeResponse;
+                            try {
+                                if (proxiedRequest.semaphore.tryAcquire(1, 10, TimeUnit.SECONDS)) {
+                                    if (proxiedRequest.canceled) {
+                                        return createCanceledResponse();
+                                    }
+                                    if (proxiedRequest.response != null) {
+                                        return proxiedRequest.response;
+                                    }
+                                    if (proxiedRequest.nativeResponse != null) {
+                                        directResponseData = proxiedRequest.nativeResponse;
+                                    } else {
+                                        requestContext =
+                                            proxiedRequest.requestContext != null ? proxiedRequest.requestContext : requestContext;
+                                    }
                                 } else {
-                                    requestContext = proxiedRequest.requestContext != null ? proxiedRequest.requestContext : requestContext;
-                                }
-                            } else {
-                                synchronized (proxiedRequest) {
-                                    proxiedRequest.timedOut = true;
+                                    synchronized (proxiedRequest) {
+                                        proxiedRequest.timedOut = true;
+                                    }
+                                    removeProxiedRequest(proxyId);
+                                    Log.w("InAppBrowserProxy", "Proxy timeout, falling back to native replay for: " + requestContext.url);
                                 }
+                            } catch (InterruptedException error) {
                                 removeProxiedRequest(proxyId);
-                                Log.w("InAppBrowserProxy", "Proxy timeout, falling back to native replay for: " + requestContext.url);
+                                Thread.currentThread().interrupt();
+                                Log.e("InAppBrowserProxy", "Semaphore wait error", error);
+                                return bridgeBackedRequest ? createCanceledResponse() : null;
                             }
-                        } catch (InterruptedException error) {
-                            removeProxiedRequest(proxyId);
-                            Thread.currentThread().interrupt();
-                            Log.e("InAppBrowserProxy", "Semaphore wait error", error);
-                            return bridgeBackedRequest ? createCanceledResponse() : null;
                         }
-                    }
 
-                    NativeResponseData nativeResponse = directResponseData;
-                    if (nativeResponse == null) {
-                        try {
-                            nativeResponse = performNativeRequest(requestContext);
-                        } catch (IOException error) {
-                            Log.e("InAppBrowserProxy", "Native request failed for: " + requestContext.url, error);
-                            return createProxiedNativeFailureResponse(requestContext.url, bridgeBackedRequest, error);
+                        NativeResponseData nativeResponse = directResponseData;
+                        if (nativeResponse == null) {
+                            try {
+                                nativeResponse = performNativeRequest(requestContext);
+                            } catch (IOException error) {
+                                Log.e("InAppBrowserProxy", "Native request failed for: " + requestContext.url, error);
+                                return createProxiedNativeFailureResponse(requestContext.url, bridgeBackedRequest, error);
+                            }
                         }
-                    }
 
-                    int redirectsFollowed = 0;
-                    while (true) {
-                        NativeProxyRule inboundRule = findMatchingRule(_options.getInboundProxyRules(), requestContext, nativeResponse);
-                        if (inboundRule == null || inboundRule.getAction() == NativeProxyRule.Action.CONTINUE) {
+                        int redirectsFollowed = 0;
+                        while (true) {
+                            NativeProxyRule inboundRule = findMatchingRule(_options.getInboundProxyRules(), requestContext, nativeResponse);
+                            if (inboundRule == null || inboundRule.getAction() == NativeProxyRule.Action.CONTINUE) {
+                                RedirectReplayResult redirectReplay;
+                                try {
+                                    redirectReplay = followRedirectForWebView(requestContext, nativeResponse, redirectsFollowed);
+                                } catch (IOException error) {
+                                    Log.e("InAppBrowserProxy", "Native redirect replay failed for: " + requestContext.url, error);
+                                    return createProxiedNativeFailureResponse(requestContext.url, bridgeBackedRequest, error);
+                                }
+                                if (redirectReplay != null) {
+                                    requestContext = redirectReplay.requestContext;
+                                    nativeResponse = redirectReplay.responseData;
+                                    redirectsFollowed++;
+                                    continue;
+                                }
+                                return createWebResourceResponseOrFallback(nativeResponse, bridgeBackedRequest, requestContext.url);
+                            }
+                            if (inboundRule.getAction() == NativeProxyRule.Action.CANCEL) {
+                                return createCanceledResponse();
+                            }
+
+                            String proxyId = UUID.randomUUID().toString();
+                            ProxiedRequest proxiedRequest = new ProxiedRequest();
+                            proxiedRequest.requestContext = requestContext;
+                            proxiedRequest.nativeResponse = nativeResponse;
+                            addProxiedRequest(proxyId, proxiedRequest);
+
+                            String dialogId = instanceId != null ? instanceId : "";
+                            _options
+                                .getCallbacks()
+                                .proxyRequestEvent(
+                                    proxyId,
+                                    "inbound",
+                                    requestContext.url,
+                                    requestContext.method,
+                                    serializeHeaders(requestContext.headers),
+                                    requestContext.base64Body.isEmpty() ? null : requestContext.base64Body,
+                                    nativeResponse.statusCode,
+                                    serializeHeaders(nativeResponse.headers),
+                                    Base64.encodeToString(nativeResponse.bodyBytes, Base64.NO_WRAP),
+                                    dialogId
+                                );
+
+                            try {
+                                if (proxiedRequest.semaphore.tryAcquire(1, 10, TimeUnit.SECONDS)) {
+                                    if (proxiedRequest.canceled) {
+                                        return createCanceledResponse();
+                                    }
+                                    if (proxiedRequest.response != null) {
+                                        return proxiedRequest.response;
+                                    }
+                                    if (proxiedRequest.nativeResponse != null) {
+                                        nativeResponse = proxiedRequest.nativeResponse;
+                                    }
+                                } else {
+                                    synchronized (proxiedRequest) {
+                                        proxiedRequest.timedOut = true;
+                                    }
+                                    removeProxiedRequest(proxyId);
+                                }
+                            } catch (InterruptedException error) {
+                                Thread.currentThread().interrupt();
+                                Log.e("InAppBrowserProxy", "Semaphore wait error", error);
+                            }
+
                             RedirectReplayResult redirectReplay;
                             try {
                                 redirectReplay = followRedirectForWebView(requestContext, nativeResponse, redirectsFollowed);
@@ -5724,69 +5907,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                             }
                             return createWebResourceResponseOrFallback(nativeResponse, bridgeBackedRequest, requestContext.url);
                         }
-                        if (inboundRule.getAction() == NativeProxyRule.Action.CANCEL) {
-                            return createCanceledResponse();
-                        }
-
-                        String proxyId = UUID.randomUUID().toString();
-                        ProxiedRequest proxiedRequest = new ProxiedRequest();
-                        proxiedRequest.requestContext = requestContext;
-                        proxiedRequest.nativeResponse = nativeResponse;
-                        addProxiedRequest(proxyId, proxiedRequest);
-
-                        String dialogId = instanceId != null ? instanceId : "";
-                        _options
-                            .getCallbacks()
-                            .proxyRequestEvent(
-                                proxyId,
-                                "inbound",
-                                requestContext.url,
-                                requestContext.method,
-                                serializeHeaders(requestContext.headers),
-                                requestContext.base64Body.isEmpty() ? null : requestContext.base64Body,
-                                nativeResponse.statusCode,
-                                serializeHeaders(nativeResponse.headers),
-                                Base64.encodeToString(nativeResponse.bodyBytes, Base64.NO_WRAP),
-                                dialogId
-                            );
-
-                        try {
-                            if (proxiedRequest.semaphore.tryAcquire(1, 10, TimeUnit.SECONDS)) {
-                                if (proxiedRequest.canceled) {
-                                    return createCanceledResponse();
-                                }
-                                if (proxiedRequest.response != null) {
-                                    return proxiedRequest.response;
-                                }
-                                if (proxiedRequest.nativeResponse != null) {
-                                    nativeResponse = proxiedRequest.nativeResponse;
-                                }
-                            } else {
-                                synchronized (proxiedRequest) {
-                                    proxiedRequest.timedOut = true;
-                                }
-                                removeProxiedRequest(proxyId);
-                            }
-                        } catch (InterruptedException error) {
-                            Thread.currentThread().interrupt();
-                            Log.e("InAppBrowserProxy", "Semaphore wait error", error);
-                        }
-
-                        RedirectReplayResult redirectReplay;
-                        try {
-                            redirectReplay = followRedirectForWebView(requestContext, nativeResponse, redirectsFollowed);
-                        } catch (IOException error) {
-                            Log.e("InAppBrowserProxy", "Native redirect replay failed for: " + requestContext.url, error);
-                            return createProxiedNativeFailureResponse(requestContext.url, bridgeBackedRequest, error);
-                        }
-                        if (redirectReplay != null) {
-                            requestContext = redirectReplay.requestContext;
-                            nativeResponse = redirectReplay.responseData;
-                            redirectsFollowed++;
-                            continue;
-                        }
-                        return createWebResourceResponseOrFallback(nativeResponse, bridgeBackedRequest, requestContext.url);
                     }
+
+                    return interceptBundledAssetRequest(request);
                 }
 
                 @Override
@@ -5953,6 +6076,10 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                     _options.getCallbacks().pageLoaded();
                     stopReloadGesture();
                     injectJavaScriptInterface();
+                    // The freshly parsed document carries no safe-area variables, whatever was
+                    // injected into the previous one, so drop the cache and serve them again.
+                    resetInjectedSafeAreaCssVariables();
+                    reapplyInsetsFromWindowRoot();
 
                     // Inject Google Pay polyfills if enabled
                     if (_options.getEnableGooglePaySupport()) {