mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 15:11:03 +00:00
Code Issues Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
M66B 2021-04-06 11:58:54 +02:00
parent ccb026b7b2
commit 52b43e0d73
2 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/DaoMessage.java
View file

@ -249,7 +249,7 @@ public interface DaoMessage {
" JOIN folder_view AS folder ON folder.id = message.folder" +
" WHERE " + is_outbox +
" AND NOT ui_snoozed IS NULL")
LiveData<Integer> liveOutboxPending();
LiveData<Integer> liveOutboxPending();
@Query("SELECT account.name AS accountName" +
", COUNT(message.id) AS count" +
@ -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

75
app/src/main/java/eu/faircode/email/WorkerFts.java
View file

@ -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,49 +65,47 @@ public class WorkerFts extends Worker {
SQLiteDatabase sdb = FtsDbHelper.getInstance(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
try (Cursor cursor = db.message().getMessageFts()) {
while (cursor.moveToNext())
try {
long id = cursor.getLong(0);
Log.i("FTS index=" + id);
ids.add(id);
for (long id : db.message().getMessageFts())
try {
Log.i("FTS index=" + id);
EntityMessage message = db.message().getMessage(id);
if (message == null) {
Log.i("FTS gone");
continue;
}
ids.add(id);
File file = message.getFile(context);
String text = HtmlHelper.getFullText(file);
if (TextUtils.isEmpty(text)) {
Log.i("FTS empty");
continue;
}
boolean fts = prefs.getBoolean("fts", false);
if (!fts)
break;
try {
sdb.beginTransaction();
FtsDbHelper.insert(sdb, message, text);
sdb.setTransactionSuccessful();
} finally {
sdb.endTransaction();
}
indexed++;
if (ids.size() > INDEX_BATCH_SIZE)
markIndexed(db, ids);
} catch (Throwable ex) {
Log.e(ex);
EntityMessage message = db.message().getMessage(id);
if (message == null) {
Log.i("FTS gone");
continue;
}
markIndexed(db, ids);
}
File file = message.getFile(context);
String text = HtmlHelper.getFullText(file);
if (TextUtils.isEmpty(text)) {
Log.i("FTS empty");
continue;
}
boolean fts = prefs.getBoolean("fts", false);
if (!fts)
break;
try {
sdb.beginTransaction();
FtsDbHelper.insert(sdb, message, text);
sdb.setTransactionSuccessful();
} finally {
sdb.endTransaction();
}
indexed++;
if (ids.size() > INDEX_BATCH_SIZE)
markIndexed(db, ids);
} catch (Throwable ex) {
Log.e(ex);
}
markIndexed(db, ids);
Log.i("FTS indexed=" + indexed);
return Result.success();