Merge pull request #469 from Infomaniak/unread-count

fix: UnreadCount
Infomaniak · Jan 6, 2023 · adf6276 · adf6276
2 parents 0a21a64 + b570081
commit adf6276
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/MailCore/Cache/MailboxManager.swift b/MailCore/Cache/MailboxManager.swift
@@ -652,7 +652,7 @@ public class MailboxManager: ObservableObject {
             if newCursor != nil {
                 guard let folder = folder.fresh(using: realm) else { return }
                 try? realm.safeWrite {
-                    folder.computeUnreadCount(using: realm)
+                    folder.computeUnreadCount()
                     folder.cursor = newCursor
                     folder.lastUpdate = Date()
                 }

diff --git a/MailCore/Models/Folder.swift b/MailCore/Models/Folder.swift
@@ -177,9 +177,8 @@ public class Folder: Object, Codable, Comparable, Identifiable {
         return lhs.id == rhs.id
     }
 
-    public func computeUnreadCount(using realm: Realm) {
-        let unreadMessages = realm.objects(Message.self).where { $0.folderId == self.id && $0.seen == false }
-        unreadCount = unreadMessages.count
+    public func computeUnreadCount() {
+        unreadCount = threads.where { $0.hasUnseenMessages == true }.count
     }
 
     public func isParent(of folder: Folder) -> Bool {

diff --git a/MailCore/Utils/NotificationsHelper.swift b/MailCore/Utils/NotificationsHelper.swift
@@ -64,10 +64,8 @@ public enum NotificationsHelper {
         for mailbox in MailboxInfosManager.instance.getMailboxes() {
             if let mailboxManager = AccountManager.instance.getMailboxManager(for: mailbox),
                let inboxFolder = mailboxManager.getFolder(with: .inbox) {
-                totalUnreadCount += mailboxManager.getRealm()
-                    .objects(Message.self)
-                    .where { $0.seen == false && $0.folderId == inboxFolder.id }
-                    .count
+                inboxFolder.computeUnreadCount()
+                totalUnreadCount += inboxFolder.unreadCount
             }
         }