From 4ddd93f5952aa9dc8a265f7bd9eed02fa985130d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 8 Nov 2022 21:05:23 +0100
Subject: [PATCH] Simplification

---
 app/src/main/java/eu/faircode/email/DaoAccount.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index c827d457cc..f9d4a359d1 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -111,9 +111,7 @@ public interface DaoAccount {
             ", folder.type AS folderType, folder.`order` AS folderOrder" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.color AS folderColor" +
             ", folder.synchronize AS folderSync, folder.state AS foldeState, folder.sync_state AS folderSyncState" +
-            ", (SELECT COUNT(operation.id) FROM operation" +
-            "   WHERE operation.folder = folder.id" +
-            "   AND state = 'executing') AS executing" +
+            ", COUNT(operation.id) AS executing" +
             ", (SELECT COUNT(message.id) FROM message" +
             "   WHERE message.folder = folder.id" +
             "   AND NOT ui_hide) AS messages" +
@@ -127,8 +125,10 @@ public interface DaoAccount {
             "    AND NOT ui_hide) AS unseen" +
             " FROM account" +
             " JOIN folder ON folder.account = account.id" +
+            " LEFT JOIN operation ON operation.folder = folder.id AND operation.state = 'executing'" +
             " WHERE account.synchronize" +
-            " AND folder.navigation")
+            " AND folder.navigation" +
+            " GROUP BY folder.id")
     LiveData<List<TupleAccountFolder>> liveAccountFolder();
 
     @Query("SELECT account.*" +