@capgo/capacitor-inappbrowser 8.15.3 → 8.15.4

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

@@ -20,7 +20,6 @@ import android.util.Log;
 import android.webkit.CookieManager;
 import android.webkit.PermissionRequest;
 import android.webkit.WebView;
-import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
@@ -63,8 +62,7 @@ import org.json.JSONObject;
         @Permission(alias = "camera", strings = { Manifest.permission.CAMERA }),
         @Permission(alias = "microphone", strings = { Manifest.permission.RECORD_AUDIO }),
         @Permission(alias = "storage", strings = { Manifest.permission.READ_EXTERNAL_STORAGE })
-    },
-    requestCodes = { WebViewDialog.FILE_CHOOSER_REQUEST_CODE }
+    }
 )
 public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.PermissionHandler {
 
@@ -108,7 +106,6 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
     private boolean currentPermissionNeedsCamera = false;
     private boolean currentPermissionNeedsMicrophone = false;
 
-    private ActivityResultLauncher<Intent> fileChooserLauncher;
     private ActivityResultLauncher<String[]> webPermissionLauncher;
     private PluginCall pendingCameraPermissionCall;
 
@@ -118,10 +115,6 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
     @Override
     public void load() {
         super.load();
-        fileChooserLauncher = getActivity().registerForActivityResult(
-            new ActivityResultContracts.StartActivityForResult(),
-            this::handleFileChooserResult
-        );
         webPermissionLauncher = getActivity().registerForActivityResult(
             new ActivityResultContracts.RequestMultiplePermissions(),
             this::handleWebPermissionResult
@@ -355,6 +348,7 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         );
         dialog.setInstanceId(webViewId);
         dialog.activity = CapgoInAppBrowserPlugin.this.getActivity();
+        dialog.bindToHostActivity();
         registerWebView(webViewId, dialog, makeActive);
         return dialog;
     }
@@ -525,59 +519,6 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         return targetWebViews;
     }
 
-    private WebViewDialog findFileChooserDialog() {
-        if (activeWebViewId != null) {
-            WebViewDialog dialog = webViewDialogs.get(activeWebViewId);
-            if (dialog != null && dialog.mFilePathCallback != null) {
-                return dialog;
-            }
-        }
-
-        if (webViewDialog != null && webViewDialog.mFilePathCallback != null) {
-            return webViewDialog;
-        }
-
-        for (WebViewDialog dialog : webViewDialogs.values()) {
-            if (dialog != null && dialog.mFilePathCallback != null) {
-                return dialog;
-            }
-        }
-
-        return null;
-    }
-
-    private void handleFileChooserResult(ActivityResult result) {
-        WebViewDialog webViewDialog = findFileChooserDialog();
-        if (webViewDialog != null && webViewDialog.mFilePathCallback != null) {
-            Uri[] results = null;
-            Intent data = result.getData();
-
-            if (result.getResultCode() == Activity.RESULT_OK) {
-                // Handle camera capture result
-                if (webViewDialog.tempCameraUri != null && (data == null || data.getData() == null)) {
-                    results = new Uri[] { webViewDialog.tempCameraUri };
-                }
-                // Handle regular file picker result
-                else if (data != null) {
-                    if (data.getClipData() != null) {
-                        // Handle multiple files
-                        int count = data.getClipData().getItemCount();
-                        results = new Uri[count];
-                        for (int i = 0; i < count; i++) {
-                            results[i] = data.getClipData().getItemAt(i).getUri();
-                        }
-                    } else if (data.getData() != null) {
-                        // Handle single file
-                        results = new Uri[] { data.getData() };
-                    }
-                }
-            }
-
-            // Send the result to WebView and clean up
-            webViewDialog.completeLegacyFileChooserResult(results);
-        }
-    }
-
     public void handleMicrophonePermissionRequest(PermissionRequest request) {
         if (request == null) {
             return;
@@ -796,6 +737,16 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         );
     }
 
+    private CustomTabColorSchemeParams buildCustomTabColorScheme(int colorInt) {
+        return applyCustomTabNavigationBarColor(new CustomTabColorSchemeParams.Builder().setToolbarColor(colorInt), colorInt).build();
+    }
+
+    @SuppressWarnings("deprecation")
+    private CustomTabColorSchemeParams.Builder applyCustomTabNavigationBarColor(CustomTabColorSchemeParams.Builder builder, int colorInt) {
+        // androidx.browser 1.9.0 still exposes only setNavigationBarColor; no non-deprecated replacement.
+        return builder.setNavigationBarColor(colorInt);
+    }
+
     @PluginMethod
     public void open(PluginCall call) {
         String url = call.getString("url");
@@ -828,10 +779,7 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         if (toolbarColor != null) {
             try {
                 int colorInt = Color.parseColor(toolbarColor);
-                CustomTabColorSchemeParams colorParams = new CustomTabColorSchemeParams.Builder()
-                    .setToolbarColor(colorInt)
-                    .setNavigationBarColor(colorInt)
-                    .build();
+                CustomTabColorSchemeParams colorParams = buildCustomTabColorScheme(colorInt);
                 builder.setDefaultColorSchemeParams(colorParams);
                 builder.setColorSchemeParams(CustomTabsIntent.COLOR_SCHEME_DARK, colorParams);
             } catch (IllegalArgumentException e) {

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

@@ -11,7 +11,6 @@ import com.getcapacitor.annotation.Permission;
         @Permission(alias = "camera", strings = { Manifest.permission.CAMERA }),
         @Permission(alias = "microphone", strings = { Manifest.permission.RECORD_AUDIO }),
         @Permission(alias = "storage", strings = { Manifest.permission.READ_EXTERNAL_STORAGE })
-    },
-    requestCodes = { WebViewDialog.FILE_CHOOSER_REQUEST_CODE }
+    }
 )
 public class InAppBrowserPlugin extends CapgoInAppBrowserPlugin {}

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

@@ -122,9 +122,14 @@ final class SafeAreaInsetsSupport {
      * Whether the WebView container must be inset for the bottom system bar. On Android 15+ the dialog
      * is forced edge-to-edge (decorFitsSystemWindows=false), so the window always draws under the
      * navigation bar and insetting is mandatory to keep bottom content on-screen, regardless of the
-     * enabledSafeBottomMargin opt-in that older versions honour.
+     * enabledSafeBottomMargin opt-in that older versions honour. Pre-API 30 windows that lay out behind
+     * a transparent navigation bar need the same treatment.
      */
+    static boolean shouldInsetBottomForContainer(boolean enabledSafeBottomMargin, boolean isEdgeToEdge, boolean layoutBehindNavigationBar) {
+        return enabledSafeBottomMargin || isEdgeToEdge || layoutBehindNavigationBar;
+    }
+
     static boolean shouldInsetBottomForContainer(boolean enabledSafeBottomMargin, boolean isEdgeToEdge) {
-        return enabledSafeBottomMargin || isEdgeToEdge;
+        return shouldInsetBottomForContainer(enabledSafeBottomMargin, isEdgeToEdge, false);
     }
 }

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

@@ -0,0 +1,109 @@
+package ee.forgr.capacitor_inappbrowser;
+
+import android.graphics.Color;
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
+
+/**
+ * Centralizes window chrome decisions so WebViewDialog can avoid deprecated system UI APIs on
+ * Android 15+ while keeping API 24–34 behavior unchanged.
+ */
+final class SystemUiChromeSupport {
+
+    static final int EDGE_TO_EDGE_SDK = Build.VERSION_CODES.VANILLA_ICE_CREAM;
+
+    private SystemUiChromeSupport() {}
+
+    static boolean requiresEdgeToEdgeChrome(int sdkInt) {
+        return sdkInt >= EDGE_TO_EDGE_SDK;
+    }
+
+    static boolean shouldApplyLegacySystemBarColors(int sdkInt) {
+        return sdkInt < EDGE_TO_EDGE_SDK;
+    }
+
+    static boolean shouldUsePreApi30LayoutFlags(int sdkInt) {
+        return sdkInt < Build.VERSION_CODES.R;
+    }
+
+    static boolean usesLayoutBehindNavigationBar(int sdkInt, boolean edgeToEdge) {
+        return !edgeToEdge && shouldUsePreApi30LayoutFlags(sdkInt);
+    }
+
+    static void setDecorFitsSystemWindows(Window window, boolean decorFitsSystemWindows) {
+        if (window == null) {
+            return;
+        }
+        WindowCompat.setDecorFitsSystemWindows(window, decorFitsSystemWindows);
+    }
+
+    static void prepareInitialDialogWindow(Window window) {
+        if (window == null) {
+            return;
+        }
+
+        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        if (shouldApplyLegacySystemBarColors(Build.VERSION.SDK_INT)) {
+            applyLegacySystemBarColors(window, Color.TRANSPARENT, null);
+            clearLegacyTranslucentStatusFlag(window);
+        }
+    }
+
+    static void applyDialogWindowChrome(
+        Window window,
+        View decorView,
+        boolean edgeToEdge,
+        Integer statusBarColor,
+        Integer navigationBarColor,
+        Boolean lightStatusBars
+    ) {
+        if (window == null || decorView == null) {
+            return;
+        }
+
+        if (edgeToEdge) {
+            setDecorFitsSystemWindows(window, false);
+        } else if (!shouldUsePreApi30LayoutFlags(Build.VERSION.SDK_INT)) {
+            setDecorFitsSystemWindows(window, true);
+            applyLegacySystemBarColors(window, statusBarColor, navigationBarColor);
+        } else {
+            applyPreApi30LayoutBehindNavigationBar(decorView);
+            applyLegacySystemBarColors(window, statusBarColor, navigationBarColor);
+        }
+
+        WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, decorView);
+        if (lightStatusBars != null) {
+            controller.setAppearanceLightStatusBars(lightStatusBars);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void applyPreApi30LayoutBehindNavigationBar(View decorView) {
+        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+    }
+
+    @SuppressWarnings("deprecation")
+    static void applyLegacySystemBarColors(Window window, Integer statusBarColor, Integer navigationBarColor) {
+        if (window == null || !shouldApplyLegacySystemBarColors(Build.VERSION.SDK_INT)) {
+            return;
+        }
+
+        if (statusBarColor != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.setStatusBarColor(statusBarColor);
+        }
+        if (navigationBarColor != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.setNavigationBarColor(navigationBarColor);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void clearLegacyTranslucentStatusFlag(Window window) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+    }
+}

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

@@ -69,7 +69,9 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
+import androidx.activity.ComponentActivity;
 import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.FileProvider;
@@ -409,10 +411,11 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
     private boolean preShowInjectedAtDocumentStart = false;
 
     public PermissionRequest currentPermissionRequest;
-    public static final int FILE_CHOOSER_REQUEST_CODE = 1000;
     public ValueCallback<Uri> mUploadMessage;
     public ValueCallback<Uri[]> mFilePathCallback;
     FileChooserRequestSupport.FileChooserRequest activeFileChooserRequest;
+    private ActivityResultLauncher<Intent> cameraCaptureLauncher;
+    private ActivityResultLauncher<Intent> fileChooserLauncher;
     private boolean openWebViewResolved;
     private boolean isDismissing = false;
     private PermissionRequest pendingCameraLaunchPermissionRequest;
@@ -447,6 +450,11 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         this.instanceId = id != null ? id : "";
     }
 
+    void bindToHostActivity() {
+        ensureFileChooserLaunchers();
+        registerDialogBackHandler();
+    }
+
     public String getInstanceId() {
         return instanceId;
     }
@@ -2116,10 +2124,6 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
     public void presentWebView() {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setCancelable(true);
-        Objects.requireNonNull(getWindow()).setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        );
         setContentView(R.layout.activity_browser);
 
         // If custom dimensions are set, configure for touch passthrough
@@ -2143,18 +2147,10 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             if (appBar != null) appBar.setFitsSystemWindows(true);
         }
 
-        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-        // Make status bar transparent
-        if (getWindow() != null) {
-            getWindow().setStatusBarColor(Color.TRANSPARENT);
-
-            // Add FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS flag to the window
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        // Set dimensions if specified, otherwise fullscreen
+        applyDimensions();
 
-            // On Android 30+ clear FLAG_TRANSLUCENT_STATUS flag
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-        }
+        SystemUiChromeSupport.prepareInitialDialogWindow(getWindow());
 
         WindowInsetsControllerCompat insetsController = new WindowInsetsControllerCompat(
             getWindow(),
@@ -2206,9 +2202,6 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                 });
         }
 
-        // Set dimensions if specified, otherwise fullscreen
-        applyDimensions();
-
         this._webView = findViewById(R.id.browser_view);
 
         this.swipeRefreshLayout = findViewById(R.id.content_browser_layout);
@@ -2583,38 +2576,12 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                                 }
 
                                 try {
-                                    if (activity instanceof androidx.activity.ComponentActivity) {
-                                        androidx.activity.ComponentActivity componentActivity =
-                                            (androidx.activity.ComponentActivity) activity;
-                                        componentActivity
-                                            .getActivityResultRegistry()
-                                            .register(
-                                                "camera_capture",
-                                                new androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult(),
-                                                (result) -> {
-                                                    if (!FileChooserRequestSupport.isActive(request, activeFileChooserRequest)) {
-                                                        return;
-                                                    }
-                                                    Uri[] results = null;
-                                                    if (result.getResultCode() == Activity.RESULT_OK && request.tempCameraUri != null) {
-                                                        results = new Uri[] { request.tempCameraUri };
-                                                    }
-                                                    if (
-                                                        FileChooserRequestSupport.completeIfActive(
-                                                            request,
-                                                            activeFileChooserRequest,
-                                                            results
-                                                        )
-                                                    ) {
-                                                        request.tempCameraUri = null;
-                                                        clearActiveFileChooserRequest(request);
-                                                    }
-                                                }
-                                            )
-                                            .launch(takePictureIntent);
+                                    ensureFileChooserLaunchers();
+                                    if (cameraCaptureLauncher != null) {
+                                        cameraCaptureLauncher.launch(takePictureIntent);
                                     } else {
-                                        // Fallback for non-ComponentActivity
-                                        activity.startActivityForResult(takePictureIntent, FILE_CHOOSER_REQUEST_CODE);
+                                        Log.e("InAppBrowser", "ComponentActivity required for camera capture, falling back to file picker");
+                                        fallbackToFilePicker(request);
                                     }
                                 } catch (SecurityException e) {
                                     Log.e("InAppBrowser", "Security exception launching camera: " + e.getMessage(), e);
@@ -2887,6 +2854,52 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         registerConfigurationCallbacks();
     }
 
+    private void registerDialogBackHandler() {
+        setOnKeyListener((dialogInterface, keyCode, event) -> {
+            if (keyCode != KeyEvent.KEYCODE_BACK) {
+                return false;
+            }
+            if (event.getAction() != KeyEvent.ACTION_UP) {
+                return true;
+            }
+            if (!shouldConsumeBackPress()) {
+                return false;
+            }
+            handleBrowserBackNavigation();
+            return true;
+        });
+    }
+
+    private boolean shouldConsumeBackPress() {
+        return isShowing() && !isHiddenModeActive && !backLayerActive;
+    }
+
+    private void handleBrowserBackNavigation() {
+        if (_options == null) {
+            dismiss();
+            return;
+        }
+
+        if (
+            _webView != null &&
+            _webView.canGoBack() &&
+            (TextUtils.equals(_options.getToolbarType(), "navigation") || _options.getActiveNativeNavigationForWebview())
+        ) {
+            _webView.goBack();
+            return;
+        }
+
+        if (_options.getDisableGoBackOnNativeApplication()) {
+            return;
+        }
+
+        String currentUrl = getUrl();
+        if (_options.getCallbacks() != null) {
+            _options.getCallbacks().closeEvent(currentUrl);
+        }
+        dismiss();
+    }
+
     private void applyHiddenMode() {
         Window window = getWindow();
         if (window == null) {
@@ -3033,7 +3046,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         }
 
         // Check if we need Android 15+ specific fixes
-        boolean isAndroid15Plus = Build.VERSION.SDK_INT >= 35;
+        boolean isAndroid15Plus = SystemUiChromeSupport.requiresEdgeToEdgeChrome(Build.VERSION.SDK_INT);
 
         View toolbarView = findViewById(R.id.tool_bar);
 
@@ -3062,69 +3075,54 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
 
         // Handle window decoration - version-specific handling
         if (getWindow() != null) {
-            if (isAndroid15Plus) {
-                // Android 15+: Use edge-to-edge with proper insets handling
-                getWindow().setDecorFitsSystemWindows(false);
-                getWindow().setStatusBarColor(Color.TRANSPARENT);
-                getWindow().setNavigationBarColor(Color.TRANSPARENT);
-
-                WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
+            View decorView = getWindow().getDecorView();
+            Integer statusBarColor = null;
+            Integer navigationBarColor = Color.TRANSPARENT;
+            Boolean lightStatusBars = null;
 
-                // Set status bar text color
+            if (isAndroid15Plus) {
                 if (_options.getToolbarColor() != null && !_options.getToolbarColor().isEmpty()) {
                     try {
                         int backgroundColor = Color.parseColor(_options.getToolbarColor());
-                        boolean isDarkBackground = isDarkColor(backgroundColor);
-                        controller.setAppearanceLightStatusBars(!isDarkBackground);
+                        lightStatusBars = !isDarkColor(backgroundColor);
                     } catch (IllegalArgumentException e) {
                         // Ignore color parsing errors
                     }
                 }
-            } else if (Build.VERSION.SDK_INT >= 30) {
-                // Android 11-14: Keep navigation bar transparent but respect status bar
-                getWindow().setNavigationBarColor(Color.TRANSPARENT);
-
-                WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
-
-                // Set status bar color to match toolbar or use system default
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 if (_options.getToolbarColor() != null && !_options.getToolbarColor().isEmpty()) {
                     try {
                         int toolbarColor = Color.parseColor(_options.getToolbarColor());
-                        getWindow().setStatusBarColor(toolbarColor);
-                        boolean isDarkBackground = isDarkColor(toolbarColor);
-                        controller.setAppearanceLightStatusBars(!isDarkBackground);
+                        statusBarColor = toolbarColor;
+                        lightStatusBars = !isDarkColor(toolbarColor);
                     } catch (IllegalArgumentException e) {
-                        // Follow system theme if color parsing fails
                         boolean isDarkTheme = isDarkThemeEnabled();
-                        int statusBarColor = isDarkTheme ? Color.BLACK : Color.WHITE;
-                        getWindow().setStatusBarColor(statusBarColor);
-                        controller.setAppearanceLightStatusBars(!isDarkTheme);
+                        statusBarColor = isDarkTheme ? Color.BLACK : Color.WHITE;
+                        lightStatusBars = !isDarkTheme;
                     }
                 } else {
-                    // Follow system theme if no toolbar color provided
                     boolean isDarkTheme = isDarkThemeEnabled();
-                    int statusBarColor = isDarkTheme ? Color.BLACK : Color.WHITE;
-                    getWindow().setStatusBarColor(statusBarColor);
-                    controller.setAppearanceLightStatusBars(!isDarkTheme);
+                    statusBarColor = isDarkTheme ? Color.BLACK : Color.WHITE;
+                    lightStatusBars = !isDarkTheme;
                 }
             } else {
-                // Pre-Android 11: Use deprecated flags for edge-to-edge navigation bar only
-                getWindow()
-                    .getDecorView()
-                    .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
-
-                getWindow().setNavigationBarColor(Color.TRANSPARENT);
-
-                // Set status bar color to match toolbar
                 if (_options.getToolbarColor() != null && !_options.getToolbarColor().isEmpty()) {
                     try {
-                        int toolbarColor = Color.parseColor(_options.getToolbarColor());
-                        getWindow().setStatusBarColor(toolbarColor);
+                        statusBarColor = Color.parseColor(_options.getToolbarColor());
                     } catch (IllegalArgumentException e) {
                         // Use system default
                     }
                 }
             }
+
+            SystemUiChromeSupport.applyDialogWindowChrome(
+                getWindow(),
+                decorView,
+                isAndroid15Plus,
+                statusBarColor,
+                navigationBarColor,
+                lightStatusBars
+            );
         }
 
         requestSafeAreaInsets();
@@ -3443,7 +3441,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             return;
         }
 
-        boolean isAndroid15Plus = Build.VERSION.SDK_INT >= 35;
+        boolean isAndroid15Plus = SystemUiChromeSupport.requiresEdgeToEdgeChrome(Build.VERSION.SDK_INT);
         View toolbarView = findBrowserContentDescendant(R.id.tool_bar);
         applyWindowInsetsToWebView(windowInsets, isAndroid15Plus, toolbarView);
     }
@@ -3515,7 +3513,13 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             return;
         }
 
-        boolean applyBottomInset = SafeAreaInsetsSupport.shouldInsetBottomForContainer(_options.getEnabledSafeMargin(), isEdgeToEdge);
+        boolean layoutBehindNavigationBar =
+            !backLayerActive && SystemUiChromeSupport.usesLayoutBehindNavigationBar(Build.VERSION.SDK_INT, isEdgeToEdge);
+        boolean applyBottomInset = SafeAreaInsetsSupport.shouldInsetBottomForContainer(
+            _options.getEnabledSafeMargin(),
+            isEdgeToEdge,
+            layoutBehindNavigationBar
+        );
         int statusBarTop = SafeAreaInsetsSupport.resolveStatusBarTop(
             bars.top,
             bars.bottom,
@@ -4086,6 +4090,88 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         }
     }
 
+    private void ensureFileChooserLaunchers() {
+        if (!(activity instanceof ComponentActivity componentActivity)) {
+            return;
+        }
+        if (fileChooserLauncher != null && cameraCaptureLauncher != null) {
+            return;
+        }
+
+        String launcherSuffix = (instanceId != null && !instanceId.isEmpty() ? instanceId + "_" : "") + Integer.toHexString(hashCode());
+        if (cameraCaptureLauncher == null) {
+            cameraCaptureLauncher = componentActivity
+                .getActivityResultRegistry()
+                .register(
+                    "inappbrowser_camera_capture_" + launcherSuffix,
+                    new ActivityResultContracts.StartActivityForResult(),
+                    this::handleCameraCaptureActivityResult
+                );
+        }
+        if (fileChooserLauncher == null) {
+            fileChooserLauncher = componentActivity
+                .getActivityResultRegistry()
+                .register(
+                    "inappbrowser_file_chooser_" + launcherSuffix,
+                    new ActivityResultContracts.StartActivityForResult(),
+                    this::handleFileChooserActivityResult
+                );
+        }
+    }
+
+    private void clearActivityResultLaunchers() {
+        if (cameraCaptureLauncher != null) {
+            cameraCaptureLauncher.unregister();
+            cameraCaptureLauncher = null;
+        }
+        if (fileChooserLauncher != null) {
+            fileChooserLauncher.unregister();
+            fileChooserLauncher = null;
+        }
+    }
+
+    private void handleCameraCaptureActivityResult(ActivityResult result) {
+        FileChooserRequestSupport.FileChooserRequest request = activeFileChooserRequest;
+        if (!FileChooserRequestSupport.isActive(request, activeFileChooserRequest)) {
+            return;
+        }
+
+        Uri[] results = null;
+        if (result.getResultCode() == Activity.RESULT_OK && request.tempCameraUri != null) {
+            results = new Uri[] { request.tempCameraUri };
+        }
+        if (FileChooserRequestSupport.completeIfActive(request, activeFileChooserRequest, results)) {
+            request.tempCameraUri = null;
+            clearActiveFileChooserRequest(request);
+        }
+    }
+
+    private void handleFileChooserActivityResult(ActivityResult result) {
+        FileChooserRequestSupport.FileChooserRequest request = activeFileChooserRequest;
+        if (!FileChooserRequestSupport.isActive(request, activeFileChooserRequest)) {
+            return;
+        }
+
+        Uri[] results = null;
+        if (result.getResultCode() == Activity.RESULT_OK) {
+            Intent data = result.getData();
+            if (data != null) {
+                if (data.getClipData() != null) {
+                    int count = data.getClipData().getItemCount();
+                    results = new Uri[count];
+                    for (int i = 0; i < count; i++) {
+                        results[i] = data.getClipData().getItemAt(i).getUri();
+                    }
+                } else if (data.getData() != null) {
+                    results = new Uri[] { data.getData() };
+                }
+            }
+        }
+        if (FileChooserRequestSupport.completeIfActive(request, activeFileChooserRequest, results)) {
+            clearActiveFileChooserRequest(request);
+        }
+    }
+
     private void beginFileChooserRequest(ValueCallback<Uri[]> filePathCallback, String[] acceptTypes, boolean isMultiple) {
         if (activeFileChooserRequest != null) {
             FileChooserRequestSupport.cancel(activeFileChooserRequest);
@@ -4106,17 +4192,6 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         tempCameraUri = activeFileChooserRequest != null ? activeFileChooserRequest.tempCameraUri : null;
     }
 
-    void completeLegacyFileChooserResult(Uri[] results) {
-        FileChooserRequestSupport.FileChooserRequest request = activeFileChooserRequest;
-        if (request == null) {
-            return;
-        }
-        if (FileChooserRequestSupport.completeIfActive(request, activeFileChooserRequest, results)) {
-            request.tempCameraUri = null;
-            clearActiveFileChooserRequest(request);
-        }
-    }
-
     private void openFileChooser(FileChooserRequestSupport.FileChooserRequest request) {
         if (!FileChooserRequestSupport.isActive(request, activeFileChooserRequest)) {
             return;
@@ -4127,88 +4202,14 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         Log.d("InAppBrowser", "File picker using action: " + intent.getAction() + ", MIME types: " + mimeTypes);
 
         try {
-            if (activity instanceof androidx.activity.ComponentActivity) {
-                androidx.activity.ComponentActivity componentActivity = (androidx.activity.ComponentActivity) activity;
-                componentActivity
-                    .getActivityResultRegistry()
-                    .register(
-                        "file_chooser",
-                        new androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult(),
-                        (result) -> {
-                            if (!FileChooserRequestSupport.isActive(request, activeFileChooserRequest)) {
-                                return;
-                            }
-                            Uri[] results = null;
-                            if (result.getResultCode() == Activity.RESULT_OK) {
-                                Intent data = result.getData();
-                                if (data != null) {
-                                    if (data.getClipData() != null) {
-                                        // Handle multiple files
-                                        int count = data.getClipData().getItemCount();
-                                        results = new Uri[count];
-                                        for (int i = 0; i < count; i++) {
-                                            results[i] = data.getClipData().getItemAt(i).getUri();
-                                        }
-                                    } else if (data.getData() != null) {
-                                        // Handle single file
-                                        results = new Uri[] { data.getData() };
-                                    }
-                                }
-                            }
-                            if (FileChooserRequestSupport.completeIfActive(request, activeFileChooserRequest, results)) {
-                                clearActiveFileChooserRequest(request);
-                            }
-                        }
-                    )
-                    .launch(Intent.createChooser(intent, "Select File"));
-            } else {
-                // Fallback for non-ComponentActivity
-                activity.startActivityForResult(Intent.createChooser(intent, "Select File"), FILE_CHOOSER_REQUEST_CODE);
-            }
+            launchFileChooserIntent(Intent.createChooser(intent, "Select File"), request);
         } catch (ActivityNotFoundException e) {
             // If no app can handle the specific MIME type, try with a more generic one
             Log.e("InAppBrowser", "No app available for types: " + mimeTypes + ", trying with */*");
             intent.setType("*/*");
             intent.removeExtra(Intent.EXTRA_MIME_TYPES);
             try {
-                if (activity instanceof androidx.activity.ComponentActivity) {
-                    androidx.activity.ComponentActivity componentActivity = (androidx.activity.ComponentActivity) activity;
-                    componentActivity
-                        .getActivityResultRegistry()
-                        .register(
-                            "file_chooser",
-                            new androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult(),
-                            (result) -> {
-                                if (!FileChooserRequestSupport.isActive(request, activeFileChooserRequest)) {
-                                    return;
-                                }
-                                Uri[] results = null;
-                                if (result.getResultCode() == Activity.RESULT_OK) {
-                                    Intent data = result.getData();
-                                    if (data != null) {
-                                        if (data.getClipData() != null) {
-                                            // Handle multiple files
-                                            int count = data.getClipData().getItemCount();
-                                            results = new Uri[count];
-                                            for (int i = 0; i < count; i++) {
-                                                results[i] = data.getClipData().getItemAt(i).getUri();
-                                            }
-                                        } else if (data.getData() != null) {
-                                            // Handle single file
-                                            results = new Uri[] { data.getData() };
-                                        }
-                                    }
-                                }
-                                if (FileChooserRequestSupport.completeIfActive(request, activeFileChooserRequest, results)) {
-                                    clearActiveFileChooserRequest(request);
-                                }
-                            }
-                        )
-                        .launch(Intent.createChooser(intent, "Select File"));
-                } else {
-                    // Fallback for non-ComponentActivity
-                    activity.startActivityForResult(Intent.createChooser(intent, "Select File"), FILE_CHOOSER_REQUEST_CODE);
-                }
+                launchFileChooserIntent(Intent.createChooser(intent, "Select File"), request);
             } catch (ActivityNotFoundException ex) {
                 // If still failing, report error
                 Log.e("InAppBrowser", "No app can handle file picker", ex);
@@ -4219,6 +4220,18 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         }
     }
 
+    private void launchFileChooserIntent(Intent chooserIntent, FileChooserRequestSupport.FileChooserRequest request) {
+        ensureFileChooserLaunchers();
+        if (fileChooserLauncher == null) {
+            Log.e("InAppBrowser", "ComponentActivity required for file chooser");
+            if (FileChooserRequestSupport.cancelIfActive(request, activeFileChooserRequest)) {
+                clearActiveFileChooserRequest(request);
+            }
+            return;
+        }
+        fileChooserLauncher.launch(chooserIntent);
+    }
+
     public void reload() {
         if (_webView == null) {
             Log.w("InAppBrowser", "Cannot reload - WebView is null");
@@ -4700,8 +4713,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
 
                 // Also ensure status bar gets the color
                 if (getWindow() != null) {
-                    // Set status bar color
-                    getWindow().setStatusBarColor(toolbarColor);
+                    SystemUiChromeSupport.applyLegacySystemBarColors(getWindow(), toolbarColor, null);
 
                     // Determine proper status bar text color (light or dark icons)
                     boolean isDarkBackground = isDarkColor(toolbarColor);
@@ -6165,21 +6177,6 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         return false;
     }
 
-    @Override
-    public void onBackPressed() {
-        if (
-            _webView != null &&
-            _webView.canGoBack() &&
-            (TextUtils.equals(_options.getToolbarType(), "navigation") || _options.getActiveNativeNavigationForWebview())
-        ) {
-            _webView.goBack();
-        } else if (!_options.getDisableGoBackOnNativeApplication()) {
-            String currentUrl = getUrl();
-            _options.getCallbacks().closeEvent(currentUrl);
-            super.onBackPressed();
-        }
-    }
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         // Forward volume key events to the MainActivity
@@ -6384,6 +6381,8 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         // Clear any remaining proxied requests
         proxiedRequestsHashmap.clear();
 
+        clearActivityResultLaunchers();
+
         try {
             super.dismiss();
         } catch (Exception e) {

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.15.3"
+    private let pluginVersion: String = "8.15.4"
     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.15.3",
+  "version": "8.15.4",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",