react-native-background-geolocation 5.8.0 → 5.8.1

package/android/build.gradle

@@ -9,7 +9,7 @@ def DEFAULT_TARGET_SDK_VERSION                      = 35
 
 // Plugin dependencies
 def DEFAULT_PLAY_SERVICES_LOCATION_VERSION          = "21.3.0"
-def DEFAULT_TSLOCATIONMANAGER_VERSION               = "4.7.0"
+def DEFAULT_TSLOCATIONMANAGER_VERSION               = "4.7.+"
 def DEFAULT_OK_HTTP_VERSION                         = "4.12.0"
 def DEFAULT_ANDROID_PERMISSIONS_VERSION             = "2.1.6"
 def DEFAULT_EVENTBUS_VERSION                        = "3.3.1"

package/ios/RNBackgroundGeolocation/RNBackgroundGeolocation.mm

@@ -11,7 +11,6 @@
 #import <ReactCodegen/RNBackgroundGeolocation/RNBackgroundGeolocation.h>
 
 #import <React/RCTBridge+Private.h>
-#import <React/RCTUtils.h>
 
 using namespace facebook;
 using namespace facebook::react;
@@ -21,6 +20,7 @@ using namespace facebook::react;
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
+#import <React/RCTUtils.h>
 #import <TSLocationManager/TSLocationManager.h>
 
 static NSString *const TS_LOCATION_MANAGER_TAG = @"TSLocationManager";
@@ -68,9 +68,12 @@ RCT_EXPORT_MODULE();
         // TSLocationManager instance
         locationManager = [TSLocationManager sharedInstance];
 
-        // Provide reference to rootViewController for #emailLog method.
-        UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
-        locationManager.viewController = root;
+        // Provide a view controller for the SDK's alerts.  (#2675) UIApplicationDelegate.window is optional: a UIScene
+        // app's AppDelegate (React Native 0.88's template) has none, and sending it -window throws.  Fall back to the
+        // scene's key window.
+        id<UIApplicationDelegate> appDelegate = [[UIApplication sharedApplication] delegate];
+        UIWindow *window = [appDelegate respondsToSelector:@selector(window)] ? appDelegate.window : nil;
+        locationManager.viewController = (window ?: RCTKeyWindow()).rootViewController;
     }
     return self;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-background-geolocation",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "description": "The most sophisticated cross-platform background location-tracking & geofencing module with battery-conscious motion-detection intelligence",
   "scripts": {
     "build": "pnpm run build:expo",

package/src/NativeModule.js

@@ -230,9 +230,25 @@ export default class NativeModule {
     return subscription;
   }
 
+  // @deprecated in favor of subscription.remove().
+  // (WO-144) index.js's removeListener() and the shared types still expose this, so it has to exist
+  // until they retire it: 5.0 deleted it here alone and the call threw.
+  static removeListener(event, callback) {
+    console.warn('BackgroundGeolocation.removeListener is deprecated.  Event-listener methods (eg: onLocation) now return a subscription instance.  Call subscription.remove() on the returned subscription instead.  Eg:\nconst subscription = BackgroundGeolocation.onLocation(myLocationHandler)\n...\nsubscription.remove()');
+    const found = findEventSubscriptionByEvent(event, callback);
+    if (found !== null) {
+      found.subscription.remove();
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   static removeListeners() {
     return new Promise((resolve, reject) => {
-      EVENT_SUBSCRIPTIONS.forEach((sub) => {
+      // (WO-096) Walk a copy: each remove() splices EVENT_SUBSCRIPTIONS, and forEach over the live
+      // array skips the element after every one it removes.
+      EVENT_SUBSCRIPTIONS.slice().forEach((sub) => {
         sub.subscription.remove();
       });
       EVENT_SUBSCRIPTIONS = [];

package/src/index.js

@@ -576,9 +576,10 @@ export default class BackgroundGeolocation {
 
   /**
   * Remove geofences.  You may either supply an array of identifiers or nothing to destroy all geofences.
-  * 1. removeGeofences() <-- Promise
+  * 1. removeGeofences() <-- Promise:  remove all
   * 2. removeGeofences(['foo'])  <-- Promise
-  * 3. removeGeofences(success, [failure])  <-- v4 callback form:  remove all
+  * 3. removeGeofences([])  <-- Promise:  remove none
+  * 4. removeGeofences(success, [failure])  <-- v4 callback form:  remove all
   */
   static removeGeofences(identifiers, failure) {
     if (typeof(identifiers) == 'function') {
@@ -587,10 +588,11 @@ export default class BackgroundGeolocation {
       NativeModule.removeGeofences([]).then(success).catch(failure);
       return;
     }
-    if (identifiers == null) identifiers = [];
-    // (WO-047) An empty list means "remove all" in both cores: anything malformed must reject,
-    // never fall through to [].  An index loop, not .some(), which skips the holes of a sparse list.
-    // Covered by tests/remove-geofences.test.js.
+    // (WO-055) "All" crosses to native as [], as it does in every release: both cores read an empty list as
+    // "remove all".
+    if (identifiers == null) return NativeModule.removeGeofences([]);
+    // (WO-047) Anything malformed must reject here, never fall through to [].  An index loop, not .some(),
+    // which skips the holes of a sparse list.  Covered by tests/remove-geofences.test.js.
     let valid = Array.isArray(identifiers);
     for (let n = 0; valid && n < identifiers.length; n++) {
       valid = typeof(identifiers[n]) == 'string';
@@ -598,6 +600,8 @@ export default class BackgroundGeolocation {
     if (!valid) {
       return Promise.reject(new Error("BackgroundGeolocation#removeGeofences must be provided an {Array} of {String} identifiers, or nothing to remove all geofences."));
     }
+    // (WO-055) An empty list names none.  It never crosses to native, where it would remove all.
+    if (!identifiers.length) return Promise.resolve(true);
     return NativeModule.removeGeofences(identifiers);
   }