@capgo/capacitor-inappbrowser 8.20.0 → 8.20.1

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

@@ -581,6 +581,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     private ActivityResultLauncher<Intent> fileChooserLauncher;
     private boolean openWebViewResolved;
     private boolean isDismissing = false;
+    private AlertDialog backCloseConfirmDialog;
     private PermissionRequest pendingCameraLaunchPermissionRequest;
 
     // Temporary URI for storing camera capture
@@ -1067,6 +1068,10 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
 
                 activity.runOnUiThread(() -> {
                     try {
+                        if (isDismissing) {
+                            // Dismissal already started (e.g. close button or back); do not close twice.
+                            return;
+                        }
                         String currentUrl = getUrl();
                         dismiss();
 
@@ -2974,6 +2979,10 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                 public void onCloseWindow(WebView window) {
                     Log.d("InAppBrowser", "onCloseWindow called");
                     if (window == _webView) {
+                        if (isDismissing) {
+                            // Dismissal already started (e.g. close button or back); do not close twice.
+                            return;
+                        }
                         String currentUrl = getUrl();
                         dismiss();
                         if (_options != null && _options.getCallbacks() != null) {
@@ -3243,6 +3252,26 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             case DISMISS:
             default:
                 String currentUrl = getUrl();
+                Pattern urlPattern = _options.getCloseModalURLPattern();
+                if (_options.getCloseModal() && (urlPattern == null || urlPattern.matcher(currentUrl).find())) {
+                    // Confirm like the toolbar close button; OK does the same close as below
+                    backCloseConfirmDialog = new AlertDialog.Builder(_context)
+                        .setTitle(_options.getCloseModalTitle())
+                        .setMessage(_options.getCloseModalDescription())
+                        .setPositiveButton(_options.getCloseModalOk(), (dialog, which) -> {
+                            if (isDismissing) {
+                                return;
+                            }
+                            if (_options.getCallbacks() != null) {
+                                _options.getCallbacks().confirmBtnClicked(currentUrl);
+                                _options.getCallbacks().closeEvent(currentUrl);
+                            }
+                            dismiss();
+                        })
+                        .setNegativeButton(_options.getCloseModalCancel(), null)
+                        .show();
+                    return;
+                }
                 if (_options.getCallbacks() != null) {
                     _options.getCallbacks().closeEvent(currentUrl);
                 }
@@ -6768,6 +6797,10 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
 
     @Override
     public void dismiss() {
+        if (backCloseConfirmDialog != null) {
+            backCloseConfirmDialog.dismiss();
+            backCloseConfirmDialog = null;
+        }
         clearFullscreen();
         unregisterConfigurationCallbacks();
         scheduleHostWebViewInsetRestore();

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

package/package.json

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