From 37197065ce08e38ae204dec674b89d9a8efdb261 Mon Sep 17 00:00:00 2001
From: xynngh <xynngh@protonmail.com>
Date: Fri, 11 Sep 2020 23:32:09 +0400
Subject: [PATCH] Fix usage of String.toUpperCase()

---
 .../java/dummydomain/yetanothercallblocker/Settings.java    | 6 ++++--
 .../yetanothercallblocker/data/CountryHelper.java           | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java b/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java
index 4a7c64e..90562ce 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java
@@ -9,6 +9,8 @@ import androidx.preference.PreferenceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Locale;
+
 import dummydomain.yetanothercallblocker.data.CountryHelper;
 import dummydomain.yetanothercallblocker.sia.model.database.DbManager;
 
@@ -228,14 +230,14 @@ public class Settings extends GenericSettings {
 
     public String getCountryCode() {
         String override = getCountryCodeOverride();
-        if (!TextUtils.isEmpty(override)) return override.toUpperCase();
+        if (!TextUtils.isEmpty(override)) return override.toUpperCase(Locale.ROOT);
 
         return getCachedAutoDetectedCountryCode();
     }
 
     public String getCountryCodeForReviews() {
         String override = getCountryCodeForReviewsOverride();
-        if (!TextUtils.isEmpty(override)) return override.toUpperCase();
+        if (!TextUtils.isEmpty(override)) return override.toUpperCase(Locale.ROOT);
 
         String code = getCachedAutoDetectedCountryCode();
         return !TextUtils.isEmpty(code) ? code : "US";
diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/data/CountryHelper.java b/app/src/main/java/dummydomain/yetanothercallblocker/data/CountryHelper.java
index 37dccf1..1d5ec0b 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/data/CountryHelper.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/data/CountryHelper.java
@@ -9,6 +9,8 @@ import androidx.core.os.ConfigurationCompat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Locale;
+
 public class CountryHelper {
 
     private static final Logger LOG = LoggerFactory.getLogger(CountryHelper.class);
@@ -20,10 +22,10 @@ public class CountryHelper {
 
             if (tm != null) {
                 String countryCode = tm.getNetworkCountryIso();
-                if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase();
+                if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase(Locale.ROOT);
 
                 countryCode = tm.getSimCountryIso();
-                if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase();
+                if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase(Locale.ROOT);
             }
 
             String countryCode = ConfigurationCompat