Check AssistVoiceInteractionService before opening assist (#6521)

Author: TimoPtr

app/src/main/kotlin/io/homeassistant/companion/android/assist/service/AssistVoiceInteractionService.kt

@@ -71,9 +71,11 @@ class AssistVoiceInteractionService : VoiceInteractionService() {
         )
     }
     private var lastTriggerTime: Instant? = null
+    private var isServiceReady = false
 
     override fun onReady() {
         super.onReady()
+        isServiceReady = true
         Timber.d("VoiceInteractionService is ready")
         serviceScope.launch {
             if (assistConfigManager.isWakeWordEnabled()) {
@@ -87,6 +89,7 @@ class AssistVoiceInteractionService : VoiceInteractionService() {
 
     override fun onShutdown() {
         super.onShutdown()
+        isServiceReady = false
         Timber.d("VoiceInteractionService is shutting down")
         // Don't use stopListening() as it launches a coroutine that may not complete before cancel
         serviceScope.cancel()
@@ -239,6 +242,10 @@ class AssistVoiceInteractionService : VoiceInteractionService() {
     }
 
     private fun launchAssist(wakeWord: String? = null) {
+        if (!isServiceReady) {
+            Timber.w("Cannot launch Assist: VoiceInteractionService is not ready yet")
+            return
+        }
         val args = Bundle().apply {
             wakeWord?.let { putString(EXTRA_WAKE_WORD, it) }
         }

app/src/test/kotlin/io/homeassistant/companion/android/assist/service/AssistVoiceInteractionServiceTest.kt

@@ -33,10 +33,10 @@ import org.junit.Test
 import org.junit.jupiter.api.assertNull
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
-import org.robolectric.annotation.Config
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows
 import org.robolectric.android.controller.ServiceController
+import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowVoiceInteractionService
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -356,4 +356,60 @@ class AssistVoiceInteractionServiceTest {
         // Both detections should have sent a broadcast, even though the second was debounced
         assertEquals(2, wakeWordBroadcasts.size)
     }
+
+    @Test
+    fun `Given service not ready when wake word detected then do not show session`() = runTest {
+        val shadow = Shadows.shadowOf(service) as ShadowVoiceInteractionService
+        coEvery { assistConfigManager.getSelectedWakeWordModel() } returns microWakeWordModelConfigs[0]
+
+        // Do NOT call onReady() - service is not ready
+
+        val intent = Intent().apply {
+            action = "io.homeassistant.companion.android.START_LISTENING"
+        }
+        service.onStartCommand(intent, 0, 1)
+        advanceUntilIdle()
+
+        // Simulate wake word detection while service is not ready
+        onWakeWordDetectedSlot.captured.invoke(microWakeWordModelConfigs[0])
+        advanceUntilIdle()
+
+        // showSession should NOT have been called
+        assertNull(shadow.lastSessionBundle)
+        // But the listener should still have been stopped to release the microphone
+        coVerify { wakeWordListener.stop() }
+    }
+
+    @Test
+    fun `Given service shut down after ready when wake word detected then do not show session`() = runTest {
+        val shadow = Shadows.shadowOf(service) as ShadowVoiceInteractionService
+        coEvery { assistConfigManager.getSelectedWakeWordModel() } returns microWakeWordModelConfigs[0]
+
+        // Make service ready and start listening so the wake word callback is captured
+        service.onReady()
+        advanceUntilIdle()
+
+        val intent = Intent().apply {
+            action = "io.homeassistant.companion.android.START_LISTENING"
+        }
+        service.onStartCommand(intent, 0, 1)
+        advanceUntilIdle()
+
+        // Simulate a shutdown that races with the wake-word coroutine: when
+        // stop() is called inside the launched coroutine, the service shuts down
+        // concurrently (setting isServiceReady = false). Because launchAssist()
+        // runs synchronously after stop() returns, only the isServiceReady guard
+        // prevents showSession() from being called.
+        coEvery { wakeWordListener.stop() } coAnswers {
+            service.onShutdown()
+        }
+
+        // Invoke the wake word callback to queue the coroutine, then advance
+        onWakeWordDetectedSlot.captured.invoke(microWakeWordModelConfigs[0])
+        advanceUntilIdle()
+
+        // showSession should NOT have been called because the service is no longer ready
+        assertNull(shadow.lastSessionBundle)
+        coVerify { wakeWordListener.stop() }
+    }
 }