Make sure FlutterEventChannel is on the main thread

DefinedNet · Feb 21, 2025 · ecc372d · ecc372d
1 parent a06476f
commit ecc372d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
@@ -27,7 +27,13 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
 
     Task {
       for await site in await dnUpdater.siteUpdates {
-        self.sites?.updateSite(site: site)
+        // Signal the site has changed in case the current site details screen is active
+        let container = sites?.getContainer(id: site.id)
+        if container != nil {
+          // Update references to the site with the new site config
+          container!.site = site
+          container!.updater.update(connected: site.connected ?? false, replaceSite: site)
+        }
 
         // Signal to the main screen to reload
         self.ui?.invokeMethod("refreshSites", arguments: nil)

diff --git a/ios/Runner/Sites.swift b/ios/Runner/Sites.swift
@@ -29,12 +29,12 @@ class Sites {
     case .failure(let error):
       return Result.failure(error)
     case .success(let sites):
-      sites.values.forEach { site in
+      for site in sites.values {
         var updater = self.containers[site.id]?.updater
         if updater != nil {
-          updater!.setSite(site: site)
+          await updater!.setSite(site: site)
         } else {
-          updater = SiteUpdater(messenger: self.messenger!, site: site)
+          updater = await SiteUpdater(messenger: self.messenger!, site: site)
         }
         self.containers[site.id] = SiteContainer(site: site, updater: updater!)
       }
@@ -84,18 +84,10 @@ class Sites {
     return containers[id]
   }
 
-  func updateSite(site: Site) {
-    // Signal the site has changed in case the current site details screen is active
-    let container = getContainer(id: site.id)
-    if container != nil {
-      // Update references to the site with the new site config
-      container!.site = site
-      container!.updater.update(connected: site.connected ?? false, replaceSite: site)
-    }
-  }
 }
 
-class SiteUpdater: NSObject, FlutterStreamHandler, @unchecked Sendable {
+@MainActor
+final class SiteUpdater: NSObject, FlutterStreamHandler, @unchecked Sendable {
   private var eventSink: FlutterEventSink?
   private var eventChannel: FlutterEventChannel
   private var site: Site