Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 22:26:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unified system folder fixes/improvements

Browse Source
This commit is contained in:
M66B
2019-07-22 13:44:25 +02:00
parent 816ab11ef9
commit a1bead9301
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/DaoFolder.java
View File

@@ -101,9 +101,9 @@ public interface DaoFolder {
" LEFT JOIN rule ON rule.folder = folder.id" +
" LEFT JOIN operation ON operation.folder = folder.id" +
" WHERE account.`synchronize`" +
" AND folder.unified" +
" AND ((:type IS NULL AND folder.unified) OR folder.type = :type)" +
" GROUP BY folder.id")
LiveData<List<TupleFolderEx>> liveUnified();
LiveData<List<TupleFolderEx>> liveUnified(String type);
@Query("SELECT folder.*" +
", account.`order` AS accountOrder, account.name AS accountName, account.color AS accountColor" +
@@ -158,6 +158,7 @@ public interface DaoFolder {
" FROM folder" +
" JOIN account ON account.id = folder.account" +
" WHERE account.synchronize" +
" AND folder.type <> '" + EntityFolder.SYSTEM + "'" +
" AND folder.type <> '" + EntityFolder.USER + "'" +
" GROUP BY folder.type" +
" HAVING COUNT(folder.id) > 1")