morgan pushed to branch tor-browser-128.4.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
5e9deb42
by cypherpunks1 at 2024-10-30T03:09:46+00:00
3 changed files:
- mobile/android/android-components/components/feature/awesomebar/src/main/java/mozilla/components/feature/awesomebar/provider/SessionAutocompleteProvider.kt
- mobile/android/android-components/components/feature/awesomebar/src/main/java/mozilla/components/feature/awesomebar/provider/SessionSuggestionProvider.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
Changes:
| ... | ... | @@ -36,7 +36,7 @@ class SessionAutocompleteProvider( |
| 36 | 36 | |
| 37 | 37 | val tabUrl = store.state.tabs
|
| 38 | 38 | .firstOrNull {
|
| 39 | - !it.content.private && doesUrlStartsWithText(it.content.url, query)
|
|
| 39 | + /* !it.content.private && */ doesUrlStartsWithText(it.content.url, query)
|
|
| 40 | 40 | }
|
| 41 | 41 | ?.content?.url
|
| 42 | 42 | ?: return null
|
| ... | ... | @@ -54,7 +54,7 @@ class SessionSuggestionProvider( |
| 54 | 54 | |
| 55 | 55 | val suggestions = mutableListOf<AwesomeBar.Suggestion>()
|
| 56 | 56 | val iconRequests: List<Deferred<Icon>?> = distinctTabs.map {
|
| 57 | - icons?.loadIcon(IconRequest(url = it.content.url, waitOnNetworkLoad = false))
|
|
| 57 | + icons?.loadIcon(IconRequest(url = it.content.url, isPrivate = it.content.private, waitOnNetworkLoad = false))
|
|
| 58 | 58 | }
|
| 59 | 59 | |
| 60 | 60 | val searchWords = searchText.split(" ")
|
| ... | ... | @@ -62,7 +62,7 @@ class SessionSuggestionProvider( |
| 62 | 62 | if (
|
| 63 | 63 | resultsUriFilter?.invoke(result.content.url.toUri()) != false &&
|
| 64 | 64 | searchWords.all { result.contains(it) } &&
|
| 65 | - !result.content.private &&
|
|
| 65 | +// !result.content.private &&
|
|
| 66 | 66 | shouldIncludeSelectedTab(state, result)
|
| 67 | 67 | ) {
|
| 68 | 68 | suggestions.add(
|
| ... | ... | @@ -328,12 +328,12 @@ class AwesomeBarView( |
| 328 | 328 | }
|
| 329 | 329 | }
|
| 330 | 330 | |
| 331 | - if (activity.browsingModeManager.mode == BrowsingMode.Normal && state.showAllSessionSuggestions) {
|
|
| 331 | + if (/* activity.browsingModeManager.mode == BrowsingMode.Normal && */ state.showAllSessionSuggestions) {
|
|
| 332 | 332 | // Unlike other providers, we don't exclude sponsored suggestions for open tabs.
|
| 333 | 333 | providersToAdd.add(getLocalTabsProvider())
|
| 334 | 334 | }
|
| 335 | 335 | |
| 336 | - if (activity.browsingModeManager.mode == BrowsingMode.Normal && state.showSessionSuggestionsForCurrentEngine) {
|
|
| 336 | + if (/* activity.browsingModeManager.mode == BrowsingMode.Normal && */ state.showSessionSuggestionsForCurrentEngine) {
|
|
| 337 | 337 | getFilterForCurrentEngineResults(state)?.let {
|
| 338 | 338 | providersToAdd.add(getLocalTabsProvider(it))
|
| 339 | 339 | }
|