fix: Ensure destination folder is always frozen

Infomaniak · Apr 30, 2024 · ce3de22 · ce3de22
1 parent 0da989b
commit ce3de22
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Mail/Views/MoveEmailView.swift b/Mail/Views/MoveEmailView.swift
@@ -92,9 +92,15 @@ struct MoveEmailView: View {
 
     private func move(to folder: Folder) {
         let frozenOriginFolder = originFolder?.freezeIfNeeded()
+        let frozenDestinationFolder = folder.freezeIfNeeded()
+
         Task {
             await tryOrDisplayError {
-                try await actionsManager.performMove(messages: movedMessages, from: frozenOriginFolder, to: folder)
+                try await actionsManager.performMove(
+                    messages: movedMessages,
+                    from: frozenOriginFolder,
+                    to: frozenDestinationFolder
+                )
             }
         }
         dismissModal()

diff --git a/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift b/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift
@@ -19,6 +19,7 @@
 import CocoaLumberjackSwift
 import Foundation
 import InfomaniakCore
+import InfomaniakCoreDB
 import InfomaniakCoreUI
 import RealmSwift
 import Sentry
@@ -31,8 +32,8 @@ public extension MailboxManager {
     /// - Parameters:
     ///   - folder: Folder to fetch messages from
     ///   - fetchCurrentFolderCompleted: Completion once the messages have been fetched
-    func threads(folder: Folder, fetchCurrentFolderCompleted: (() -> Void) = {}) async throws {
-        try await messages(folder: folder.freezeIfNeeded())
+    func threads(@EnsureFrozen folder: Folder, fetchCurrentFolderCompleted: (() -> Void) = {}) async throws {
+        try await messages(folder: folder)
         fetchCurrentFolderCompleted()
 
         var roles: [FolderRole] {