From 7c45a7e9ee190a5f12dfa955ca00f97264439689 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 18 Mar 2020 14:40:35 +0100 Subject: [PATCH] Revert "Skip counting duplicates for auto close" This reverts commit bda547792fc4f619e9fc19f995a5a97852e4f36b. --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index ea6a5447e9..513f7965bd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3905,8 +3905,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. } } - if (!message.duplicate && - !(EntityFolder.OUTBOX.equals(message.folderType) && message.ui_snoozed != null) && + if (!(EntityFolder.OUTBOX.equals(message.folderType) && message.ui_snoozed != null) && !EntityFolder.ARCHIVE.equals(message.folderType) && !EntityFolder.SENT.equals(message.folderType) && !EntityFolder.TRASH.equals(message.folderType) && @@ -3945,8 +3944,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. TupleMessageEx message = messages.get(i); if (message == null) continue; - if (!message.duplicate && - !(EntityFolder.OUTBOX.equals(message.folderType) && message.ui_snoozed != null) && + if (!(EntityFolder.OUTBOX.equals(message.folderType) && message.ui_snoozed != null) && !EntityFolder.ARCHIVE.equals(message.folderType) && !EntityFolder.SENT.equals(message.folderType) && !EntityFolder.TRASH.equals(message.folderType) &&