mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-21 23:32:51 +00:00
Code Issues Releases Wiki Activity

Keyword improvements

Browse source
This commit is contained in:
M66B 2024-11-08 11:34:02 +01:00
parent 11da34bff4
commit 1d1f087b7a
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/FragmentDialogKeywordManage.java
View file

@ -86,9 +86,11 @@ public class FragmentDialogKeywordManage extends FragmentDialogBase {
String global = prefs.getString("global_keywords", null);
if (global != null) {
List<String> available = new ArrayList<>();
available.addAll(Arrays.asList(global.split(" ")));
if (data.available != null)
available.addAll(Arrays.asList(data.available));
for (String kw : global.split(" "))
if (!available.contains(kw))
available.add(kw);
data.available = available.toArray(new String[0]);
}

12
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -5229,7 +5229,17 @@ public class FragmentMessages extends FragmentBase
available.add(kw);
}
Collections.sort(available);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String global = prefs.getString("global_keywords", null);
if (global != null)
for (String kw : global.split(" "))
if (!available.contains(kw))
available.add(kw);
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(available, collator);
return new Pair<>(selected, available);
}