Close current tab if Fire mode unsupported and mode is FIRE

Author: 0nko

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -3995,7 +3995,13 @@ class BrowserTabFragment :
                 ).findViewById<DuckDuckGoWebView>(R.id.browserWebView)
 
         webView?.let {
-            webViewModeInitializer.bind(it, browserMode)
+            if (webViewModeInitializer.bind(it, browserMode).isFailure) {
+                if (browserMode != BrowserMode.REGULAR) {
+                    logcat(ERROR) { "Attempting to open a FIRE tab while Fire mode is unsupported." }
+                    this.closeCurrentTab()
+                    return
+                }
+            }
 
             it.webViewClient = webViewClient
             it.webChromeClient = webChromeClient

browser-mode/browser-mode-impl/src/main/java/com/duckduckgo/browsermode/impl/RealWebViewModeInitializer.kt

@@ -37,16 +37,12 @@ class RealWebViewModeInitializer @Inject constructor(
 ) : WebViewModeInitializer {
     override fun bind(webView: WebView, mode: BrowserMode): Result<Unit> {
         if (!fireModeAvailability.isAvailable()) {
-            return if (mode != BrowserMode.REGULAR) {
-                Result.failure(
-                    IllegalStateException(
-                        "Attempting to bind a WebView profile to " +
-                            "Fire mode when the Fire mode feature is not available.",
-                    ),
-                )
-            } else {
-                Result.success(Unit)
-            }
+            return Result.failure(
+                IllegalStateException(
+                    "Attempting to bind a WebView profile to " +
+                        "Fire mode when the Fire mode feature is not available.",
+                ),
+            )
         }
         return runCatching {
             webViewProfileBinder.bind(webView, mode.profileName)