GetLocales might crash, lint says. Lets prevent it.

yeriomin · Dec 1, 2017 · 603bc3a · 603bc3a
1 parent 0ca216f
commit 603bc3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ android {
     }
     lintOptions {
         warning 'MissingTranslation'
-        disable 'GoogleAppIndexingWarning','GoogleAppIndexingApiWarning','TrulyRandom','BadHostnameVerifier','IconMissingDensityFolder','IconLocation','UnusedAttribute'
+        disable 'GoogleAppIndexingWarning','GoogleAppIndexingApiWarning','TrulyRandom','BadHostnameVerifier','IconMissingDensityFolder','IconLocation','UnusedAttribute','GetLocales'
     }
 }
 

diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/NativeDeviceInfoProvider.java b/app/src/main/java/com/github/yeriomin/yalpstore/NativeDeviceInfoProvider.java
@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.TimeZone;
 
 public class NativeDeviceInfoProvider implements DeviceInfoProvider {
@@ -198,8 +199,16 @@ static public List<String> getFeatures(Context context) {
     }
 
     static public List<String> getLocales(Context context) {
+        List<String> rawLocales = new ArrayList<>();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            rawLocales.addAll(Arrays.asList(context.getAssets().getLocales()));
+        } else {
+            for (Locale locale: Locale.getAvailableLocales()) {
+                rawLocales.add(locale.toString());
+            }
+        }
         List<String> locales = new ArrayList<>();
-        for (String locale: context.getAssets().getLocales()) {
+        for (String locale: rawLocales) {
             if (TextUtils.isEmpty(locale)) {
                 continue;
             }