[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40063: Do not sort search engines alphabetically

Title: GitLab

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix

Commits:

2 changed files:

Changes:

  • app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt
    ... ... @@ -26,7 +26,6 @@ import org.mozilla.fenix.BuildConfig
    26 26 
     import org.mozilla.fenix.Config
    27 27 
     import org.mozilla.fenix.ext.components
    28 28 
     import org.mozilla.fenix.ext.settings
    29 
    -import java.util.Locale
    30 29
    31 30 
     @SuppressWarnings("TooManyFunctions")
    32 31 
     open class FenixSearchEngineProvider(
    ... ... @@ -112,7 +111,7 @@ open class FenixSearchEngineProvider(
    112 111 
             engineList.copy(
    113 112 
                 list = engineList.list.filter {
    114 113 
                     installedIdentifiers.contains(it.identifier)
    115 
    -            }.sortedBy { it.name.toLowerCase(Locale.getDefault()) },
    114 
    +            },
    116 115 
                 default = engineList.default?.let {
    117 116 
                     if (installedIdentifiers.contains(it.identifier)) {
    118 117 
                         it

  • app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
    ... ... @@ -32,7 +32,6 @@ import org.mozilla.fenix.ext.components
    32 32 
     import org.mozilla.fenix.ext.getRootView
    33 33 
     import org.mozilla.fenix.ext.settings
    34 34 
     import org.mozilla.fenix.utils.allowUndo
    35 
    -import java.util.Locale
    36 35
    37 36 
     abstract class SearchEngineListPreference @JvmOverloads constructor(
    38 37 
         context: Context,
    ... ... @@ -116,7 +115,6 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
    116 115
    117 116 
             searchEngineList.list
    118 117 
                 .filter { it.identifier != searchEngineList.default?.identifier }
    119 
    -            .sortedBy { it.name.toLowerCase(Locale.getDefault()) }
    120 118 
                 .forEachIndexed(setupSearchEngineItem)
    121 119 
         }
    122 120

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. If you'd like to receive fewer emails, you can adjust your notification settings. 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits