Skip to content

Colota - Android GPS Location tracker

fix(motion): resync detector on profile stationary-entry (#530)

lguenth3fd1b8353d0e
diff --git a/apps/mobile/android/app/src/main/java/com/colota/service/LocationForegroundService.kt b/apps/mobile/android/app/src/main/java/com/colota/service/LocationForegroundService.kt
index 27cbd190..f5a4d97b 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/service/LocationForegroundService.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/service/LocationForegroundService.kt
@@ -1334,6 +1334,8 @@ class LocationForegroundService : Service() {
private fun handleStationaryChanged(stationary: Boolean) {
ensureMotionDetectorRunning()
+ // Reset the edge-triggered detector so continuing motion re-fires a MOVING edge.
+ if (stationary) (motionDetector as? RawSensorMotionDetector)?.resyncStationaryBaseline()
}
// ── Debug-only motion injection (BuildConfig.DEBUG) ───────────────────
diff --git a/apps/mobile/android/app/src/main/java/com/colota/service/RawSensorMotionDetector.kt b/apps/mobile/android/app/src/main/java/com/colota/service/RawSensorMotionDetector.kt
index 88dc19bc..6208b592 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/service/RawSensorMotionDetector.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/service/RawSensorMotionDetector.kt
@@ -136,6 +136,17 @@ class RawSensorMotionDetector(
}
}
+ /** Reset to STATIONARY so the next sustained motion re-fires a MOVING edge. */
+ fun resyncStationaryBaseline() {
+ val handler = sensorHandler ?: return
+ handler.post {
+ if (BuildConfig.DEBUG) AppLogger.d(TAG, "Resynced to STATIONARY (was $currentState)")
+ currentState = MotionState.STATIONARY
+ aboveThresholdSinceMs = 0L
+ belowThresholdSinceMs = 0L
+ }
+ }
+
private fun processSample(nowMs: Long, magnitude: Double) {
sampleWindow.addLast(Sample(nowMs, magnitude))
while (sampleWindow.isNotEmpty() && nowMs - sampleWindow.first().timestampMs > VARIANCE_WINDOW_MS) {
diff --git a/apps/mobile/android/app/src/test/java/com/Colota/service/LocationForegroundServiceTest.kt b/apps/mobile/android/app/src/test/java/com/Colota/service/LocationForegroundServiceTest.kt
index 8391a609..33c36d9f 100644
--- a/apps/mobile/android/app/src/test/java/com/Colota/service/LocationForegroundServiceTest.kt
+++ b/apps/mobile/android/app/src/test/java/com/Colota/service/LocationForegroundServiceTest.kt
@@ -2143,6 +2143,28 @@ class LocationForegroundServiceTest {
verify { detector.stop() }
}
+ @Test
+ fun `handleStationaryChanged true resyncs detector baseline`() {
+ val detector = mockk<RawSensorMotionDetector>(relaxed = true)
+ setField("motionDetector", detector)
+ every { profileManager.isStationary } returns true
+
+ invokeHandleStationaryChanged(true)
+
+ verify { detector.resyncStationaryBaseline() }
+ }
+
+ @Test
+ fun `handleStationaryChanged false does not resync`() {
+ val detector = mockk<RawSensorMotionDetector>(relaxed = true)
+ setField("motionDetector", detector)
+ every { profileManager.isStationary } returns false
+
+ invokeHandleStationaryChanged(false)
+
+ verify(exactly = 0) { detector.resyncStationaryBaseline() }
+ }
+
// =========================================================================
// maybeResumeGps - dual hold logic
// =========================================================================
@@ -2550,6 +2572,14 @@ class LocationForegroundServiceTest {
method.invoke(service)
}
+ private fun invokeHandleStationaryChanged(stationary: Boolean) {
+ val method = LocationForegroundService::class.java.getDeclaredMethod(
+ "handleStationaryChanged", Boolean::class.javaPrimitiveType
+ )
+ method.isAccessible = true
+ method.invoke(service, stationary)
+ }
+
private fun invokeMaybeResumeGps() {
val method = LocationForegroundService::class.java.getDeclaredMethod("maybeResumeGps")
method.isAccessible = true
diff --git a/apps/mobile/android/app/src/test/java/com/Colota/service/RawSensorMotionDetectorTest.kt b/apps/mobile/android/app/src/test/java/com/Colota/service/RawSensorMotionDetectorTest.kt
index 6a84b86d..59b34330 100644
--- a/apps/mobile/android/app/src/test/java/com/Colota/service/RawSensorMotionDetectorTest.kt
+++ b/apps/mobile/android/app/src/test/java/com/Colota/service/RawSensorMotionDetectorTest.kt
@@ -365,4 +365,51 @@ class RawSensorMotionDetectorTest {
assertEquals(listOf(MotionState.STATIONARY), received)
}
+
+ @Test
+ fun `resyncStationaryBaseline re-arms a fresh MOVING edge after currentState is already MOVING`() {
+ val received = mutableListOf<MotionState>()
+ val detector = makeDetector()
+ detector.start { received += it }
+ // Already MOVING: high-variance samples produce no edge (the deadlock).
+ var t = 0L
+ var hi = true
+ while (t <= 4_000L) {
+ feedSample(magnitude = if (hi) 0.6 else -0.6, atMs = t)
+ hi = !hi
+ t += 100L
+ }
+ assertTrue("MOVING edge must not fire while already MOVING", received.isEmpty())
+
+ detector.resyncStationaryBaseline()
+
+ // Continuing motion now re-fires a fresh MOVING edge (dwell = 3000ms).
+ while (t <= 8_000L) {
+ feedSample(magnitude = if (hi) 0.6 else -0.6, atMs = t)
+ hi = !hi
+ t += 100L
+ }
+
+ assertEquals(listOf(MotionState.MOVING), received)
+ }
+
+ @Test
+ fun `resyncStationaryBaseline emits no listener callback itself`() {
+ val received = mutableListOf<MotionState>()
+ val detector = makeDetector()
+ detector.start { received += it }
+ received.clear()
+
+ detector.resyncStationaryBaseline()
+
+ assertTrue(received.isEmpty())
+ }
+
+ @Test
+ fun `resyncStationaryBaseline before start is a no-op`() {
+ val received = mutableListOf<MotionState>()
+ val detector = makeDetector()
+ detector.resyncStationaryBaseline()
+ assertTrue(received.isEmpty())
+ }
}