From efa8a88a550ae671fc5206ad9a7f161646199d92 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 17 May 2020 08:29:48 +0200
Subject: [PATCH] Simplified updating keyword colors

---
 .../eu/faircode/email/AdapterKeyword.java     | 35 -------------------
 .../eu/faircode/email/AdapterMessage.java     |  5 +--
 .../eu/faircode/email/FragmentMessages.java   |  4 +++
 3 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterKeyword.java b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
index 87e12ee317..9fd2d54f61 100644
--- a/app/src/main/java/eu/faircode/email/AdapterKeyword.java
+++ b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
@@ -165,41 +165,6 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
                 prefs.edit().remove("keyword." + keyword.name).apply();
             else
                 prefs.edit().putInt("keyword." + keyword.name, keyword.color).apply();
-
-            Bundle args = new Bundle();
-            args.putLong("id", id);
-
-            new SimpleTask<Void>() {
-                @Override
-                protected Void onExecute(Context context, Bundle args) {
-                    long id = args.getLong("id");
-
-                    DB db = DB.getInstance(context);
-
-                    EntityMessage message = db.message().getMessage(id);
-                    if (message == null)
-                        return null;
-
-                    // Update keyword colors
-                    try {
-                        db.beginTransaction();
-
-                        db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(null));
-                        db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(message.keywords));
-
-                        db.setTransactionSuccessful();
-                    } finally {
-                        db.endTransaction();
-                    }
-
-                    return null;
-                }
-
-                @Override
-                protected void onException(Bundle args, Throwable ex) {
-                    Log.e(ex);
-                }
-            }.execute(context, owner, args, "keyword:set");
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e9c58e683b..d877b1c8d5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4166,6 +4166,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             FragmentDialogKeywordManage fragment = new FragmentDialogKeywordManage();
             fragment.setArguments(args);
+            fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_KEYWORDS);
             fragment.show(parentFragment.getParentFragmentManager(), "keyword:manage");
         }
 
@@ -4993,10 +4994,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     same = false;
                     log("duplicate changed", next.id);
                 }
-                if (!Arrays.equals(prev.keyword_colors, next.keyword_colors)) {
-                    same = false;
-                    log("keyword colors changed", next.id);
-                }
 
                 return same;
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 95ad356de3..6ad0eeafe5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -324,6 +324,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     private static final int REQUEST_EMPTY_FOLDER = 20;
     private static final int REQUEST_BOUNDARY_RETRY = 21;
     static final int REQUEST_PICK_CONTACT = 22;
+    static final int REQUEST_KEYWORDS = 23;
 
     static final String ACTION_STORE_RAW = BuildConfig.APPLICATION_ID + ".STORE_RAW";
     static final String ACTION_DECRYPT = BuildConfig.APPLICATION_ID + ".DECRYPT";
@@ -5049,6 +5050,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     if (resultCode == RESULT_OK && data != null)
                         onPickContact(data.getData());
                     break;
+                case REQUEST_KEYWORDS:
+                    adapter.notifyDataSetChanged();
+                    break;
             }
         } catch (Throwable ex) {
             Log.e(ex);