From 4a7a41a4e11482193463a51901d15c92e9bebf69 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 1 Apr 2020 18:28:01 +0200 Subject: [PATCH] Search messages on sent date --- app/src/main/java/eu/faircode/email/Core.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 92af4d039e..7e2a8cc1b2 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -117,6 +117,7 @@ import javax.mail.search.MessageIDTerm; import javax.mail.search.OrTerm; import javax.mail.search.ReceivedDateTerm; import javax.mail.search.SearchTerm; +import javax.mail.search.SentDateTerm; import static android.os.Process.THREAD_PRIORITY_BACKGROUND; import static androidx.core.app.NotificationCompat.DEFAULT_LIGHTS; @@ -1720,8 +1721,10 @@ class Core { // Reduce list of local uids Flags flags = ifolder.getPermanentFlags(); SearchTerm searchTerm = new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time)); - if (sync_nodate) + if (sync_nodate) { + searchTerm = new OrTerm(searchTerm, new SentDateTerm(ComparisonTerm.GE, new Date(sync_time))); 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))