fix: only re-arm location updates when none is active to avoid churn

The early start() path now re-registers for location updates only when there is no active request, so a successful registration is left in place on repeated start() calls (e.g. toggling isShared or permission callbacks) instead of being cancelled and re-registered (which also reset the interval timer). Recovery after a failed first attempt is preserved because the flag is false in that case, and the focus-driven refresh path still re-registers unconditionally to pick up the new interval.

Co-Authored-By: Cursor <cursoragent@cursor.com>

Author: nan-li

OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/controller/impl/GmsLocationController.kt

@@ -56,10 +56,8 @@ internal class GmsLocationController(
                             setLocationAndFire(localLastLocation)
                         }
                     }
-                    // Retry the subscription in case the first attempt failed because
-                    // permission was not yet granted, otherwise it would only recover on
-                    // the next app focus change.
-                    locationUpdateListener?.refreshRequest()
+                    // Re-register here if the first attempt failed
+                    locationUpdateListener?.refreshRequest(onlyIfInactive = true)
                     wasSuccessful = true
                 } else {
                     try {
@@ -202,7 +200,7 @@ internal class GmsLocationController(
             }
         }
 
-        internal fun refreshRequest() {
+        internal fun refreshRequest(onlyIfInactive: Boolean = false) {
             if (!googleApiClient.isConnected) {
                 Logging.warn("Attempt to refresh location request but not currently connected!")
                 return
@@ -224,6 +222,8 @@ internal class GmsLocationController(
 
             synchronized(requestLock) {
                 if (hasExistingRequest) {
+                    // Don't tear down an already-active request when only recovering a failed one.
+                    if (onlyIfInactive) return@synchronized
                     _fusedLocationApiWrapper.cancelLocationUpdates(googleApiClient, this)
                 }
                 Logging.debug("GMSLocationController GoogleApiClient requestLocationUpdates!")

OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/internal/controller/GmsLocationControllerTests.kt

@@ -174,12 +174,8 @@ class GmsLocationControllerTests : FunSpec({
         }
     }
 
-    // Regression: when isShared is enabled before location permission is granted, the
-    // GoogleApiClient connects (which does not require permission) but the first
-    // requestLocationUpdates fails. A later start() (e.g. triggered by the permission grant)
-    // previously short-circuited and only fired a one-shot last location, leaving the live
-    // subscription dead until the next app focus change. It must now re-arm on that start().
-    test("start re-arms the live location subscription on a subsequent start") {
+    // Repeated start() on a healthy request must not cancel + re-register it (which resets the interval).
+    test("start does not re-register an already-active request") {
         // Given
         val location = Location("TEST_PROVIDER")
         location.latitude = 123.45
@@ -194,11 +190,11 @@ class GmsLocationControllerTests : FunSpec({
         val response1 = gmsLocationController.start()
         val response2 = gmsLocationController.start()
 
-        // Then
+        // Then the active request is left alone: not re-registered, not cancelled
         response1 shouldBe true
         response2 shouldBe true
-        // Once on the initial init, and again when the second start re-arms the subscription.
-        fusedLocationApiWrapperMock.requestLocationUpdatesCallCount shouldBe 2
+        fusedLocationApiWrapperMock.requestLocationUpdatesCallCount shouldBe 1
+        fusedLocationApiWrapperMock.cancelLocationUpdatesCallCount shouldBe 0
     }
 
     // Regression: a requestLocationUpdates that fails (e.g. a swallowed SecurityException