Add MainActor attribution to avoid crashes

EhPanda-Team · Jul 10, 2024 · 856c492 · 856c492
1 parent 0de6620
commit 856c492
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/EhPanda/App/Tools/Clients/AppDelegateClient.swift b/EhPanda/App/Tools/Clients/AppDelegateClient.swift
@@ -9,7 +9,7 @@ import SwiftUI
 import ComposableArchitecture
 
 struct AppDelegateClient {
-    let setOrientation: (UIInterfaceOrientationMask) -> Void
+    let setOrientation: @MainActor (UIInterfaceOrientationMask) -> Void
     let setOrientationMask: (UIInterfaceOrientationMask) -> Void
 }
 
@@ -23,6 +23,7 @@ extension AppDelegateClient {
         }
     )
 
+    @MainActor
     func setPortraitOrientation() {
         setOrientation(.portrait)
     }

diff --git a/EhPanda/App/Tools/Clients/UIApplicationClient.swift b/EhPanda/App/Tools/Clients/UIApplicationClient.swift
@@ -10,7 +10,7 @@ import Combine
 import ComposableArchitecture
 
 struct UIApplicationClient {
-    let openURL: (URL) -> Void
+    let openURL: @MainActor (URL) -> Void
     let hideKeyboard: () -> Void
     let alternateIconName: () -> String?
     let setAlternateIconName: @MainActor (String?) async -> Bool
@@ -43,11 +43,13 @@ extension UIApplicationClient {
             (DeviceUtil.keyWindow ?? DeviceUtil.anyWindow)?.overrideUserInterfaceStyle = userInterfaceStyle
         }
     )
+    @MainActor
     func openSettings() {
         if let url = URL(string: UIApplication.openSettingsURLString) {
             return openURL(url)
         }
     }
+    @MainActor
     func openFileApp() {
         if let dirPath = FileUtil.logsDirectoryURL?.path,
            let dirURL = URL(string: "shareddocuments://" + dirPath)

diff --git a/EhPanda/View/Detail/Comments/CommentsReducer.swift b/EhPanda/View/Detail/Comments/CommentsReducer.swift
@@ -130,7 +130,7 @@ struct CommentsReducer: Reducer {
             case .handleCommentLink(let url):
                 guard urlClient.checkIfHandleable(url) else {
                     return .run { _ in
-                        uiApplicationClient.openURL(url)
+                        await uiApplicationClient.openURL(url)
                     }
                 }
                 let (isGalleryImageURL, _, _) = urlClient.analyzeURL(url)

diff --git a/EhPanda/View/Reading/ReadingReducer.swift b/EhPanda/View/Reading/ReadingReducer.swift
@@ -212,7 +212,7 @@ struct ReadingReducer: Reducer {
                         appDelegateClient.setPortraitOrientationMask()
                     })
                     effects.append(.run { _ in
-                        appDelegateClient.setPortraitOrientation()
+                        await appDelegateClient.setPortraitOrientation()
                     })
                 } else {
                     effects.append(.run { _ in

diff --git a/EhPanda/View/Setting/GeneralSetting/GeneralSettingReducer.swift b/EhPanda/View/Setting/GeneralSetting/GeneralSettingReducer.swift
@@ -89,7 +89,7 @@ struct GeneralSettingReducer: Reducer {
 
             case .navigateToSystemSetting:
                 return .run { _ in
-                    uiApplicationClient.openSettings()
+                    await uiApplicationClient.openSettings()
                 }
 
             case .calculateWebImageDiskCache:

diff --git a/EhPanda/View/Setting/Logs/LogsReducer.swift b/EhPanda/View/Setting/Logs/LogsReducer.swift
@@ -51,7 +51,7 @@ struct LogsReducer: Reducer {
 
             case .navigateToFileApp:
                 return .run { _ in
-                    uiApplicationClient.openFileApp()
+                    await uiApplicationClient.openFileApp()
                 }
 
             case .teardown: