Merge pull request #1123 from cph-cachet/health-12/1120-metadata

Health 12/1120 metadata
cph-cachet · Jan 29, 2025 · 709dff0 · 709dff0
2 parents f1f4ee0 + fa5b915
commit 709dff0
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 12 deletions.
diff --git a/packages/health/CHANGELOG.md b/packages/health/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 12.0.2
+
+* iOS: Parse metadata to remove unsupported types - PR [#1120](https://github.com/cph-cachet/flutter-plugins/pull/1120)
+
 ## 12.0.1
 
 * Update of API and README doc
@@ -23,7 +27,6 @@
   <uses-permission android:name="android.permission.health.READ_LEAN_BODY_MASS"/>
   <uses-permission android:name="android.permission.health.WRITE_LEAN_BODY_MASS"/>
   ```
-
 * iOS: Add `WATER_TEMPERATURE` and `UNDERWATER_DEPTH` health values [#1096](https://github.com/cph-cachet/flutter-plugins/issues/1096)
 * iOS: Add support for `Underwater Diving` workout [#1096](https://github.com/cph-cachet/flutter-plugins/issues/1096)
 * Fix [#1072](https://github.com/cph-cachet/flutter-plugins/issues/1072) and [#1074](https://github.com/cph-cachet/flutter-plugins/issues/1074)

diff --git a/packages/health/ios/Classes/SwiftHealthPlugin.swift b/packages/health/ios/Classes/SwiftHealthPlugin.swift
@@ -860,8 +860,8 @@ public class SwiftHealthPlugin: NSObject, FlutterPlugin {
                         "recording_method": (sample.metadata?[HKMetadataKeyWasUserEntered] as? Bool == true)
                             ? RecordingMethod.manual.rawValue
                             : RecordingMethod.automatic.rawValue,
-                        "metadata": dataTypeKey == INSULIN_DELIVERY ? sample.metadata : nil,
-                        "dataUnitKey": unit?.unitString
+                        "dataUnitKey": unit?.unitString,
+                        "metadata": sanitizeMetadata(sample.metadata)
                     ]
                 }
                 DispatchQueue.main.async {
@@ -904,14 +904,6 @@ public class SwiftHealthPlugin: NSObject, FlutterPlugin {
                     samplesCategory = samplesCategory.filter { $0.value == 4 }
                 }
                 let categories = samplesCategory.map { sample -> NSDictionary in
-                    var metadata: [String: Any] = [:]
-
-                    if let sampleMetadata = sample.metadata {
-                        for (key, value) in sampleMetadata {
-                            metadata[key] = value
-                        }
-                    }
-
                     return [
                         "uuid": "\(sample.uuid)",
                         "value": sample.value,
@@ -920,7 +912,7 @@ public class SwiftHealthPlugin: NSObject, FlutterPlugin {
                         "source_id": sample.sourceRevision.source.bundleIdentifier,
                         "source_name": sample.sourceRevision.source.name,
                         "recording_method": (sample.metadata?[HKMetadataKeyWasUserEntered] as? Bool == true) ? RecordingMethod.manual.rawValue : RecordingMethod.automatic.rawValue,
-                        "metadata": metadata
+                        "metadata": sanitizeMetadata(sample.metadata)
                     ]
                 }
                 DispatchQueue.main.async {
@@ -1037,6 +1029,54 @@ public class SwiftHealthPlugin: NSObject, FlutterPlugin {
         HKHealthStore().execute(query)
     }
 
+    private func sanitizeMetadata(_ metadata: [String: Any]?) -> [String: Any] {
+        guard let metadata = metadata else { return [:] }
+
+        var sanitized = [String: Any]()
+
+        for (key, value) in metadata {
+            switch value {
+            case let stringValue as String:
+                sanitized[key] = stringValue
+            case let numberValue as NSNumber:
+                sanitized[key] = numberValue
+            case let boolValue as Bool:
+                sanitized[key] = boolValue
+            case let arrayValue as [Any]:
+                sanitized[key] = sanitizeArray(arrayValue)
+            case let mapValue as [String: Any]:
+                sanitized[key] = sanitizeMetadata(mapValue)
+            default:
+                continue
+            }
+        }
+
+        return sanitized
+    }
+
+    private func sanitizeArray(_ array: [Any]) -> [Any] {
+        var sanitizedArray: [Any] = []
+
+        for value in array {
+            switch value {
+            case let stringValue as String:
+                sanitizedArray.append(stringValue)
+            case let numberValue as NSNumber:
+                sanitizedArray.append(numberValue)
+            case let boolValue as Bool:
+                sanitizedArray.append(boolValue)
+            case let arrayValue as [Any]:
+                sanitizedArray.append(sanitizeArray(arrayValue))
+            case let mapValue as [String: Any]:
+                sanitizedArray.append(sanitizeMetadata(mapValue))
+            default:
+                continue
+            }
+        }
+
+        return sanitizedArray
+    }
+
     @available(iOS 14.0, *)
     private func fetchEcgMeasurements(_ sample: HKElectrocardiogram) -> NSDictionary {
         let semaphore = DispatchSemaphore(value: 0)