@capgo/capacitor-inappbrowser 8.14.0 → 8.14.1

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/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.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.14.0",
+  "version": "8.14.1",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",