From d2a9ce057fd53a128b280f3d10e9f44b94e4a287 Mon Sep 17 00:00:00 2001 From: Evgenii Evstropov Date: Sun, 4 Feb 2018 20:44:29 +0100 Subject: [PATCH] add support for more information and fix isTracked flag --- RCTAppleHealthKit/RCTAppleHealthKit+Queries.m | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m index d8aa95a..d28cb4b 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m @@ -138,16 +138,19 @@ NSString *startDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.startDate]; NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate]; + bool isTracked = true; - for(id key in [sample metadata]) - if (key == HKMetadataKeyWasUserEntered ) { - isTracked = false; - } + if ([[sample metadata][HKMetadataKeyWasUserEntered] intValue] == 1) { + isTracked = false; + } NSDictionary *elem = @{ @"type" : type, @"energy" : @(energy), @"isTracked" : @(isTracked), + @"sourceName" : [[[sample sourceRevision] source] name], + @"sourceBundleId" : [[[sample sourceRevision] source] bundleIdentifier], + @"device": [[sample sourceRevision] productType], @"distance" : @(distance), @"startDate" : startDateString, @"endDate" : endDateString @@ -164,14 +167,16 @@ NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate]; bool isTracked = true; - for(id key in [sample metadata]) - if (key == HKMetadataKeyWasUserEntered ) { - isTracked = false; - } + if ([[sample metadata][HKMetadataKeyWasUserEntered] intValue] == 1) { + isTracked = false; + } NSDictionary *elem = @{ @"value" : @(value), @"isTracked" : @(isTracked), + @"sourceName" : [[[sample sourceRevision] source] name], + @"sourceBundleId" : [[[sample sourceRevision] source] bundleIdentifier], + @"device": [[sample sourceRevision] productType], @"startDate" : startDateString, @"endDate" : endDateString }; -- 2.26.2