react-native-background-geolocation 5.7.0 → 5.8.0

package/RNBackgroundGeolocation.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.source_files        = 'ios/RNBackgroundGeolocation/*.{h,m,mm}'
   s.preserve_paths      = 'docs', 'CHANGELOG.md', 'LICENSE', 'package.json', 'RNBackgroundGeolocation.ios.js'
 
-  tslm_version = ENV['TSLOCATIONMANAGER_VERSION'] || '~> 4.7.1'
+  tslm_version = ENV['TSLOCATIONMANAGER_VERSION'] || '~> 4.8.0'
   s.dependency 'TSLocationManager', tslm_version
 
   s.libraries           = 'sqlite3', 'z', 'stdc++'

package/android/app.gradle

@@ -1,22 +1,3 @@
-
-android {
-	purgeBackgroundGeolocationDebugResources(applicationVariants)
-}
-
-/**
-* Background Geolocation's aar includes about 1.5M of mp3 sound-files for its debugging sound FX.
-* This method strips those mp3s out in RELEASE builds.
-*/
-def purgeBackgroundGeolocationDebugResources(applicationVariants) {
-    if ((rootProject.ext.has("removeBackgroundGeolocationDebugSoundsInRelease")) && (rootProject.ext.removeBackgroundGeolocationDebugSoundsInRelease == false)) return
-    applicationVariants.all { variant ->
-        if (variant.buildType.name == "release") {
-            println("[react-native-background-geolocation] Purging debug resources in release build")
-            variant.mergeResourcesProvider.configure {
-                doLast {
-                    delete(fileTree(dir: outputDir, includes: ["raw_tslocationmanager*"]))
-                }
-            }
-        }
-    }
-}
+// Intentionally empty. This script once stripped the SDK's debug sound FX from release builds.
+// It remains only so the `apply from: ".../app.gradle"` line in an app's
+// android/app/build.gradle (the Expo plugin adds one) still resolves.

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.6.+"
+def DEFAULT_TSLOCATIONMANAGER_VERSION               = "4.7.0"
 def DEFAULT_OK_HTTP_VERSION                         = "4.12.0"
 def DEFAULT_ANDROID_PERMISSIONS_VERSION             = "2.1.6"
 def DEFAULT_EVENTBUS_VERSION                        = "3.3.1"

package/android/src/main/java/com/transistorsoft/rnbackgroundgeolocation/RNBackgroundGeolocationModule.java

@@ -697,23 +697,40 @@ public class RNBackgroundGeolocationModule
     }
 
     @ReactMethod
-    public void addGeofences(ReadableArray data, final Promise response) {
-        List<TSGeofence> geofences = new ArrayList<TSGeofence>();
-        for (int n=0;n<data.size();n++) {
-            try {
-                geofences.add(buildGeofence(data.getMap(n)));
-            } catch (TSGeofence.Exception e) {
-                response.reject(e.getMessage());
-                return;
-            }
+    public void addGeofences(final ReadableArray data, final Promise response) {
+        // (WO-107) This runs on React Native's native-modules thread, which every native module shares, and
+        // building a polygon geofence computes its minimum enclosing circle: thousands kept the thread busy for
+        // tens of seconds (RN #2668).  Build on the SDK's pool.
+        // (WO-107) Nothing may escape the pool's Runnable: an exception there kills the app, where on the
+        // native-modules thread React Native turned it into a rejection.  A missing array is refused here, as iOS
+        // refuses it; anything the build throws rejects.
+        if (data == null) {
+            response.reject("No geofences provided");
+            return;
         }
+        BackgroundGeolocation.getThreadPool().execute(new Runnable() {
+            @Override public void run() {
+                List<TSGeofence> geofences = new ArrayList<TSGeofence>();
+                for (int n=0;n<data.size();n++) {
+                    try {
+                        geofences.add(buildGeofence(data.getMap(n)));
+                    } catch (TSGeofence.Exception e) {
+                        response.reject(e.getMessage());
+                        return;
+                    } catch (RuntimeException e) {     // an element that is not a map, a field of the wrong type
+                        response.reject(e);
+                        return;
+                    }
+                }
 
-        getAdapter().addGeofences(geofences, new TSCallback() {
-            @Override public void onSuccess() {
-                response.resolve(true);
-            }
-            @Override public void onFailure(String error) {
-                response.reject(error);
+                getAdapter().addGeofences(geofences, new TSCallback() {
+                    @Override public void onSuccess() {
+                        response.resolve(true);
+                    }
+                    @Override public void onFailure(String error) {
+                        response.reject(error);
+                    }
+                });
             }
         });
     }

package/package.json

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