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

actually use phone's locale when picking descriptive metadata

Browse Source 
A TreeSet apparently does not really maintain insertion order, while a
LinkedHashSet does.  This ensures that the insertion order of locales
is preserved in localesToUse so that the prioritization is correct.
This commit is contained in:
Hans-Christoph Steiner 2017-04-17 14:45:34 +02:00
parent 148d69d9b4
commit 6fae74b36d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,9 @@ import android.os.Parcelable;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.io.filefilter.RegexFileFilter; import org.apache.commons.io.filefilter.RegexFileFilter;
import org.fdroid.fdroid.AppFilter; import org.fdroid.fdroid.AppFilter;
import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.FDroidApp;
@ -40,10 +38,10 @@ import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -377,7 +375,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
String languageTag = defaultLocale.getLanguage(); String languageTag = defaultLocale.getLanguage();
String localeTag = languageTag + "-" + defaultLocale.getCountry(); String localeTag = languageTag + "-" + defaultLocale.getCountry();
Set<String> locales = localized.keySet(); Set<String> locales = localized.keySet();
Set<String> localesToUse = new TreeSet<>(); Set<String> localesToUse = new LinkedHashSet<>();
if (locales.contains(localeTag)) { if (locales.contains(localeTag)) {
localesToUse.add(localeTag); localesToUse.add(localeTag);