expo-location 18.0.9 → 18.0.10

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 18.0.10 — 2025-04-01
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed issue with some permission request flows resolving too soon on iOS. ([#35693](https://github.com/expo/expo/pull/35693) by [@chrfalch](https://github.com/chrfalch))
+- [iOS] Remove restarting all services when CLLocationManager reports an error ([#35478](https://github.com/expo/expo/pull/35478) by [@chrfalch](https://github.com/chrfalch))
+
 ## 18.0.9 — 2025-03-31
 
 _This version does not introduce any user-facing changes._
@@ -31,6 +38,7 @@ _This version does not introduce any user-facing changes._
 
 ### 🐛 Bug fixes
 
+- [iOS] Added guards to avoid task options to crash the app. ([#35477](https://github.com/expo/expo/pull/35477) by [@chrfalch](https://github.com/chrfalch))
 - [iOS] Added error handler to the streaming location/heading methods since these can fail while streaming ([#35004](https://github.com/expo/expo/pull/35004) by [@chrfalch](https://github.com/chrfalch))
 
 ## 18.0.6 — 2025-02-10

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '18.0.9'
+version = '18.0.10'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.location"
   defaultConfig {
     versionCode 29
-    versionName "18.0.9"
+    versionName "18.0.10"
   }
 }
 

package/ios/Requesters/EXBackgroundLocationPermissionRequester.m

@@ -10,6 +10,7 @@ static SEL alwaysAuthorizationSelector;
 @interface EXBackgroundLocationPermissionRequester ()
 
 @property (nonatomic, assign) bool wasAsked;
+@property (nonatomic, assign) bool isWaitingForTimeout;
 
 @end
 
@@ -19,6 +20,7 @@ static SEL alwaysAuthorizationSelector;
 {
   if (self = [super init]) {
     _wasAsked = false;
+    _isWaitingForTimeout = false;
   }
   return self;
 }
@@ -37,10 +39,28 @@ static SEL alwaysAuthorizationSelector;
 {
   if ([EXBaseLocationRequester isConfiguredForAlwaysAuthorization] && [self.locationManager respondsToSelector:alwaysAuthorizationSelector]) {
     _wasAsked = true;
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(handleAppBecomingActive)
-                                                 name:UIApplicationDidBecomeActiveNotification
-                                               object:nil];
+    CLAuthorizationStatus status = [self.locationManager authorizationStatus];
+    
+    if (status == kCLAuthorizationStatusAuthorizedWhenInUse) {
+      // We already have a foreground permission granted:
+      // When asking for background location, we might or might not have asked for foreground permission
+      // before we get here. An issue here is if the user has a temporary permission ("Allow once") - which
+      // results in the status being "kCLAuthorizationStatusAuthorizedWhenInUse" - without us knowing.
+      // We need to handle this special case which is not possible to detect through the API.
+      // What we do is that we'll wait 1.5 seconds on an UIApplicationWillResignActiveNotification
+      // notification (which will be emitted almost directly if the permission dialog is displayed). If the permission
+      // dialog is not displayed we'll timeout and can resolve the waiting promise with an updated denied status.
+      [[NSNotificationCenter defaultCenter] addObserver:self
+                                               selector:@selector(handleAppBecomingInactive)
+                                                   name:UIApplicationWillResignActiveNotification
+                                                 object:nil];
+      
+      // Setup timeout - if no permission dialog was displayed we can just stop listening and deny
+      // the request
+      [self setupAppInactivateTimeout];
+    }
+    
+    // Request permissions
     ((void (*)(id, SEL))objc_msgSend)(self.locationManager, alwaysAuthorizationSelector);
   } else {
     self.reject(@"ERR_LOCATION_INFO_PLIST", @"One of the `NSLocation*UsageDescription` keys must be present in Info.plist to be able to use geolocation.", nil);
@@ -50,9 +70,6 @@ static SEL alwaysAuthorizationSelector;
   }
 }
 
-// If user selects "Keep Only While Using" option, the `locationManagerDidChangeAuthorization` won't be called.
-// So we don't know when we should resolve promise.
-// Hovewer, we can check for `UIApplicationDidBecomeActiveNotification` event which is called when permissions modal disappears.
 - (void)handleAppBecomingActive
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -63,6 +80,47 @@ static SEL alwaysAuthorizationSelector;
   }
 }
 
+- (void)handleAppBecomingInactive
+{
+  // Let's wait until the app becomes inactive - this happens when OS displays the
+  // permission dialog - then we can cancel the timeout handler.
+
+  _isWaitingForTimeout = false;
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  
+  // When the app is inactive it means that a permission dialog is showing and we should ask to be
+  // notified when the dialog is closed:
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(handleAppBecomingActive)
+                                               name:UIApplicationDidBecomeActiveNotification
+                                             object:nil];
+}
+
+- (void)setupAppInactivateTimeout
+{
+  _isWaitingForTimeout = true;
+  
+  // Obtain a reference to the current queue
+  dispatch_queue_t currentQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0);
+
+  // Calculate the time for the delay
+  dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC));
+
+  EX_WEAKIFY(self);
+  
+  // Schedule the block to be executed after the delay
+  dispatch_after(delayTime, currentQueue, ^{
+    EX_ENSURE_STRONGIFY(self)
+    // Check if we are still waiting - ie. we haven't seen a permission dialog
+    if (self.isWaitingForTimeout && self.resolve) {
+      self.isWaitingForTimeout = false;
+      self.resolve([self getPermissions]);
+      self.resolve = nil;
+      self.reject = nil;
+    }
+  });
+}
+
 - (NSDictionary *)parsePermissions:(CLAuthorizationStatus)systemStatus
 {
   EXPermissionStatus status;

package/ios/Requesters/EXBaseLocationRequester.h

@@ -3,8 +3,9 @@
 #import <CoreLocation/CLLocationManager.h>
 
 #import <ExpoModulesCore/EXPermissionsInterface.h>
+#import <CoreLocation/CLLocationManagerDelegate.h>
 
-@interface EXBaseLocationRequester : NSObject<EXPermissionsRequester>
+@interface EXBaseLocationRequester : NSObject<EXPermissionsRequester, CLLocationManagerDelegate>
 
 @property (nonatomic, strong) CLLocationManager *locationManager;
 @property (nonatomic, strong) EXPromiseResolveBlock resolve;
@@ -16,6 +17,4 @@
 - (void)requestLocationPermissions;
 - (NSDictionary *)parsePermissions:(CLAuthorizationStatus)systemStatus;
 
-- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status;
-
 @end

package/ios/Requesters/EXBaseLocationRequester.m

@@ -4,12 +4,11 @@
 #import <ExpoModulesCore/EXUtilities.h>
 
 #import <objc/message.h>
-#import <CoreLocation/CLLocationManagerDelegate.h>
 
 @interface EXBaseLocationRequester () <CLLocationManagerDelegate>
 
 @property (nonatomic, assign) bool locationManagerWasCalled;
-
+@property (nonatomic, assign) CLAuthorizationStatus beginStatus;
 
 @end
 
@@ -73,25 +72,47 @@
     //    make Expo developers receive this kind of messages nor add our own default usage description,
     //    we try to fool the static analyzer and construct the selector in runtime.
     //    This way behavior of this requester is governed by provided NSLocationUsageDescriptions.
+    
+    // 2. Location permission request types
     //
-    // 2. Why there's no way to call specifically whenInUse or always authorization?
+    //    Foreground
+    //    - "Allow once"
+    //    - "Allow while using App"
+    //    - "Don't allow"
     //
-    //    The requester sets itself as the delegate of the CLLocationManager, so when the user responds
-    //    to a permission requesting dialog, manager calls `locationManager:didChangeAuthorizationStatus:` method.
-    //    To be precise, manager calls this method in two circumstances:
-    //      - right when `request*Authorization` method is called,
-    //      - when `authorizationStatus` changes.
-    //    With this behavior we aren't able to support the following use case:
-    //      - app requests `whenInUse` authorization
-    //      - user allows `whenInUse` authorization
-    //      - `authorizationStatus` changes from `undetermined` to `whenInUse`, callback is called, promise is resolved
-    //      - app wants to escalate authorization to `always`
-    //      - user selects `whenInUse` authorization (iOS 11+)
-    //      - `authorizationStatus` doesn't change, so callback is not called and requester can't know whether
-    //        user responded to the dialog selecting `whenInUse` or is still deciding
-    //    To support this use case we will have to change the way location authorization is requested
-    //    from promise-based to listener-based.
-
+    //    Background
+    //    - "Keep only while using"
+    //    - "Change to always allow"
+    //
+    // Requesting background permissions directly without first asking for foreground permissions is the
+    // same as asking for foreground permissions and then asking for background permissions.
+    //
+    // "Allow once" is a temporary permission (limited to the current app session). It is not possible to get
+    // info from the API about wether or not the current permission is temporary. You cannot request background
+    // permissions with a temporary token - a background request will then return denied.
+    //
+    // Requesting background permissions directly and "Allow while using the App" gives you a provisional
+    // background permission that can later be elevated to a full "Always allow" permission.
+    // You will be asked at a later point if you want to convert to "Always allow". The system waits until
+    // you have started using the newly aquired permission before showing the permission dialog.
+    //
+    // Test the following scenarios in BareExpo -> APIs -> Location
+    // ------------------------------------------------------------
+    // (before tests, make sure to clear any location permissions and restart the app)
+    //
+    //   rfp = requestForegroundPermissionsAsync, fp: Actual foreground permission given
+    //   rbp = requestBackgroundPermissionsAsync, bg: Actual background permission given
+    //
+    // - rfp -> "Allow once", then rbp -> no dialog                             = (fp: granted (temporary), bg: denied after 1.5 seconds)
+    // - rfp -> "Allow while using App", then rbp -> "Keep only while using"    = (fp: granted, bg: denied)
+    // - rfp -> "Allow while using App", then rbp -> "Change to always allow"   = (fp: granted, bg: granted)
+    // - rfp -> "Don't allow", then rbp -> no dialog                            = (fp: denied, bg: denied)
+    // - rbp -> "Allow once", no more dalogs                                    = (fp: granted (temporary), bg: denied)
+    // - rbp -> "Allow while using App", no more dialogs                        = (fp: granted, bg: granted (provisional))
+    // - rbp -> "Don't allow"                                                   = (fp: denied, bg: denied)
+    
+    // Save start statue and call requestLocationPermissions
+    _beginStatus = [self.locationManager authorizationStatus];
     [self requestLocationPermissions];
   }
 }
@@ -107,38 +128,15 @@
   }
 }
 
-- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status
-{
-  // TODO: Permissions.LOCATION issue (search by this phrase)
-  // if Permissions.LOCATION is being called for the first time on iOS devide and prompts for user action it might not call this callback at all
-  // it happens if user requests more that one permission at the same time via Permissions.askAsync(...) and LOCATION dialog is not being called first
-  // to reproduce this find NCL code testing that
-  if (status == kCLAuthorizationStatusNotDetermined || !_locationManagerWasCalled) {
-    // CLLocationManager calls this delegate method once on start with kCLAuthorizationNotDetermined even before the user responds
-    // to the "Don't Allow" / "Allow" dialog box. This isn't the event we care about so we skip it. See:
-    // http://stackoverflow.com/questions/30106341/swift-locationmanager-didchangeauthorizationstatus-always-called/30107511#30107511
-    _locationManagerWasCalled = true;
-    return;
-  }
-
-  if (_resolve) {
-    _resolve([self getPermissions]);
-    _resolve = nil;
-    _reject = nil;
-  }
-}
-
 - (void)locationManagerDidChangeAuthorization:(CLLocationManager *)manager
 {
-  CLAuthorizationStatus status = [manager authorizationStatus];
-  if (status == kCLAuthorizationStatusNotDetermined || !_locationManagerWasCalled) {
+  CLAuthorizationStatus nextState = [manager authorizationStatus];
+  if (_beginStatus == nextState && !_locationManagerWasCalled) {
     // CLLocationManager calls this delegate method once on start with kCLAuthorizationNotDetermined even before the user responds
     // to the "Don't Allow" / "Allow" dialog box. This isn't the event we care about so we skip it. See:
     // http://stackoverflow.com/questions/30106341/swift-locationmanager-didchangeauthorizationstatus-always-called/30107511#30107511
     _locationManagerWasCalled = true;
-    if (status != kCLAuthorizationStatusAuthorizedWhenInUse) {
-      return;
-    }
+    return;
   }
 
   if (_resolve) {

package/ios/TaskConsumers/EXLocationTaskConsumer.m

@@ -68,11 +68,10 @@
     EXLocationAccuracy accuracy = [options[@"accuracy"] unsignedIntegerValue] ?: EXLocationAccuracyBalanced;
 
     locationManager.desiredAccuracy = [EXLocation CLLocationAccuracyFromOption:accuracy];
-    locationManager.distanceFilter = [options[@"distanceInterval"] doubleValue] ?: kCLDistanceFilterNone;
-    locationManager.activityType = [EXLocation CLActivityTypeFromOption:[options[@"activityType"] integerValue]];
-    locationManager.pausesLocationUpdatesAutomatically = [options[@"pausesUpdatesAutomatically"] boolValue];
-
-    locationManager.showsBackgroundLocationIndicator = [options[@"showsBackgroundLocationIndicator"] boolValue];
+    locationManager.distanceFilter = [self numberToDouble:options[@"distanceInterval"] defaultValue:kCLDistanceFilterNone];
+    locationManager.activityType = [EXLocation CLActivityTypeFromOption:[self numberToInteger:options[@"activityType"] defaultValue:CLActivityTypeOther]];
+    locationManager.pausesLocationUpdatesAutomatically = [self numberToBool:options[@"pausesUpdatesAutomatically"] defaultValue:true];
+    locationManager.showsBackgroundLocationIndicator = [self numberToBool:options[@"showsBackgroundLocationIndicator"] defaultValue:false];
 
     [locationManager startUpdatingLocation];
     [locationManager startMonitoringSignificantLocationChanges];
@@ -91,15 +90,7 @@
 
 - (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
 {
-  if (error.domain == kCLErrorDomain) {
-    // This error might happen when the device is not able to find out the location. Try to restart monitoring location.
-    [manager stopUpdatingLocation];
-    [manager stopMonitoringSignificantLocationChanges];
-    [manager startUpdatingLocation];
-    [manager startMonitoringSignificantLocationChanges];
-  } else {
-    [_task executeWithData:nil withError:error];
-  }
+  [_task executeWithData:nil withError:error];
 }
 
 # pragma mark - internal
@@ -172,7 +163,17 @@
 
 - (double)numberToDouble:(NSNumber *)number defaultValue:(double)defaultValue
 {
-  return number == nil ? defaultValue : [number doubleValue];
+  return [number isEqual:[NSNull null]] || number == nil ? defaultValue : [number doubleValue];
+}
+
+- (NSInteger)numberToInteger:(NSNumber *)number defaultValue:(NSInteger)defaultValue
+{
+  return [number isEqual:[NSNull null]] || number == nil ? defaultValue : [number integerValue];
+}
+
+- (BOOL)numberToBool:(NSNumber *)number defaultValue:(BOOL)defaultValue
+{
+  return [number isEqual:[NSNull null]] || number == nil ? defaultValue : [number boolValue];
 }
 
 + (NSArray<NSDictionary *> *)_exportLocations:(NSArray<CLLocation *> *)locations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-location",
-  "version": "18.0.9",
+  "version": "18.0.10",
   "description": "Allows reading geolocation information from the device. Your app can poll for the current location or subscribe to location update events.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "efc676ef6dbe6c2eaed19c1a31abb79a935f583a"
+  "gitHead": "b08a0bd52965f85871c12c31da16a45e2cd26c4c"
 }