From 5a9dcd9f87048b0ff471e082d5e0498ec8302f25 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:26:23 +0200
Subject: [PATCH] Refactoring

---
 .../email/BoundaryCallbackMessages.java       | 20 +++++++++----------
 .../java/eu/faircode/email/DaoMessage.java    |  6 +++---
 .../java/eu/faircode/email/FtsDbHelper.java   |  8 ++++----
 app/src/main/res/values/strings.xml           |  2 ++
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 07c4b0bdec..c3475594a2 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -231,8 +231,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             criteria.with_hidden,
                             criteria.with_encrypted,
                             criteria.with_attachments,
-                            criteria.from,
-                            criteria.to,
+                            criteria.after,
+                            criteria.before,
                             SEARCH_LIMIT, state.offset);
                     Log.i("Boundary device folder=" + folder +
                             " criteria=" + criteria +
@@ -426,10 +426,10 @@ 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)));
+                                    if (criteria.after != null)
+                                        and.add(new ReceivedDateTerm(ComparisonTerm.GT, new Date(criteria.after)));
+                                    if (criteria.before != null)
+                                        and.add(new ReceivedDateTerm(ComparisonTerm.LT, new Date(criteria.before)));
 
                                     SearchTerm term = null;
 
@@ -625,8 +625,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         boolean with_hidden;
         boolean with_encrypted;
         boolean with_attachments;
-        Long from = null;
-        Long to = null;
+        Long after = null;
+        Long before = null;
 
         SearchCriteria() {
         }
@@ -685,8 +685,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         this.with_hidden == other.with_hidden &&
                         this.with_encrypted == other.with_encrypted &&
                         this.with_attachments == other.with_attachments &&
-                        Objects.equals(this.from, other.from) &&
-                        Objects.equals(this.to, other.to));
+                        Objects.equals(this.after, other.after) &&
+                        Objects.equals(this.before, other.before));
             } 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 cdb4d88672..7bdc9e244b 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -296,14 +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)" +
+            " AND (:after IS NULL OR received > :after)" +
+            " AND (:before IS NULL OR received < :before)" +
             " 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,
+            Long after, Long before,
             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 a87e971d18..5850874a9a 100644
--- a/app/src/main/java/eu/faircode/email/FtsDbHelper.java
+++ b/app/src/main/java/eu/faircode/email/FtsDbHelper.java
@@ -140,10 +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 ";
+        if (criteria.after != null)
+            select += "time > " + criteria.after + " AND ";
+        if (criteria.before != null)
+            select += "time < " + criteria.before + " AND ";
 
         Log.i("FTS select=" + select + " search=" + search);
         List<Long> result = new ArrayList<>();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43a00dcdd1..c90705829e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -917,6 +917,8 @@
     <string name="title_search_with_hidden">Hidden (on device only)</string>
     <string name="title_search_with_encrypted">Encrypted (on device only)</string>
     <string name="title_search_with_attachments">With attachments (on device only)</string>
+    <string name="title_search_with_before">Before</string>
+    <string name="title_search_with_after">After</string>
     <string name="title_search_flag_unseen">unread</string>
     <string name="title_search_flag_flagged">starred</string>
     <string name="title_search_flag_hidden">hidden</string>