Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct multiple inboxes

Browse Source
This commit is contained in:
M66B
2025-06-26 22:56:34 +02:00
parent e0f05c8205
commit 63c30a8bd0
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -2992,9 +2992,16 @@ class Core {
try {
db.beginTransaction();
if (EntityFolder.INBOX.equals(type)) // Case insensitive
folder = db.folder().getFolderByType(account.id, type);
else
if (EntityFolder.INBOX.equals(type)) { // Case insensitive
List<EntityFolder> inboxes = db.folder().getFoldersByType(account.id, type);
if (inboxes == null || inboxes.isEmpty())
folder = null;
else {
folder = inboxes.get(0);
for (int i = 1; i < inboxes.size(); i++)
db.folder().deleteFolder(inboxes.get(i).id);
}
} else
folder = db.folder().getFolderByName(account.id, fullName);
if (folder == null) {
EntityFolder parent = null;

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

@@ -236,6 +236,11 @@ public interface DaoFolder {
" WHERE account = :account AND type = :type")
EntityFolder getFolderByType(long account, String type);
@Query("SELECT folder.* FROM folder" +
" WHERE account = :account AND type = :type" +
" ORDER BY folder.id")
List<EntityFolder> getFoldersByType(long account, String type);
@Query("SELECT folder.* FROM folder" +
" JOIN account ON account.id = folder.account" +
" WHERE account.synchronize" +