For #1620: Hide search results when they match URL

nightly-build-test
Sawyer Blatz 5 years ago committed by Emily Kager
parent 22eb207cef
commit 19a2d9df4f

@ -166,31 +166,39 @@ class AwesomeBarView(
fun update(state: SearchFragmentState) { fun update(state: SearchFragmentState) {
view.removeAllProviders() view.removeAllProviders()
// Do not make suggestions based on user's current URL
if (state.query == state.session?.url) {
return
}
// Only show the shortcutEnginePicker by itself
if (state.showSearchShortcuts) { if (state.showSearchShortcuts) {
view.addProviders(shortcutsEnginePickerProvider) view.addProviders(shortcutsEnginePickerProvider)
} else { view.onInputChanged(state.query)
if (state.showSearchSuggestions) { return
view.addProviders( }
when (state.searchEngineSource) {
is SearchEngineSource.Default -> defaultSearchSuggestionProvider
is SearchEngineSource.Shortcut -> createSuggestionProviderForEngine(
state.searchEngineSource.searchEngine
)
}
)
}
if (state.showHistorySuggestions) { if (state.showSearchSuggestions) {
view.addProviders(historyStorageProvider) view.addProviders(
} when (state.searchEngineSource) {
is SearchEngineSource.Default -> defaultSearchSuggestionProvider
is SearchEngineSource.Shortcut -> createSuggestionProviderForEngine(
state.searchEngineSource.searchEngine
)
}
)
}
if (state.showHistorySuggestions) {
view.addProviders(historyStorageProvider)
}
if (state.showBookmarkSuggestions) { if (state.showBookmarkSuggestions) {
view.addProviders(bookmarksStorageSuggestionProvider) view.addProviders(bookmarksStorageSuggestionProvider)
} }
if ((container.context.asActivity() as? HomeActivity)?.browsingModeManager?.mode?.isPrivate == false) { if ((container.context.asActivity() as? HomeActivity)?.browsingModeManager?.mode?.isPrivate == false) {
view.addProviders(sessionProvider) view.addProviders(sessionProvider)
}
} }
view.onInputChanged(state.query) view.onInputChanged(state.query)

Loading…
Cancel
Save