Basic keyword management

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -78,6 +78,7 @@ import java.text.Collator;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -1156,6 +1157,86 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 notifyDataSetChanged();
         }
 
+        private void onManageKeywords(ActionData data) {
+            Bundle args = new Bundle();
+            args.putSerializable("message", data.message);
+
+            new SimpleTask<EntityFolder>() {
+                @Override
+                protected EntityFolder onLoad(Context context, Bundle args) throws Throwable {
+                    EntityMessage message = (EntityMessage) args.getSerializable("message");
+                    return DB.getInstance(context).folder().getFolder(message.folder);
+                }
+
+                @Override
+                protected void onLoaded(final Bundle args, EntityFolder folder) {
+                    EntityMessage message = (EntityMessage) args.getSerializable("message");
+
+                    List<String> keywords = Arrays.asList(message.keywords);
+
+                    final List<String> items = new ArrayList<>(keywords);
+                    for (String keyword : folder.keywords)
+                        if (!items.contains(keyword))
+                            items.add(keyword);
+
+                    Collections.sort(items);
+
+                    final boolean selected[] = new boolean[items.size()];
+                    final boolean dirty[] = new boolean[items.size()];
+                    for (int i = 0; i < selected.length; i++) {
+                        selected[i] = keywords.contains(items.get(i));
+                        dirty[i] = false;
+                    }
+
+                    new DialogBuilderLifecycle(context, owner)
+                            .setTitle(R.string.title_manage_keywords)
+                            .setMultiChoiceItems(items.toArray(new String[0]), selected, new DialogInterface.OnMultiChoiceClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+                                    dirty[which] = true;
+                                }
+                            })
+                            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    args.putStringArray("keywords", items.toArray(new String[0]));
+                                    args.putBooleanArray("selected", selected);
+                                    args.putBooleanArray("dirty", dirty);
+
+                                    new SimpleTask<Void>() {
+                                        @Override
+                                        protected Void onLoad(Context context, Bundle args) throws Throwable {
+                                            EntityMessage message = (EntityMessage) args.getSerializable("message");
+                                            String[] keywords = args.getStringArray("keywords");
+                                            boolean[] selected = args.getBooleanArray("selected");
+                                            boolean[] dirty = args.getBooleanArray("dirty");
+
+                                            DB db = DB.getInstance(context);
+
+                                            try {
+                                                db.beginTransaction();
+
+                                                for (int i = 0; i < selected.length; i++)
+                                                    if (dirty[i])
+                                                        EntityOperation.queue(db, message, EntityOperation.KEYWORD, keywords[i], selected[i]);
+
+                                                db.setTransactionSuccessful();
+                                            } finally {
+                                                db.endTransaction();
+                                            }
+
+                                            EntityOperation.process(context);
+
+                                            return null;
+                                        }
+                                    }.load(context, owner, args);
+                                }
+                            })
+                            .show();
+                }
+            }.load(context, owner, args);
+        }
+
         private void onDecrypt(ActionData data) {
             LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
             lbm.sendBroadcast(
@@ -1187,6 +1268,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers);
             popupMenu.getMenu().findItem(R.id.menu_show_headers).setVisible(data.message.uid != null);
 
+            popupMenu.getMenu().findItem(R.id.menu_manage_keywords).setVisible(data.message.uid != null);
+
             popupMenu.getMenu().findItem(R.id.menu_decrypt).setEnabled(data.message.to != null && data.message.to.length > 0);
 
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@@ -1217,6 +1300,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                         case R.id.menu_show_headers:
                             onShowHeaders(data);
                             return true;
+                        case R.id.menu_manage_keywords:
+                            onManageKeywords(data);
+                            return true;
                         case R.id.menu_decrypt:
                             onDecrypt(data);
                             return true;

app/src/main/java/eu/faircode/email/Helper.java

@@ -445,4 +445,9 @@ public class Helper {
 
         return true;
     }
+
+    static String sanitizeKeyword(String keyword) {
+        // ()}%*"\]
+        return keyword.replaceAll("[^A-Za-z0-9]", "");
+    }
 }

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -1500,7 +1500,7 @@ public class ServiceSynchronize extends LifecycleService {
         }
 
         // https://tools.ietf.org/html/rfc3501#section-2.3.2
-        String keyword = jargs.getString(0);
+        String keyword = Helper.sanitizeKeyword(jargs.getString(0));
         boolean set = jargs.getBoolean(1);
 
         Message imessage = ifolder.getMessageByUID(message.uid);

app/src/main/res/menu/menu_message.xml

@@ -34,6 +34,10 @@
         android:checkable="true"
         android:title="@string/title_show_headers" />
 
+    <item
+        android:id="@+id/menu_manage_keywords"
+        android:title="@string/title_manage_keywords" />
+
     <item
         android:id="@+id/menu_decrypt"
         android:title="@string/title_decrypt" />

app/src/main/res/values/strings.xml

@@ -210,6 +210,7 @@
     <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
+    <string name="title_manage_keywords">Manage keywords</string>
     <string name="title_show_html">Show original</string>
 
     <string name="title_trash">Trash</string>