Refactoring

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

@@ -310,13 +310,14 @@ public interface DaoMessage {
             " ORDER BY message.received DESC")
     List<Long> getMessageIdsByFolder(Long folder);
 
+    @Transaction
     @Query("SELECT message.id FROM message" +
             " JOIN folder_view AS folder ON folder.id = message.folder" +
             " WHERE content" +
             " AND NOT fts" +
             " AND folder.type <> '" + EntityFolder.OUTBOX + "'" +
             " ORDER BY message.received")
-    Cursor getMessageFts();
+    List<Long> getMessageFts();
 
     @Query("SELECT message.id, account, thread, (:find IS NULL" +
             " OR (:senders AND `from` LIKE :find COLLATE NOCASE)" + // no index

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

@@ -21,7 +21,6 @@ package eu.faircode.email;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.database.Cursor;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -66,10 +65,9 @@ public class WorkerFts extends Worker {
 
             SQLiteDatabase sdb = FtsDbHelper.getInstance(context);
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            try (Cursor cursor = db.message().getMessageFts()) {
-                while (cursor.moveToNext())
+
+            for (long id : db.message().getMessageFts())
                 try {
-                        long id = cursor.getLong(0);
                     Log.i("FTS index=" + id);
 
                     ids.add(id);
@@ -108,7 +106,6 @@ public class WorkerFts extends Worker {
                 }
 
             markIndexed(db, ids);
-            }
 
             Log.i("FTS indexed=" + indexed);
             return Result.success();