From 33dac6d5e837f19b6b15abba190004094331120d Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 13 Jan 2021 19:44:11 +0100 Subject: [PATCH] Revert "Use message IDs for auto expand" This reverts commit 039b713a65fb810320380ec475e3853b8c65ecbf. --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index f62229b43d..335e4b0f84 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -4758,12 +4758,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. int unseen = 0; TupleMessageEx single = null; TupleMessageEx see = null; - List msgids = new ArrayList<>(); for (TupleMessageEx message : messages) { if (message == null) continue; - if ((message.msgid == null || !msgids.contains(message.msgid)) && + if (!message.duplicate && !EntityFolder.DRAFTS.equals(message.folderType) && !EntityFolder.TRASH.equals(message.folderType)) { count++; @@ -4777,9 +4776,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (message.folder == folder && !EntityFolder.OUTBOX.equals(message.folderType)) autoCloseCount++; - - if (message.msgid != null) - msgids.add(message.msgid); } // Auto expand when: