Fix onboarding bug

Author: CrisBarreiro

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

@@ -1041,60 +1041,58 @@ class BrowserTabFragment :
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        lifecycleScope.launch {
-            omnibar = Omnibar(
-                omnibarType = settingsDataStore.omnibarType,
-                binding = binding,
-                isUnifiedOmnibarEnabled = omnibarRepository.isUnifiedOmnibarLayoutEnabled,
-            )
-            webViewContainer = binding.webViewContainer
-            viewModel.registerWebViewListener(webViewClient, webChromeClient)
-            configureWebView()
-            configureSwipeRefresh()
-            configureAutoComplete()
-            configureNewTab()
-            initPrivacyProtectionsPopup()
-            createPopupMenu()
-
-            configureNavigationBar()
-            configureOmnibar()
-
-            configureObservers()
-
-            if (savedInstanceState == null) {
-                viewModel.onViewReady()
-                viewModel.setIsCustomTab(tabDisplayedInCustomTabScreen)
-                messageFromPreviousTab?.let {
-                    processMessage(it)
-                }
-            } else {
-                viewModel.onViewRecreated()
+        omnibar = Omnibar(
+            omnibarType = settingsDataStore.omnibarType,
+            binding = binding,
+            isUnifiedOmnibarEnabled = omnibarRepository.isUnifiedOmnibarLayoutEnabled,
+        )
+
+        webViewContainer = binding.webViewContainer
+        configureObservers()
+        viewModel.registerWebViewListener(webViewClient, webChromeClient)
+        configureWebView()
+        configureSwipeRefresh()
+        configureAutoComplete()
+        configureNewTab()
+        initPrivacyProtectionsPopup()
+        createPopupMenu()
+
+        configureNavigationBar()
+        configureOmnibar()
+
+        if (savedInstanceState == null) {
+            viewModel.onViewReady()
+            viewModel.setIsCustomTab(tabDisplayedInCustomTabScreen)
+            messageFromPreviousTab?.let {
+                processMessage(it)
             }
+        } else {
+            viewModel.onViewRecreated()
+        }
 
-            lifecycle.addObserver(
-                @SuppressLint("NoLifecycleObserver") // we don't observe app lifecycle
-                object : DefaultLifecycleObserver {
-                    override fun onStop(owner: LifecycleOwner) {
-                        if (isVisible) {
-                            if (viewModel.browserViewState.value?.maliciousSiteBlocked != true) {
-                                updateOrDeleteWebViewPreview()
-                            }
+        lifecycle.addObserver(
+            @SuppressLint("NoLifecycleObserver") // we don't observe app lifecycle
+            object : DefaultLifecycleObserver {
+                override fun onStop(owner: LifecycleOwner) {
+                    if (isVisible) {
+                        if (viewModel.browserViewState.value?.maliciousSiteBlocked != true) {
+                            updateOrDeleteWebViewPreview()
                         }
                     }
-                },
-            )
-
-            childFragmentManager.findFragmentByTag(ADD_SAVED_SITE_FRAGMENT_TAG)?.let { dialog ->
-                (dialog as EditSavedSiteDialogFragment).listener = viewModel
-                dialog.deleteBookmarkListener = viewModel
-            }
+                }
+            },
+        )
 
-            if (swipingTabsFeature.isEnabled) {
-                disableSwipingOutsideTheOmnibar()
-            }
+        childFragmentManager.findFragmentByTag(ADD_SAVED_SITE_FRAGMENT_TAG)?.let { dialog ->
+            (dialog as EditSavedSiteDialogFragment).listener = viewModel
+            dialog.deleteBookmarkListener = viewModel
+        }
 
-            launchDownloadMessagesJob()
+        if (swipingTabsFeature.isEnabled) {
+            disableSwipingOutsideTheOmnibar()
         }
+
+        launchDownloadMessagesJob()
     }
 
     private fun updateOrDeleteWebViewPreview() {
@@ -2103,9 +2101,7 @@ class BrowserTabFragment :
             }
 
             is Command.ResetHistory -> {
-                lifecycleScope.launch {
-                    resetWebView()
-                }
+                resetWebView()
             }
 
             is Command.LaunchPrivacyPro -> {
@@ -3186,7 +3182,7 @@ class BrowserTabFragment :
     }
 
     @SuppressLint("SetJavaScriptEnabled")
-    private suspend fun configureWebView() {
+    private fun configureWebView() {
         if (!onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
             binding.daxDialogOnboardingCtaContent.layoutTransition = LayoutTransition()
             binding.daxDialogOnboardingCtaContent.layoutTransition.enableTransitionType(LayoutTransition.CHANGING)
@@ -3211,8 +3207,10 @@ class BrowserTabFragment :
             it.clearSslPreferences()
 
             it.settings.apply {
-                clientBrandHintProvider.setDefault(this)
-                webViewClient.clientProvider = clientBrandHintProvider
+                lifecycleScope.launch {
+                    clientBrandHintProvider.setDefault(this@apply)
+                    webViewClient.clientProvider = clientBrandHintProvider
+                }
                 userAgentString = userAgentProvider.userAgent()
                 javaScriptEnabled = true
                 domStorageEnabled = true
@@ -3275,11 +3273,14 @@ class BrowserTabFragment :
                 onSignedInEmailProtectionPromptShown = { viewModel.showEmailProtectionChooseEmailPrompt() },
                 onInContextEmailProtectionSignupPromptShown = { showNativeInContextEmailProtectionSignupPrompt() },
             )
-            configureWebViewForBlobDownload(it)
-            webViewCompatTestHelper.configureWebViewForWebViewCompatTest(
-                it,
-                isBlobDownloadWebViewFeatureEnabled(it),
-            )
+            lifecycleScope.launch {
+                configureWebViewForBlobDownload(it)
+                webViewCompatTestHelper.configureWebViewForWebViewCompatTest(
+                    it,
+                    isBlobDownloadWebViewFeatureEnabled(it),
+                )
+            }
+
             configureWebViewForAutofill(it)
             printInjector.addJsInterface(it) { viewModel.printFromWebView() }
             autoconsent.addJsInterface(it, autoconsentCallback)
@@ -3315,9 +3316,11 @@ class BrowserTabFragment :
             )
         }
 
-        WebView.setWebContentsDebuggingEnabled(withContext(dispatchers.io()) { webContentDebugging.isEnabled() })
+        lifecycleScope.launch {
+            WebView.setWebContentsDebuggingEnabled(withContext(dispatchers.io()) { webContentDebugging.isEnabled() })
 
-        webView?.let { passkeyInitializer.configurePasskeySupport(it) }
+            webView?.let { passkeyInitializer.configurePasskeySupport(it) }
+        }
     }
 
     private fun screenLock(data: JsCallbackData) {
@@ -4072,7 +4075,7 @@ class BrowserTabFragment :
         return viewModel.onUserPressedBack(isCustomTab)
     }
 
-    private suspend fun resetWebView() {
+    private fun resetWebView() {
         destroyWebView()
         configureWebView()
     }