fix: fix crash by ensuring UI operations run on the main thread when …

…ending text editing
aalberrty · Oct 27, 2024 · e9e83a4 · e9e83a4
1 parent 2137888
commit e9e83a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/EhPanda/App/Tools/Clients/UIApplicationClient.swift b/EhPanda/App/Tools/Clients/UIApplicationClient.swift
@@ -11,7 +11,7 @@ import ComposableArchitecture
 
 struct UIApplicationClient {
     let openURL: @MainActor (URL) -> Void
-    let hideKeyboard: () -> Void
+    let hideKeyboard: @Sendable () async -> Void
     let alternateIconName: () -> String?
     let setAlternateIconName: @MainActor (String?) async -> Bool
     let setUserInterfaceStyle: @MainActor (UIUserInterfaceStyle) -> Void
@@ -23,7 +23,9 @@ extension UIApplicationClient {
             UIApplication.shared.open(url, options: [:])
         },
         hideKeyboard: {
-            UIApplication.shared.endEditing()
+            await MainActor.run {
+                UIApplication.shared.endEditing()
+            }
         },
         alternateIconName: {
             UIApplication.shared.alternateIconName

diff --git a/EhPanda/App/Tools/Extensions/Extensions.swift b/EhPanda/App/Tools/Extensions/Extensions.swift
@@ -17,6 +17,7 @@ extension Encodable {
 
 // MARK: UIApplication
 extension UIApplication {
+    @MainActor
     func endEditing() {
         sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
     }

diff --git a/EhPanda/View/Setting/EhSetting/EhSettingReducer.swift b/EhPanda/View/Setting/EhSetting/EhSettingReducer.swift
@@ -70,7 +70,7 @@ struct EhSettingReducer {
                 return .none
 
             case .setKeyboardHidden:
-                return .run(operation: { _ in uiApplicationClient.hideKeyboard() })
+                return .run(operation: { _ in await uiApplicationClient.hideKeyboard() })
 
             case .setDefaultProfile(let profileSet):
                 return .run { _ in