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

Fixed notify clear

This commit is contained in:
M66B 2021-07-06 08:13:31 +02:00
parent 436db41bef
commit 53868387ec
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -773,11 +773,15 @@ public interface DaoMessage {
int setMessageLastAttempt(long id, long last_attempt); int setMessageLastAttempt(long id, long last_attempt);
@Query("UPDATE message SET ui_ignored = 1" + @Query("UPDATE message SET ui_ignored = 1" +
" WHERE (:account IS NULL OR account = :account)" + " WHERE NOT ui_ignored" +
" AND NOT ui_ignored" + " AND account IN (" +
" SELECT id FROM account" +
" WHERE :folder IS NOT NULL" +
" OR id = :account" +
" OR (:account IS NULL AND NOT account.notify))" +
" AND folder IN (" + " AND folder IN (" +
" SELECT id FROM folder" + " SELECT id FROM folder" +
" WHERE (:folder IS NULL AND folder.unified) OR id = :folder)") " WHERE :folder IS NULL OR id = :folder)")
int ignoreAll(Long account, Long folder); int ignoreAll(Long account, Long folder);
@Query("UPDATE message SET ui_found = 1 WHERE id = :id AND NOT (ui_found IS 1)") @Query("UPDATE message SET ui_found = 1 WHERE id = :id AND NOT (ui_found IS 1)")

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

@ -187,7 +187,7 @@ public class ServiceUI extends IntentService {
cleared = db.message().ignoreAll(null, -group); cleared = db.message().ignoreAll(null, -group);
else else
cleared = db.message().ignoreAll(group == 0 ? null : group, null); cleared = db.message().ignoreAll(group == 0 ? null : group, null);
Log.i("Cleared=" + cleared); EntityLog.log(this, "Notify clear group=" + group + " cleared=" + cleared);
} }
private void cancel(long group, long id) { private void cancel(long group, long id) {