Skip to content

Commit

Permalink
fix(ios): if user supplies no specific auth constant for hasLocationP…
Browse files Browse the repository at this point in the history
…ermissions, assume WHEN_IN_USE
  • Loading branch information
sgtcoolguy committed Feb 22, 2021
1 parent 82ff625 commit 5db8321
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions iphone/Classes/GeolocationModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -827,10 +827,14 @@ - (CLLocationManager *)locationPermissionManager

- (bool)hasLocationPermissions:(CLAuthorizationStatus)authorizationType
{
BOOL locationServicesEnabled = [CLLocationManager locationServicesEnabled];
CLAuthorizationStatus currentPermissionLevel = [CLLocationManager authorizationStatus];
CLAuthorizationStatus requestedPermissionLevel = authorizationType;
return locationServicesEnabled && currentPermissionLevel == requestedPermissionLevel;
if (!CLLocationManager.locationServicesEnabled) {
return false;
}
CLAuthorizationStatus currentPermissionLevel = CLLocationManager.authorizationStatus;
// FIXME: If user does not supply the value, what should we do?
// Basically if they give a value other than AUTHORIZATION_ALWAYS, assume WHEN_IN_USE
CLAuthorizationStatus requestedPermissionLevel = (authorizationType == kCLAuthorizationStatusAuthorizedAlways) ? kCLAuthorizationStatusAuthorizedAlways : kCLAuthorizationStatusAuthorizedWhenInUse;
return currentPermissionLevel == requestedPermissionLevel;
}

- (JSValue *)requestLocationPermissions:(CLAuthorizationStatus)authorizationType withCallback:(JSValue *)callback
Expand Down

0 comments on commit 5db8321

Please sign in to comment.