diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index c3cdc5eb1..2f60a40ca 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -130,7 +130,12 @@ private void loadApps (SharedPreferences prefs) Collections.sort(mApps,new Comparator() { public int compare(TorifiedApp o1, TorifiedApp o2) { - if (o1.isTorified() == o2.isTorified()) return o1.getName().compareTo(o2.getName()); + /* Some apps start with lowercase letters and without the sorting being case + insensitive they'd appear at the end of the grid of apps, a position where users + would likely not expect to find them. + */ + if (o1.isTorified() == o2.isTorified()) + return o1.getName().compareToIgnoreCase(o2.getName()); if (o1.isTorified()) return -1; return 1; } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java index c72ebe3bc..cb60e442a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java @@ -133,8 +133,7 @@ public void setIcon(Drawable icon) { @Override public int compareTo(Object another) { - - return this.toString().compareTo(another.toString()); + return this.toString().compareToIgnoreCase(another.toString()); } @Override