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

Refactoring

Browse Source
This commit is contained in:
M66B
2023-12-14 19:26:14 +01:00
parent 8be1db079e
commit aba9e355ef
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,41 +199,41 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
BoundaryCallbackMessages.SearchCriteria criteria, String query) {
String search = escape(processBreakText(query));
String select = "";
StringBuilder select = new StringBuilder();
List<String> args = new ArrayList<>();
if (account != null) {
select += "account = ? AND ";
select.append("account = ? AND ");
args.add(Long.toString(account));
}
if (folder != null) {
select += "folder = ? AND ";
select.append("folder = ? AND ");
args.add(Long.toString(folder));
}
if (exclude.length > 0) {
select += "NOT folder IN (";
select.append("NOT folder IN (");
for (int i = 0; i < exclude.length; i++) {
if (i > 0)
select += ", ";
select += "?";
select.append(", ");
select.append("?");
args.add(Long.toString(exclude[i]));
}
select += ") AND ";
select.append(") AND ");
}
if (criteria.after != null) {
select += "time > ? AND ";
select.append("time > ? AND ");
args.add(Long.toString(criteria.after));
}
if (criteria.before != null) {
select += "time < ? AND ";
select.append("time < ? AND ");
args.add(Long.toString(criteria.before));
}
select += "message MATCH ?";
select.append("message MATCH ?");
args.add(search);
Log.i("FTS select=" + select +
@@ -243,7 +243,7 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
// TODO CASA
try (Cursor cursor = db.query(
"message", new String[]{"rowid"},
select,
select.toString(),
args.toArray(new String[0]),
null, null, "time DESC", null)) {
while (cursor != null && cursor.moveToNext())

22
app/src/main/java/eu/faircode/email/Fts5DbHelper.java
View File

@@ -199,41 +199,41 @@ public class Fts5DbHelper extends SQLiteOpenHelper {
String search = (sb.length() > 0 ? sb.toString() : escape(criteria.query));
String select = "";
StringBuilder select = new StringBuilder();
List<String> args = new ArrayList<>();
if (account != null) {
select += "account = ? AND ";
select.append("account = ? AND ");
args.add(Long.toString(account));
}
if (folder != null) {
select += "folder = ? AND ";
select.append("folder = ? AND ");
args.add(Long.toString(folder));
}
if (exclude.length > 0) {
select += "NOT folder IN (";
select.append("NOT folder IN (");
for (int i = 0; i < exclude.length; i++) {
if (i > 0)
select += ", ";
select += "?";
select.append(", ");
select.append("?");
args.add(Long.toString(exclude[i]));
}
select += ") AND ";
select.append(") AND ");
}
if (criteria.after != null) {
select += "time > ? AND ";
select.append("time > ? AND ");
args.add(Long.toString(criteria.after));
}
if (criteria.before != null) {
select += "time < ? AND ";
select.append("time < ? AND ");
args.add(Long.toString(criteria.before));
}
select += "message MATCH ?";
select.append("message MATCH ?");
args.add(search);
Log.i("FTS select=" + select +
@@ -243,7 +243,7 @@ public class Fts5DbHelper extends SQLiteOpenHelper {
// TODO CASA
try (Cursor cursor = db.query(
"message", new String[]{"rowid"},
select,
select.toString(),
args.toArray(new String[0]),
null, null, "time DESC", null)) {
while (cursor != null && cursor.moveToNext())