Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 14:17:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring keywords

Browse Source
This commit is contained in:
M66B
2021-07-01 08:00:04 +02:00
parent 2d8f188cf1
commit 302f34ec44
3 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -311,30 +311,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private static final int MAX_QUOTE_LEVEL = 3;
private static final int MAX_TRANSLATABLE_TEXT_SIZE = 50 * 1024;
// https://www.iana.org/assignments/imap-jmap-keywords/imap-jmap-keywords.xhtml
private static final List<String> IMAP_KEYWORDS_BLACKLIST = Collections.unmodifiableList(Arrays.asList(
MessageHelper.FLAG_FORWARDED.toLowerCase(Locale.ROOT),
"$MDNSent".toLowerCase(Locale.ROOT), // https://tools.ietf.org/html/rfc3503
"$SubmitPending".toLowerCase(Locale.ROOT),
"$Submitted".toLowerCase(Locale.ROOT),
"$Junk".toLowerCase(Locale.ROOT),
"$NotJunk".toLowerCase(Locale.ROOT),
"Junk".toLowerCase(Locale.ROOT),
"NonJunk".toLowerCase(Locale.ROOT),
"$recent".toLowerCase(Locale.ROOT),
"DTAG_document".toLowerCase(Locale.ROOT),
"DTAG_image".toLowerCase(Locale.ROOT),
"$X-Me-Annot-1".toLowerCase(Locale.ROOT),
"$X-Me-Annot-2".toLowerCase(Locale.ROOT),
"\\Unseen".toLowerCase(Locale.ROOT), // Mail.ru
"$sent".toLowerCase(Locale.ROOT), // Kmail
"$attachment".toLowerCase(Locale.ROOT), // Kmail
"$signed".toLowerCase(Locale.ROOT), // Kmail
"$encrypted".toLowerCase(Locale.ROOT), // Kmail
"$Classified".toLowerCase(Locale.ROOT),
"$HasNoAttachment".toLowerCase(Locale.ROOT)
));
public class ViewHolder extends RecyclerView.ViewHolder implements
View.OnClickListener,
View.OnLongClickListener,
@@ -5332,8 +5308,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private SpannableStringBuilder getKeywords(TupleMessageEx message) {
SpannableStringBuilder keywords = new SpannableStringBuilder();
for (int i = 0; i < message.keywords.length; i++) {
String k = message.keywords[i].toLowerCase(Locale.ROOT);
if (!IMAP_KEYWORDS_BLACKLIST.contains(k)) {
if (MessageHelper.showKeyword(message.keywords[i])) {
if (keywords.length() > 0)
keywords.append(" ");