[tor-commits] [orbot/master] toUpperCase -> compareToIgnoreCase

[n8fr8@xxxxxxxxxxxxxx]

commit 1c9afcbafe898779fb91483fe32851e850d605b9
Author: lexi <bird.s.lex@xxxxxxxxx>
Date:   Fri Apr 13 14:55:28 2018 -0400

    toUpperCase -> compareToIgnoreCase
---
 app/src/main/java/org/torproject/android/ui/AppManagerActivity.java     | 2 +-
 .../src/main/java/org/torproject/android/service/vpn/TorifiedApp.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 17e39ccd..2f60a40c 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -135,7 +135,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
                    would likely not expect to find them.
                  */
                 if (o1.isTorified() == o2.isTorified())
-                    return o1.getName().toUpperCase().compareTo(o2.getName().toUpperCase());
+                    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 1276f2f6..cb60e442 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,7 +133,7 @@ public class TorifiedApp implements Comparable {
 	
 	@Override
 	public int compareTo(Object another) {
-		return this.toString().toUpperCase().compareTo(another.toString().toUpperCase());
+		return this.toString().compareToIgnoreCase(another.toString());
 	}
 	
 	@Override



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