Merge remote-tracking branch 'origin/fenix/112.2.0' into iceraven

pull/636/head
akliuxingyuan 1 year ago
commit 69610505b0

@ -171,16 +171,25 @@ class RadioSearchEngineListPreference @JvmOverloads constructor(
) {
val selectedOrDefaultSearchEngine = context.components.core.store.state.search.selectedOrDefaultSearchEngine
if (selectedOrDefaultSearchEngine == engine) {
val nextSearchEngine = if (context.settings().showUnifiedSearchFeature) {
context.components.core.store.state.search.searchEngines.first {
it.id != engine.id && (it.isGeneral || it.type == SearchEngine.Type.CUSTOM)
}
} else {
context.components.core.store.state.search.searchEngines.first {
it.id != engine.id
val nextSearchEngine =
if (context.settings().showUnifiedSearchFeature) {
context.components.core.store.state.search.searchEngines.firstOrNull {
it.id != engine.id && (it.isGeneral || it.type == SearchEngine.Type.CUSTOM)
}
?: context.components.core.store.state.search.searchEngines.firstOrNull {
it.id != engine.id
}
} else {
context.components.core.store.state.search.searchEngines.firstOrNull {
it.id != engine.id
}
}
nextSearchEngine?.let {
context.components.useCases.searchUseCases.selectSearchEngine(
nextSearchEngine,
)
}
context.components.useCases.searchUseCases.selectSearchEngine(nextSearchEngine)
}
context.components.useCases.searchUseCases.removeSearchEngine(engine)

Loading…
Cancel
Save