Fix healthKit

oversizedev · Nov 10, 2024 · 5fcea82 · 5fcea82
1 parent 75c514a
commit 5fcea82
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 35 deletions.
diff --git a/Sources/HealthKit/BloodPressureService.swift → ...eHealthService/BloodPressureService.swift b/Sources/HealthKit/BloodPressureService.swift → ...eHealthService/BloodPressureService.swift
@@ -10,9 +10,9 @@ import Foundation
 import OversizeCore
 import OversizeModels
 
-#if !os(tvOS)
+#if canImport(HealthKit)
     @available(iOS 15, macOS 13.0, *)
-    public class BloodPressureService: HealthKitService {
+    public class BloodPressureService: HealthKitService, @unchecked Sendable {
         private let bloodPressureType = HKQuantityType.correlationType(forIdentifier: HKCorrelationTypeIdentifier.bloodPressure)
         private let bloodPressureSystolicType = HKQuantityType.quantityType(forIdentifier: HKQuantityTypeIdentifier.bloodPressureSystolic)
         private let bloodPressureDiastolicType = HKQuantityType.quantityType(forIdentifier: HKQuantityTypeIdentifier.bloodPressureDiastolic)

diff --git a/Sources/HealthKit/BodyMassService.swift → ...ersizeHealthService/BodyMassService.swift b/Sources/HealthKit/BodyMassService.swift → ...ersizeHealthService/BodyMassService.swift
diff --git a/Sources/HealthKit/HealthKitService.swift → ...rsizeHealthService/HealthKitService.swift b/Sources/HealthKit/HealthKitService.swift → ...rsizeHealthService/HealthKitService.swift
@@ -10,7 +10,7 @@ import Foundation
 import OversizeCore
 import OversizeModels
 
-#if !os(tvOS)
+#if canImport(HealthKit)
     @available(iOS 15, macOS 13.0, *)
     open class HealthKitService: @unchecked Sendable {
         var healthStore: HKHealthStore?
@@ -28,29 +28,23 @@ import OversizeModels
             guard let healthStore else {
                 return .failure(AppError.healthKit(type: .savingItem))
             }
-            return await withCheckedContinuation { continuation in
-                healthStore.save(quantitySample) { _, error in
-                    if error != nil {
-                        continuation.resume(returning: .failure(AppError.healthKit(type: .savingItem)))
-                    } else {
-                        continuation.resume(returning: .success(quantitySample))
-                    }
-                }
+            do {
+                try await healthStore.save(quantitySample)
+                return .success(quantitySample)
+            } catch {
+                return .failure(AppError.healthKit(type: .savingItem))
             }
         }
 
         func saveCorrelation(_ correlation: HKCorrelation) async -> Result<HKCorrelation, AppError> {
             guard let healthStore else {
                 return .failure(AppError.healthKit(type: .savingItem))
             }
-            return await withCheckedContinuation { continuation in
-                healthStore.save(correlation) { _, error in
-                    if error != nil {
-                        continuation.resume(returning: .failure(AppError.healthKit(type: .savingItem)))
-                    } else {
-                        continuation.resume(returning: .success(correlation))
-                    }
-                }
+            do {
+                try await healthStore.save(correlation)
+                return .success(correlation)
+            } catch {
+                return .failure(AppError.healthKit(type: .savingItem))
             }
         }
 
@@ -161,26 +155,27 @@ import OversizeModels
         }
 
         func deleteObject(_ object: HKObject) async -> Result<HKObject, AppError> {
-            await withCheckedContinuation { continuation in
-                self.healthStore?.delete(object, withCompletion: { _, error in
-                    if error != nil {
-                        continuation.resume(returning: .failure(AppError.healthKit(type: .deleteItem)))
-                    } else {
-                        continuation.resume(returning: .success(object))
-                    }
-                })
+            guard let healthStore else {
+                return .failure(AppError.healthKit(type: .deleteItem))
+            }
+            do {
+                try await healthStore.delete(object)
+                return .success(object)
+            } catch {
+                return .failure(AppError.healthKit(type: .deleteItem))
             }
         }
 
+
         func deleteObjects(_ objects: [HKObject]) async -> Result<[HKObject], AppError> {
-            await withCheckedContinuation { continuation in
-                self.healthStore?.delete(objects, withCompletion: { _, error in
-                    if error != nil {
-                        continuation.resume(returning: .failure(AppError.healthKit(type: .deleteItem)))
-                    } else {
-                        continuation.resume(returning: .success(objects))
-                    }
-                })
+            guard let healthStore else {
+                return .failure(AppError.healthKit(type: .deleteItem))
+            }
+            do {
+                try await healthStore.delete(objects)
+                return .success(objects)
+            } catch {
+                return .failure(AppError.healthKit(type: .deleteItem))
             }
         }
     }

diff --git a/Sources/HealthKit/ServiceRegistering.swift → ...izeHealthService/ServiceRegistering.swift b/Sources/HealthKit/ServiceRegistering.swift → ...izeHealthService/ServiceRegistering.swift