From 2270dd78facd0ce52c8ae05e23fb95776e877d72 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 21 Jul 2020 20:48:08 +0200 Subject: [PATCH] Search on sent date when using date header --- app/src/main/java/eu/faircode/email/Core.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 1bd715c957..fd16c98eb3 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2054,11 +2054,11 @@ class Core { // Reduce list of local uids Flags flags = ifolder.getPermanentFlags(); - SearchTerm searchTerm = new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time)); - if (sync_nodate) { - searchTerm = new OrTerm(searchTerm, new SentDateTerm(ComparisonTerm.GE, new Date(sync_time))); + SearchTerm searchTerm = account.use_date + ? new SentDateTerm(ComparisonTerm.GE, new Date(sync_time)) + : new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time)); + if (sync_nodate) searchTerm = new OrTerm(searchTerm, new ReceivedDateTerm(ComparisonTerm.LT, new Date(365 * 24 * 3600 * 1000L))); - } if (sync_unseen && flags.contains(Flags.Flag.SEEN)) searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.SEEN), false)); if (sync_flagged && flags.contains(Flags.Flag.FLAGGED))