From 88b3c684eb3cac999c91823054d65d36da65f001 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 Apr 2020 11:51:50 +0200
Subject: [PATCH] Prepare searchin on date range

---
 .../email/BoundaryCallbackMessages.java       | 20 ++++++++++++++++---
 .../java/eu/faircode/email/DaoMessage.java    |  3 +++
 .../java/eu/faircode/email/FtsDbHelper.java   | 11 ++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 17a72b7a68..07c4b0bdec 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -44,6 +44,7 @@ import java.io.Serializable;
 import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
@@ -60,9 +61,11 @@ import javax.mail.UIDFolder;
 import javax.mail.internet.MimeMessage;
 import javax.mail.search.AndTerm;
 import javax.mail.search.BodyTerm;
+import javax.mail.search.ComparisonTerm;
 import javax.mail.search.FlagTerm;
 import javax.mail.search.FromStringTerm;
 import javax.mail.search.OrTerm;
+import javax.mail.search.ReceivedDateTerm;
 import javax.mail.search.RecipientStringTerm;
 import javax.mail.search.SearchTerm;
 import javax.mail.search.SubjectTerm;
@@ -195,7 +198,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         if (fts && pro && criteria.isQueryOnly()) {
             if (state.ids == null) {
                 SQLiteDatabase sdb = FtsDbHelper.getInstance(context);
-                state.ids = FtsDbHelper.match(sdb, account, folder, criteria.query);
+                state.ids = FtsDbHelper.match(sdb, account, folder, criteria);
             }
 
             try {
@@ -228,6 +231,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             criteria.with_hidden,
                             criteria.with_encrypted,
                             criteria.with_attachments,
+                            criteria.from,
+                            criteria.to,
                             SEARCH_LIMIT, state.offset);
                     Log.i("Boundary device folder=" + folder +
                             " criteria=" + criteria +
@@ -421,6 +426,11 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                             state.ifolder.getPermanentFlags().contains(Flags.Flag.FLAGGED))
                                         and.add(new FlagTerm(new Flags(Flags.Flag.FLAGGED), true));
 
+                                    if (criteria.from != null)
+                                        and.add(new ReceivedDateTerm(ComparisonTerm.GT, new Date(criteria.from)));
+                                    if (criteria.to != null)
+                                        and.add(new ReceivedDateTerm(ComparisonTerm.LT, new Date(criteria.to)));
+
                                     SearchTerm term = null;
 
                                     if (or.size() > 0)
@@ -608,13 +618,15 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         boolean in_senders = true;
         boolean in_receipients = true;
         boolean in_subject = true;
-        boolean in_keywords = true;
+        boolean in_keywords = false;
         boolean in_message = true;
         boolean with_unseen;
         boolean with_flagged;
         boolean with_hidden;
         boolean with_encrypted;
         boolean with_attachments;
+        Long from = null;
+        Long to = null;
 
         SearchCriteria() {
         }
@@ -672,7 +684,9 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         this.with_flagged == other.with_flagged &&
                         this.with_hidden == other.with_hidden &&
                         this.with_encrypted == other.with_encrypted &&
-                        this.with_attachments == other.with_attachments);
+                        this.with_attachments == other.with_attachments &&
+                        Objects.equals(this.from, other.from) &&
+                        Objects.equals(this.to, other.to));
             } else
                 return false;
         }
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 9574c386d2..cdb4d88672 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -296,11 +296,14 @@ public interface DaoMessage {
             " AND (NOT :hidden OR NOT ui_snoozed IS NULL)" +
             " AND (NOT :encrypted OR ui_encrypt > 0)" +
             " AND (NOT :attachments OR attachments > 0)" +
+            " AND (:from IS NULL OR received > :from)" +
+            " AND (:to IS NULL OR received < :to)" +
             " ORDER BY received DESC" +
             " LIMIT :limit OFFSET :offset")
     List<TupleMatch> matchMessages(
             Long account, Long folder, String find,
             boolean unseen, boolean flagged, boolean hidden, boolean encrypted, boolean attachments,
+            Long from, Long to,
             int limit, int offset);
 
     @Query("SELECT id" +
diff --git a/app/src/main/java/eu/faircode/email/FtsDbHelper.java b/app/src/main/java/eu/faircode/email/FtsDbHelper.java
index c3b64f05fe..a87e971d18 100644
--- a/app/src/main/java/eu/faircode/email/FtsDbHelper.java
+++ b/app/src/main/java/eu/faircode/email/FtsDbHelper.java
@@ -107,9 +107,12 @@ public class FtsDbHelper extends SQLiteOpenHelper {
         db.delete("message", "rowid = ?", new Object[]{id});
     }
 
-    static List<Long> match(SQLiteDatabase db, Long account, Long folder, String query) {
+    static List<Long> match(
+            SQLiteDatabase db,
+            Long account, Long folder,
+            BoundaryCallbackMessages.SearchCriteria criteria) {
         StringBuilder sb = new StringBuilder();
-        for (String or : query.split(",")) {
+        for (String or : criteria.query.split(",")) {
             if (sb.length() > 0)
                 sb.append(" OR ");
 
@@ -137,6 +140,10 @@ public class FtsDbHelper extends SQLiteOpenHelper {
             select += "account = " + account + " AND ";
         if (folder != null)
             select += "folder = " + folder + " AND ";
+        if (criteria.from != null)
+            select += "time > " + criteria.from + " AND ";
+        if (criteria.to != null)
+            select += "time < " + criteria.to + " AND ";
 
         Log.i("FTS select=" + select + " search=" + search);
         List<Long> result = new ArrayList<>();