@capgo/inappbrowser 7.2.21 → 7.3.2

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

@@ -28,6 +28,7 @@ import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import org.json.JSONException;
@@ -91,7 +92,9 @@ public class InAppBrowserPlugin
         currentPermissionRequest.deny();
         currentPermissionRequest = null;
       }
-      call.reject("Microphone permission is required");
+      if (call != null) {
+        call.reject("Microphone permission is required");
+      }
     }
   }
 
@@ -155,7 +158,7 @@ public class InAppBrowserPlugin
           webViewDialog.mFilePathCallback.onReceiveValue(results);
           webViewDialog.mFilePathCallback = null;
         } catch (Exception e) {
-          Log.e("ACTIVITYRESULT", e.getMessage());
+          Log.e("ACTIVITYRESULT", Objects.requireNonNull(e.getMessage()));
         }
       }
     }
@@ -723,10 +726,8 @@ public class InAppBrowserPlugin
         new CustomTabsCallback() {
           @Override
           public void onNavigationEvent(int navigationEvent, Bundle extras) {
-            switch (navigationEvent) {
-              case NAVIGATION_FINISHED:
-                notifyListeners("browserPageLoaded", new JSObject());
-                break;
+            if (navigationEvent == NAVIGATION_FINISHED) {
+              notifyListeners("browserPageLoaded", new JSObject());
             }
           }
         }
@@ -734,4 +735,20 @@ public class InAppBrowserPlugin
     }
     return currentSession;
   }
+
+  @Override
+  protected void handleOnDestroy() {
+    if (webViewDialog != null) {
+      try {
+        webViewDialog.dismiss();
+      } catch (Exception e) {
+        // Ignore, dialog may already be dismissed
+      }
+      webViewDialog = null;
+    }
+    currentPermissionRequest = null;
+    customTabsClient = null;
+    currentSession = null;
+    super.handleOnDestroy();
+  }
 }

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

@@ -17,10 +17,10 @@ public class Options {
       ASSET,
     }
 
-    private AllIconTypes iconType;
-    private String icon;
-    private int height;
-    private int width;
+    private final AllIconTypes iconType;
+    private final String icon;
+    private final int height;
+    private final int width;
 
     private ButtonNearDone(
       AllIconTypes iconType,
@@ -80,14 +80,20 @@ public class Options {
           try {
             fileInputString.close();
           } catch (IOException e) {
-            throw new RuntimeException(e);
+            e.printStackTrace();
           }
         }
       }
       Integer width = android.getInteger("width", 48);
 
       Integer height = android.getInteger("height", 48);
-      return new ButtonNearDone(AllIconTypes.ASSET, icon, height, width);
+      final ButtonNearDone buttonNearDone1 = new ButtonNearDone(
+        AllIconTypes.ASSET,
+        icon,
+        height,
+        width
+      );
+      return buttonNearDone1;
     }
 
     public AllIconTypes getIconType() {

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

@@ -15,7 +15,6 @@ import android.graphics.Picture;
 import android.graphics.drawable.PictureDrawable;
 import android.net.Uri;
 import android.net.http.SslError;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
@@ -37,7 +36,6 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
-import androidx.annotation.RequiresApi;
 import androidx.core.view.WindowInsetsControllerCompat;
 import com.caverock.androidsvg.SVG;
 import com.caverock.androidsvg.SVGParseException;
@@ -45,15 +43,12 @@ import com.getcapacitor.JSObject;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.CookiePolicy;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
@@ -61,7 +56,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.json.JSONException;
@@ -69,10 +63,10 @@ import org.json.JSONObject;
 
 public class WebViewDialog extends Dialog {
 
-  private class ProxiedRequest {
+  private static class ProxiedRequest {
 
     private WebResourceResponse response;
-    private Semaphore semaphore;
+    private final Semaphore semaphore;
 
     public WebResourceResponse getResponse() {
       return response;
@@ -86,21 +80,23 @@ public class WebViewDialog extends Dialog {
 
   private WebView _webView;
   private Toolbar _toolbar;
-  private Options _options;
-  private Context _context;
+  private Options _options = null;
+  private final Context _context;
   public Activity activity;
   private boolean isInitialized = false;
-  private WebView capacitorWebView;
-  private HashMap<String, ProxiedRequest> proxiedRequestsHashmap;
+  private final WebView capacitorWebView;
+  private final Map<String, ProxiedRequest> proxiedRequestsHashmap =
+    new HashMap<>();
+  private final ExecutorService executorService =
+    Executors.newCachedThreadPool();
 
   Semaphore preShowSemaphore = null;
-  String preshowError = null;
+  String preShowError = null;
 
   public PermissionRequest currentPermissionRequest;
   public static final int FILE_CHOOSER_REQUEST_CODE = 1000;
   public ValueCallback<Uri> mUploadMessage;
   public ValueCallback<Uri[]> mFilePathCallback;
-  ExecutorService executorService = Executors.newFixedThreadPool(1);
 
   public interface PermissionHandler {
     void handleCameraPermissionRequest(PermissionRequest request);
@@ -108,7 +104,7 @@ public class WebViewDialog extends Dialog {
     void handleMicrophonePermissionRequest(PermissionRequest request);
   }
 
-  private PermissionHandler permissionHandler;
+  private final PermissionHandler permissionHandler;
 
   public WebViewDialog(
     Context context,
@@ -123,30 +119,45 @@ public class WebViewDialog extends Dialog {
     this.permissionHandler = permissionHandler;
     this.isInitialized = false;
     this.capacitorWebView = capacitorWebView;
-    this.proxiedRequestsHashmap = new HashMap<>();
   }
 
-  public class JavaScriptInterface {
+  // Add this class to provide safer JavaScript interface
+  private class JavaScriptInterface {
 
     @JavascriptInterface
     public void postMessage(String message) {
-      // Handle message from JavaScript
-      _options.getCallbacks().javascriptCallback(message);
+      try {
+        // Handle message from JavaScript safely
+        if (message == null || message.isEmpty()) {
+          Log.e("InAppBrowser", "Received empty message from WebView");
+          return;
+        }
+        _options.getCallbacks().javascriptCallback(message);
+      } catch (Exception e) {
+        Log.e("InAppBrowser", "Error in postMessage: " + e.getMessage());
+      }
     }
 
     @JavascriptInterface
     public void close() {
-      // close webview
-      activity.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            dismiss();
-            _options.getCallbacks().closeEvent(_webView.getUrl());
-            _webView.destroy();
-          }
+      try {
+        // close webview safely
+        if (activity != null) {
+          activity.runOnUiThread(() -> {
+            try {
+              String currentUrl = _webView != null ? _webView.getUrl() : "";
+              dismiss();
+              if (_options != null && _options.getCallbacks() != null) {
+                _options.getCallbacks().closeEvent(currentUrl);
+              }
+            } catch (Exception e) {
+              Log.e("InAppBrowser", "Error closing WebView: " + e.getMessage());
+            }
+          });
         }
-      );
+      } catch (Exception e) {
+        Log.e("InAppBrowser", "Error in close: " + e.getMessage());
+      }
     }
   }
 
@@ -154,23 +165,31 @@ public class WebViewDialog extends Dialog {
 
     @JavascriptInterface
     public void error(String error) {
-      // Handle message from JavaScript
-      if (preShowSemaphore != null) {
-        preshowError = error;
-        preShowSemaphore.release();
+      try {
+        // Handle message from JavaScript
+        if (preShowSemaphore != null) {
+          preShowError = error;
+          preShowSemaphore.release();
+        }
+      } catch (Exception e) {
+        Log.e("InAppBrowser", "Error in error callback: " + e.getMessage());
       }
     }
 
     @JavascriptInterface
     public void success() {
-      // Handle message from JavaScript
-      if (preShowSemaphore != null) {
-        preShowSemaphore.release();
+      try {
+        // Handle message from JavaScript
+        if (preShowSemaphore != null) {
+          preShowSemaphore.release();
+        }
+      } catch (Exception e) {
+        Log.e("InAppBrowser", "Error in success callback: " + e.getMessage());
       }
     }
   }
 
-  @SuppressLint("SetJavaScriptEnabled")
+  @SuppressLint({ "SetJavaScriptEnabled", "AddJavascriptInterface" })
   public void presentWebView() {
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setCancelable(true);
@@ -210,9 +229,6 @@ public class WebViewDialog extends Dialog {
     _webView.getSettings().setDatabaseEnabled(true);
     _webView.getSettings().setDomStorageEnabled(true);
     _webView.getSettings().setAllowFileAccess(true);
-    _webView
-      .getSettings()
-      .setPluginState(android.webkit.WebSettings.PluginState.ON);
     _webView.getSettings().setLoadWithOverviewMode(true);
     _webView.getSettings().setUseWideViewPort(true);
     _webView.getSettings().setAllowFileAccessFromFileURLs(true);
@@ -228,7 +244,7 @@ public class WebViewDialog extends Dialog {
         public boolean onShowFileChooser(
           WebView webView,
           ValueCallback<Uri[]> filePathCallback,
-          WebChromeClient.FileChooserParams fileChooserParams
+          FileChooserParams fileChooserParams
         ) {
           openFileChooser(
             filePathCallback,
@@ -392,10 +408,10 @@ public class WebViewDialog extends Dialog {
         );
         return;
       }
-      if (preshowError != null && !preshowError.isEmpty()) {
+      if (preShowError != null && !preShowError.isEmpty()) {
         Log.e(
           "InjectPreShowScript",
-          "Error within the user-provided preShowFunction: " + preshowError
+          "Error within the user-provided preShowFunction: " + preShowError
         );
       }
     } catch (InterruptedException e) {
@@ -405,7 +421,7 @@ public class WebViewDialog extends Dialog {
       );
     } finally {
       preShowSemaphore = null;
-      preshowError = null;
+      preShowError = null;
     }
   }
 
@@ -529,21 +545,27 @@ public class WebViewDialog extends Dialog {
               .setMessage(_options.getCloseModalDescription())
               .setPositiveButton(
                 _options.getCloseModalOk(),
-                new DialogInterface.OnClickListener() {
+                new OnClickListener() {
                   public void onClick(DialogInterface dialog, int which) {
                     // Close button clicked, do something
+                    String currentUrl = _webView != null
+                      ? _webView.getUrl()
+                      : "";
                     dismiss();
-                    _options.getCallbacks().closeEvent(_webView.getUrl());
-                    _webView.destroy();
+                    if (_options != null && _options.getCallbacks() != null) {
+                      _options.getCallbacks().closeEvent(currentUrl);
+                    }
                   }
                 }
               )
               .setNegativeButton(_options.getCloseModalCancel(), null)
               .show();
           } else {
+            String currentUrl = _webView != null ? _webView.getUrl() : "";
             dismiss();
-            _options.getCallbacks().closeEvent(_webView.getUrl());
-            _webView.destroy();
+            if (_options != null && _options.getCallbacks() != null) {
+              _options.getCallbacks().closeEvent(currentUrl);
+            }
           }
         }
       }
@@ -618,7 +640,7 @@ public class WebViewDialog extends Dialog {
             try {
               inputStream.close();
             } catch (IOException e) {
-              throw new RuntimeException(e);
+              e.printStackTrace();
             }
           }
         }
@@ -742,9 +764,7 @@ public class WebViewDialog extends Dialog {
               intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
               context.startActivity(intent);
               return true;
-            } catch (ActivityNotFoundException e) {
-              // Do nothing
-            } catch (URISyntaxException e) {
+            } catch (ActivityNotFoundException | URISyntaxException e) {
               // Do nothing
             }
           }
@@ -769,7 +789,6 @@ public class WebViewDialog extends Dialog {
         //          _webView.evaluateJavascript("");
         //        }
         //
-        @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
         @Override
         public WebResourceResponse shouldInterceptRequest(
           WebView view,
@@ -798,7 +817,7 @@ public class WebViewDialog extends Dialog {
           // We need to call a JS function
           String requestId = randomRequestId();
           ProxiedRequest proxiedRequest = new ProxiedRequest();
-          proxiedRequestsHashmap.put(requestId, proxiedRequest);
+          addProxiedRequest(requestId, proxiedRequest);
 
           // lsuakdchgbbaHandleProxiedRequest
           activity.runOnUiThread(
@@ -841,7 +860,7 @@ public class WebViewDialog extends Dialog {
               return proxiedRequest.response;
             } else {
               Log.e("InAppBrowserProxy", "Semaphore timed out");
-              proxiedRequestsHashmap.remove(requestId); // prevent mem leak
+              removeProxiedRequest(requestId); // prevent mem leak
             }
           } catch (InterruptedException e) {
             Log.e("InAppBrowserProxy", "Semaphore wait error", e);
@@ -1068,99 +1087,97 @@ public class WebViewDialog extends Dialog {
   }
 
   public static String getReasonPhrase(int statusCode) {
-    switch (statusCode) {
-      case (200):
-        return "OK";
-      case (201):
-        return "Created";
-      case (202):
-        return "Accepted";
-      case (203):
-        return "Non Authoritative Information";
-      case (204):
-        return "No Content";
-      case (205):
-        return "Reset Content";
-      case (206):
-        return "Partial Content";
-      case (207):
-        return "Partial Update OK";
-      case (300):
-        return "Mutliple Choices";
-      case (301):
-        return "Moved Permanently";
-      case (302):
-        return "Moved Temporarily";
-      case (303):
-        return "See Other";
-      case (304):
-        return "Not Modified";
-      case (305):
-        return "Use Proxy";
-      case (307):
-        return "Temporary Redirect";
-      case (400):
-        return "Bad Request";
-      case (401):
-        return "Unauthorized";
-      case (402):
-        return "Payment Required";
-      case (403):
-        return "Forbidden";
-      case (404):
-        return "Not Found";
-      case (405):
-        return "Method Not Allowed";
-      case (406):
-        return "Not Acceptable";
-      case (407):
-        return "Proxy Authentication Required";
-      case (408):
-        return "Request Timeout";
-      case (409):
-        return "Conflict";
-      case (410):
-        return "Gone";
-      case (411):
-        return "Length Required";
-      case (412):
-        return "Precondition Failed";
-      case (413):
-        return "Request Entity Too Large";
-      case (414):
-        return "Request-URI Too Long";
-      case (415):
-        return "Unsupported Media Type";
-      case (416):
-        return "Requested Range Not Satisfiable";
-      case (417):
-        return "Expectation Failed";
-      case (418):
-        return "Reauthentication Required";
-      case (419):
-        return "Proxy Reauthentication Required";
-      case (422):
-        return "Unprocessable Entity";
-      case (423):
-        return "Locked";
-      case (424):
-        return "Failed Dependency";
-      case (500):
-        return "Server Error";
-      case (501):
-        return "Not Implemented";
-      case (502):
-        return "Bad Gateway";
-      case (503):
-        return "Service Unavailable";
-      case (504):
-        return "Gateway Timeout";
-      case (505):
-        return "HTTP Version Not Supported";
-      case (507):
-        return "Insufficient Storage";
-      default:
-        return "";
+    return switch (statusCode) {
+      case (200) -> "OK";
+      case (201) -> "Created";
+      case (202) -> "Accepted";
+      case (203) -> "Non Authoritative Information";
+      case (204) -> "No Content";
+      case (205) -> "Reset Content";
+      case (206) -> "Partial Content";
+      case (207) -> "Partial Update OK";
+      case (300) -> "Mutliple Choices";
+      case (301) -> "Moved Permanently";
+      case (302) -> "Moved Temporarily";
+      case (303) -> "See Other";
+      case (304) -> "Not Modified";
+      case (305) -> "Use Proxy";
+      case (307) -> "Temporary Redirect";
+      case (400) -> "Bad Request";
+      case (401) -> "Unauthorized";
+      case (402) -> "Payment Required";
+      case (403) -> "Forbidden";
+      case (404) -> "Not Found";
+      case (405) -> "Method Not Allowed";
+      case (406) -> "Not Acceptable";
+      case (407) -> "Proxy Authentication Required";
+      case (408) -> "Request Timeout";
+      case (409) -> "Conflict";
+      case (410) -> "Gone";
+      case (411) -> "Length Required";
+      case (412) -> "Precondition Failed";
+      case (413) -> "Request Entity Too Large";
+      case (414) -> "Request-URI Too Long";
+      case (415) -> "Unsupported Media Type";
+      case (416) -> "Requested Range Not Satisfiable";
+      case (417) -> "Expectation Failed";
+      case (418) -> "Reauthentication Required";
+      case (419) -> "Proxy Reauthentication Required";
+      case (422) -> "Unprocessable Entity";
+      case (423) -> "Locked";
+      case (424) -> "Failed Dependency";
+      case (500) -> "Server Error";
+      case (501) -> "Not Implemented";
+      case (502) -> "Bad Gateway";
+      case (503) -> "Service Unavailable";
+      case (504) -> "Gateway Timeout";
+      case (505) -> "HTTP Version Not Supported";
+      case (507) -> "Insufficient Storage";
+      default -> "";
+    };
+  }
+
+  @Override
+  public void dismiss() {
+    if (_webView != null) {
+      _webView.loadUrl("about:blank");
+      _webView.onPause();
+      _webView.removeAllViews();
+      _webView.destroy();
+      _webView = null;
+    }
+
+    if (executorService != null && !executorService.isShutdown()) {
+      executorService.shutdown();
+      try {
+        if (!executorService.awaitTermination(500, TimeUnit.MILLISECONDS)) {
+          executorService.shutdownNow();
+        }
+      } catch (InterruptedException e) {
+        executorService.shutdownNow();
+      }
+    }
+
+    super.dismiss();
+  }
+
+  public void addProxiedRequest(String key, ProxiedRequest request) {
+    synchronized (proxiedRequestsHashmap) {
+      proxiedRequestsHashmap.put(key, request);
+    }
+  }
+
+  public ProxiedRequest getProxiedRequest(String key) {
+    synchronized (proxiedRequestsHashmap) {
+      ProxiedRequest request = proxiedRequestsHashmap.get(key);
+      proxiedRequestsHashmap.remove(key);
+      return request;
+    }
+  }
+
+  public void removeProxiedRequest(String key) {
+    synchronized (proxiedRequestsHashmap) {
+      proxiedRequestsHashmap.remove(key);
     }
   }
 }

package/ios/Plugin/InAppBrowserPlugin.swift

@@ -60,7 +60,12 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     func presentView(isAnimated: Bool = true) {
-        self.bridge?.viewController?.present(self.navigationWebViewController!, animated: isAnimated, completion: {
+        guard let navigationController = self.navigationWebViewController else {
+            self.currentPluginCall?.reject("Navigation controller is not initialized")
+            return
+        }
+
+        self.bridge?.viewController?.present(navigationController, animated: isAnimated, completion: {
             self.currentPluginCall?.resolve()
         })
     }
@@ -98,18 +103,19 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
         DispatchQueue.main.async {
             WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
+                let group = DispatchGroup()
                 for cookie in cookies {
-
                     if cookie.domain == host || cookie.domain.hasSuffix(".\(host)") || host.hasSuffix(cookie.domain) {
-                        let semaphore = DispatchSemaphore(value: 1)
+                        group.enter()
                         WKWebsiteDataStore.default().httpCookieStore.delete(cookie) {
-                            semaphore.signal()
+                            group.leave()
                         }
-                        semaphore.wait()
                     }
                 }
 
-                call.resolve()
+                group.notify(queue: .main) {
+                    call.resolve()
+                }
             }
         }
     }
@@ -211,43 +217,45 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         let credentials = self.readCredentials(call)
 
         DispatchQueue.main.async {
-            let url = URL(string: urlString)
-            if self.isPresentAfterPageLoad {
-                self.webViewController = WKWebViewController.init(url: url!, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink, blankNavigationTab: toolbarType == "blank")
-            } else {
-                self.webViewController = WKWebViewController.init()
-                self.webViewController?.setHeaders(headers: headers)
-                self.webViewController?.setCredentials(credentials: credentials)
-                self.webViewController?.setPreventDeeplink(preventDeeplink: preventDeeplink)
+            guard let url = URL(string: urlString) else {
+                call.reject("Invalid URL format")
+                return
             }
 
-            self.webViewController?.source = .remote(url!)
-            self.webViewController?.leftNavigationBarItemTypes = self.getToolbarItems(toolbarType: toolbarType) + [.reload]
-            self.webViewController?.leftNavigationBarItemTypes = self.getToolbarItems(toolbarType: toolbarType)
-            self.webViewController?.toolbarItemTypes = []
-            self.webViewController?.doneBarButtonItemPosition = .right
+            self.webViewController = WKWebViewController.init(url: url, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink, blankNavigationTab: toolbarType == "blank")
 
-            self.webViewController?.buttonNearDoneIcon = buttonNearDoneIcon
+            guard let webViewController = self.webViewController else {
+                call.reject("Failed to initialize WebViewController")
+                return
+            }
+
+            webViewController.source = .remote(url)
+            webViewController.leftNavigationBarItemTypes = self.getToolbarItems(toolbarType: toolbarType) + [.reload]
+            webViewController.toolbarItemTypes = []
+            webViewController.doneBarButtonItemPosition = .right
+
+            webViewController.buttonNearDoneIcon = buttonNearDoneIcon
 
             if call.getBool("showArrow", false) {
-                self.webViewController?.stopBarButtonItemImage = UIImage(named: "Forward@3x", in: Bundle(for: InAppBrowserPlugin.self), compatibleWith: nil)
+                webViewController.stopBarButtonItemImage = UIImage(named: "Forward@3x", in: Bundle(for: InAppBrowserPlugin.self), compatibleWith: nil)
             }
 
-            self.webViewController?.capBrowserPlugin = self
-            self.webViewController?.title = call.getString("title", "New Window")
-            self.webViewController?.shareSubject = call.getString("shareSubject")
-            self.webViewController?.shareDisclaimer = disclaimerContent
-            self.webViewController?.preShowScript = call.getString("preShowScript")
-            self.webViewController?.websiteTitleInNavigationBar = call.getBool("visibleTitle", true)
+            webViewController.capBrowserPlugin = self
+            webViewController.title = call.getString("title", "New Window")
+            webViewController.shareSubject = call.getString("shareSubject")
+            webViewController.shareDisclaimer = disclaimerContent
+            webViewController.preShowScript = call.getString("preShowScript")
+            webViewController.websiteTitleInNavigationBar = call.getBool("visibleTitle", true)
             if closeModal {
-                self.webViewController?.closeModal = true
-                self.webViewController?.closeModalTitle = closeModalTitle
-                self.webViewController?.closeModalDescription = closeModalDescription
-                self.webViewController?.closeModalOk = closeModalOk
-                self.webViewController?.closeModalCancel = closeModalCancel
+                webViewController.closeModal = true
+                webViewController.closeModalTitle = closeModalTitle
+                webViewController.closeModalDescription = closeModalDescription
+                webViewController.closeModalOk = closeModalOk
+                webViewController.closeModalCancel = closeModalCancel
             }
-            self.webViewController?.ignoreUntrustedSSLError = ignoreUntrustedSSLError
-            self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
+            webViewController.ignoreUntrustedSSLError = ignoreUntrustedSSLError
+
+            self.navigationWebViewController = UINavigationController.init(rootViewController: webViewController)
             self.navigationWebViewController?.navigationBar.isTranslucent = false
             self.navigationWebViewController?.toolbar.isTranslucent = false
             self.navigationWebViewController?.navigationBar.backgroundColor = backgroundColor
@@ -256,11 +264,11 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             self.navigationWebViewController?.modalPresentationStyle = .fullScreen
             if toolbarType == "blank" {
                 self.navigationWebViewController?.navigationBar.isHidden = true
-                self.webViewController?.blankNavigationTab = true
+                webViewController.blankNavigationTab = true
             }
             if showReloadButton {
                 let toolbarItems = self.getToolbarItems(toolbarType: toolbarType)
-                self.webViewController?.leftNavigationBarItemTypes = toolbarItems + [.reload]
+                webViewController.leftNavigationBarItemTypes = toolbarItems + [.reload]
             }
             if !self.isPresentAfterPageLoad {
                 self.presentView(isAnimated: isAnimated)

package/ios/Plugin/WKWebViewController.swift

@@ -75,7 +75,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.setPreventDeeplink(preventDeeplink: preventDeeplink)
         self.initWebview(isInspectable: isInspectable)
     }
-    
+
     public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool) {
         super.init(nibName: nil, bundle: nil)
         self.blankNavigationTab = blankNavigationTab
@@ -111,7 +111,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     open var ignoreUntrustedSSLError = false
     var viewWasPresented = false
     var preventDeeplink: Bool = false
-    var blankNavigationTab: Bool = false;
+    var blankNavigationTab: Bool = false
 
     internal var preShowSemaphore: DispatchSemaphore?
     internal var preShowError: String?
@@ -326,10 +326,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             webView.perform(Selector(("setInspectable:")), with: isInspectable)
         }
 
-        if (self.blankNavigationTab) {
+        if self.blankNavigationTab {
             // First add the webView to view hierarchy
             self.view.addSubview(webView)
-            
+
             // Then set up constraints
             webView.translatesAutoresizingMaskIntoConstraints = false
             NSLayoutConstraint.activate([
@@ -352,7 +352,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         }
         webView.addObserver(self, forKeyPath: #keyPath(WKWebView.url), options: .new, context: nil)
 
-        if (!self.blankNavigationTab) {
+        if !self.blankNavigationTab {
             self.view = webView
         }
         self.webView = webView
@@ -841,7 +841,20 @@ fileprivate extension WKWebViewController {
             canDismiss = delegate?.webViewController?(self, canDismiss: url) ?? true
         }
         if canDismiss {
-            //            UIDevice.current.setValue(Int(UIInterfaceOrientation.portrait.rawValue), forKey: "orientation")
+            // Cleanup webView
+            webView?.stopLoading()
+            webView?.removeObserver(self, forKeyPath: estimatedProgressKeyPath)
+            if websiteTitleInNavigationBar {
+                webView?.removeObserver(self, forKeyPath: titleKeyPath)
+            }
+            webView?.removeObserver(self, forKeyPath: #keyPath(WKWebView.url))
+            webView?.configuration.userContentController.removeAllUserScripts()
+            webView?.configuration.userContentController.removeScriptMessageHandler(forName: "messageHandler")
+            webView?.configuration.userContentController.removeScriptMessageHandler(forName: "close")
+            webView?.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
+            webView?.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
+            webView = nil
+
             self.capBrowserPlugin?.notifyListeners("closeEvent", data: ["url": webView?.url?.absoluteString ?? ""])
             dismiss(animated: true, completion: nil)
         }

package/package.json

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