- Fixed a crash when trying to fetch statistical data with no user pe…

…rmission
agencyenterprise · Jan 19, 2023 · ff09ea8 · ff09ea8
1 parent 195e3e4
commit ff09ea8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m
@@ -35,7 +35,7 @@ - (void)fitness_getStepCountOnDay:(NSDictionary *)input callback:(RCTResponseSen
                                     includeManuallyAdded:includeManuallyAdded
                                     day:date
                              completion:^(double value, NSDate *startDate, NSDate *endDate, NSError *error) {
-        if (!value && value != 0) {
+        if ((!value && value != 0) || error != nil) {
             callback(@[RCTJSErrorFromNSError(error)]);
             return;
         }
@@ -218,7 +218,7 @@ - (void)fitness_getDistanceWalkingRunningOnDay:(NSDictionary *)input callback:(R
     HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierDistanceWalkingRunning];
 
     [self fetchSumOfSamplesOnDayForType:quantityType unit:unit includeManuallyAdded:includeManuallyAdded day:date completion:^(double distance, NSDate *startDate, NSDate *endDate, NSError *error) {
-        if (!distance && distance != 0) {
+        if ((!distance && distance != 0) || error != nil) {
             callback(@[RCTJSErrorFromNSError(error)]);
             return;
         }
@@ -277,7 +277,7 @@ - (void)fitness_getDistanceSwimmingOnDay:(NSDictionary *)input callback:(RCTResp
     HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierDistanceSwimming];
 
     [self fetchSumOfSamplesOnDayForType:quantityType unit:unit includeManuallyAdded:includeManuallyAdded day:date completion:^(double distance, NSDate *startDate, NSDate *endDate, NSError *error) {
-        if (!distance && distance != 0) {
+        if ((!distance && distance != 0) || error != nil) {
             callback(@[RCTJSErrorFromNSError(error)]);
             return;
         }
@@ -334,7 +334,7 @@ - (void)fitness_getDistanceCyclingOnDay:(NSDictionary *)input callback:(RCTRespo
     HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierDistanceCycling];
 
     [self fetchSumOfSamplesOnDayForType:quantityType unit:unit includeManuallyAdded:includeManuallyAdded day:date completion:^(double distance, NSDate *startDate, NSDate *endDate, NSError *error) {
-        if (!distance && distance != 0) {
+        if ((!distance && distance != 0) || error != nil) {
             callback(@[RCTJSErrorFromNSError(error)]);
             return;
         }
@@ -391,7 +391,7 @@ - (void)fitness_getFlightsClimbedOnDay:(NSDictionary *)input callback:(RCTRespon
     HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierFlightsClimbed];
 
     [self fetchSumOfSamplesOnDayForType:quantityType unit:unit includeManuallyAdded:includeManuallyAdded day:date completion:^(double count, NSDate *startDate, NSDate *endDate, NSError *error) {
-        if (!count && count != 0) {
+        if ((!count && count != 0) || error != nil) {
             callback(@[RCTJSErrorFromNSError(error)]);
             return;
         }

diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
@@ -756,6 +756,12 @@ - (void)fetchSumOfSamplesOnDayForType:(HKQuantityType *)quantityType
                                                                     NSDate *startDate = result.startDate;
                                                                     NSDate *endDate = result.endDate;
                                                                     double value = [sum doubleValueForUnit:unit];
+                                                                    if (startDate == nil || endDate == nil) {
+                                                                        error = [[NSError alloc] initWithDomain:@"AppleHealthKit"
+                                                                                                           code:0
+                                                                                                           userInfo:@{@"Error reason": @"Could not fetch statistics: Not authorized"}
+                                                                        ];
+                                                                    }
                                                                     completionHandler(value, startDate, endDate, error);
                                                               }
                                                           }];