mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Case insensitive keyword sort

This commit is contained in:
M66B 2023-02-23 22:27:28 +01:00
parent e404da4f60
commit acc98898f3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/TupleKeyword.java
View File

@ -26,11 +26,13 @@ import android.graphics.Color;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceManager;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
public class TupleKeyword {
@ -75,12 +77,15 @@ public class TupleKeyword {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(all, new Comparator<String>() {
@Override
public int compare(String k1, String k2) {
k1 = prefs.getString("kwtitle." + k1, getDefaultKeywordAlias(context, k1));
k2 = prefs.getString("kwtitle." + k2, getDefaultKeywordAlias(context, k2));
return k1.compareTo(k2);
return collator.compare(k1, k2);
}
});