From 59d85f25bdb86f5d87771a2b16aa16c3c049841b Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 30 Dec 2020 08:28:54 +0100 Subject: [PATCH] Simplification --- app/src/main/java/eu/faircode/email/WorkerFts.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/WorkerFts.java b/app/src/main/java/eu/faircode/email/WorkerFts.java index c8e5b49326..d09cb02d97 100644 --- a/app/src/main/java/eu/faircode/email/WorkerFts.java +++ b/app/src/main/java/eu/faircode/email/WorkerFts.java @@ -33,7 +33,6 @@ import androidx.work.Worker; import androidx.work.WorkerParameters; import java.io.File; -import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -66,11 +65,13 @@ public class WorkerFts extends Worker { SQLiteDatabase sdb = FtsDbHelper.getInstance(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); try (Cursor cursor = db.message().getMessageFts()) { - while (cursor.moveToNext()) { - long id = cursor.getLong(0); + while (cursor.moveToNext()) try { + long id = cursor.getLong(0); Log.i("FTS index=" + id); + ids.add(id); + EntityMessage message = db.message().getMessage(id); if (message == null) { Log.i("FTS gone"); @@ -98,16 +99,11 @@ public class WorkerFts extends Worker { indexed++; - ids.add(id); if (ids.size() > INDEX_BATCH_SIZE) markIndexed(db, ids); } catch (Throwable ex) { - if (ex instanceof FileNotFoundException || - ex instanceof OutOfMemoryError) - ids.add(id); Log.e(ex); } - } markIndexed(db, ids); }