Android Auto-aware Assist Triggering

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

@@ -48,11 +48,14 @@ class AssistActivity : BaseActivity() {
     private var contextIsLocked = true
 
     companion object {
-        private const val EXTRA_SERVER = "server"
-        private const val EXTRA_PIPELINE = "pipeline"
-        private const val EXTRA_START_LISTENING = "start_listening"
-        private const val EXTRA_FROM_FRONTEND = "from_frontend"
-        private const val EXTRA_FROM_WAKE_WORD_PHRASE = "from_wake_word_phrase"
+        const val EXTRA_SERVER = "server"
+        const val EXTRA_PIPELINE = "pipeline"
+        const val EXTRA_START_LISTENING = "start_listening"
+        const val EXTRA_FROM_FRONTEND = "from_frontend"
+        const val EXTRA_FROM_WAKE_WORD_PHRASE = "from_wake_word_phrase"
+        const val EXTRA_TRIGGER_SOURCE = "trigger_source"
+        const val TRIGGER_SOURCE_ASSIST = "assist"
+        const val ACTION_TRIGGER_AUTOMOTIVE_ASSIST = "ACTION_TRIGGER_AUTOMOTIVE_ASSIST"
 
         fun newInstance(
             context: Context,
@@ -61,13 +64,15 @@ class AssistActivity : BaseActivity() {
             startListening: Boolean = true,
             fromFrontend: Boolean = true,
             wakeWordPhrase: String? = null,
+            triggerSource: String? = null,
         ): Intent {
             return Intent(context, AssistActivity::class.java).apply {
                 putExtra(EXTRA_SERVER, serverId)
                 putExtra(EXTRA_PIPELINE, pipelineId)
                 putExtra(EXTRA_START_LISTENING, startListening)
                 putExtra(EXTRA_FROM_FRONTEND, fromFrontend)
                 putExtra(EXTRA_FROM_WAKE_WORD_PHRASE, wakeWordPhrase)
+                putExtra(EXTRA_TRIGGER_SOURCE, triggerSource)
             }
         }
     }
@@ -113,6 +118,27 @@ class AssistActivity : BaseActivity() {
         }
 
         val fromFrontend = intent.getBooleanExtra(EXTRA_FROM_FRONTEND, false)
+        val triggerSource = intent.getStringExtra(EXTRA_TRIGGER_SOURCE)
+
+        if (triggerSource == TRIGGER_SOURCE_ASSIST) {
+            if (io.homeassistant.companion.android.vehicle.HaCarAppService.carInfo != null) {
+                val automotiveIntent = Intent(
+                    io.homeassistant.companion.android.vehicle.HaCarAppService.ACTION_NAVIGATE_TO_AUTOMOTIVE_ASSIST,
+                ).apply {
+                    putExtra(
+                        io.homeassistant.companion.android.vehicle.HaCarAppService.EXTRA_SERVER,
+                        if (intent.hasExtra(EXTRA_SERVER)) {
+                            intent.getIntExtra(EXTRA_SERVER, ServerManager.SERVER_ID_ACTIVE)
+                        } else {
+                            ServerManager.SERVER_ID_ACTIVE
+                        },
+                    )
+                }
+                sendBroadcast(automotiveIntent)
+                finish()
+                return
+            }
+        }
 
         setContent {
             if (viewModel.shouldFinish) {
@@ -166,6 +192,9 @@ class AssistActivity : BaseActivity() {
 
     override fun onPause() {
         super.onPause()
+        // The error says onPause() is protected in AssistViewModel.
+        // We need to call it, but it's protected.
+        // Let's see if we can change the visibility in AssistViewModel.
         viewModel.onPause()
     }
 

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

@@ -1,5 +1,4 @@
 package io.homeassistant.companion.android.assist
-
 import android.content.Context
 import androidx.core.content.getSystemService
 import io.homeassistant.companion.android.assist.service.AssistVoiceInteractionService

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

@@ -506,13 +506,13 @@ class AssistViewModel @AssistedInject constructor(
         if (!proactive) requestSilently = false
     }
 
-    fun onPause() {
+    override fun onPause() {
         requestPermission = null
         inactivityTimerJob?.cancel()
         stopRecording()
     }
 
-    fun onDestroy() {
+    override fun onDestroy() {
         requestPermission = null
         inactivityTimerJob?.cancel()
         stopRecording()