Save point

Author: liamcharger

InfiniLink/BLE/BLECharacteristicHandler.swift

@@ -19,8 +19,7 @@ struct BLECharacteristicHandler {
     let remindersManager = RemindersManager.shared
     let deviceManager = DeviceManager.shared
     let fitnessCalculator = FitnessCalculator.shared
-    
-    let viewContext = PersistenceController.shared.container.viewContext
+    let persistenceController = PersistenceController.shared
 
     @AppStorage("filterHeartRateData") var filterHeartRateData: Bool = false
     @AppStorage("remindOnStepGoalCompletion") var remindOnStepGoalCompletion = true
@@ -34,7 +33,7 @@ struct BLECharacteristicHandler {
         fetchRequest.sortDescriptors = [NSSortDescriptor(key: "timestamp", ascending: true)]
 
         do {
-            return try viewContext.fetch(fetchRequest)
+            return try persistenceController.container.viewContext.fetch(fetchRequest)
         } catch {
             log("Error fetching heart points: \(error)", caller: "BLECharacteristicHandler")
             return []

InfiniLink/BLE/BLEManager.swift

@@ -200,7 +200,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
                 await deviceManager.removeDevice(device ?? pairedDevice)
             }
             // Update the list of user watches
-            await deviceManager.fetchAllDevices()
+            deviceManager.fetchAllDevices()
 
             if let first = deviceManager.watches.first, deviceManager.watches.count <= 1 {
                 // Switch to the user's next watch

InfiniLink/BLE/DeviceManager.swift

@@ -92,12 +92,16 @@ class DeviceManager: ObservableObject {
         fetchRequest.predicate = NSPredicate(format: "uuid == %@", id)
 
         do {
-            let existingDevices = try persistenceController.container.viewContext.fetch(fetchRequest)
+            let context = persistenceController.container.viewContext
+            let existingDevices = try context.fetch(fetchRequest)
+            
+            // There's already a paired watch
             if let existingDevice = existingDevices.first {
                 return existingDevice
             }
 
-            let newDevice = Device(context: persistenceController.container.viewContext)
+            // There's not already a paired watch, create a new object to save
+            let newDevice = Device(context: context)
             newDevice.uuid = id
             newDevice.bleUUID = id
             newDevice.blefsVersion = ""
@@ -108,9 +112,7 @@ class DeviceManager: ObservableObject {
             newDevice.modelNumber = ""
             newDevice.serial = ""
 
-            Task {
-                await persistenceController.save()
-            }
+            try context.save()
 
             return newDevice
         } catch {
@@ -121,8 +123,7 @@ class DeviceManager: ObservableObject {
 
     // Get settings from settings file from watch and save it to keep device object up-to-date
     func updateSettings(settings: Settings) {
-        guard let uuid = bleManager.pairedDevice?.uuid else { return }
-        guard let device = fetchDevice(with: uuid) else { return }
+        guard let device = fetchDevice() else { return }
 
         device.brightLevel = Int16(settings.brightLevel.rawValue)
         device.chimesOption = Int16(settings.chimesOption.rawValue)
@@ -193,13 +194,11 @@ class DeviceManager: ObservableObject {
         }
     }
 
-    func fetchAllDevices() async {
+    func fetchAllDevices() {
         let fetchRequest: NSFetchRequest<Device> = Device.fetchRequest()
 
         do {
-            try await persistenceController.container.performBackgroundTask { context in
-                self.watches = try context.fetch(fetchRequest)
-            }
+            self.watches = try self.persistenceController.container.viewContext.fetch(fetchRequest)
         } catch {
             log("Error fetching devices: \(error.localizedDescription)", caller: "DeviceManager")
         }

InfiniLink/Core/Connect/MyDevicesView.swift

@@ -97,9 +97,7 @@ struct MyDevicesView: View {
                 ConnectView()
             }
             .onAppear {
-                Task {
-                    await deviceManager.fetchAllDevices()
-                }
+                deviceManager.fetchAllDevices()
             }
         }
         .navigationViewStyle(.stack)

InfiniLink/Core/Settings/General/Filesystem/Views/FileSystemDetailView.swift

@@ -135,8 +135,6 @@ struct FileSystemDetailView: View {
 
                         guard let info = try? bleFs.convertDataToReadableFile(data: data, fileExtension: `extension`) else { return }
 
-                        self.isLoadingFile = false
-                        
                         switch `extension` {
                         case "txt":
                             self.textData = info as? String
@@ -147,6 +145,8 @@ struct FileSystemDetailView: View {
                         default:
                             self.textData = "This file is not currently supported."
                         }
+                        
+                        self.isLoadingFile = false
                     }
                 }
             }