Merge branch 'hotfix/5.268.1'

Author: joshliebe

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

@@ -607,7 +607,6 @@ class BrowserTabViewModel @Inject constructor(
     private var isProcessingTrackingLink = false
     private var isLinkOpenedInNewTab = false
     private var allowlistRefreshTriggerJob: Job? = null
-    private var submitQueryJob: Job? = null
     private var isCustomTabScreen: Boolean = false
     private var alreadyShownKeyboard: Boolean = false
     private var pendingDuckChatAuthUpdate: Boolean = false
@@ -1038,7 +1037,6 @@ class BrowserTabViewModel @Inject constructor(
     public override fun onCleared() {
         buildingSiteFactoryJob?.cancel()
         autoCompleteJob.cancel()
-        submitQueryJob?.cancel()
         fireproofWebsiteState.removeObserver(fireproofWebsitesObserver)
         navigationAwareLoginDetector.loginEventLiveData.removeObserver(loginDetectionObserver)
         fireproofDialogsEventHandler.event.removeObserver(fireproofDialogEventObserver)
@@ -1244,104 +1242,86 @@ class BrowserTabViewModel @Inject constructor(
             searchCountDao.incrementSearchCount()
         }
 
-        val currentUrl = url
-        val shouldCloseTabForPrivacyPro = webNavigationState?.hasNavigationHistory != true
+        val verticalParameter = extractVerticalParameter(url)
+        var urlToNavigate = queryUrlConverter.convertQueryToUrl(trimmedInput, verticalParameter, queryOrigin)
 
-        submitQueryJob?.cancel()
-        submitQueryJob =
-            viewModelScope.launch(dispatchers.main()) {
-                val verticalParameter = extractVerticalParameter(currentUrl)
-                var urlToNavigate =
-                    withContext(dispatchers.io()) {
-                        queryUrlConverter.convertQueryToUrl(trimmedInput, verticalParameter, queryOrigin)
+        when (val type = specialUrlDetector.determineType(trimmedInput)) {
+            is ShouldLaunchDuckChatLink -> {
+                runCatching {
+                    logcat { "Duck.ai: ShouldLaunchDuckChatLink $urlToNavigate" }
+                    val queryParameter = urlToNavigate.toUri().getQueryParameter(QUERY)
+                    if (queryParameter != null) {
+                        duckChat.openDuckChatWithPrefill(queryParameter)
+                    } else {
+                        duckChat.openDuckChat()
                     }
-                if (currentGlobalLayoutState() is Invalidated) {
-                    recoverTabWithQuery(query)
-                    return@launch
+                    return
                 }
+            }
 
-                when (val type = specialUrlDetector.determineType(trimmedInput)) {
-                    is ShouldLaunchDuckChatLink -> {
-                        runCatching {
-                            logcat { "Duck.ai: ShouldLaunchDuckChatLink $urlToNavigate" }
-                            val queryParameter = urlToNavigate.toUri().getQueryParameter(QUERY)
-                            if (queryParameter != null) {
-                                duckChat.openDuckChatWithPrefill(queryParameter)
-                            } else {
-                                duckChat.openDuckChat()
-                            }
-                            return@launch
-                        }
-                    }
-
-                    is ShouldLaunchPrivacyProLink -> {
-                        if (shouldCloseTabForPrivacyPro) {
-                            closeCurrentTab()
-                        }
-                        command.value = LaunchPrivacyPro(urlToNavigate.toUri())
-                        return@launch
-                    }
+            is ShouldLaunchPrivacyProLink -> {
+                if (webNavigationState == null || webNavigationState?.hasNavigationHistory == false) {
+                    closeCurrentTab()
+                }
+                command.value = LaunchPrivacyPro(urlToNavigate.toUri())
+                return
+            }
 
-                    is NonHttpAppLink -> {
-                        nonHttpAppLinkClicked(type)
-                    }
+            is NonHttpAppLink -> {
+                nonHttpAppLinkClicked(type)
+            }
 
-                    is SpecialUrlDetector.UrlType.CloakedAmpLink -> {
-                        handleCloakedAmpLink(type.ampUrl)
-                    }
+            is SpecialUrlDetector.UrlType.CloakedAmpLink -> {
+                handleCloakedAmpLink(type.ampUrl)
+            }
 
-                    else -> {
-                        if (type is SpecialUrlDetector.UrlType.ExtractedAmpLink) {
-                            logcat { "AMP link detection: Using extracted URL: ${type.extractedUrl}" }
-                            urlToNavigate = type.extractedUrl
-                        } else if (type is SpecialUrlDetector.UrlType.TrackingParameterLink) {
-                            logcat { "Loading parameter cleaned URL: ${type.cleanedUrl}" }
-                            urlToNavigate = type.cleanedUrl
-                        }
+            else -> {
+                if (type is SpecialUrlDetector.UrlType.ExtractedAmpLink) {
+                    logcat { "AMP link detection: Using extracted URL: ${type.extractedUrl}" }
+                    urlToNavigate = type.extractedUrl
+                } else if (type is SpecialUrlDetector.UrlType.TrackingParameterLink) {
+                    logcat { "Loading parameter cleaned URL: ${type.cleanedUrl}" }
+                    urlToNavigate = type.cleanedUrl
+                }
 
-                        if (shouldClearHistoryOnNewQuery()) {
-                            returnedHomeAfterSiteLoaded = false
-                            command.value = ResetHistory
-                        }
+                if (shouldClearHistoryOnNewQuery()) {
+                    returnedHomeAfterSiteLoaded = false
+                    command.value = ResetHistory
+                }
 
-                        fireQueryChangedPixel(trimmedInput)
+                fireQueryChangedPixel(trimmedInput)
 
-                        if (!appSettingsPreferencesStore.showAppLinksPrompt) {
-                            appLinksHandler.updatePreviousUrl(urlToNavigate)
-                            appLinksHandler.setUserQueryState(true)
-                        } else {
-                            clearPreviousUrl()
-                        }
-
-                        site?.nextUrl = urlToNavigate
-                        command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))
-                    }
+                if (!appSettingsPreferencesStore.showAppLinksPrompt) {
+                    appLinksHandler.updatePreviousUrl(urlToNavigate)
+                    appLinksHandler.setUserQueryState(true)
+                } else {
+                    clearPreviousUrl()
                 }
 
-                globalLayoutState.value = Browser(isNewTabState = false)
-                findInPageViewState.value = FindInPageViewState(visible = false)
-                omnibarViewState.value =
-                    currentOmnibarViewState().copy(
-                        omnibarText = if (isFullUrlEnabled.value) trimmedInput else addressDisplayFormatter.getShortUrl(trimmedInput),
-                        queryOrFullUrl = trimmedInput,
-                        forceExpand = true,
-                    )
-                browserViewState.value =
-                    currentBrowserViewState().copy(
-                        browserShowing = true,
-                        browserError = OMITTED,
-                        sslError = NONE,
-                        maliciousSiteBlocked = false,
-                        maliciousSiteStatus = null,
-                        lastQueryOrigin = queryOrigin,
-                    )
-                autoCompleteViewState.value =
-                    currentAutoCompleteViewState().copy(
-                        showSuggestions = false,
-                        showFavorites = false,
-                        searchResults = AutoCompleteResult("", emptyList()),
-                    )
+                site?.nextUrl = urlToNavigate
+                command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))
             }
+        }
+
+        globalLayoutState.value = Browser(isNewTabState = false)
+        findInPageViewState.value = FindInPageViewState(visible = false)
+        omnibarViewState.value =
+            currentOmnibarViewState().copy(
+                omnibarText = if (isFullUrlEnabled.value) trimmedInput else addressDisplayFormatter.getShortUrl(trimmedInput),
+                queryOrFullUrl = trimmedInput,
+                forceExpand = true,
+            )
+        browserViewState.value =
+            currentBrowserViewState().copy(
+                browserShowing = true,
+                browserError = OMITTED,
+                sslError = NONE,
+                maliciousSiteBlocked = false,
+                maliciousSiteStatus = null,
+                lastQueryOrigin = queryOrigin,
+            )
+        autoCompleteViewState.value =
+            currentAutoCompleteViewState().copy(showSuggestions = false, showFavorites = false, searchResults = AutoCompleteResult("", emptyList()))
     }
 
     private fun getUrlHeaders(url: String?): Map<String, String> = url?.let { customHeadersProvider.getCustomHeaders(it) } ?: emptyMap()

app/src/test/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -1439,20 +1439,6 @@ class BrowserTabViewModelTest {
         }
     }
 
-    @Test
-    fun whenGlobalLayoutInvalidatedDuringQueryConversionThenOpenInNewTabAndStateRemainsInvalidated() {
-        givenOneActiveTabSelected()
-        whenever(mockOmnibarConverter.convertQueryToUrl(any(), anyOrNull(), any(), any())).thenAnswer {
-            testee.recoverFromRenderProcessGone()
-            "foo.com"
-        }
-
-        testee.onUserSubmittedQuery("foo")
-
-        assertCommandIssued<Command.OpenInNewTab>()
-        assertTrue(testee.globalLayoutState.value is GlobalLayoutViewState.Invalidated)
-    }
-
     @Test
     fun whenBrowsingAndUrlLoadedThenSiteVisitedEntryAddedToLeaderboardDao() =
         runTest {

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.268.0
+VERSION=5.268.1