From 4beb4eb8d049ba74ab0aa7c939643f13beac9118 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 25 Nov 2018 18:29:11 +0100
Subject: [PATCH] Show keywords

---
 .../java/eu/faircode/email/AdapterMessage.java    |  5 +++++
 app/src/main/java/eu/faircode/email/DB.java       |  2 +-
 .../eu/faircode/email/ServiceSynchronize.java     |  8 ++++----
 app/src/main/res/layout/item_message_compact.xml  | 15 ++++++++++++++-
 app/src/main/res/layout/item_message_normal.xml   | 15 ++++++++++++++-
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 06f7f08b7f..e892f6d22f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -162,6 +162,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         private TextView tvTimeSent;
         private TextView tvTimeReceived;
         private TextView tvSubjectEx;
+        private TextView tvKeywords;
 
         private TextView tvHeaders;
         private ProgressBar pbHeaders;
@@ -215,6 +216,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             tvCc = itemView.findViewById(R.id.tvCc);
             tvBcc = itemView.findViewById(R.id.tvBcc);
             tvSubjectEx = itemView.findViewById(R.id.tvSubjectEx);
+            tvKeywords = itemView.findViewById(R.id.tvKeywords);
 
             tvHeaders = itemView.findViewById(R.id.tvHeaders);
             pbHeaders = itemView.findViewById(R.id.pbHeaders);
@@ -411,6 +413,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             tvTime.setTextColor(colorUnseen);
 
             grpAddress.setVisibility(viewType == ViewType.THREAD && show_expanded && show_addresses ? View.VISIBLE : View.GONE);
+            tvKeywords.setVisibility(View.GONE);
             ivAddContact.setVisibility(viewType == ViewType.THREAD && show_expanded && contacts && message.from != null ? View.VISIBLE : View.GONE);
             pbHeaders.setVisibility(View.GONE);
             grpHeaders.setVisibility(show_headers && show_expanded ? View.VISIBLE : View.GONE);
@@ -438,6 +441,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 tvCc.setText(MessageHelper.getFormattedAddresses(message.cc, true));
                 tvBcc.setText(MessageHelper.getFormattedAddresses(message.bcc, true));
                 tvSubjectEx.setText(message.subject);
+                tvKeywords.setText(TextUtils.join(" ", message.keywords));
+                tvKeywords.setVisibility(message.keywords.length > 0 ? View.VISIBLE : View.GONE);
 
                 tvHeaders.setText(show_headers ? message.headers : null);
 
diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index 69d333e493..2b5c6659e3 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -186,7 +186,7 @@ public abstract class DB extends RoomDatabase {
             if (value == null)
                 return new String[0];
             else
-                return TextUtils.split(" ", value);
+                return TextUtils.split(value, " ");
         }
 
         @TypeConverter
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 283b78b1b1..c91f9c15f3 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1505,9 +1505,10 @@ public class ServiceSynchronize extends LifecycleService {
         imessage.setFlags(flags, set);
 
         List<String> keywords = new ArrayList<>(Arrays.asList(message.keywords));
-        if (set)
-            keywords.add(keyword);
-        else
+        if (set) {
+            if (!keywords.contains(keyword))
+                keywords.add(keyword);
+        } else
             keywords.remove(keyword);
         db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(keywords.toArray(new String[0])));
     }
@@ -2155,7 +2156,6 @@ public class ServiceSynchronize extends LifecycleService {
             if (message.ui_hide && full) {
                 update = true;
                 message.ui_hide = false;
-                db.message().updateMessage(message);
                 Log.i(Helper.TAG, folder.name + " updated id=" + message.id + " uid=" + message.uid + " unhide");
             }
 
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index f25143bd27..f684df4851 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -416,6 +416,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTimeReceived" />
 
+        <TextView
+            android:id="@+id/tvKeywords"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
+            android:text="Keywords"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textIsSelectable="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
+
         <View
             android:id="@+id/vSeparatorHeaders"
             android:layout_width="0dp"
@@ -424,7 +437,7 @@
             android:background="?attr/colorSeparator"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
+            app:layout_constraintTop_toBottomOf="@id/tvKeywords" />
 
         <TextView
             android:id="@+id/tvHeaders"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 9bf34637e8..e9dcace3d1 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -413,6 +413,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTimeReceived" />
 
+        <TextView
+            android:id="@+id/tvKeywords"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
+            android:text="Keywords"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textIsSelectable="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
+
         <View
             android:id="@+id/vSeparatorHeaders"
             android:layout_width="0dp"
@@ -421,7 +434,7 @@
             android:background="?attr/colorSeparator"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
+            app:layout_constraintTop_toBottomOf="@id/tvKeywords" />
 
         <TextView
             android:id="@+id/tvHeaders"