Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 13:47:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed message counts

Browse Source
This commit is contained in:
M66B
2019-02-11 20:26:05 +00:00
parent 7f4de090df
commit 53cf0f98f1
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,14 +170,15 @@ public interface DaoMessage {
" ORDER BY message.received DESC")
List<Long> getMessageIdsByFolder(Long folder);
@Query("SELECT *" +
@Query("SELECT message.*" +
" FROM message" +
" LEFT JOIN account ON account.id = :account" +
" WHERE account = :account" +
" AND thread = :thread" +
" AND message.thread = :thread" +
" AND (:id IS NULL OR message.id = :id)" +
" AND (:folder IS NULL OR message.folder = :folder)" +
" AND NOT uid IS NULL" +
" AND NOT ui_hide")
" AND (NOT message.uid IS NULL OR account.pop)" +
" AND NOT message.ui_hide")
List<EntityMessage> getMessageByThread(long account, String thread, Long id, Long folder);
@Query("SELECT * FROM message" +
@@ -235,6 +236,7 @@ public interface DaoMessage {
" JOIN folder ON folder.id = message.folder" +
" WHERE account.`synchronize`" +
" AND folder.unified" +
" AND (account.created IS NULL OR message.received > account.created)" +
" AND NOT message.ui_seen" +
" AND NOT message.ui_hide" +
" AND NOT message.ui_ignored" +