From 1666326c5944f696992bd1b4e9e52e7c0b2a489a Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 2 Jan 2021 20:24:17 +0100 Subject: [PATCH] Move de-classifying to core --- app/src/main/java/eu/faircode/email/Core.java | 4 ++++ app/src/main/java/eu/faircode/email/EntityOperation.java | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 9b6c7d4dc8..146b3210c1 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -998,6 +998,10 @@ class Core { if (folder.id.equals(target.id)) throw new IllegalArgumentException("self"); + // De-classify + for (EntityMessage message : messages) + MessageClassifier.classify(message, false, context); + IMAPFolder itarget = (IMAPFolder) istore.getFolder(target.name); // Get source messages diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index a295ad6e7c..01c6282318 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -229,9 +229,6 @@ public class EntityOperation { db.rule().deleteRule(rule.id); } - if (message.content) - MessageClassifier.classify(message, false, context); - // Create copy without uid in target folder // Message with same msgid can be in archive if (message.uid != null &&