Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround Locale.toLanguageTag() requiring android-21

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2021-02-06 01:23:53 +01:00
parent cb1b4330ef
commit a11d214039
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/fdroid/fdroid/data/App.java
View File

@ -10,6 +10,7 @@ import android.content.res.AssetManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
import android.database.Cursor; import android.database.Cursor;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.LocaleList; import android.os.LocaleList;
import android.os.Parcel; import android.os.Parcel;
@ -630,7 +631,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
if (localesToUse.length > 0) { if (localesToUse.length > 0) {
Locale firstMatch = systemLocaleList.getFirstMatch(localesToUse); Locale firstMatch = systemLocaleList.getFirstMatch(localesToUse);
if (firstMatch != null) { if (firstMatch != null) {
for (String languageTag : new String[]{firstMatch.toLanguageTag(), null}) { for (String languageTag : new String[]{toLanguageTag(firstMatch), null}) {
if (languageTag == null) { if (languageTag == null) {
languageTag = getFallbackLanguageTag(firstMatch, localesToUse); // NOPMD languageTag = getFallbackLanguageTag(firstMatch, localesToUse); // NOPMD
} }
@ -649,6 +650,18 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
return null; return null;
} }
/**
* Replace with {@link Locale#toLanguageTag()} once
* {@link android.os.Build.VERSION_CODES#LOLLIPOP} is {@code minSdkVersion}
*/
private String toLanguageTag(Locale firstMatch) {
if (Build.VERSION.SDK_INT < 21) {
return firstMatch.toString().replace("_", "-");
} else {
return firstMatch.toLanguageTag();
}
}
/** /**
* Get all locales that have an entry for {@code key}. * Get all locales that have an entry for {@code key}.
*/ */