expo-location 16.5.2 → 16.5.4

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 16.5.4 — 2024-02-27
+
+### 🎉 New features
+
+- [Android] Make foreground service permission opt-in with `isAndroidForegroundServiceEnabled` config plugin option [#27265](https://github.com/expo/expo/pull/27265) by [@brentvatne](https://github.com/brentvatne))
+
+## 16.5.3 — 2024-02-06
+
+### 🐛 Bug fixes
+
+- [Android] Fixed: `NullPointerException: it must not be null`. ([#26688](https://github.com/expo/expo/pull/26688) by [@lukmccall](https://github.com/lukmccall))
+
 ## 16.5.2 — 2024-01-10
 
 ### 🎉 New features

package/README.md

@@ -51,13 +51,14 @@ This module requires the permissions for approximate and exact device location.
 <!-- Added permissions -->
 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
 <!-- Optional permissions -->
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
 <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 ```
 
-> **Note:** on Android, you have to [submit your app for review and request access to use the background location permission](https://support.google.com/googleplay/android-developer/answer/9799150?hl=en).
+> **Note:** on Android, you have to [submit your app for review and request access to use the background location permission](https://support.google.com/googleplay/android-developer/answer/9799150?hl=en) or [foreground location permissions](https://support.google.com/googleplay/android-developer/answer/13392821?hl=en).
 
 # Contributing
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '16.5.2'
+version = '16.5.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -94,7 +94,7 @@ android {
   namespace "expo.modules.location"
   defaultConfig {
     versionCode 29
-    versionName "16.5.2"
+    versionName "16.5.4"
   }
 }
 

package/android/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
 
   <application>
     <service

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

@@ -14,6 +14,9 @@ internal class LocationBackgroundUnauthorizedException :
 internal class LocationRequestRejectedException(cause: Exception) :
   CodedException("Location request has been rejected: " + cause.message)
 
+internal class CurrentLocationIsUnavailableException :
+  CodedException("Current location is unavailable. Make sure that location services are enabled")
+
 internal class LocationRequestCancelledException :
   CodedException("Location request has been cancelled")
 

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

@@ -69,8 +69,13 @@ class LocationHelpers {
     fun requestSingleLocation(locationProvider: FusedLocationProviderClient, locationRequest: CurrentLocationRequest, promise: Promise) {
       try {
         locationProvider.getCurrentLocation(locationRequest, null)
-          .addOnSuccessListener {
-            promise.resolve(LocationResponse(it))
+          .addOnSuccessListener { location: Location? ->
+            if (location == null) {
+              promise.reject(CurrentLocationIsUnavailableException())
+              return@addOnSuccessListener
+            }
+
+            promise.resolve(LocationResponse(location))
           }
           .addOnFailureListener {
             promise.reject(LocationRequestRejectedException(it))
@@ -166,7 +171,8 @@ class LocationHelpers {
     }
 
     fun isAnyProviderAvailable(context: Context?): Boolean {
-      val locationManager = context?.getSystemService(Context.LOCATION_SERVICE) as? LocationManager ?: return false
+      val locationManager = context?.getSystemService(Context.LOCATION_SERVICE) as? LocationManager
+        ?: return false
       return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
     }
 
@@ -177,7 +183,8 @@ class LocationHelpers {
           contextPermissions,
           object : Promise {
             override fun resolve(value: Any?) {
-              val result = value as? Bundle ?: throw ConversionException(Any::class.java, Bundle::class.java, "value returned by the permission promise is not a Bundle")
+              val result = value as? Bundle
+                ?: throw ConversionException(Any::class.java, Bundle::class.java, "value returned by the permission promise is not a Bundle")
               continuation.resume(PermissionRequestResponse(result))
             }
 
@@ -197,7 +204,10 @@ class LocationHelpers {
           contextPermissions,
           object : Promise {
             override fun resolve(value: Any?) {
-              it.resume(value as? Bundle ?: throw ConversionException(Any::class.java, Bundle::class.java, "value returned by the permission promise is not a Bundle"))
+              it.resume(
+                value as? Bundle
+                  ?: throw ConversionException(Any::class.java, Bundle::class.java, "value returned by the permission promise is not a Bundle")
+              )
             }
 
             override fun reject(code: String, message: String?, cause: Throwable?) {

package/package.json

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

package/plugin/build/withLocation.d.ts

@@ -5,5 +5,6 @@ declare const _default: ConfigPlugin<void | {
     locationWhenInUsePermission?: string | undefined;
     isIosBackgroundLocationEnabled?: boolean | undefined;
     isAndroidBackgroundLocationEnabled?: boolean | undefined;
+    isAndroidForegroundServiceEnabled?: boolean | undefined;
 }>;
 export default _default;

package/plugin/build/withLocation.js

@@ -14,7 +14,7 @@ const withBackgroundLocation = (config) => {
         return config;
     });
 };
-const withLocation = (config, { locationAlwaysAndWhenInUsePermission, locationAlwaysPermission, locationWhenInUsePermission, isIosBackgroundLocationEnabled, isAndroidBackgroundLocationEnabled, } = {}) => {
+const withLocation = (config, { locationAlwaysAndWhenInUsePermission, locationAlwaysPermission, locationWhenInUsePermission, isIosBackgroundLocationEnabled, isAndroidBackgroundLocationEnabled, isAndroidForegroundServiceEnabled, } = {}) => {
     if (isIosBackgroundLocationEnabled) {
         config = withBackgroundLocation(config);
     }
@@ -34,11 +34,14 @@ const withLocation = (config, { locationAlwaysAndWhenInUsePermission, locationAl
         return config;
     });
     return config_plugins_1.AndroidConfig.Permissions.withPermissions(config, [
+        // Note: these are already added in the library AndroidManifest.xml and so
+        // are not required here, we may want to remove them in the future.
         'android.permission.ACCESS_COARSE_LOCATION',
         'android.permission.ACCESS_FINE_LOCATION',
-        'android.permission.FOREGROUND_SERVICE',
-        // Optional
+        // These permissions are optional, and not listed in the library AndroidManifest.xml
         isAndroidBackgroundLocationEnabled && 'android.permission.ACCESS_BACKGROUND_LOCATION',
+        isAndroidForegroundServiceEnabled && 'android.permission.FOREGROUND_SERVICE',
+        isAndroidForegroundServiceEnabled && 'android.permission.FOREGROUND_SERVICE_LOCATION',
     ].filter(Boolean));
 };
 exports.default = (0, config_plugins_1.createRunOncePlugin)(withLocation, pkg.name, pkg.version);

package/plugin/src/withLocation.ts

@@ -27,6 +27,7 @@ const withLocation: ConfigPlugin<
     locationWhenInUsePermission?: string;
     isIosBackgroundLocationEnabled?: boolean;
     isAndroidBackgroundLocationEnabled?: boolean;
+    isAndroidForegroundServiceEnabled?: boolean;
   } | void
 > = (
   config,
@@ -36,6 +37,7 @@ const withLocation: ConfigPlugin<
     locationWhenInUsePermission,
     isIosBackgroundLocationEnabled,
     isAndroidBackgroundLocationEnabled,
+    isAndroidForegroundServiceEnabled,
   } = {}
 ) => {
   if (isIosBackgroundLocationEnabled) {
@@ -62,11 +64,14 @@ const withLocation: ConfigPlugin<
   return AndroidConfig.Permissions.withPermissions(
     config,
     [
+      // Note: these are already added in the library AndroidManifest.xml and so
+      // are not required here, we may want to remove them in the future.
       'android.permission.ACCESS_COARSE_LOCATION',
       'android.permission.ACCESS_FINE_LOCATION',
-      'android.permission.FOREGROUND_SERVICE',
-      // Optional
+      // These permissions are optional, and not listed in the library AndroidManifest.xml
       isAndroidBackgroundLocationEnabled && 'android.permission.ACCESS_BACKGROUND_LOCATION',
+      isAndroidForegroundServiceEnabled && 'android.permission.FOREGROUND_SERVICE',
+      isAndroidForegroundServiceEnabled && 'android.permission.FOREGROUND_SERVICE_LOCATION',
     ].filter(Boolean) as string[]
   );
 };