From 039b713a65fb810320380ec475e3853b8c65ecbf Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 13 Jan 2021 12:34:00 +0100 Subject: [PATCH] Use message IDs for auto expand --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 335e4b0f84..f62229b43d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -4758,11 +4758,12 @@ 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.duplicate && + if ((message.msgid == null || !msgids.contains(message.msgid)) && !EntityFolder.DRAFTS.equals(message.folderType) && !EntityFolder.TRASH.equals(message.folderType)) { count++; @@ -4776,6 +4777,9 @@ 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: