Skip to content

Colota - Android GPS Location tracker

fix(service): skip the boot restart when the service is already running (#597)

Max Dietrichf65c04fa4c63
diff --git a/apps/mobile/android/app/src/main/java/com/colota/triggers/BootReceiver.kt b/apps/mobile/android/app/src/main/java/com/colota/triggers/BootReceiver.kt
index 49be2dbb..3bfbeadd 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/triggers/BootReceiver.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/triggers/BootReceiver.kt
@@ -120,6 +120,11 @@ class LocationBootReceiver : BroadcastReceiver() {
return
}
+ if (LocationForegroundService.isRunning) {
+ AppLogger.d(TAG, "Trigger received ($action) but the service is already running - not restarting")
+ return
+ }
+
AppLogger.d(TAG, "Trigger received ($action). Restarting service...")
val reason = if (action == Intent.ACTION_MY_PACKAGE_REPLACED) "App updated" else "Device rebooted"
diff --git a/apps/mobile/android/app/src/test/java/com/Colota/triggers/LocationBootReceiverTest.kt b/apps/mobile/android/app/src/test/java/com/Colota/triggers/LocationBootReceiverTest.kt
index c9151016..8566ea5a 100644
--- a/apps/mobile/android/app/src/test/java/com/Colota/triggers/LocationBootReceiverTest.kt
+++ b/apps/mobile/android/app/src/test/java/com/Colota/triggers/LocationBootReceiverTest.kt
@@ -177,6 +177,18 @@ class LocationBootReceiverTest {
verify { LocationForegroundService.startTracking(any(), any(), "Device rebooted") }
}
+ @Test
+ fun `handleBootCompleted does not restart a service that is already running`() = runTest {
+ mockkObject(LocationForegroundService.Companion)
+ every { LocationForegroundService.isRunning } returns true
+ every { LocationForegroundService.startTracking(any(), any(), any()) } just Runs
+ mockDbReadyAndEnabled()
+
+ callHandleBootCompleted(mockContext, Intent.ACTION_BOOT_COMPLETED)
+
+ verify(exactly = 0) { LocationForegroundService.startTracking(any(), any(), any()) }
+ }
+
@Test
fun `handleBootCompleted loads config from database`() = runTest {
mockDbReadyAndEnabled()