Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 11:55:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements

Browse Source
This commit is contained in:
M66B
2023-12-06 17:06:46 +01:00
parent 4d86ea2b2c
commit 757181958b
23 changed files with 134 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/eu/faircode/email/Fts4DbHelper.java
View File

@@ -200,30 +200,50 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
String search = escape(processBreakText(query));
String select = "";
if (account != null)
select += "account = " + account + " AND ";
if (folder != null)
select += "folder = " + folder + " AND ";
List<String> args = new ArrayList<>();
if (account != null) {
select += "account = ? AND ";
args.add(Long.toString(account));
}
if (folder != null) {
select += "folder = ? AND ";
args.add(Long.toString(folder));
}
if (exclude.length > 0) {
select += "NOT folder IN (";
for (int i = 0; i < exclude.length; i++) {
if (i > 0)
select += ", ";
select += exclude[i];
select += "?";
args.add(Long.toString(exclude[i]));
}
select += ") 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 + " query=" + query);
if (criteria.after != null) {
select += "time > ? AND ";
args.add(Long.toString(criteria.after));
}
if (criteria.before != null) {
select += "time < ? AND ";
args.add(Long.toString(criteria.before));
}
select += "message MATCH ?";
args.add(search);
Log.i("FTS select=" + select +
" args=" + TextUtils.join(", ", args) +
" query=" + query);
List<Long> result = new ArrayList<>();
try (Cursor cursor = db.query(
"message", new String[]{"rowid"},
select + "message MATCH ?",
new String[]{search},
select,
args.toArray(new String[0]),
null, null, "time DESC", null)) {
while (cursor != null && cursor.moveToNext())
result.add(cursor.getLong(0));