expo-location 18.0.9-canary-20250320-7a205d3 → 18.0.9

package/CHANGELOG.md

@@ -8,43 +8,46 @@
 
 ### 🐛 Bug fixes
 
-- [iOS] Remove restarting all services when CLLocationManager reports an error ([#35478](https://github.com/expo/expo/pull/35478) by [@chrfalch](https://github.com/chrfalch))
-- [Android] Add missing ProGuard rule to fix task consumer failed ([#34098](https://github.com/expo/expo/pull/34098) by [@cornejobarraza](https://github.com/cornejobarraza))
-- [iOS] `startLocationUpdatesAsync` should not require background permissions ([#33617](https://github.com/expo/expo/pull/33617) by [@andrejpavlovic](https://github.com/andrejpavlovic)
-
 ### 💡 Others
 
-- On Android, remove dependency on `smart-location-lib`. ([#33609](https://github.com/expo/expo/pull/33609) by [@alanjhughes](https://github.com/alanjhughes))
-- [Android] Started using expo modules gradle plugin. ([#34176](https://github.com/expo/expo/pull/34176) by [@lukmccall](https://github.com/lukmccall))
+## 18.0.9 — 2025-03-31
+
+_This version does not introduce any user-facing changes._
 
-## 18.0.8 - 2025-03-14
+## 18.0.8 — 2025-03-14
 
 ### 💡 Others
 
 - On iOS, added setting the scope value as per our documentation. ([#35452](https://github.com/expo/expo/pull/35452) by [@chrfalch](https://github.com/chrfalch))
 
+## 18.0.7 — 2025-02-19
+
+- On Android, remove dependency on `smart-location-lib`. ([#33609](https://github.com/expo/expo/pull/33609) by [@alanjhughes](https://github.com/alanjhughes))
+- [Android] Started using expo modules gradle plugin. ([#34176](https://github.com/expo/expo/pull/34176) by [@lukmccall](https://github.com/lukmccall))
+
 ## 18.0.7 - 2025-02-19
 
+- ([iOS][location] Add scope to foreground and background iOS permissions as pr. documentation (#35452))
+
 ### 🐛 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
+## 18.0.6 — 2025-02-10
 
 ### 🐛 Bug fixes
 
 - [Android] Use less specific exception in catch block of `resolveUserSettingsForRequest`. ([#34784](https://github.com/expo/expo/pull/34784) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 18.0.5 - 2025-01-10
+## 18.0.5 — 2025-01-10
 
 _This version does not introduce any user-facing changes._
 
-## 18.0.4 - 2024-12-10
+## 18.0.4 — 2024-12-10
 
 _This version does not introduce any user-facing changes._
 
-## 18.0.3 - 2024-11-29
+## 18.0.3 — 2024-11-29
 
 _This version does not introduce any user-facing changes._
 

package/android/build.gradle

@@ -1,20 +1,24 @@
-plugins {
-  id 'com.android.library'
-  id 'expo-module-gradle-plugin'
-}
+apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '18.0.2'
+version = '18.0.9'
+
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
+useExpoPublishing()
 
 android {
   namespace "expo.modules.location"
   defaultConfig {
     versionCode 29
-    versionName "18.0.2"
-    consumerProguardFiles("proguard-rules.pro")
+    versionName "18.0.9"
   }
 }
 
 dependencies {
   api 'com.google.android.gms:play-services-location:21.0.1'
+  implementation project(":${project.name}\$io.nlopez.smartlocation-jetified-aar")
 }

package/android/src/main/java/expo/modules/location/LocationHelpers.kt

@@ -16,6 +16,8 @@ import expo.modules.location.records.LocationLastKnownOptions
 import expo.modules.location.records.LocationOptions
 import expo.modules.location.records.LocationResponse
 import expo.modules.location.records.PermissionRequestResponse
+import io.nlopez.smartlocation.location.config.LocationAccuracy
+import io.nlopez.smartlocation.location.config.LocationParams
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
@@ -108,16 +110,16 @@ class LocationHelpers {
 
     private fun mapOptionsToLocationParams(options: LocationOptions): LocationParams {
       val accuracy = options.accuracy
-      val locationParams = buildLocationParamsForAccuracy(accuracy)
+      val locationParamsBuilder = buildLocationParamsForAccuracy(accuracy)
 
       options.timeInterval?.let {
-        locationParams.interval = it
+        locationParamsBuilder.setInterval(it)
       }
       options.distanceInterval?.let {
-        locationParams.distance = it.toFloat()
+        locationParamsBuilder.setDistance(it.toFloat())
       }
 
-      return locationParams
+      return locationParamsBuilder.build()
     }
 
     private fun mapAccuracyToPriority(accuracy: Int): Int {
@@ -129,15 +131,42 @@ class LocationHelpers {
       }
     }
 
-    private fun buildLocationParamsForAccuracy(accuracy: Int): LocationParams {
+    private fun buildLocationParamsForAccuracy(accuracy: Int): LocationParams.Builder {
       return when (accuracy) {
-        LocationModule.ACCURACY_LOWEST -> LocationParams(accuracy = LocationAccuracy.LOWEST, distance = 3000f, interval = 10000)
-        LocationModule.ACCURACY_LOW -> LocationParams(accuracy = LocationAccuracy.LOW, distance = 1000f, interval = 5000)
-        LocationModule.ACCURACY_BALANCED -> LocationParams(accuracy = LocationAccuracy.MEDIUM, distance = 100f, interval = 3000)
-        LocationModule.ACCURACY_HIGH -> LocationParams(accuracy = LocationAccuracy.HIGH, distance = 50f, interval = 2000)
-        LocationModule.ACCURACY_HIGHEST -> LocationParams(accuracy = LocationAccuracy.HIGH, distance = 25f, interval = 1000)
-        LocationModule.ACCURACY_BEST_FOR_NAVIGATION -> LocationParams(accuracy = LocationAccuracy.HIGH, distance = 0f, interval = 500)
-        else -> LocationParams(accuracy = LocationAccuracy.MEDIUM, distance = 100f, interval = 3000)
+        LocationModule.ACCURACY_LOWEST -> LocationParams.Builder()
+          .setAccuracy(LocationAccuracy.LOWEST)
+          .setDistance(3000f)
+          .setInterval(10000)
+
+        LocationModule.ACCURACY_LOW -> LocationParams.Builder()
+          .setAccuracy(LocationAccuracy.LOW)
+          .setDistance(1000f)
+          .setInterval(5000)
+
+        LocationModule.ACCURACY_BALANCED -> LocationParams.Builder()
+          .setAccuracy(LocationAccuracy.MEDIUM)
+          .setDistance(100f)
+          .setInterval(3000)
+
+        LocationModule.ACCURACY_HIGH -> LocationParams.Builder()
+          .setAccuracy(LocationAccuracy.HIGH)
+          .setDistance(50f)
+          .setInterval(2000)
+
+        LocationModule.ACCURACY_HIGHEST -> LocationParams.Builder()
+          .setAccuracy(LocationAccuracy.HIGH)
+          .setDistance(25f)
+          .setInterval(1000)
+
+        LocationModule.ACCURACY_BEST_FOR_NAVIGATION -> LocationParams.Builder()
+          .setAccuracy(LocationAccuracy.HIGH)
+          .setDistance(0f)
+          .setInterval(500)
+
+        else -> LocationParams.Builder()
+          .setAccuracy(LocationAccuracy.MEDIUM)
+          .setDistance(100f)
+          .setInterval(3000)
       }
     }
 

package/android/src/main/java/expo/modules/location/LocationModule.kt

@@ -4,7 +4,6 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.hardware.GeomagneticField
 import android.hardware.Sensor
 import android.hardware.SensorEvent
@@ -12,14 +11,11 @@ import android.hardware.SensorEventListener
 import android.hardware.SensorManager
 import android.location.Geocoder
 import android.location.Location
-import android.location.LocationManager
 import android.os.Build
 import android.os.Bundle
 import android.os.Looper
 import android.util.Log
 import androidx.annotation.ChecksSdkIntAtLeast
-import androidx.core.app.ActivityCompat
-import androidx.core.location.LocationManagerCompat
 import androidx.core.os.bundleOf
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.common.api.CommonStatusCodes
@@ -55,6 +51,9 @@ import expo.modules.location.records.ReverseGeocodeLocation
 import expo.modules.location.records.ReverseGeocodeResponse
 import expo.modules.location.taskConsumers.GeofencingTaskConsumer
 import expo.modules.location.taskConsumers.LocationTaskConsumer
+import io.nlopez.smartlocation.SmartLocation
+import io.nlopez.smartlocation.geocoding.utils.LocationAddress
+import io.nlopez.smartlocation.location.config.LocationParams
 import java.util.Locale
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -158,12 +157,21 @@ class LocationModule : Module(), LifecycleEventListener, SensorEventListener, Ac
     }
 
     AsyncFunction<LocationProviderStatus>("getProviderStatusAsync") {
-      return@AsyncFunction getProviderStatus()
+      val state = SmartLocation.with(mContext).location().state()
+
+      return@AsyncFunction LocationProviderStatus().apply {
+        backgroundModeEnabled = state.locationServicesEnabled()
+        gpsAvailable = state.isGpsAvailable
+        networkAvailable = state.isNetworkAvailable
+        locationServicesEnabled = state.locationServicesEnabled()
+        passiveAvailable = state.isPassiveAvailable
+      }
     }
 
     AsyncFunction("watchDeviceHeading") { watchId: Int ->
       mHeadingId = watchId
-      return@AsyncFunction startHeadingUpdate()
+      startHeadingUpdate()
+      return@AsyncFunction
     }
 
     AsyncFunction("watchPositionImplAsync") { watchId: Int, options: LocationOptions, promise: Promise ->
@@ -206,6 +214,7 @@ class LocationModule : Module(), LifecycleEventListener, SensorEventListener, Ac
       } else {
         removeLocationUpdatesForRequest(watchId)
       }
+      return@AsyncFunction
     }
 
     AsyncFunction("geocodeAsync") Coroutine { address: String ->
@@ -332,23 +341,6 @@ class LocationModule : Module(), LifecycleEventListener, SensorEventListener, Ac
     } ?: throw NoPermissionsModuleException()
   }
 
-  private fun getProviderStatus(): LocationProviderStatus {
-    val manager = mContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-
-    val isGpsAvailable = manager.isProviderEnabled(LocationManager.GPS_PROVIDER)
-    val isNetworkAvailable = manager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-    val isLocationServicesEnabled = LocationManagerCompat.isLocationEnabled(manager)
-    val isPassiveAvailable = manager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER)
-
-    return LocationProviderStatus().apply {
-      backgroundModeEnabled = isLocationServicesEnabled
-      gpsAvailable = isGpsAvailable
-      networkAvailable = isNetworkAvailable
-      locationServicesEnabled = isLocationServicesEnabled
-      passiveAvailable = isPassiveAvailable
-    }
-  }
-
   private suspend fun requestBackgroundPermissionsAsync(): PermissionRequestResponse {
     if (!isBackgroundPermissionInManifest()) {
       throw NoPermissionInManifestException("ACCESS_BACKGROUND_LOCATION")
@@ -508,54 +500,27 @@ class LocationModule : Module(), LifecycleEventListener, SensorEventListener, Ac
   }
 
   private fun startHeadingUpdate() {
-    val locationManager = mContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-    if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
-      ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED
-    ) {
-      return
-    }
-    val lastLocation =
-      locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
-        ?: locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
-
-    if (lastLocation != null) {
+    val locationControl = SmartLocation.with(mContext).location().oneFix().config(LocationParams.BEST_EFFORT)
+    val currLoc = locationControl.lastLocation
+    if (currLoc != null) {
       mGeofield = GeomagneticField(
-        lastLocation.latitude.toFloat(),
-        lastLocation.longitude.toFloat(),
-        lastLocation.altitude.toFloat(),
+        currLoc.latitude.toFloat(), currLoc.longitude.toFloat(), currLoc.altitude.toFloat(),
         System.currentTimeMillis()
       )
     } else {
-      val locationRequest = LocationRequest.Builder(
-        LocationRequest.PRIORITY_HIGH_ACCURACY,
-        0L
-      ).setMaxUpdates(1)
-        .build()
-
-      val locationCallback = object : LocationCallback() {
-        override fun onLocationResult(locationResult: LocationResult) {
-          locationResult.lastLocation?.let {
-            mGeofield = GeomagneticField(
-              it.latitude.toFloat(),
-              it.longitude.toFloat(),
-              it.altitude.toFloat(),
-              System.currentTimeMillis()
-            )
-          }
-        }
+      locationControl.start { location: Location ->
+        mGeofield = GeomagneticField(
+          location.latitude.toFloat(), location.longitude.toFloat(), location.altitude.toFloat(),
+          System.currentTimeMillis()
+        )
       }
-      mLocationProvider.requestLocationUpdates(locationRequest, locationCallback, Looper.getMainLooper())
     }
     mSensorManager.registerListener(
       this,
       mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD),
       SensorManager.SENSOR_DELAY_NORMAL
     )
-    mSensorManager.registerListener(
-      this,
-      mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
-      SensorManager.SENSOR_DELAY_NORMAL
-    )
+    mSensorManager.registerListener(this, mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), SensorManager.SENSOR_DELAY_NORMAL)
   }
 
   private fun sendUpdate() {
@@ -633,6 +598,7 @@ class LocationModule : Module(), LifecycleEventListener, SensorEventListener, Ac
   private fun stopWatching() {
     // if permissions not granted it won't work anyway, but this can be invoked when permission dialog appears
     if (Geocoder.isPresent() && !isMissingForegroundPermissions()) {
+      SmartLocation.with(mContext).geocoding().stop()
       mGeocoderPaused = true
     }
     for (requestId in mLocationCallbacks.keys) {
@@ -699,10 +665,8 @@ class LocationModule : Module(), LifecycleEventListener, SensorEventListener, Ac
       locations?.let { location ->
         location.let {
           val results = it.mapNotNull { address ->
-            val newLocation = Location(LocationManager.GPS_PROVIDER)
-            newLocation.latitude = address.latitude
-            newLocation.longitude = address.longitude
-            GeocodeResponse.from(newLocation)
+            val locationAddress = LocationAddress(address)
+            GeocodeResponse.from(locationAddress.location)
           }
           continuation.resume(results)
         }

package/build/LocationEventEmitter.web.d.ts

@@ -1,2 +1,2 @@
-export declare const LocationEventEmitter: import("expo").EventEmitterType<Record<never, never>>;
+export declare const LocationEventEmitter: import("expo-modules-core/types").EventEmitter<Record<never, never>>;
 //# sourceMappingURL=LocationEventEmitter.web.d.ts.map

package/build/LocationEventEmitter.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocationEventEmitter.web.d.ts","sourceRoot":"","sources":["../src/LocationEventEmitter.web.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,uDAAqB,CAAC"}
+{"version":3,"file":"LocationEventEmitter.web.d.ts","sourceRoot":"","sources":["../src/LocationEventEmitter.web.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,sEAAqB,CAAC"}

package/expo-module.config.json

@@ -1,9 +1,22 @@
 {
-  "platforms": ["apple", "android"],
+  "platforms": [
+    "apple",
+    "android"
+  ],
   "apple": {
-    "modules": ["LocationModule"]
+    "modules": [
+      "LocationModule"
+    ]
   },
   "android": {
-    "modules": ["expo.modules.location.LocationModule"]
+    "modules": [
+      "expo.modules.location.LocationModule"
+    ],
+    "gradleAarProjects": [
+      {
+        "name": "io.nlopez.smartlocation-jetified-aar",
+        "aarFilePath": "android/libs/io.nlopez.smartlocation-3.3.3-jetified.aar"
+      }
+    ]
   }
 }

package/ios/LocationModule.swift

@@ -163,13 +163,9 @@ public final class LocationModule: Module {
     // Background location
 
     AsyncFunction("startLocationUpdatesAsync") { (taskName: String, options: [String: Any]) in
-      // There are two ways of starting this service.
-      // 1. As a background location service, this requires the background location permission.
-      // 2. As a user-initiated foreground service, this does NOT require the background location permission.
-      // Unfortunately, we cannot distinguish between those cases.
-      // So we only check foreground permission which needs to be granted in both cases.
       try ensureLocationServicesEnabled()
       try ensureForegroundLocationPermissions(appContext)
+      try ensureBackgroundLocationPermissions(appContext)
 
       guard CLLocationManager.significantLocationChangeMonitoringAvailable() else {
         throw Exceptions.LocationUpdatesUnavailable()

package/ios/TaskConsumers/EXLocationTaskConsumer.m

@@ -68,10 +68,11 @@
     EXLocationAccuracy accuracy = [options[@"accuracy"] unsignedIntegerValue] ?: EXLocationAccuracyBalanced;
 
     locationManager.desiredAccuracy = [EXLocation CLLocationAccuracyFromOption:accuracy];
-    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.distanceFilter = [options[@"distanceInterval"] doubleValue] ?: kCLDistanceFilterNone;
+    locationManager.activityType = [EXLocation CLActivityTypeFromOption:[options[@"activityType"] integerValue]];
+    locationManager.pausesLocationUpdatesAutomatically = [options[@"pausesUpdatesAutomatically"] boolValue];
+
+    locationManager.showsBackgroundLocationIndicator = [options[@"showsBackgroundLocationIndicator"] boolValue];
 
     [locationManager startUpdatingLocation];
     [locationManager startMonitoringSignificantLocationChanges];
@@ -90,7 +91,15 @@
 
 - (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
 {
-  [_task executeWithData:nil withError: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];
+  }
 }
 
 # pragma mark - internal
@@ -163,17 +172,7 @@
 
 - (double)numberToDouble:(NSNumber *)number defaultValue:(double)defaultValue
 {
-  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];
+  return number == nil ? defaultValue : [number doubleValue];
 }
 
 + (NSArray<NSDictionary *> *)_exportLocations:(NSArray<CLLocation *> *)locations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-location",
-  "version": "18.0.9-canary-20250320-7a205d3",
+  "version": "18.0.9",
   "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",
@@ -39,9 +39,10 @@
     "preset": "expo-module-scripts"
   },
   "devDependencies": {
-    "expo-module-scripts": "4.0.5-canary-20250320-7a205d3"
+    "expo-module-scripts": "^4.0.4"
   },
   "peerDependencies": {
-    "expo": "53.0.0-canary-20250320-7a205d3"
-  }
+    "expo": "*"
+  },
+  "gitHead": "efc676ef6dbe6c2eaed19c1a31abb79a935f583a"
 }

package/android/proguard-rules.pro

@@ -1,3 +0,0 @@
-# https://github.com/expo/expo/issues/3918
-
--keep class expo.modules.location.taskConsumers.** { *; }

package/android/src/main/java/expo/modules/location/LocationParams.kt

@@ -1,14 +0,0 @@
-package expo.modules.location
-
-data class LocationParams(
-  val accuracy: LocationAccuracy,
-  var distance: Float,
-  var interval: Long
-)
-
-enum class LocationAccuracy {
-  LOWEST,
-  LOW,
-  MEDIUM,
-  HIGH
-}