react-native-nitro-location-tracking 0.1.4 → 0.1.5

package/android/src/main/java/com/margelo/nitro/nitrolocationtracking/LocationEngine.kt

@@ -4,10 +4,15 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.location.Location
 import android.os.Looper
+import android.util.Log
 import com.google.android.gms.location.*
 import kotlin.coroutines.resume
 
 class LocationEngine(private val context: Context) {
+  companion object {
+    private const val TAG = "NitroLocationEngine"
+  }
+
   private val fusedClient =
     LocationServices.getFusedLocationProviderClient(context)
   private var locationCallback: LocationCallback? = null
@@ -23,6 +28,10 @@ class LocationEngine(private val context: Context) {
 
   @SuppressLint("MissingPermission")
   fun start(config: LocationConfig) {
+    if (tracking) {
+      locationCallback?.let { fusedClient.removeLocationUpdates(it) }
+    }
+
     val priority = when (config.desiredAccuracy) {
       AccuracyLevel.HIGH -> Priority.PRIORITY_HIGH_ACCURACY
       AccuracyLevel.BALANCED -> Priority.PRIORITY_BALANCED_POWER_ACCURACY
@@ -31,12 +40,17 @@ class LocationEngine(private val context: Context) {
     val request = LocationRequest.Builder(priority, config.intervalMs.toLong())
       .setMinUpdateDistanceMeters(config.distanceFilter.toFloat())
       .setMinUpdateIntervalMillis(config.fastestIntervalMs.toLong())
+      .setWaitForAccurateLocation(false)
       .build()
 
     locationCallback = object : LocationCallback() {
       override fun onLocationResult(result: LocationResult) {
         result.lastLocation?.let { processLocation(it) }
       }
+
+      override fun onLocationAvailability(availability: LocationAvailability) {
+        Log.d(TAG, "onLocationAvailability — isLocationAvailable=${availability.isLocationAvailable}")
+      }
     }
     fusedClient.requestLocationUpdates(
       request, locationCallback!!, Looper.getMainLooper())
@@ -45,6 +59,7 @@ class LocationEngine(private val context: Context) {
 
   fun stop() {
     locationCallback?.let { fusedClient.removeLocationUpdates(it) }
+    locationCallback = null
     tracking = false
   }
 
@@ -71,7 +86,6 @@ class LocationEngine(private val context: Context) {
 
   private fun processLocation(location: Location) {
     val data = locationToData(location)
-//    dbWriter?.insert(data, currentRideId)
     onLocation?.invoke(data)
 
     val isMoving = location.speed > 0.5f

package/ios/LocationEngine.swift

@@ -1,7 +1,15 @@
 import CoreLocation
 
 class LocationEngine: NSObject, CLLocationManagerDelegate {
+    /// Continuous tracking manager — only used for startUpdatingLocation / stopUpdatingLocation
     private let locationManager = CLLocationManager()
+    /// Separate one-shot manager so requestLocation() never kills startUpdatingLocation()
+    private lazy var oneShotManager: CLLocationManager = {
+        let mgr = CLLocationManager()
+        mgr.delegate = self
+        mgr.desiredAccuracy = kCLLocationAccuracyBest
+        return mgr
+    }()
     private var tracking = false
 
     var onLocation: ((LocationData) -> Void)?
@@ -65,9 +73,10 @@ class LocationEngine: NSObject, CLLocationManagerDelegate {
                 return
             }
         }
-        // Otherwise request a fresh location
+        // Use a SEPARATE manager for one-shot requests so we never
+        // stop the continuous startUpdatingLocation() on locationManager.
         pendingLocationCompletion = completion
-        locationManager.requestLocation()
+        oneShotManager.requestLocation()
     }
 
     private var pendingLocationCompletion: ((LocationData?) -> Void)?
@@ -85,16 +94,16 @@ class LocationEngine: NSObject, CLLocationManagerDelegate {
             accuracy: location.horizontalAccuracy,
             timestamp: location.timestamp.timeIntervalSince1970 * 1000
         )
-      
 
-        // Handle pending one-shot request
-        if let completion = pendingLocationCompletion {
+        // Handle pending one-shot request (from oneShotManager)
+        if manager === oneShotManager, let completion = pendingLocationCompletion {
             completion(data)
             pendingLocationCompletion = nil
+            return
         }
 
-        // Save to SQLite immediately (offline-first)
-//        dbWriter?.insert(data, rideId: currentRideId)
+        // Continuous updates from locationManager only
+        guard manager === locationManager else { return }
 
         // Notify JS via Nitro callback
         onLocation?(data)
@@ -105,10 +114,11 @@ class LocationEngine: NSObject, CLLocationManagerDelegate {
 
     func locationManager(_ manager: CLLocationManager,
                          didFailWithError error: Error) {
-        if let completion = pendingLocationCompletion {
+        if manager === oneShotManager, let completion = pendingLocationCompletion {
             completion(nil)
             pendingLocationCompletion = nil
         }
     }
 }
 
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-location-tracking",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A React Native Nitro module for location tracking",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",