@capgo/capacitor-inappbrowser 8.16.4 → 8.16.6

package/android/build.gradle

@@ -34,6 +34,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
     lintOptions {
         abortOnError = false
     }
@@ -56,6 +61,8 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "androidx.window:window:1.5.1"
     testImplementation "junit:junit:$junitVersion"
+    testImplementation 'org.robolectric:robolectric:4.14.1'
+    testImplementation 'androidx.activity:activity:1.10.1'
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation "androidx.browser:browser:$androidxBrowserVersion"

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

@@ -428,12 +428,21 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         webViewStack.addLast(id);
         if (makeActive || activeWebViewId == null || webViewDialog == null) {
             setActiveWebView(id, dialog);
+        } else {
+            dialog.setActiveForBackNavigation(false);
         }
     }
 
     private void setActiveWebView(String id, WebViewDialog dialog) {
         activeWebViewId = id;
         webViewDialog = dialog;
+        syncActiveWebViewBackNavigation();
+    }
+
+    private void syncActiveWebViewBackNavigation() {
+        for (Map.Entry<String, WebViewDialog> entry : webViewDialogs.entrySet()) {
+            entry.getValue().setActiveForBackNavigation(java.util.Objects.equals(entry.getKey(), activeWebViewId));
+        }
     }
 
     private void unregisterWebView(String id) {
@@ -441,6 +450,7 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         webViewStack.remove(id);
         activeWebViewId = webViewStack.peekLast();
         webViewDialog = activeWebViewId != null ? webViewDialogs.get(activeWebViewId) : null;
+        syncActiveWebViewBackNavigation();
         if (webViewDialog != null) {
             String url = webViewDialog.getUrl();
             if (url != null) {

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

@@ -22,6 +22,41 @@ final class WebViewBackNavigationSupport {
         return isShowing && !hiddenMode && !backLayerActive;
     }
 
+    /**
+     * When {@code disableGoBackOnNativeApplication} is true, the dialog must not be cancelable on
+     * back/gesture. Otherwise {@link androidx.activity.ComponentDialog}'s built-in back callback
+     * dismisses the dialog before our handler can return {@link Action#IGNORE}. While cancelable is
+     * false that built-in callback still consumes back without dismissing, so {@link WebViewDialog}
+     * must keep its own callback registered last on the dispatcher.
+     */
+    static boolean isCancelableOnBack(boolean disableGoBackOnNativeApplication) {
+        return !disableGoBackOnNativeApplication;
+    }
+
+    /**
+     * Activity-level back handling is required when the overlay is hosted on the activity window
+     * (back layer) or when predictive-back can bypass the dialog dispatcher while the flag blocks
+     * dismiss.
+     */
+    static boolean shouldRegisterActivityBackHandler(
+        boolean isShowing,
+        boolean backLayerActive,
+        boolean hiddenMode,
+        boolean disableGoBackOnNativeApplication,
+        boolean isActiveForBackNavigation
+    ) {
+        if (!isActiveForBackNavigation) {
+            return false;
+        }
+        if (hiddenMode) {
+            return false;
+        }
+        if (!isShowing && !backLayerActive) {
+            return false;
+        }
+        return backLayerActive || disableGoBackOnNativeApplication;
+    }
+
     static Action resolveAction(
         boolean customFullscreenActive,
         boolean webViewCanGoBack,

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

@@ -345,6 +345,8 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     private Window customFullscreenWindow;
     private OnBackPressedCallback customFullscreenBackCallback;
     private OnBackPressedCallback dialogBackCallback;
+    private OnBackPressedCallback dialogActivityBackCallback;
+    private boolean activeForBackNavigation = true;
     private Toolbar _toolbar;
     private Options _options = null;
     private final Context _context;
@@ -461,17 +463,20 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     void bindToHostActivity() {
         ensureFileChooserLaunchers();
         registerDialogBackHandler();
+        registerDialogActivityBackHandler();
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        syncDialogBackCallbackEnabled();
+        // ComponentDialog registers its own back callback in onCreate; re-add ours last so
+        // handleBrowserBackNavigation runs before the built-in cancel callback (LIFO order).
+        ensureDialogBackHandlerOnTop();
     }
 
     @Override
     protected void onStop() {
-        syncDialogBackCallbackEnabled();
+        syncBackNavigationHandlers();
         super.onStop();
     }
 
@@ -670,7 +675,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         backLayerActive = false;
         backLayerParent = null;
         restoreHostTransparency();
-        syncDialogBackCallbackEnabled();
+        syncBackNavigationHandlers();
     }
 
     private void attachContentToDialogWindow() {
@@ -713,7 +718,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             super.hide();
         }
         refreshInsetsForHostingLayer();
-        syncDialogBackCallbackEnabled();
+        syncBackNavigationHandlers();
         return true;
     }
 
@@ -2145,7 +2150,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     @SuppressLint({ "SetJavaScriptEnabled", "AddJavascriptInterface" })
     public void presentWebView() {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setCancelable(true);
+        applyBackNavigationPolicy();
         setContentView(R.layout.activity_browser);
 
         // If custom dimensions are set, configure for touch passthrough
@@ -2918,6 +2923,19 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         if (dialogBackCallback != null) {
             return;
         }
+        ensureDialogBackHandlerOnTop();
+    }
+
+    /**
+     * Re-register the dialog back callback so it sits above {@link ComponentDialog}'s built-in
+     * callback. That callback is always enabled and consumes back without dismissing when
+     * {@link #setCancelable(boolean)} is false, which would block webview history navigation.
+     */
+    private void ensureDialogBackHandlerOnTop() {
+        if (dialogBackCallback != null) {
+            dialogBackCallback.remove();
+            dialogBackCallback = null;
+        }
         // Predictive back (API 33+) never delivers KEYCODE_BACK to Dialog OnKeyListener.
         dialogBackCallback = new OnBackPressedCallback(false) {
             @Override
@@ -2926,13 +2944,70 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             }
         };
         getOnBackPressedDispatcher().addCallback(dialogBackCallback);
-        syncDialogBackCallbackEnabled();
+        syncBackNavigationHandlers();
     }
 
-    private void syncDialogBackCallbackEnabled() {
+    private void registerDialogActivityBackHandler() {
+        if (!(activity instanceof ComponentActivity componentActivity) || dialogActivityBackCallback != null) {
+            return;
+        }
+        dialogActivityBackCallback = new OnBackPressedCallback(false) {
+            @Override
+            public void handleOnBackPressed() {
+                handleBrowserBackNavigation();
+            }
+        };
+        componentActivity.getOnBackPressedDispatcher().addCallback(componentActivity, dialogActivityBackCallback);
+        syncBackNavigationHandlers();
+    }
+
+    void applyBackNavigationPolicy() {
+        boolean disableGoBack = _options != null && _options.getDisableGoBackOnNativeApplication();
+        setCancelable(WebViewBackNavigationSupport.isCancelableOnBack(disableGoBack));
+        if (isShowing()) {
+            ensureDialogBackHandlerOnTop();
+        } else {
+            syncBackNavigationHandlers();
+        }
+    }
+
+    private void syncBackNavigationHandlers() {
         if (dialogBackCallback != null) {
             dialogBackCallback.setEnabled(shouldConsumeBackPress());
         }
+        if (dialogActivityBackCallback != null) {
+            dialogActivityBackCallback.setEnabled(shouldRegisterActivityBackHandler());
+        }
+    }
+
+    private boolean shouldRegisterActivityBackHandler() {
+        return WebViewBackNavigationSupport.shouldRegisterActivityBackHandler(
+            isShowing(),
+            backLayerActive,
+            isHiddenModeActive,
+            _options != null && _options.getDisableGoBackOnNativeApplication(),
+            activeForBackNavigation
+        );
+    }
+
+    void setActiveForBackNavigation(boolean active) {
+        if (activeForBackNavigation == active) {
+            return;
+        }
+        activeForBackNavigation = active;
+        syncBackNavigationHandlers();
+    }
+
+    boolean isActiveForBackNavigation() {
+        return activeForBackNavigation;
+    }
+
+    boolean isBackLayerActive() {
+        return backLayerActive;
+    }
+
+    boolean isActivityBackHandlerEnabled() {
+        return dialogActivityBackCallback != null && dialogActivityBackCallback.isEnabled();
     }
 
     private void unregisterDialogBackHandler() {
@@ -2940,6 +3015,10 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             dialogBackCallback.remove();
             dialogBackCallback = null;
         }
+        if (dialogActivityBackCallback != null) {
+            dialogActivityBackCallback.remove();
+            dialogActivityBackCallback = null;
+        }
     }
 
     private boolean shouldConsumeBackPress() {
@@ -3146,7 +3225,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         }
 
         isHiddenModeActive = true;
-        syncDialogBackCallbackEnabled();
+        syncBackNavigationHandlers();
     }
 
     private void restoreVisibleMode() {
@@ -3184,7 +3263,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         previousWebViewAlpha = 1f;
         previousWebViewVisibility = View.VISIBLE;
         isHiddenModeActive = false;
-        syncDialogBackCallbackEnabled();
+        syncBackNavigationHandlers();
     }
 
     public void setHidden(boolean hidden) {
@@ -3210,7 +3289,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                         // Set flag immediately to prevent race condition if setHidden(false)
                         // is called before the posted runnable executes
                         isHiddenModeActive = true;
-                        syncDialogBackCallbackEnabled();
+                        syncBackNavigationHandlers();
                         decorView.post(this::applyHiddenMode);
                     } catch (Exception e) {
                         Log.w("InAppBrowser", "Unable to show dialog before hiding", e);

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.16.4"
+    private let pluginVersion: String = "8.16.6"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [

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

@@ -5,6 +5,10 @@ import WebKit
 extension WKWebView {
     private static var _overriddenSchemes = Set<String>()
     private static let _overriddenSchemesLock = NSLock()
+    private static var _originalHandlesURLSchemeIMP: IMP?
+
+    // Original +[WKWebView handlesURLScheme:] IMP (saved before swizzle).
+    private typealias HandlesURLSchemeIMP = @convention(c) (AnyClass, Selector, NSString) -> Bool
 
     private static let _swizzleOnce: Void = {
         let original = class_getClassMethod(WKWebView.self, #selector(WKWebView.handlesURLScheme(_:)))
@@ -18,6 +22,7 @@ extension WKWebView {
             return
         }
 
+        _originalHandlesURLSchemeIMP = method_getImplementation(original)
         method_exchangeImplementations(original, swizzled)
     }()
 
@@ -28,7 +33,14 @@ extension WKWebView {
         _overriddenSchemesLock.unlock()
 
         if isOverridden { return false }
-        return _capgo_handlesURLScheme(urlScheme)
+
+        guard let imp = _originalHandlesURLSchemeIMP else {
+            print("[InAppBrowser][Proxy] WARNING: Original handlesURLScheme IMP missing; assuming not handled")
+            return false
+        }
+
+        let original: HandlesURLSchemeIMP = unsafeBitCast(imp, to: HandlesURLSchemeIMP.self)
+        return original(WKWebView.self, #selector(WKWebView.handlesURLScheme(_:)), urlScheme as NSString)
     }
 
     static func enableCustomSchemeHandling(for schemes: [String]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.16.4",
+  "version": "8.16.6",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",