From a82d921530898d7e54c2f2f14606e8cda25ed726 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 13 Jan 2020 20:07:32 +0100
Subject: [PATCH] Always sync unified system folders

---
 app/src/main/java/eu/faircode/email/DaoFolder.java        | 4 ++--
 app/src/main/java/eu/faircode/email/FragmentAccounts.java | 2 +-
 app/src/main/java/eu/faircode/email/FragmentFolders.java  | 2 +-
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index 5f72bf8705..32a1da6800 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -54,9 +54,9 @@ public interface DaoFolder {
     @Query("SELECT folder.* FROM folder" +
             " JOIN account ON account.id = folder.account" +
             " WHERE account.synchronize" +
-            " AND folder.synchronize" +
+            " AND (NOT :synchronizing OR folder.synchronize)" +
             " AND ((:type IS NULL AND folder.unified) OR folder.type = :type)")
-    List<EntityFolder> getFoldersSynchronizingUnified(String type);
+    List<EntityFolder> getFoldersUnified(String type, boolean synchronizing);
 
     @Query("SELECT folder.* FROM folder" +
             " JOIN account ON account.id = folder.account" +
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index 42eee59fc6..e5ad974b68 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -350,7 +350,7 @@ public class FragmentAccounts extends FragmentBase {
                     db.beginTransaction();
 
                     // Unified inbox
-                    List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified(null);
+                    List<EntityFolder> folders = db.folder().getFoldersUnified(null, true);
                     for (EntityFolder folder : folders) {
                         EntityOperation.sync(context, folder.id, true);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 611c6aa7ec..ccc2cb6145 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -337,7 +337,7 @@ public class FragmentFolders extends FragmentBase {
 
                     if (aid < 0) {
                         // Unified inbox
-                        List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified(null);
+                        List<EntityFolder> folders = db.folder().getFoldersUnified(null, true);
                         for (EntityFolder folder : folders) {
                             EntityOperation.sync(context, folder.id, true);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index fe9c870c09..6dfecf0ffe 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1304,7 +1304,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     List<EntityFolder> folders = new ArrayList<>();
                     if (fid < 0)
-                        folders.addAll(db.folder().getFoldersSynchronizingUnified(type));
+                        folders.addAll(db.folder().getFoldersUnified(type, type == null));
                     else {
                         EntityFolder folder = db.folder().getFolder(fid);
                         if (folder != null)