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

[Matthew Finkel]

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


Commits:
04c2a951 by Alex Catarineu at 2020-09-30T19:48:53+02:00
Bug 40063: Do not sort search engines alphabetically

- - - - -
294a617b by Matthew Finkel at 2020-09-30T21:36:52+00:00
Merge remote-tracking branch 'acatgl/40063' into tor-browser-81.1.1-10.0-1

- - - - -


2 changed files:

- app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt
- app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt


Changes:

=====================================
app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt
=====================================
@@ -26,7 +26,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(
@@ -112,7 +111,7 @@ open class FenixSearchEngineProvider(
         engineList.copy(
             list = engineList.list.filter {
                 installedIdentifiers.contains(it.identifier)
-            }.sortedBy { it.name.toLowerCase(Locale.getDefault()) },
+            },
             default = engineList.default?.let {
                 if (installedIdentifiers.contains(it.identifier)) {
                     it


=====================================
app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
=====================================
@@ -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,
@@ -116,7 +115,6 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
 
         searchEngineList.list
             .filter { it.identifier != searchEngineList.default?.identifier }
-            .sortedBy { it.name.toLowerCase(Locale.getDefault()) }
             .forEachIndexed(setupSearchEngineItem)
     }
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c211ca85cb0db534b76be84df2a02ea762fbea53...294a617bf99061600410e999fa5c1ec3ccde588b

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c211ca85cb0db534b76be84df2a02ea762fbea53...294a617bf99061600410e999fa5c1ec3ccde588b
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20200930/e392281b/attachment-0001.htm>