Fix: Bookmark loading bug (#6303)

Task/Issue URL:
https://app.asana.com/1/137249556945/project/1207418217763355/task/1210647917463143?focus=true

### Description

This PR fixes an issue when opening a bookmark from a NTP hides the
loaded website.

### Steps to test this PR

- [x] Add some bookmark
- [x] Make sure the bookmarked site is not open already in another tab,
otherwise close it
- [x] Open a new NTP
- [x] Go to Bookmarks and tap on the saved bookmark
- [x] Verify the bookmark is properly loaded in the NTP tab

Author: 0nko

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

@@ -114,6 +114,7 @@ import com.duckduckgo.app.browser.model.LongPressTarget
 import com.duckduckgo.app.browser.newtab.FavoritesQuickAccessAdapter.QuickAccessFavorite
 import com.duckduckgo.app.browser.omnibar.ChangeOmnibarPositionFeature
 import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
+import com.duckduckgo.app.browser.omnibar.QueryOrigin.*
 import com.duckduckgo.app.browser.omnibar.model.OmnibarPosition.BOTTOM
 import com.duckduckgo.app.browser.omnibar.model.OmnibarPosition.TOP
 import com.duckduckgo.app.browser.refreshpixels.RefreshPixelSender
@@ -5569,6 +5570,24 @@ class BrowserTabViewModelTest {
         }
     }
 
+    @Test
+    fun givenRequestSubmittedFromBookmarkThenCorrectQueryOriginSetInBrowserViewState() {
+        whenever(mockOmnibarConverter.convertQueryToUrl("foo", null, FromBookmark)).thenReturn("foo.com")
+
+        testee.onUserSubmittedQuery("foo", queryOrigin = FromBookmark)
+
+        assertEquals(testee.browserViewState.value?.lastQueryOrigin, FromBookmark)
+    }
+
+    @Test
+    fun givenRequestSubmittedFromUserThenCorrectQueryOriginSetInBrowserViewState() {
+        whenever(mockOmnibarConverter.convertQueryToUrl("foo", null)).thenReturn("foo.com")
+
+        testee.onUserSubmittedQuery("foo")
+
+        assertEquals(testee.browserViewState.value?.lastQueryOrigin, FromUser)
+    }
+
     @Test
     fun givenSuggestedSearchesDialogShownWhenUserSubmittedQueryThenCustomSearchPixelIsSent() {
         whenever(mockOmnibarConverter.convertQueryToUrl("foo", null)).thenReturn("foo.com")

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

@@ -682,7 +682,7 @@ open class BrowserActivity : DuckDuckGoActivity() {
             is Command.LaunchFeedbackView -> startActivity(FeedbackActivity.intent(this))
             is Command.SwitchToTab -> openExistingTab(command.tabId)
             is Command.OpenInNewTab -> launchNewTab(command.url)
-            is Command.OpenSavedSite -> currentTab?.submitQuery(command.url)
+            is Command.OpenSavedSite -> currentTab?.openSavedSite(command.url)
             is Command.ShowSetAsDefaultBrowserDialog -> showSetAsDefaultBrowserDialog()
             is Command.DismissSetAsDefaultBrowserDialog -> dismissSetAsDefaultBrowserDialog()
             is Command.ShowSystemDefaultAppsActivity -> showSystemDefaultAppsActivity(command.intent)

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

@@ -148,6 +148,7 @@ import com.duckduckgo.app.browser.newtab.NewTabPageProvider
 import com.duckduckgo.app.browser.omnibar.Omnibar
 import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
 import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
+import com.duckduckgo.app.browser.omnibar.QueryOrigin
 import com.duckduckgo.app.browser.omnibar.experiments.FadeOmnibarItemPressedListener
 import com.duckduckgo.app.browser.omnibar.getOmnibarType
 import com.duckduckgo.app.browser.omnibar.model.OmnibarPosition.BOTTOM
@@ -1747,6 +1748,10 @@ class BrowserTabFragment :
         }
     }
 
+    fun openSavedSite(url: String) {
+        viewModel.onUserSubmittedQuery(url, QueryOrigin.FromBookmark)
+    }
+
     fun submitQuery(query: String) {
         viewModel.onUserSubmittedQuery(query)
     }

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

@@ -1156,6 +1156,7 @@ class BrowserTabViewModel @Inject constructor(
             sslError = NONE,
             maliciousSiteBlocked = false,
             maliciousSiteStatus = null,
+            lastQueryOrigin = queryOrigin,
         )
         autoCompleteViewState.value =
             currentAutoCompleteViewState().copy(showSuggestions = false, showFavorites = false, searchResults = AutoCompleteResult("", emptyList()))
@@ -2873,7 +2874,7 @@ class BrowserTabViewModel @Inject constructor(
     private fun showOrHideKeyboard(cta: Cta?) {
         // we hide the keyboard when showing a DialogCta and HomeCta type in the home screen otherwise we show it
         val shouldHideKeyboard = cta is HomePanelCta || cta is DaxBubbleCta.DaxPrivacyProCta || isBuckExperimentEnabledAndDaxEndCta(cta) ||
-            duckChat.showInputScreen.value
+            duckChat.showInputScreen.value || currentBrowserViewState().lastQueryOrigin == QueryOrigin.FromBookmark
         command.value = if (shouldHideKeyboard) HideKeyboard else ShowKeyboard
     }
 

app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarEntryConverter.kt

@@ -27,5 +27,6 @@ interface OmnibarEntryConverter {
 
 sealed class QueryOrigin {
     object FromUser : QueryOrigin()
+    object FromBookmark : QueryOrigin()
     data class FromAutocomplete(val isNav: Boolean?) : QueryOrigin()
 }

app/src/main/java/com/duckduckgo/app/browser/omnibar/QueryUrlConverter.kt

@@ -38,7 +38,7 @@ class QueryUrlConverter @Inject constructor(private val requestRewriter: Request
     ): String {
         val isUrl = when (queryOrigin) {
             is QueryOrigin.FromAutocomplete -> queryOrigin.isNav
-            is QueryOrigin.FromUser -> UriString.isWebUrl(searchQuery) || UriString.isDuckUri(searchQuery)
+            is QueryOrigin.FromUser, QueryOrigin.FromBookmark -> UriString.isWebUrl(searchQuery) || UriString.isDuckUri(searchQuery)
         }
 
         if (isUrl == true) {

app/src/main/java/com/duckduckgo/app/browser/viewstate/BrowserViewState.kt

@@ -19,6 +19,7 @@ package com.duckduckgo.app.browser.viewstate
 import com.duckduckgo.app.browser.SSLErrorType
 import com.duckduckgo.app.browser.SpecialUrlDetector
 import com.duckduckgo.app.browser.WebViewErrorResponse
+import com.duckduckgo.app.browser.omnibar.QueryOrigin
 import com.duckduckgo.app.global.model.MaliciousSiteStatus
 import com.duckduckgo.privacyprotectionspopup.api.PrivacyProtectionsPopupViewState
 import com.duckduckgo.savedsites.api.models.SavedSite
@@ -58,6 +59,7 @@ data class BrowserViewState(
     val maliciousSiteStatus: MaliciousSiteStatus? = null,
     val privacyProtectionsPopupViewState: PrivacyProtectionsPopupViewState = PrivacyProtectionsPopupViewState.Gone,
     val showDuckChatOption: Boolean = false,
+    val lastQueryOrigin: QueryOrigin = QueryOrigin.FromUser,
 )
 
 sealed class HighlightableButton {

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

@@ -102,6 +102,20 @@ class QueryUrlConverterTest {
         assertEquals(input, result)
     }
 
+    @Test
+    fun whenQueryOriginIsFromBookmarkAndIsQueryThenSearchQueryBuilt() {
+        val input = "foo"
+        val result = testee.convertQueryToUrl(input, queryOrigin = QueryOrigin.FromBookmark)
+        assertDuckDuckGoSearchQuery("foo", result)
+    }
+
+    @Test
+    fun whenQueryOriginIsFromBookmarkAndIsUrlThenUrlReturned() {
+        val input = "http://example.com"
+        val result = testee.convertQueryToUrl(input, queryOrigin = QueryOrigin.FromBookmark)
+        assertEquals(input, result)
+    }
+
     @Test
     fun whenQueryOriginIsFromAutocompleteAndIsNavIsFalseThenSearchQueryBuilt() {
         val input = "example.com"