Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Metadata Parse Crash #1120

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Fix Metadata Parse Crash #1120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 51 additions & 11 deletions packages/health/ios/Classes/SwiftHealthPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand All @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
Loading