mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Specific search suggestions

This commit is contained in:
M66B 2022-12-22 08:19:39 +01:00
parent e019abfce2
commit 33c148eb7d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@ -666,7 +666,8 @@ public interface DaoMessage {
int getSnoozedCount();
@Query("SELECT id AS _id, subject AS suggestion FROM message" +
" WHERE (:account IS NULL OR message.account = :account)" +
" WHERE :subject" +
" AND (:account IS NULL OR message.account = :account)" +
" AND (:folder IS NULL OR message.folder = :folder)" +
" AND subject LIKE :query" +
" AND NOT message.ui_hide" +
@ -675,7 +676,8 @@ public interface DaoMessage {
" UNION" +
" SELECT id AS _id, sender AS suggestion FROM message" +
" WHERE (:account IS NULL OR message.account = :account)" +
" WHERE :senders" +
" AND (:account IS NULL OR message.account = :account)" +
" AND (:folder IS NULL OR message.folder = :folder)" +
" AND sender LIKE :query" +
" AND NOT message.ui_hide" +
@ -683,7 +685,7 @@ public interface DaoMessage {
" ORDER BY sender, subject" +
" LIMIT :limit")
Cursor getSuggestions(Long account, Long folder, String query, int limit);
Cursor getSuggestions(boolean subject, boolean senders, Long account, Long folder, String query, int limit);
@Query("SELECT language FROM message" +
" WHERE (:account IS NULL OR message.account = :account)" +

2
app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
View File

@ -169,6 +169,8 @@ public class FragmentDialogSearch extends FragmentDialogBase {
DB db = DB.getInstance(context);
return db.message().getSuggestions(
cbSubject.isChecked(),
cbSenders.isChecked(),
account < 0 ? null : account,
folder < 0 ? null : folder,
"%" + typed + "%",