@capgo/inappbrowser 8.1.3 → 8.1.4

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

@@ -50,7 +50,7 @@ import org.json.JSONObject;
 )
 public class InAppBrowserPlugin extends Plugin implements WebViewDialog.PermissionHandler {
 
-    private final String pluginVersion = "8.1.3";
+    private final String pluginVersion = "8.1.4";
 
     public static final String CUSTOM_TAB_PACKAGE_NAME = "com.android.chrome"; // Change when in stable
     private CustomTabsClient customTabsClient;

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

@@ -1138,13 +1138,20 @@ public class WebViewDialog extends Dialog {
         // Apply system insets to WebView content view (compatible with all Android versions)
         ViewCompat.setOnApplyWindowInsetsListener(_webView, (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());
 
             ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
 
             // Apply safe margin inset to bottom margin if enabled in options or fallback to 0px
-            int navBottom = _options.getEnabledSafeMargin() ? bars.bottom : 0;
+            int safeBottomInset = Math.max(
+                bars.bottom,
+                Math.max(navigationBars.bottom, Math.max(systemGestures.bottom, mandatoryGestures.bottom))
+            );
+            int navBottom = _options.getEnabledSafeMargin() ? safeBottomInset : 0;
 
             // Apply top inset only if useTopInset option is enabled or fallback to 0px
             int navTop = _options.getUseTopInset() ? bars.top : 0;
@@ -1161,6 +1168,7 @@ public class WebViewDialog extends Dialog {
 
             return WindowInsetsCompat.CONSUMED;
         });
+        ViewCompat.requestApplyInsets(_webView);
 
         // Handle window decoration - version-specific handling
         if (getWindow() != null) {
@@ -2977,20 +2985,8 @@ public class WebViewDialog extends Dialog {
             }
         }
 
-        // Shutdown executor service safely
-        if (executorService != null && !executorService.isShutdown()) {
-            try {
-                executorService.shutdown();
-                if (!executorService.awaitTermination(500, TimeUnit.MILLISECONDS)) {
-                    executorService.shutdownNow();
-                }
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                executorService.shutdownNow();
-            } catch (Exception e) {
-                Log.e("InAppBrowser", "Error shutting down executor: " + e.getMessage());
-            }
-        }
+        // Shutdown executor service asynchronously to avoid blocking UI thread
+        shutdownExecutorServiceAsync();
 
         // Clear any remaining proxied requests
         synchronized (proxiedRequestsHashmap) {
@@ -3004,6 +3000,30 @@ public class WebViewDialog extends Dialog {
         }
     }
 
+    private void shutdownExecutorServiceAsync() {
+        if (executorService.isShutdown()) {
+            return;
+        }
+        Thread shutdownThread = new Thread(
+            () -> {
+                try {
+                    executorService.shutdown();
+                    if (!executorService.awaitTermination(500, TimeUnit.MILLISECONDS)) {
+                        executorService.shutdownNow();
+                    }
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    executorService.shutdownNow();
+                } catch (Exception e) {
+                    Log.e("InAppBrowser", "Error shutting down executor: " + e.getMessage());
+                }
+            },
+            "InAppBrowser-ExecutorShutdown"
+        );
+        shutdownThread.setDaemon(true);
+        shutdownThread.start();
+    }
+
     public void addProxiedRequest(String key, ProxiedRequest request) {
         synchronized (proxiedRequestsHashmap) {
             proxiedRequestsHashmap.put(key, request);

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -28,7 +28,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.1.3"
+    private let pluginVersion: String = "8.1.4"
     public let identifier = "InAppBrowserPlugin"
     public let jsName = "InAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

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