@capgo/capacitor-inappbrowser 8.8.0 → 8.8.1

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

@@ -1143,6 +1143,7 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
 
         options.setShareDisclaimer(call.getObject("shareDisclaimer", null));
         options.setPreShowScript(call.getString("preShowScript", null));
+        options.setPreShowScriptInjectionTime(call.getString("preShowScriptInjectionTime", "pageLoad"));
         options.setShareSubject(call.getString("shareSubject", null));
         options.setToolbarType(call.getString("toolbarType", ""));
         options.setPreventDeeplink(Boolean.TRUE.equals(call.getBoolean("preventDeeplink", false)));

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

@@ -168,6 +168,7 @@ public class Options {
     private boolean ignoreUntrustedSSLError;
     private boolean clientCertificatePrompt;
     private String preShowScript;
+    private String preShowScriptInjectionTime = "pageLoad";
     private String toolbarTextColor;
     private Pattern proxyRequestsPattern = null;
     private boolean proxyRequests = false;
@@ -617,6 +618,14 @@ public class Options {
         this.preShowScript = preLoadScript;
     }
 
+    public String getPreShowScriptInjectionTime() {
+        return preShowScriptInjectionTime;
+    }
+
+    public void setPreShowScriptInjectionTime(String preShowScriptInjectionTime) {
+        this.preShowScriptInjectionTime = preShowScriptInjectionTime != null ? preShowScriptInjectionTime : "pageLoad";
+    }
+
     public boolean getPreventDeeplink() {
         return preventDeeplink;
     }
@@ -753,6 +762,7 @@ public class Options {
         copy.setIgnoreUntrustedSSLError(ignoreUntrustedSSLError);
         copy.setClientCertificatePrompt(clientCertificatePrompt);
         copy.setPreShowScript(preShowScript);
+        copy.setPreShowScriptInjectionTime(preShowScriptInjectionTime);
         copy.setToolbarTextColor(toolbarTextColor);
         copy.setProxyRequestsPattern(proxyRequestsPattern);
         copy.setProxyRequests(proxyRequests);

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

@@ -377,6 +377,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
 
     Semaphore preShowSemaphore = null;
     String preShowError = null;
+    // True when preShowScript was registered via WebViewCompat.addDocumentStartJavaScript;
+    // the blocking evaluateJavascript injection in onPageFinished is skipped in that case.
+    private boolean preShowInjectedAtDocumentStart = false;
 
     public PermissionRequest currentPermissionRequest;
     public static final int FILE_CHOOSER_REQUEST_CODE = 1000;
@@ -3409,6 +3412,14 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         try {
             injectDocumentStartPostMessageBridge();
             WebViewCompat.addDocumentStartJavaScript(_webView, createMobileAppBridgeScript(), Collections.singleton("*"));
+            // Honor preShowScriptInjectionTime: "documentStart" (matches iOS WKUserScript
+            // .atDocumentStart). Runs before page scripts and persists across navigations,
+            // so the blocking semaphore injection in onPageFinished is not needed.
+            String preShowScript = _options.getPreShowScript();
+            if (preShowScript != null && !preShowScript.isEmpty() && "documentStart".equals(_options.getPreShowScriptInjectionTime())) {
+                WebViewCompat.addDocumentStartJavaScript(_webView, preShowScript, Collections.singleton("*"));
+                preShowInjectedAtDocumentStart = true;
+            }
         } catch (Exception e) {
             Log.e("InAppBrowser", "Error injecting document-start JavaScript interface: " + e.getMessage());
         }
@@ -5392,7 +5403,10 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                         isInitialized = true;
                         _webView.clearHistory();
                         if (_options.isPresentAfterPageLoad()) {
-                            boolean usePreShowScript = _options.getPreShowScript() != null && !_options.getPreShowScript().isEmpty();
+                            boolean usePreShowScript =
+                                _options.getPreShowScript() != null &&
+                                !_options.getPreShowScript().isEmpty() &&
+                                !preShowInjectedAtDocumentStart;
                             if (!usePreShowScript) {
                                 showAccordingToLayerModeOrFallback();
                                 resolveOpenWebViewIfNeeded();
@@ -5419,7 +5433,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                                 );
                             }
                         }
-                    } else if (_options.getPreShowScript() != null && !_options.getPreShowScript().isEmpty()) {
+                    } else if (
+                        _options.getPreShowScript() != null && !_options.getPreShowScript().isEmpty() && !preShowInjectedAtDocumentStart
+                    ) {
                         executorService.execute(
                             new Runnable() {
                                 @Override

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -98,7 +98,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.8.0"
+    private let pluginVersion: String = "8.8.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.8.0",
+  "version": "8.8.1",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",