Browse Source

Revert changes to registerHandlers() function due to Xcode 15 issues

Deniz Cengiz 1 year ago
parent
commit
f60bc896ea
1 changed files with 25 additions and 11 deletions
  1. 25 11
      FreeAPS/Sources/Services/Network/TidepoolManager.swift

+ 25 - 11
FreeAPS/Sources/Services/Network/TidepoolManager.swift

@@ -98,18 +98,32 @@ final class BaseTidepoolManager: TidepoolManager, Injectable {
 
 
     /// Registers handlers for Core Data changes
     /// Registers handlers for Core Data changes
     private func registerHandlers() {
     private func registerHandlers() {
-        coreDataPublisher?.filterByEntityName("PumpEventStored").sink { [weak self] _ in
-            Task { await self?.uploadInsulin() }
-        }.store(in: &subscriptions)
-
-        coreDataPublisher?.filterByEntityName("CarbEntryStored").sink { [weak self] _ in
-            Task { await self?.uploadCarbs() }
-        }.store(in: &subscriptions)
+            coreDataPublisher?.filterByEntityName("PumpEventStored").sink { [weak self] _ in
+                guard let self = self else { return }
+                Task { [weak self] in
+                    guard let self = self else { return }
+                    await self.uploadInsulin()
+                }
+            }.store(in: &subscriptions)
 
 
-        coreDataPublisher?.filterByEntityName("GlucoseStored").sink { [weak self] _ in
-            Task { await self?.uploadGlucose() }
-        }.store(in: &subscriptions)
-    }
+            coreDataPublisher?.filterByEntityName("CarbEntryStored").sink { [weak self] _ in
+                guard let self = self else { return }
+                Task { [weak self] in
+                    guard let self = self else { return }
+                    await self.uploadCarbs()
+                }
+            }.store(in: &subscriptions)
+
+            // TODO: this is currently done in FetchGlucoseManager and forced there inside a background task.
+            // leave it there, or move it here? not sure…
+            coreDataPublisher?.filterByEntityName("GlucoseStored").sink { [weak self] _ in
+                guard let self = self else { return }
+                Task { [weak self] in
+                    guard let self = self else { return }
+                    await self.uploadGlucose()
+                }
+            }.store(in: &subscriptions)
+        }
 
 
     private func subscribe() {
     private func subscribe() {
         broadcaster.register(TempTargetsObserver.self, observer: self)
         broadcaster.register(TempTargetsObserver.self, observer: self)