From 83820ef382e591eae37a9ef59f8b2fe273778b31 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 25 Mar 2020 08:29:52 +0100 Subject: [PATCH] Messages in the same folder are not duplicate Since messages should have unique messages IDs this should not happen --- .../java/eu/faircode/email/FragmentMessages.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 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 a544cfa08c..931c88653a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3908,13 +3908,18 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. Collections.sort(dups, new Comparator() { @Override public int compare(TupleMessageEx d1, TupleMessageEx d2) { - int o1 = DUPLICATE_ORDER.indexOf(d1.folderType); - int o2 = DUPLICATE_ORDER.indexOf(d2.folderType); - return ((Integer) o1).compareTo(o2); + Integer o1 = DUPLICATE_ORDER.indexOf(d1.folderType); + Integer o2 = DUPLICATE_ORDER.indexOf(d2.folderType); + return o1.compareTo(o2); } }); - for (int i = 1; i < dups.size(); i++) - dups.get(i).duplicate = true; + + TupleMessageEx first = dups.get(0); + for (int i = 1; i < dups.size(); i++) { + TupleMessageEx dup = dups.get(i); + if (!Objects.equals(first.folderType, dup.folderType)) + dup.duplicate = true; + } } }