Procházet zdrojové kódy

use configured backgroundContext() from CD stack

polscm32 před 2 roky
rodič
revize
309310fa47

+ 1 - 1
FreeAPS/Sources/APS/APSManager.swift

@@ -83,7 +83,7 @@ final class BaseAPSManager: APSManager, Injectable {
     @Persisted(key: "lastHistoryCleanupDate") private var lastHistoryCleanupDate = Date.distantPast
 
     let viewContext = CoreDataStack.shared.persistentContainer.viewContext
-    let privateContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let privateContext = CoreDataStack.shared.newTaskContext()
 
     private var openAPS: OpenAPS!
 

+ 1 - 1
FreeAPS/Sources/APS/DeviceDataManager.swift

@@ -73,7 +73,7 @@ final class BaseDeviceDataManager: DeviceDataManager, Injectable {
     @SyncAccess private var pumpUpdateCancellable: AnyCancellable?
     private var pumpUpdatePromise: Future<Bool, Never>.Promise?
     @SyncAccess var loopInProgress: Bool = false
-    private let privateContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    private let privateContext = CoreDataStack.shared.newTaskContext()
 
     var pumpManager: PumpManagerUI? {
         didSet {

+ 1 - 1
FreeAPS/Sources/APS/FetchGlucoseManager.swift

@@ -32,7 +32,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
     private lazy var dexcomSourceG7 = DexcomSourceG7(glucoseStorage: glucoseStorage, glucoseManager: self)
     private lazy var simulatorSource = GlucoseSimulatorSource()
 
-    private let context = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    private let context = CoreDataStack.shared.newTaskContext()
 
     init(resolver: Resolver) {
         injectServices(resolver)

+ 1 - 1
FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -9,7 +9,7 @@ final class OpenAPS {
 
     private let storage: FileStorage
 
-    let context = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let context = CoreDataStack.shared.newTaskContext()
 
     let jsonConverter = JSONConverter()
 

+ 1 - 1
FreeAPS/Sources/APS/Storage/CarbsStorage.swift

@@ -21,7 +21,7 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
     @Injected() private var broadcaster: Broadcaster!
     @Injected() private var settings: SettingsManager!
 
-    let coredataContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let coredataContext = CoreDataStack.shared.newTaskContext()
 
     init(resolver: Resolver) {
         injectServices(resolver)

+ 1 - 1
FreeAPS/Sources/APS/Storage/GlucoseStorage.swift

@@ -24,7 +24,7 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
     @Injected() private var broadcaster: Broadcaster!
     @Injected() private var settingsManager: SettingsManager!
 
-    let coredataContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let coredataContext = CoreDataStack.shared.newTaskContext()
 
     private enum Config {
         static let filterTime: TimeInterval = 3.5 * 60

+ 1 - 1
FreeAPS/Sources/APS/Storage/PumpHistoryStorage.swift

@@ -31,7 +31,7 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
     typealias PumpEvent = PumpEventStored.EventType
     typealias TempType = PumpEventStored.TempType
 
-    private let context = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    private let context = CoreDataStack.shared.newTaskContext()
 
     private func roundDose(_ dose: Double, toIncrement increment: Double) -> Decimal {
         let roundedValue = (dose / increment).rounded() * increment

+ 1 - 1
FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetStateModel.swift

@@ -6,7 +6,7 @@ extension AddTempTarget {
         @Injected() private var storage: TempTargetsStorage!
         @Injected() var apsManager: APSManager!
 
-        let coredataContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+        let coredataContext = CoreDataStack.shared.newTaskContext()
 
         @Published var low: Decimal = 0
         // @Published var target: Decimal = 0

+ 1 - 1
FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -97,7 +97,7 @@ extension Bolus {
         let now = Date.now
 
         let context = CoreDataStack.shared.persistentContainer.viewContext
-        let backgroundContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+        let backgroundContext = CoreDataStack.shared.newTaskContext()
 
         typealias PumpEvent = PumpEventStored.EventType
 

+ 1 - 1
FreeAPS/Sources/Modules/Calibrations/CalibrationsStateModel.swift

@@ -16,7 +16,7 @@ extension Calibrations {
         var units: GlucoseUnits = .mmolL
 
         // TODO: - test if we need to use the viewContext here
-        private let context = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+        private let context = CoreDataStack.shared.newTaskContext()
 
         override func subscribe() {
             units = settingsManager.settings.units

+ 1 - 1
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -68,7 +68,7 @@ extension Home {
 
         @Published var waitForSuggestion: Bool = false
 
-        let context = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+        let context = CoreDataStack.shared.newTaskContext()
 
         override func subscribe() {
             setupBasals()

+ 1 - 1
FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift

@@ -16,7 +16,7 @@ extension NightscoutConfig {
         @Injected() private var storage: FileStorage!
         @Injected() var apsManager: APSManager!
 
-        let coredataContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+        let coredataContext = CoreDataStack.shared.newTaskContext()
 
         @Published var url = ""
         @Published var secret = ""

+ 1 - 1
FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesStateModel.swift

@@ -56,7 +56,7 @@ extension OverrideProfilesConfig {
             maxValue = settingsManager.preferences.autosensMax
         }
 
-        let coredataContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+        let coredataContext = CoreDataStack.shared.newTaskContext()
 
         func initialFetchForProfilePresets() -> [OverridePresets] {
             let fr = OverridePresets.fetchRequest()

+ 1 - 1
FreeAPS/Sources/Services/Network/NightscoutManager.swift

@@ -62,7 +62,7 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
         return NightscoutAPI(url: url, secret: secret)
     }
 
-    private let context = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    private let context = CoreDataStack.shared.newTaskContext()
 
     private var lastTwoDeterminations: [OrefDetermination]?
 

+ 1 - 1
FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -19,7 +19,7 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
     @Injected() private var garmin: GarminManager!
 
     let coreDataStorage = CoreDataStorage()
-    let context = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let context = CoreDataStack.shared.newTaskContext()
 
     private var lifetime = Lifetime()
 

+ 1 - 1
FreeAPS/Sources/Shortcuts/BaseIntentsRequest.swift

@@ -16,7 +16,7 @@ import Swinject
 
     let resolver: Resolver
 
-    let coredataContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let coredataContext = CoreDataStack.shared.newTaskContext()
 
     override init() {
         resolver = FreeAPSApp.resolver

+ 1 - 1
FreeAPS/Sources/Shortcuts/State/StateIntentRequest.swift

@@ -55,7 +55,7 @@ enum StateIntentError: Error {
 }
 
 @available(iOS 16.0, *) final class StateIntentRequest: BaseIntentsRequest {
-    let moc = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let moc = CoreDataStack.shared.newTaskContext()
 
     func getLastGlucose(onContext: NSManagedObjectContext) throws
         -> (dateGlucose: Date, glucose: String, trend: String, delta: String)

+ 1 - 1
Model/Helper/CoreDataStorage.swift

@@ -4,7 +4,7 @@ import SwiftDate
 import Swinject
 
 final class CoreDataStorage {
-    let coredataContext = CoreDataStack.shared.persistentContainer.newBackgroundContext()
+    let coredataContext = CoreDataStack.shared.newTaskContext()
 
     func fetchLatestOverride() -> [Override] {
         var overrideArray = [Override]()