mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-14 16:10:39 +00:00
Code Issues Releases Wiki Activity

Fixed FTS search in single folders

Browse source
This commit is contained in:
M66B 2023-12-20 20:33:31 +01:00
parent 7360e1c9d4
commit d4fc609e96
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/Fts4DbHelper.java
View file

@ -203,12 +203,12 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
List<String> args = new ArrayList<>();
if (account != null) {
select.append("account = ? AND ");
select.append("account = CAST(? AS INTEGER) AND ");
args.add(Long.toString(account));
}
if (folder != null) {
select.append("folder = ? AND ");
select.append("folder = CAST(? AS INTEGER) AND ");
args.add(Long.toString(folder));
}
@ -217,19 +217,19 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
for (int i = 0; i < exclude.length; i++) {
if (i > 0)
select.append(", ");
select.append("?");
select.append("CAST(? AS INTEGER)");
args.add(Long.toString(exclude[i]));
}
select.append(") AND ");
}
if (criteria.after != null) {
select.append("time > ? AND ");
select.append("time > CAST(? AS INTEGER) AND ");
args.add(Long.toString(criteria.after));
}
if (criteria.before != null) {
select.append("time < ? AND ");
select.append("time < CAST(? AS INTEGER) AND ");
args.add(Long.toString(criteria.before));
}

10
app/src/main/java/eu/faircode/email/Fts5DbHelper.java
View file

@ -203,12 +203,12 @@ public class Fts5DbHelper extends SQLiteOpenHelper {
List<String> args = new ArrayList<>();
if (account != null) {
select.append("account = ? AND ");
select.append("account = CAST(? AS INTEGER) AND ");
args.add(Long.toString(account));
}
if (folder != null) {
select.append("folder = ? AND ");
select.append("folder = CAST(? AS INTEGER) AND ");
args.add(Long.toString(folder));
}
@ -217,19 +217,19 @@ public class Fts5DbHelper extends SQLiteOpenHelper {
for (int i = 0; i < exclude.length; i++) {
if (i > 0)
select.append(", ");
select.append("?");
select.append("CAST(? AS INTEGER)");
args.add(Long.toString(exclude[i]));
}
select.append(") AND ");
}
if (criteria.after != null) {
select.append("time > ? AND ");
select.append("time > CAST(? AS INTEGER) AND ");
args.add(Long.toString(criteria.after));
}
if (criteria.before != null) {
select.append("time < ? AND ");
select.append("time < CAST(? AS INTEGER) AND ");
args.add(Long.toString(criteria.before));
}