diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 27bf3a03e..f216fd405 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -147,15 +147,17 @@ open class HomeActivity : AppCompatActivity() { openToBrowser(BrowserDirection.FromGlobal, customTabSessionId) } + @Suppress("LongParameterList") fun openToBrowserAndLoad( searchTermOrURL: String, newTab: Boolean, from: BrowserDirection, customTabSessionId: String? = null, - engine: SearchEngine? = null + engine: SearchEngine? = null, + forceSearch: Boolean = false ) { openToBrowser(from, customTabSessionId) - load(searchTermOrURL, newTab, engine) + load(searchTermOrURL, newTab, engine, forceSearch) } fun openToBrowser(from: BrowserDirection, customTabSessionId: String? = null) { @@ -180,7 +182,7 @@ open class HomeActivity : AppCompatActivity() { navHost.navController.navigate(directions) } - private fun load(searchTermOrURL: String, newTab: Boolean, engine: SearchEngine?) { + private fun load(searchTermOrURL: String, newTab: Boolean, engine: SearchEngine?, forceSearch: Boolean) { val isPrivate = this.browsingModeManager.isPrivate val loadUrlUseCase = if (newTab) { @@ -198,7 +200,7 @@ open class HomeActivity : AppCompatActivity() { } else components.useCases.searchUseCases.defaultSearch.invoke(searchTerms, engine) } - if (searchTermOrURL.isUrl()) { + if (!forceSearch && searchTermOrURL.isUrl()) { loadUrlUseCase.invoke(searchTermOrURL.toNormalizedUrl()) } else { searchUseCase.invoke(searchTermOrURL) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index b2154bc26..80df4ba0f 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -228,7 +228,8 @@ class SearchFragment : Fragment(), BackHandler { searchTermOrURL = it.searchTerms, newTab = sessionId == null, from = BrowserDirection.FromSearch, - engine = it.engine + engine = it.engine, + forceSearch = true ) val engine = it.engine ?: requireComponents