parent
60fe8de3ec
commit
e4b4934f53
|
@ -147,15 +147,17 @@ open class HomeActivity : AppCompatActivity() {
|
||||||
openToBrowser(BrowserDirection.FromGlobal, customTabSessionId)
|
openToBrowser(BrowserDirection.FromGlobal, customTabSessionId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("LongParameterList")
|
||||||
fun openToBrowserAndLoad(
|
fun openToBrowserAndLoad(
|
||||||
searchTermOrURL: String,
|
searchTermOrURL: String,
|
||||||
newTab: Boolean,
|
newTab: Boolean,
|
||||||
from: BrowserDirection,
|
from: BrowserDirection,
|
||||||
customTabSessionId: String? = null,
|
customTabSessionId: String? = null,
|
||||||
engine: SearchEngine? = null
|
engine: SearchEngine? = null,
|
||||||
|
forceSearch: Boolean = false
|
||||||
) {
|
) {
|
||||||
openToBrowser(from, customTabSessionId)
|
openToBrowser(from, customTabSessionId)
|
||||||
load(searchTermOrURL, newTab, engine)
|
load(searchTermOrURL, newTab, engine, forceSearch)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun openToBrowser(from: BrowserDirection, customTabSessionId: String? = null) {
|
fun openToBrowser(from: BrowserDirection, customTabSessionId: String? = null) {
|
||||||
|
@ -180,7 +182,7 @@ open class HomeActivity : AppCompatActivity() {
|
||||||
navHost.navController.navigate(directions)
|
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 isPrivate = this.browsingModeManager.isPrivate
|
||||||
|
|
||||||
val loadUrlUseCase = if (newTab) {
|
val loadUrlUseCase = if (newTab) {
|
||||||
|
@ -198,7 +200,7 @@ open class HomeActivity : AppCompatActivity() {
|
||||||
} else components.useCases.searchUseCases.defaultSearch.invoke(searchTerms, engine)
|
} else components.useCases.searchUseCases.defaultSearch.invoke(searchTerms, engine)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (searchTermOrURL.isUrl()) {
|
if (!forceSearch && searchTermOrURL.isUrl()) {
|
||||||
loadUrlUseCase.invoke(searchTermOrURL.toNormalizedUrl())
|
loadUrlUseCase.invoke(searchTermOrURL.toNormalizedUrl())
|
||||||
} else {
|
} else {
|
||||||
searchUseCase.invoke(searchTermOrURL)
|
searchUseCase.invoke(searchTermOrURL)
|
||||||
|
|
|
@ -228,7 +228,8 @@ class SearchFragment : Fragment(), BackHandler {
|
||||||
searchTermOrURL = it.searchTerms,
|
searchTermOrURL = it.searchTerms,
|
||||||
newTab = sessionId == null,
|
newTab = sessionId == null,
|
||||||
from = BrowserDirection.FromSearch,
|
from = BrowserDirection.FromSearch,
|
||||||
engine = it.engine
|
engine = it.engine,
|
||||||
|
forceSearch = true
|
||||||
)
|
)
|
||||||
|
|
||||||
val engine = it.engine ?: requireComponents
|
val engine = it.engine ?: requireComponents
|
||||||
|
|
Loading…
Reference in New Issue