@capgo/capacitor-inappbrowser 8.15.3 → 8.16.2

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

@@ -69,7 +69,10 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
+import androidx.activity.ComponentActivity;
+import androidx.activity.OnBackPressedCallback;
 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;
@@ -335,6 +338,12 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
     private SwipeRefreshLayout swipeRefreshLayout;
     private boolean reloadFromGestureInProgress = false;
     private WebView _webView;
+    // HTML5/iframe fullscreen (e.g. embedded YouTube) routes through WebChromeClient custom views.
+    private View customFullscreenView;
+    private WebChromeClient.CustomViewCallback customViewCallback;
+    private FrameLayout fullscreenContainer;
+    private Window customFullscreenWindow;
+    private OnBackPressedCallback customFullscreenBackCallback;
     private Toolbar _toolbar;
     private Options _options = null;
     private final Context _context;
@@ -409,10 +418,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 +457,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 +2131,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 +2154,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 +2209,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);
@@ -2250,13 +2250,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         if (!_options.getPersistWebViewData()) {
             _webView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
             _webView.getSettings().setDatabaseEnabled(false);
-            _webView.getSettings().setDomStorageEnabled(false);
             _webView.clearCache(true);
             _webView.clearHistory();
             _webView.clearFormData();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                CookieManager.getInstance().setAcceptThirdPartyCookies(_webView, false);
-            }
         }
         _webView.getSettings().setMediaPlaybackRequiresUserGesture(false);
         injectDocumentStartJavaScriptInterface();
@@ -2316,6 +2312,17 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                     return super.onConsoleMessage(consoleMessage);
                 }
 
+                // Enable HTML5/iframe fullscreen (e.g. embedded YouTube player fullscreen button).
+                @Override
+                public void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) {
+                    showCustomFullscreenView(view, callback);
+                }
+
+                @Override
+                public void onHideCustomView() {
+                    exitCustomFullscreenView();
+                }
+
                 // Enable file open dialog
                 @Override
                 public boolean onShowFileChooser(
@@ -2583,38 +2590,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);
@@ -2817,6 +2798,15 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         Map<String, String> requestHeaders = buildRequestHeadersExcludingUserAgent();
         applyWebViewUserAgent();
 
+        if (_options.getClearCookiesOnOpen() || _options.getClearCacheOnOpen()) {
+            OpenTimeBrowsingDataClearSupport.applyBeforeFirstNavigation(
+                CookieManager.getInstance(),
+                _webView,
+                _options.getClearCookiesOnOpen(),
+                _options.getClearCacheOnOpen()
+            );
+        }
+
         // Load URL with optional HTTP method and body
         String httpMethod = _options.getHttpMethod();
         String httpBody = _options.getHttpBody();
@@ -2887,6 +2877,171 @@ 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 (WebViewCustomFullscreenSupport.shouldConsumeBackPress(customFullscreenView != null)) {
+            exitCustomFullscreenView();
+            return;
+        }
+
+        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();
+    }
+
+    // Shows a native fullscreen view requested via the HTML5 Fullscreen API (e.g. embedded YouTube).
+    private void showCustomFullscreenView(View view, WebChromeClient.CustomViewCallback callback) {
+        if (WebViewCustomFullscreenSupport.shouldRejectDuplicateShow(customFullscreenView != null)) {
+            callback.onCustomViewHidden();
+            return;
+        }
+
+        Window window = resolveCustomFullscreenWindow();
+        View decorView = window != null ? window.getDecorView() : null;
+        if (!(decorView instanceof ViewGroup)) {
+            callback.onCustomViewHidden();
+            return;
+        }
+
+        customFullscreenView = view;
+        customViewCallback = callback;
+        customFullscreenWindow = window;
+
+        if (fullscreenContainer == null) {
+            fullscreenContainer = new FrameLayout(getContext());
+            fullscreenContainer.setBackgroundColor(Color.BLACK);
+        } else if (fullscreenContainer.getParent() instanceof ViewGroup oldParent) {
+            oldParent.removeView(fullscreenContainer);
+        }
+        ((ViewGroup) decorView).addView(
+            fullscreenContainer,
+            new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        );
+        fullscreenContainer.addView(
+            view,
+            new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        );
+        fullscreenContainer.setVisibility(View.VISIBLE);
+
+        if (_webView != null) {
+            _webView.setVisibility(View.INVISIBLE);
+        }
+
+        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        decorView.setSystemUiVisibility(WebViewCustomFullscreenSupport.immersiveFullscreenSystemUiVisibility());
+
+        if (WebViewCustomFullscreenSupport.shouldRegisterHostBackHandler(backLayerActive)) {
+            registerCustomFullscreenBackHandler();
+        }
+    }
+
+    private Window resolveCustomFullscreenWindow() {
+        if (WebViewCustomFullscreenSupport.shouldUseHostActivityWindow(backLayerActive) && activity != null) {
+            Window hostWindow = activity.getWindow();
+            if (hostWindow != null) {
+                return hostWindow;
+            }
+        }
+        return getWindow();
+    }
+
+    private void registerCustomFullscreenBackHandler() {
+        if (!(activity instanceof ComponentActivity componentActivity) || customFullscreenBackCallback != null) {
+            return;
+        }
+        customFullscreenBackCallback = new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (WebViewCustomFullscreenSupport.isCustomFullscreenActive(customFullscreenView)) {
+                    exitCustomFullscreenView();
+                }
+            }
+        };
+        componentActivity.getOnBackPressedDispatcher().addCallback(componentActivity, customFullscreenBackCallback);
+    }
+
+    private void unregisterCustomFullscreenBackHandler() {
+        if (customFullscreenBackCallback != null) {
+            customFullscreenBackCallback.remove();
+            customFullscreenBackCallback = null;
+        }
+    }
+
+    private void exitCustomFullscreenView() {
+        if (!WebViewCustomFullscreenSupport.isCustomFullscreenActive(customFullscreenView)) {
+            return;
+        }
+
+        if (fullscreenContainer != null) {
+            fullscreenContainer.removeView(customFullscreenView);
+            fullscreenContainer.setVisibility(View.GONE);
+            if (fullscreenContainer.getParent() instanceof ViewGroup parent) {
+                parent.removeView(fullscreenContainer);
+            }
+        }
+        if (_webView != null) {
+            _webView.setVisibility(View.VISIBLE);
+        }
+
+        Window window = customFullscreenWindow != null ? customFullscreenWindow : getWindow();
+        if (window != null) {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            window.getDecorView().setSystemUiVisibility(WebViewCustomFullscreenSupport.restoredSystemUiVisibility());
+            reapplyInsetsFromWindowRoot();
+            if (SystemUiChromeSupport.requiresEdgeToEdgeChrome(Build.VERSION.SDK_INT)) {
+                refreshEdgeToEdgeChrome();
+            }
+        }
+
+        unregisterCustomFullscreenBackHandler();
+
+        if (customViewCallback != null) {
+            customViewCallback.onCustomViewHidden();
+        }
+        customFullscreenView = null;
+        customViewCallback = null;
+        customFullscreenWindow = null;
+    }
+
     private void applyHiddenMode() {
         Window window = getWindow();
         if (window == null) {
@@ -3033,7 +3188,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 +3217,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 +3583,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 +3655,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,
@@ -3570,7 +3716,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
             container.setPadding(bars.left, padTop, bars.right, padBottom);
         }
 
-        injectSafeAreaCssVariables(padTop, padBottom, bars.left, bars.right);
+        int cssTop = SafeAreaInsetsSupport.cssTopInset(_options.getEnabledSafeTopMargin(), padTop);
+        int cssBottom = SafeAreaInsetsSupport.cssBottomInset(_options.getEnabledSafeMargin(), safeBottomInset);
+        injectSafeAreaCssVariables(cssTop, cssBottom, bars.left, bars.right);
     }
 
     private void configureBlankToolbarLayout() {
@@ -4086,6 +4234,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 +4336,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 +4346,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 +4364,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 +4857,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 +6321,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
@@ -6256,6 +6397,7 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
 
     @Override
     public void dismiss() {
+        exitCustomFullscreenView();
         unregisterConfigurationCallbacks();
         scheduleHostWebViewInsetRestore();
         detachBackLayer();
@@ -6384,6 +6526,8 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         // Clear any remaining proxied requests
         proxiedRequestsHashmap.clear();
 
+        clearActivityResultLaunchers();
+
         try {
             super.dismiss();
         } catch (Exception e) {