fix(UndoAction): Refresh folders in the correct order

Author: valentinperignon

MailCore/Cache/MailboxManager/MailboxManager+Folders.swift

@@ -18,6 +18,7 @@
 
 import Foundation
 import InfomaniakCore
+import OrderedCollections
 import RealmSwift
 
 // MARK: - Folders
@@ -129,6 +130,10 @@ public extension MailboxManager {
         return try await refreshActor.flushFolder(folder: folder, mailbox: mailbox, apiFetcher: apiFetcher)
     }
 
+    func refreshFolders(folders: OrderedSet<Folder>) async throws {
+        try await refreshActor.refreshFolders(folders: folders)
+    }
+
     func refreshFolder(from messages: [Message], additionalFolder: Folder?) async throws {
         try await refreshActor.refreshFolder(from: messages, additionalFolder: additionalFolder)
     }

MailCore/Cache/MailboxManager/MailboxManager+Message.swift

@@ -18,6 +18,7 @@
 
 import Foundation
 import InfomaniakDI
+import OrderedCollections
 import RealmSwift
 
 // MARK: - Message
@@ -99,26 +100,27 @@ public extension MailboxManager {
     }
 
     func move(messages: [Message], to folder: Folder, origin: Folder? = nil) async throws -> UndoAction {
-        return try await performMoveAction(
-            messages: messages,
-            origin: origin
-        ) { uuid, chunk in
+        return try await performMoveAction(messages: messages, from: origin, to: folder) { uuid, chunk in
             try await self.apiFetcher.move(mailboxUuid: uuid, messages: chunk, destinationId: folder.remoteId)
         }
     }
 
     func reportSpam(messages: [Message], origin: Folder?) async throws -> UndoAction {
+        guard let spamFolder = getFolder(with: .spam)?.freeze() else { throw MailError.folderNotFound }
+
         return try await performMoveAction(
             messages: messages,
-            origin: origin
+            from: origin,
+            to: spamFolder,
         ) { uuid, chunk in
             try await self.apiFetcher.reportSpams(mailboxUuid: uuid, messages: chunk)
         }
     }
 
     func performMoveAction(
         messages: [Message],
-        origin: Folder?,
+        from origin: Folder?,
+        to destination: Folder,
         action: @escaping (String, [Message]) async throws -> UndoResponse
     ) async throws -> UndoAction {
         await markMovedLocallyIfNecessary(true, messages: messages, folder: origin)
@@ -133,9 +135,9 @@ public extension MailboxManager {
         }
 
         Task {
-            try await refreshFolder(from: messages, additionalFolder: origin)
+            try await refreshFolder(from: messages, additionalFolder: destination)
         }
-        return undoAction(for: response, and: messages)
+        return undoAction(for: response, messages: messages, origin: origin, destination: destination)
     }
 
     func delete(messages: [Message]) async throws {
@@ -200,9 +202,16 @@ public extension MailboxManager {
         try await refreshFolder(from: messages, additionalFolder: nil)
     }
 
-    private func undoAction(for cancellableResponses: [UndoResponse], and messages: [Message]) -> UndoAction {
+    private func undoAction(
+        for cancellableResponses: [UndoResponse],
+        messages: [Message],
+        origin: Folder?,
+        destination: Folder?
+    ) -> UndoAction {
         let afterUndo = {
-            try await self.refreshFolder(from: messages, additionalFolder: nil)
+            let foldersToRefresh = [destination, origin].compactMap(\.self) + messages.compactMap(\.folder)
+
+            try await self.refreshFolders(folders: OrderedSet(foldersToRefresh))
             return true
         }
         let undo = {

MailCore/Cache/RefreshActor.swift

@@ -16,6 +16,7 @@
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import Collections
 import Foundation
 import InfomaniakCore
 import InfomaniakCoreCommonUI
@@ -47,19 +48,11 @@ public actor RefreshActor {
         return response
     }
 
-    public func refreshFolder(from messages: [Message], additionalFolder: Folder?) async throws {
+    public func refreshFolders(folders: OrderedSet<Folder>) async throws {
         let updateFolders = Task {
-            var folders = messages.map(\.folder)
-            if let additionalFolder {
-                folders.append(additionalFolder)
-            }
-
-            let orderedSet = NSOrderedSet(array: folders as [Any])
-
-            for folder in orderedSet {
+            for folder in folders {
                 guard !Task.isCancelled else { break }
-                guard let impactedFolder = folder as? Folder else { continue }
-                await refreshFolderContent(impactedFolder)
+                await refreshFolderContent(folder)
             }
         }
 
@@ -79,6 +72,15 @@ public actor RefreshActor {
         expiringActivity.endAll()
     }
 
+    public func refreshFolder(from messages: [Message], additionalFolder: Folder?) async throws {
+        var folders = messages.compactMap(\.folder)
+        if let additionalFolder {
+            folders.append(additionalFolder)
+        }
+
+        try await refreshFolders(folders: OrderedSet(folders))
+    }
+
     public func refreshFolderContent(_ folder: Folder) async {
         await cancelRefresh()
 

Project.swift

@@ -288,6 +288,7 @@ let project = Project(name: "Mail",
                                       .external(name: "Alamofire"),
                                       .external(name: "Algorithms"),
                                       .external(name: "Atlantis"),
+                                      .external(name: "Collections"),
                                       .external(name: "DesignSystem"),
                                       .external(name: "InfomaniakBugTracker"),
                                       .external(name: "InfomaniakConcurrency"),

Tuist/Package.resolved

@@ -243,6 +243,15 @@
         "version" : "1.2.1"
       }
     },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections",
+      "state" : {
+        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
+        "version" : "1.1.4"
+      }
+    },
     {
       "identity" : "swift-concurrency",
       "kind" : "remoteSourceControl",

Tuist/Package.swift

@@ -78,6 +78,7 @@ let package = Package(
         .package(url: "https://github.com/shaps80/SwiftUIBackports", .upToNextMajor(from: "1.15.1")),
         .package(url: "https://github.com/httpswift/swifter", .upToNextMajor(from: "1.5.0")),
         .package(url: "https://github.com/SVGKit/SVGKit.git", branch: "3.x"),
-        .package(url: "https://github.com/Infomaniak/swift-rich-html-editor.git", .upToNextMajor(from: "1.1.1"))
+        .package(url: "https://github.com/Infomaniak/swift-rich-html-editor.git", .upToNextMajor(from: "1.1.1")),
+        .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.1.4")),
     ]
 )