Procházet zdrojové kódy

Move Combine Setup functions in Bolus and Home State Model to subscribe function

polscm32 před 1 rokem
rodič
revize
01704dc740

+ 2 - 5
FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -130,6 +130,8 @@ extension Bolus {
                     .receive(on: DispatchQueue.global(qos: .background))
                     .share()
                     .eraseToAnyPublisher()
+            registerHandlers()
+            registerSubscribers()
             setupBolusStateConcurrently()
         }
 
@@ -137,11 +139,6 @@ extension Bolus {
             Task {
                 await withTaskGroup(of: Void.self) { group in
                     group.addTask {
-                        // Avoid Race Condition by not executing these functions in parallel -> both are modifying the subscriptions var
-                        self.registerHandlers()
-                        self.registerSubscribers()
-                    }
-                    group.addTask {
                         self.setupGlucoseArray()
                     }
                     group.addTask {

+ 3 - 5
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -119,6 +119,9 @@ extension Home {
                     .share()
                     .eraseToAnyPublisher()
 
+            registerSubscribers()
+            registerHandlers()
+
             // Parallelize Setup functions
             setupHomeViewConcurrently()
         }
@@ -127,11 +130,6 @@ extension Home {
             Task {
                 await withTaskGroup(of: Void.self) { group in
                     group.addTask {
-                        // Avoid Race Condition by not executing these functions in parallel -> both are modifying the subscriptions var
-                        self.registerSubscribers()
-                        self.registerHandlers()
-                    }
-                    group.addTask {
                         self.setupGlucoseArray()
                     }
                     group.addTask {