Unsubscribe model manager when in background (#3179)

home-assistant · Nov 20, 2024 · c088157 · c088157
1 parent 4b866ee
commit c088157
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Sources/App/AppDelegate.swift b/Sources/App/AppDelegate.swift
@@ -398,11 +398,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     private func setupModels() {
         // Force Realm migration to happen now
         _ = Realm.live()
-
-        Current.modelManager.cleanup().cauterize()
-        Current.modelManager.subscribe(isAppInForeground: {
-            UIApplication.shared.applicationState == .active
-        })
         Action.setupObserver()
         NotificationCategory.setupObserver()
         WidgetOpenPageIntent.setupObserver()

diff --git a/Sources/App/Scenes/WebViewSceneDelegate.swift b/Sources/App/Scenes/WebViewSceneDelegate.swift
@@ -94,10 +94,15 @@ final class WebViewSceneDelegate: NSObject, UIWindowSceneDelegate {
 
     func sceneDidEnterBackground(_ scene: UIScene) {
         DataWidgetsUpdater.update()
+        Current.modelManager.unsubscribe()
     }
 
     func sceneWillEnterForeground(_ scene: UIScene) {
         DataWidgetsUpdater.update()
+        Current.modelManager.cleanup().cauterize()
+        Current.modelManager.subscribe(isAppInForeground: {
+            UIApplication.shared.applicationState == .active
+        })
     }
 
     func windowScene(

diff --git a/Sources/Shared/API/Models/ModelManager.swift b/Sources/Shared/API/Models/ModelManager.swift
@@ -220,13 +220,14 @@ public class ModelManager: ServerObserver {
                                 token.cancel()
                                 return
                             }
-
-                            guard ModelManager.isAppInForeground() else { return }
-                            let entities = value.all.filter { $0.domain == domain }
-                            if entities != lastEntities {
-                                manager.store(type: type, from: server, sourceModels: entities).cauterize()
-                                lastEntities = entities
-                                appEntitiesModel.updateModel(entities, server: server)
+                            DispatchQueue.main.async {
+                                guard ModelManager.isAppInForeground() else { return }
+                                let entities = value.all.filter { $0.domain == domain }
+                                if entities != lastEntities {
+                                    manager.store(type: type, from: server, sourceModels: entities).cauterize()
+                                    lastEntities = entities
+                                    appEntitiesModel.updateModel(entities, server: server)
+                                }
                             }
                         }
                     },