From a246a5cb4ffa6c2b6b099a80fb610d1e4998bb7c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 8 Apr 2020 17:44:21 +0200
Subject: [PATCH] Added Thunderbird keyword aliases

---
 .../java/eu/faircode/email/AdapterKeyword.java  |  2 +-
 .../java/eu/faircode/email/AdapterMessage.java  |  6 ++++--
 .../java/eu/faircode/email/EntityMessage.java   | 17 +++++++++++++++++
 app/src/main/res/values/strings.xml             |  7 +++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterKeyword.java b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
index 2b7f769cdd..87e12ee317 100644
--- a/app/src/main/java/eu/faircode/email/AdapterKeyword.java
+++ b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
@@ -76,7 +76,7 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
         }
 
         private void bindTo(TupleKeyword keyword) {
-            cbKeyword.setText(keyword.name);
+            cbKeyword.setText(EntityMessage.getKeywordAlias(context, keyword.name));
             cbKeyword.setChecked(keyword.selected);
             cbKeyword.setEnabled(pro);
             btnColor.setColor(keyword.color);
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 36d522377e..0770f65824 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4282,14 +4282,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     if (keywords.length() > 0)
                         keywords.append(" ");
 
-                    keywords.append(message.keywords[i]);
+                    // Thunderbird
+                    String keyword = EntityMessage.getKeywordAlias(context, message.keywords[i]);
+                    keywords.append(keyword);
 
                     if (message.keyword_colors != null &&
                             message.keyword_colors[i] != null) {
                         int len = keywords.length();
                         keywords.setSpan(
                                 new ForegroundColorSpan(message.keyword_colors[i]),
-                                len - message.keywords[i].length(), len,
+                                len - keyword.length(), len,
                                 Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                     }
                 }
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index d2d43237d8..df3a72bf49 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -274,6 +274,23 @@ public class EntityMessage implements Serializable {
         }
     }
 
+    static String getKeywordAlias(Context context, String keyword) {
+        switch (keyword) {
+            case "$label1": // Important
+                return context.getString(R.string.title_keyword_label1);
+            case "$label2": // Work
+                return context.getString(R.string.title_keyword_label2);
+            case "$label3": // Personal
+                return context.getString(R.string.title_keyword_label3);
+            case "$label4": // To do
+                return context.getString(R.string.title_keyword_label4);
+            case "$label5": // Later
+                return context.getString(R.string.title_keyword_label5);
+            default:
+                return keyword;
+        }
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof EntityMessage) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cdfce8abfb..dfbc16e40c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1242,6 +1242,13 @@
         <item quantity="other">%1$d messages</item>
     </plurals>
 
+    <!-- Thunderbird -->
+    <string name="title_keyword_label1">Important</string>
+    <string name="title_keyword_label2">Work</string>
+    <string name="title_keyword_label3">Personal</string>
+    <string name="title_keyword_label4">To do</string>
+    <string name="title_keyword_label5">Later</string>
+
     <string name="title_accessibility_flagged">Starred</string>
     <string name="title_accessibility_unflagged">Unstarred</string>
     <string name="title_accessibility_collapse">Collapse</string>