Batched search

app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java

@@ -77,6 +77,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
     private State state;
 
+    private static final int SEARCH_LIMIT = 1000;
+
     interface IBoundaryCallbackMessages {
         void onLoading();
 
@@ -163,7 +165,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         Boolean seen = null;
         Boolean flagged = null;
         Boolean snoozed = null;
-
         String find = (TextUtils.isEmpty(query) ? null : query.toLowerCase(Locale.ROOT));
         if (find != null && find.startsWith(context.getString(R.string.title_search_special_prefix) + ":")) {
             String special = find.split(":")[1];
@@ -173,22 +174,27 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 flagged = true;
             else if (context.getString(R.string.title_search_special_snoozed).equals(special))
                 snoozed = true;
-
         }
 
-        if (state.matches == null) {
+        int found = 0;
-            state.matches = db.message().matchMessages(folder, "%" + find + "%", seen, flagged, snoozed);
+        try {
+            db.beginTransaction();
+
+            while (found < pageSize && !state.destroyed) {
+                state.matches = db.message().matchMessages(
+                        folder,
+                        "%" + find + "%",
+                        seen, flagged, snoozed,
+                        SEARCH_LIMIT, state.offset);
                 Log.i("Boundary device folder=" + folder +
                         " query=" + query +
                         " seen=" + seen +
                         " flagged=" + flagged +
                         " snoozed=" + snoozed +
-                    " matches=" + state.matches.size());
+                        " offset=" + state.offset +
-        }
+                        " size=" + state.matches.size());
-
+                if (state.matches.size() == 0)
-        int found = 0;
+                    break;
-        try {
-            db.beginTransaction();
 
                 for (int i = state.index; i < state.matches.size() && found < pageSize && !state.destroyed; i++) {
                     state.index = i + 1;
@@ -218,6 +224,9 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     }
                 }
 
+                state.offset += SEARCH_LIMIT;
+            }
+
             db.setTransactionSuccessful();
 
             if (found == pageSize)
@@ -514,6 +523,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         boolean destroyed = false;
         boolean error = false;
         int index = 0;
+        int offset = 0;
         List<TupleMatch> matches = null;
 
         MailService iservice = null;

app/src/main/java/eu/faircode/email/DaoMessage.java

@@ -234,8 +234,9 @@ public interface DaoMessage {
             "  WHEN 0 THEN message.ui_snoozed IS NULL" +
             "  WHEN 1 THEN message.ui_snoozed IS NOT NULL" +
             "  ELSE 1 END" + // NULL: true
-            " ORDER BY message.received DESC")
+            " ORDER BY message.received DESC" +
-    List<TupleMatch> matchMessages(Long folder, String find, Boolean seen, Boolean flagged, Boolean snoozed);
+            " LIMIT :limit OFFSET :offset")
+    List<TupleMatch> matchMessages(Long folder, String find, Boolean seen, Boolean flagged, Boolean snoozed, int limit, int offset);
 
     @Query("SELECT id" +
             " FROM message" +