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

Changed isLocalized logic

Browse Source 
`isLocalized` will be true when App will contain 1 or more valid locales for this device
This commit is contained in:
Glenn Carremans 2020-05-14 14:39:21 +02:00 committed by Hans-Christoph Steiner
parent 33683cf870
commit 2021f43761
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,10 +518,6 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
*/ */
@JsonProperty("localized") @JsonProperty("localized")
private void setLocalized(Map<String, Map<String, Object>> localized) { // NOPMD private void setLocalized(Map<String, Map<String, Object>> localized) { // NOPMD
if (localized.size() > 1) {
isLocalized = true;
}
Locale defaultLocale = Locale.getDefault(); Locale defaultLocale = Locale.getDefault();
String languageTag = defaultLocale.getLanguage(); String languageTag = defaultLocale.getLanguage();
String countryTag = defaultLocale.getCountry(); String countryTag = defaultLocale.getCountry();
@ -575,6 +571,10 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
} }
} }
if (localesToUse.size() >= 1) {
isLocalized = true;
}
String value = getLocalizedEntry(localized, localesToUse, "whatsNew"); String value = getLocalizedEntry(localized, localesToUse, "whatsNew");
if (!TextUtils.isEmpty(value)) { if (!TextUtils.isEmpty(value)) {
whatsNew = value; whatsNew = value;