@capgo/capacitor-inappbrowser 8.14.0 → 8.14.2

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

@@ -76,6 +76,14 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         }
     );
 
+    private static final ExecutorService CUSTOM_TABS_LIFECYCLE_EXECUTOR = Executors.newSingleThreadExecutor((runnable) -> {
+        Thread thread = new Thread(runnable, "CapgoInAppBrowser-CustomTabsLifecycle");
+        thread.setDaemon(true);
+        return thread;
+    });
+
+    private final CustomTabsLifecycleSupport customTabsLifecycleSupport = new CustomTabsLifecycleSupport(CUSTOM_TABS_LIFECYCLE_EXECUTOR);
+
     private final String pluginVersion = "8.6.17";
 
     private boolean resolveClientCertificatePrompt(PluginCall call) {
@@ -670,10 +678,16 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         currentPermissionNeedsMicrophone = false;
     }
 
+    private final Object customTabsClientLock = new Object();
+    private static final long CUSTOM_TABS_CONNECTION_TIMEOUT_MS = 2000;
+
     CustomTabsServiceConnection connection = new CustomTabsServiceConnection() {
         @Override
         public void onCustomTabsServiceConnected(ComponentName name, CustomTabsClient client) {
             customTabsClient = client;
+            synchronized (customTabsClientLock) {
+                customTabsClientLock.notifyAll();
+            }
         }
 
         @Override
@@ -682,6 +696,27 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         }
     };
 
+    private final CustomTabsLifecycleSupport.Binder customTabsBinder = new CustomTabsLifecycleSupport.Binder() {
+        @Override
+        public boolean bindCustomTabsService() {
+            try {
+                boolean ok = CustomTabsClient.bindCustomTabsService(getContext(), CUSTOM_TAB_PACKAGE_NAME, connection);
+                if (!ok) {
+                    Log.e(getLogTag(), "Error binding to custom tabs service");
+                }
+                return ok;
+            } catch (RuntimeException e) {
+                Log.e(getLogTag(), "Error binding to custom tabs service", e);
+                return false;
+            }
+        }
+
+        @Override
+        public void unbindCustomTabsService() {
+            getContext().unbindService(connection);
+        }
+    };
+
     @PluginMethod
     public void requestCameraPermission(PluginCall call) {
         if (isAndroidPermissionGranted(Manifest.permission.CAMERA)) {
@@ -748,8 +783,10 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
 
         if (TextUtils.isEmpty(url)) {
             call.reject("Invalid URL");
+            return;
         }
         currentUrl = url;
+        awaitCustomTabsClientIfNeeded();
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(getCustomTabsSession());
 
         // --- Chrome Custom Tab UI customization ---
@@ -1839,10 +1876,8 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
     }
 
     protected void handleOnResume() {
-        boolean ok = CustomTabsClient.bindCustomTabsService(getContext(), CUSTOM_TAB_PACKAGE_NAME, connection);
-        if (!ok) {
-            Log.e(getLogTag(), "Error binding to custom tabs service");
-        }
+        customTabsLifecycleSupport.onResume(customTabsBinder);
+
         // If we have a saved call and user returned without callback, reject
         if (openSecureWindowSavedCall != null) {
             openSecureWindowSavedCall.reject("OAuth cancelled or no callback received");
@@ -1851,7 +1886,29 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
     }
 
     protected void handleOnPause() {
-        getContext().unbindService(connection);
+        customTabsLifecycleSupport.onPause(customTabsBinder);
+    }
+
+    private void awaitCustomTabsClientIfNeeded() {
+        if (customTabsClient != null || !customTabsLifecycleSupport.isBindingOrBound()) {
+            return;
+        }
+
+        synchronized (customTabsClientLock) {
+            long deadline = System.currentTimeMillis() + CUSTOM_TABS_CONNECTION_TIMEOUT_MS;
+            while (customTabsClient == null && customTabsLifecycleSupport.isBindingOrBound() && System.currentTimeMillis() < deadline) {
+                long remaining = deadline - System.currentTimeMillis();
+                if (remaining <= 0) {
+                    break;
+                }
+                try {
+                    customTabsClientLock.wait(remaining);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    break;
+                }
+            }
+        }
     }
 
     public CustomTabsSession getCustomTabsSession() {

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

@@ -0,0 +1,84 @@
+package ee.forgr.capacitor_inappbrowser;
+
+import java.util.concurrent.Executor;
+
+final class CustomTabsLifecycleSupport {
+
+    interface Binder {
+        boolean bindCustomTabsService();
+
+        void unbindCustomTabsService();
+    }
+
+    private final Executor executor;
+    private final Object lock = new Object();
+    private boolean bound = false;
+    private boolean bindInProgress = false;
+
+    CustomTabsLifecycleSupport(Executor executor) {
+        this.executor = executor;
+    }
+
+    void onResume(Binder binder) {
+        executor.execute(() -> performBind(binder));
+    }
+
+    void onPause(Binder binder) {
+        executor.execute(() -> performUnbind(binder));
+    }
+
+    boolean isBindingOrBound() {
+        synchronized (lock) {
+            return bindInProgress || bound;
+        }
+    }
+
+    boolean isBound() {
+        synchronized (lock) {
+            return bound;
+        }
+    }
+
+    private void performBind(Binder binder) {
+        synchronized (lock) {
+            if (bound || bindInProgress) {
+                return;
+            }
+            bindInProgress = true;
+        }
+
+        boolean ok = false;
+        try {
+            ok = binder.bindCustomTabsService();
+        } catch (RuntimeException ignored) {
+            // Caller logs bind failures.
+        }
+
+        synchronized (lock) {
+            bindInProgress = false;
+            if (!ok) {
+                return;
+            }
+
+            bound = true;
+        }
+    }
+
+    private void performUnbind(Binder binder) {
+        synchronized (lock) {
+            if (bindInProgress) {
+                return;
+            }
+            if (!bound) {
+                return;
+            }
+            bound = false;
+        }
+
+        try {
+            binder.unbindCustomTabsService();
+        } catch (RuntimeException ignored) {
+            // Service may already be unbound.
+        }
+    }
+}

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

@@ -3013,30 +3013,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         final View insetsSourceView = resolveSafeAreaInsetsSourceView();
 
         ViewCompat.setOnApplyWindowInsetsListener(insetsSourceView, (v, windowInsets) -> {
-            Insets bars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-            Insets navigationBars = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars());
-            Insets systemGestures = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures());
-            Insets mandatoryGestures = windowInsets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures());
-            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(
-                bars,
-                navigationBars,
-                systemGestures,
-                mandatoryGestures,
-                ime,
-                keyboardVisible,
-                appBarHandlesTopInset,
-                isAndroid15Plus
-            );
-
+            applyWindowInsetsToWebView(windowInsets, isAndroid15Plus, toolbarView);
             return windowInsets;
         });
         requestSafeAreaInsets();
@@ -3209,6 +3186,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
 
         if (isHiddenModeActive) {
             requestSafeAreaInsets();
+            reapplyInsetsFromWindowRoot();
             return;
         }
 
@@ -3235,21 +3213,24 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         }
 
         if (swipeRefreshLayout != null) {
+            swipeRefreshLayout.setRefreshing(false);
             swipeRefreshLayout.requestLayout();
         }
 
         _webView.requestLayout();
         _webView.invalidate();
         requestSafeAreaInsets();
+        reapplyInsetsFromWindowRoot();
 
-        mainHandler.post(this::applyContainerInsetsSnapshot);
-        mainHandler.postDelayed(this::applyContainerInsetsSnapshot, 100);
-        mainHandler.postDelayed(this::applyContainerInsetsSnapshot, 300);
+        mainHandler.post(this::reapplyInsetsFromWindowRoot);
+        mainHandler.postDelayed(this::reapplyInsetsFromWindowRoot, 100);
+        mainHandler.postDelayed(this::reapplyInsetsFromWindowRoot, 300);
 
         _webView.post(() -> {
             if (_webView == null) {
                 return;
             }
+            requestWebViewContentRelayout();
             _webView.evaluateJavascript("(function(){window.dispatchEvent(new Event('resize'));})();", null);
         });
     }
@@ -3340,6 +3321,80 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         });
     }
 
+    private void applyWindowInsetsToWebView(WindowInsetsCompat windowInsets, boolean isAndroid15Plus, View toolbarView) {
+        if (windowInsets == null || _options == null) {
+            return;
+        }
+
+        Insets bars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+        Insets navigationBars = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars());
+        Insets systemGestures = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures());
+        Insets mandatoryGestures = windowInsets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures());
+        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(
+            bars,
+            navigationBars,
+            systemGestures,
+            mandatoryGestures,
+            ime,
+            keyboardVisible,
+            appBarHandlesTopInset,
+            isAndroid15Plus
+        );
+    }
+
+    /**
+     * Re-read root window insets and apply WebView margins plus container padding.
+     * Dialog windows may not re-dispatch inset listeners after rotation, leaving stale
+     * portrait margins 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) {
+            return;
+        }
+
+        WindowInsetsCompat windowInsets = ViewCompat.getRootWindowInsets(decorView);
+        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.
+            return;
+        }
+
+        boolean isAndroid15Plus = Build.VERSION.SDK_INT >= 35;
+        View toolbarView = findViewById(R.id.tool_bar);
+        applyWindowInsetsToWebView(windowInsets, isAndroid15Plus, toolbarView);
+    }
+
+    private void requestWebViewContentRelayout() {
+        View container = findViewById(R.id.content_browser_layout);
+        if (container != null) {
+            container.requestLayout();
+            container.invalidate();
+        }
+
+        if (_webView == null) {
+            return;
+        }
+
+        _webView.requestLayout();
+        _webView.invalidate();
+    }
+
     private void applySafeAreaMargins(
         Insets bars,
         Insets navigationBars,
@@ -3554,7 +3609,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         ViewCompat.requestApplyInsets(insetsSourceView);
         insetsSourceView.post(() -> {
             ViewCompat.requestApplyInsets(insetsSourceView);
-            applyContainerInsetsSnapshot();
+            reapplyInsetsFromWindowRoot();
         });
     }
 

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

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