Use @MainActor instead of DispatchQueue.main.async

FlowCrypt/Common UI/AttachmentManager.swift

@@ -9,6 +9,7 @@
 import UIKit
 import Combine
 
+@MainActor
 protocol AttachmentManagerType {
     func open(_ attachment: MessageAttachment)
 }
@@ -49,13 +50,19 @@ extension AttachmentManager: AttachmentManagerType {
             .sinkFuture(
                 receiveValue: {},
                 receiveError: { [weak self] error in
-                    self?.controller?.showToast(
-                        "\("message_attachment_saved_with_error".localized) \(error.localizedDescription)"
-                    )
+                    self?.handle(error)
                 }
             )
             .store(in: &self.cancellable)
     }
+
+    private func handle(_ error: Error) {
+        Task {
+            await controller?.showToast(
+                "\("message_attachment_saved_with_error".localized) \(error.localizedDescription)"
+            )
+        }
+    }
 }
 
 // MARK: - FilesManagerPresenter

FlowCrypt/Common UI/Refreshable.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
- protocol Refreshable {
-
-     func startRefreshing()
- }
+@MainActor
+protocol Refreshable {
+    func startRefreshing()
+}

FlowCrypt/Controllers/Compose/ComposeViewController.swift

@@ -21,7 +21,6 @@ private struct ComposedDraft: Equatable {
  * - User can be redirected here from *InboxViewController* by tapping on *+*
  * - Or from *ThreadDetailsViewController* controller by tapping on *reply*
  **/
-@MainActor
 final class ComposeViewController: TableNodeViewController {
     private lazy var logger = Logger.nested(Self.self)
 
@@ -932,7 +931,6 @@ extension ComposeViewController: PHPickerViewControllerDelegate {
                     })
             }
         }
-
     }
 }
 

FlowCrypt/Controllers/Inbox/Container/InboxViewContainerController.swift

@@ -32,7 +32,7 @@ final class InboxViewContainerController: TableNodeViewController {
     let folderService: FoldersServiceType
     let decorator: InboxViewControllerContainerDecorator
 
-    @MainActor private var state: State = .loading {
+    private var state: State = .loading {
         didSet { handleNewState() }
     }
 
@@ -68,7 +68,7 @@ final class InboxViewContainerController: TableNodeViewController {
         }
     }
 
-    @MainActor private func handleFetched(folders: [FolderViewModel]) {
+    private func handleFetched(folders: [FolderViewModel]) {
         guard folders.isNotEmpty else {
             state = .empty
             return

FlowCrypt/Controllers/Inbox/InboxViewController+Factory.swift

@@ -10,6 +10,7 @@ import Foundation
 import UIKit
 
 class InboxViewControllerFactory {
+    @MainActor
     static func make(with viewModel: InboxViewModel) -> InboxViewController {
         guard let currentAuthType = DataService.shared.currentAuthType else {
             fatalError("Internal inconsistency")

FlowCrypt/Controllers/Inbox/InboxViewController.swift

@@ -7,6 +7,7 @@ import FlowCryptCommon
 import FlowCryptUI
 import Foundation
 
+@MainActor
 final class InboxViewController: ASDKViewController<ASDisplayNode> {
     private lazy var logger = Logger.nested(Self.self)
 

FlowCrypt/Controllers/MessageList Extension/MsgListViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 
+@MainActor
 protocol MsgListViewController {
     func open(with message: InboxRenderable, path: String)
 
@@ -30,11 +31,9 @@ extension MsgListViewController where Self: UIViewController {
     private func openDraft(with message: Message) {
         guard let email = DataService.shared.email else { return }
 
-        Task {
-            let controller = await ComposeViewController(email: email)
-            await controller.updateWithMessage(message: message)
-            await navigationController?.pushViewController(controller, animated: true)
-        }
+        let controller = ComposeViewController(email: email)
+        controller.updateWithMessage(message: message)
+        navigationController?.pushViewController(controller, animated: true)
     }
 
     private func openMsg(with message: Message, path: String) {

FlowCrypt/Controllers/Settings/Backup/Backups Option Scene/BackupOptionsViewController.swift

@@ -21,6 +21,7 @@ enum BackupOption: Int, CaseIterable, Equatable {
     }
 }
 
+@MainActor
 final class BackupOptionsViewController: ASDKViewController<TableNode> {
     enum Parts: Int, CaseIterable {
         case email, download, action, info

FlowCrypt/Controllers/Settings/Backup/Backups Scene/BackupViewController.swift

@@ -9,6 +9,7 @@
 import AsyncDisplayKit
 import FlowCryptUI
 
+@MainActor
 final class BackupViewController: ASDKViewController<TableNode> {
     private enum Parts: Int, CaseIterable {
         case info, action

FlowCrypt/Controllers/Settings/Backup/Backups Seleckt Key Scene/BackupSelectKeyViewController.swift

@@ -10,6 +10,7 @@ import AsyncDisplayKit
 import FlowCryptUI
 import Foundation
 
+@MainActor
 final class BackupSelectKeyViewController: ASDKViewController<TableNode> {
     private let backupService: BackupServiceType
     private let service: ServiceActor

FlowCrypt/Controllers/Settings/KeySettings/Key List/KeySettingsViewController.swift

@@ -15,7 +15,6 @@ import FlowCryptUI
  * - User can proceed to importing keys *SetupManuallyImportKeyViewController*
  * - User can see detail information for the key in *KeyDetailViewController*
  */
-@MainActor
 final class KeySettingsViewController: TableNodeViewController {
     private var keys: [KeyDetails] = []
     private let decorator: KeySettingsViewDecorator

FlowCrypt/Controllers/Setup/PassPhraseSaveable.swift

@@ -8,6 +8,7 @@
 
 import FlowCryptUI
 
+@MainActor
 protocol PassPhraseSaveable {
     var storageMethod: StorageMethod { get set }
     var passPhraseIndexes: [IndexPath] { get }

FlowCrypt/Controllers/Setup/SetupGenerateKeyViewController.swift

@@ -28,7 +28,6 @@ enum CreateKeyError: Error {
  * - Here user can enter a pass phrase (can be saved in memory or in encrypted storage) and generate a key
  * - After key is generated, user will be redirected to **main flow** (inbox view)
  */
-@MainActor
 final class SetupGenerateKeyViewController: SetupCreatePassphraseAbstractViewController {
 
     private let backupService: BackupServiceType

FlowCrypt/Controllers/Setup/SetupManuallyImportKeyViewController.swift

@@ -78,9 +78,7 @@ final class SetupManuallyImportKeyViewController: TableNodeViewController {
     }
 
     private func updateSubtitle() {
-        DispatchQueue.main.async {
-            self.node.reloadRows(at: [Parts.description.indexPath], with: .fade)
-        }
+        node.reloadRows(at: [Parts.description.indexPath], with: .fade)
     }
 }
 

FlowCrypt/Controllers/SetupImap/SetupImapViewController.swift

@@ -509,13 +509,9 @@ extension SetupImapViewController {
             do {
                 try await self.imap.connectImap(session: imapSessionToCheck)
                 try await self.imap.connectSmtp(session: smtpSession)
-                DispatchQueue.main.async {
-                    self.handleSuccessfulConnection()
-                }
+                handleSuccessfulConnection()
             } catch {
-                DispatchQueue.main.async {
-                    self.handleConnection(error: error)
-                }
+                handleConnection(error: error)
             }
         }
     }

FlowCrypt/Controllers/SideMenu/Main/SideMenuNavigationController.swift

@@ -6,6 +6,7 @@ import ENSwiftSideMenu
 import FlowCryptUI
 import UIKit
 
+@MainActor
 protocol SideMenuViewController {
     func didOpen()
 }

FlowCrypt/Controllers/SideMenu/Menu/MyMenuViewController.swift

@@ -13,6 +13,7 @@ import FlowCryptUI
  * On tap on each folder user should be redirected to `InboxViewController` with selected folder
  * On settings tap user will be redirected to `SettingsViewController`
  */
+@MainActor
 final class MyMenuViewController: ASDKViewController<ASDisplayNode> {
     private enum Constants {
         static let allMail = "folder_all_mail".localized
@@ -174,13 +175,9 @@ extension MyMenuViewController {
         Task {
             do {
                 let folders = try await foldersProvider.fetchFolders(isForceReload: true)
-                DispatchQueue.main.async {
-                    self.handleNewFolders(with: folders)
-                }
+                handleNewFolders(with: folders)
             } catch {
-                DispatchQueue.main.async {
-                    self.handleError(with: error)
-                }
+                handleError(with: error)
             }
         }
     }

FlowCrypt/Controllers/SideMenu/NavigationController/NavigationChildController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 
+@MainActor
 protocol NavigationChildController {
     var navigationItem: UINavigationItem { get }
     var shouldShowBackButton: Bool { get }

FlowCrypt/Controllers/Threads/MessageActionsHandler.swift

@@ -10,6 +10,7 @@ import UIKit
 import FlowCryptUI
 import FlowCryptCommon
 
+@MainActor
 protocol MessageActionsHandler: AnyObject {
     var currentFolderPath: String { get }
     var trashFolderProvider: TrashFolderProviderType { get }
@@ -33,9 +34,7 @@ extension MessageActionsHandler where Self: UIViewController {
         Task {
             do {
                 let path = try await trashFolderProvider.getTrashFolderPath()
-                DispatchQueue.main.async {
-                    self.setupNavigationBarItems(with: path)
-                }
+                setupNavigationBarItems(with: path)
             } catch {
                 // todo - handle?
                 logger.logError("setupNavigationBar: \(error)")
@@ -95,22 +94,18 @@ extension MessageActionsHandler where Self: UIViewController {
         Task {
             do {
                 let trashPath = try await trashFolderProvider.getTrashFolderPath()
-                DispatchQueue.main.async {
-                    guard let trashPath = trashPath else {
-                        return
-                    }
-                    if self.currentFolderPath.caseInsensitiveCompare(trashPath) == .orderedSame {
-                        self.awaitUserConfirmation { [weak self] in
-                            self?.permanentlyDelete()
-                        }
-                    } else {
-                        self.moveToTrash(with: trashPath)
+                guard let trashPath = trashPath else {
+                    return
+                }
+                if self.currentFolderPath.caseInsensitiveCompare(trashPath) == .orderedSame {
+                    self.awaitUserConfirmation { [weak self] in
+                        self?.permanentlyDelete()
                     }
+                } else {
+                    self.moveToTrash(with: trashPath)
                 }
             } catch {
-                DispatchQueue.main.async {
-                    self.showToast(error.localizedDescription)
-                }
+                showToast(error.localizedDescription)
             }
         }
     }

FlowCrypt/Extensions/UIViewController+Spinner.swift

@@ -5,7 +5,7 @@
 //  Created by Roma Sosnovsky on 25/10/21
 //  Copyright © 2017-present FlowCrypt a. s. All rights reserved.
 //
-    
+
 import MBProgressHUD
 import UIKit
 
@@ -14,47 +14,44 @@ extension UIViewController {
         MBProgressHUD.forView(view) ?? MBProgressHUD.showAdded(to: view, animated: true)
     }
 
+    @MainActor
     func showSpinner(_ message: String = "loading_title".localized, isUserInteractionEnabled: Bool = false) {
-        DispatchQueue.main.async {
-            guard self.view.subviews.first(where: { $0 is MBProgressHUD }) == nil else {
-                // hud is already shown
-                return
-            }
-            self.view.isUserInteractionEnabled = isUserInteractionEnabled
-
-            let spinner = MBProgressHUD.showAdded(to: self.view, animated: true)
-            spinner.label.text = message
-            spinner.isUserInteractionEnabled = isUserInteractionEnabled
+        guard self.view.subviews.first(where: { $0 is MBProgressHUD }) == nil else {
+            // hud is already shown
+            return
         }
+        self.view.isUserInteractionEnabled = isUserInteractionEnabled
+
+        let spinner = MBProgressHUD.showAdded(to: self.view, animated: true)
+        spinner.label.text = message
+        spinner.isUserInteractionEnabled = isUserInteractionEnabled
     }
 
+    @MainActor
     func updateSpinner(label: String = "compose_uploading".localized,
                        progress: Float? = nil,
                        systemImageName: String? = nil) {
-        DispatchQueue.main.async {
-            if let progress = progress {
-                if progress >= 1, let imageName = systemImageName {
-                    self.updateSpinner(label: "compose_sent".localized,
-                                       systemImageName: imageName)
-                } else {
-                    self.showProgressHUD(progress: progress, label: label)
-                }
-            } else if let imageName = systemImageName {
-                self.showProgressHUDWithCustomImage(imageName: imageName, label: label)
+        if let progress = progress {
+            if progress >= 1, let imageName = systemImageName {
+                self.updateSpinner(label: "compose_sent".localized,
+                                   systemImageName: imageName)
             } else {
-                self.currentProgressHUD.mode = .indeterminate
-                self.currentProgressHUD.label.text = label
+                self.showProgressHUD(progress: progress, label: label)
             }
+        } else if let imageName = systemImageName {
+            self.showProgressHUDWithCustomImage(imageName: imageName, label: label)
+        } else {
+            self.currentProgressHUD.mode = .indeterminate
+            self.currentProgressHUD.label.text = label
         }
     }
 
+    @MainActor
     func hideSpinner() {
-        DispatchQueue.main.async {
-            self.view.subviews
-                .compactMap { $0 as? MBProgressHUD }
-                .forEach { $0.hide(animated: true) }
-            self.view.isUserInteractionEnabled = true
-        }
+        self.view.subviews
+            .compactMap { $0 as? MBProgressHUD }
+            .forEach { $0.hide(animated: true) }
+        self.view.isUserInteractionEnabled = true
     }
 }