From 7a92e0b5253885314f8dda2855556a2224c1919e Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 16 Sep 2021 20:52:30 +0200 Subject: [PATCH] Revert "Clear classifier data when folder deleted" This reverts commit ae0d96fbd8b6e1f44cbd0ae4c133c97b50db00fc. --- .../java/eu/faircode/email/MessageClassifier.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java index c8ffc7ecae..fd8d7ec0c6 100644 --- a/app/src/main/java/eu/faircode/email/MessageClassifier.java +++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java @@ -177,20 +177,19 @@ public class MessageClassifier { private static String classify(EntityMessage message, @NonNull String currentClass, @NonNull List texts, boolean added, @NonNull Context context) { State state = new State(); - DB db = DB.getInstance(context); // Check classes - boolean clear = false; + DB db = DB.getInstance(context); for (String clazz : new ArrayList<>(classMessages.get(message.account).keySet())) { EntityFolder folder = db.folder().getFolderByName(message.account, clazz); if (folder == null) { EntityLog.log(context, EntityLog.Type.Classification, message, - "Classifier deleted folder=" + message.account + ":" + clazz); - clear = true; + "Classifier deleting folder class=" + message.account + ":" + clazz); + classMessages.get(message.account).remove(clazz); + for (String word : wordClassFrequency.get(message.account).keySet()) + wordClassFrequency.get(message.account).get(word).remove(clazz); } } - if (clear) - clear(context); Log.i("Classifier texts=" + texts.size()); for (String text : texts) {