Merge pull request #15 from Tabonx/main

Dispatch KVS notifications to MainActor context
nonstrict-hq · Nov 8, 2024 · 62db0c9 · 62db0c9
2 parents 766a589 + bec656c
commit 62db0c9
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/Sources/CloudStorage/CloudStorageSync.swift b/Sources/CloudStorage/CloudStorageSync.swift
@@ -26,10 +26,15 @@ public final class CloudStorageSync: ObservableObject {
         status = Status(date: Date(), source: .initial, keys: [])
 
         NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(didChangeExternally(notification:)),
-            name: NSUbiquitousKeyValueStore.didChangeExternallyNotification,
-            object: nil)
+            forName: NSUbiquitousKeyValueStore.didChangeExternallyNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] notification in
+            guard let self else { return }
+            MainActor.assumeIsolated {
+                self.didChangeExternally(notification: notification)
+            }
+        }
         ubiquitousKvs.synchronize()
 
         #if canImport(UIKit) && !os(watchOS)
@@ -41,7 +46,7 @@ public final class CloudStorageSync: ObservableObject {
         #endif
     }
 
-    @objc private func didChangeExternally(notification: Notification) {
+    private func didChangeExternally(notification: Notification) {
         let reasonRaw = notification.userInfo?[NSUbiquitousKeyValueStoreChangeReasonKey] as? Int ?? -1
         let keys = notification.userInfo?[NSUbiquitousKeyValueStoreChangedKeysKey] as? [String] ?? []
         let reason = ChangeReason(rawValue: reasonRaw)