Commit 82e82d2f authored by Alex Catarineu's avatar Alex Catarineu Committed by Matthew Finkel
Browse files

Bug 40063: Do not sort search engines alphabetically

parent 5c92a7c7

app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt

+0 −3
Changes for app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import org.mozilla.fenix.BuildConfig 
import org.mozilla.fenix.Config

import org.mozilla.fenix.ext.components

import org.mozilla.fenix.ext.settings

import java.util.Locale



@SuppressWarnings("TooManyFunctions")

open class FenixSearchEngineProvider(
@@ -148,8 +147,6 @@ open class FenixSearchEngineProvider( 
        defaultList.copy(

            list = defaultList.list.filter {

                installedIdentifiers.contains(it.identifier)

            }.sortedBy {

                it.name.toLowerCase(Locale.getDefault())

            },

            default = defaultList.default?.let {

                if (installedIdentifiers.contains(it.identifier)) {

app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt

+0 −2
Changes for app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import org.mozilla.fenix.ext.components 
import org.mozilla.fenix.ext.getRootView

import org.mozilla.fenix.ext.settings

import org.mozilla.fenix.utils.allowUndo

import java.util.Locale



abstract class SearchEngineListPreference @JvmOverloads constructor(

    context: Context,
@@ -115,7 +114,6 @@ abstract class SearchEngineListPreference @JvmOverloads constructor( 


        searchEngineList.list

            .filter { it.identifier != searchEngineList.default?.identifier }

            .sortedBy { it.name.toLowerCase(Locale.getDefault()) }

            .forEachIndexed(setupSearchEngineItem)

    }