From 28d254a5b235c01ec8eb7defd18747f0133d1719 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 18 Mar 2020 14:49:57 +0100 Subject: [PATCH] Conditionally count archived messages for autoclose --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 513f7965bd..fd5114abce 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3906,7 +3906,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. } if (!(EntityFolder.OUTBOX.equals(message.folderType) && message.ui_snoozed != null) && - !EntityFolder.ARCHIVE.equals(message.folderType) && + !(EntityFolder.ARCHIVE.equals(message.folderType) && filter_archive) && !EntityFolder.SENT.equals(message.folderType) && !EntityFolder.TRASH.equals(message.folderType) && !EntityFolder.JUNK.equals(message.folderType)) @@ -3945,7 +3945,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (message == null) continue; if (!(EntityFolder.OUTBOX.equals(message.folderType) && message.ui_snoozed != null) && - !EntityFolder.ARCHIVE.equals(message.folderType) && + !(EntityFolder.ARCHIVE.equals(message.folderType) && filter_archive) && !EntityFolder.SENT.equals(message.folderType) && !EntityFolder.TRASH.equals(message.folderType) && !EntityFolder.JUNK.equals(message.folderType))