From bdd478ce8a33631794211ba41aa1cad83eef22ef Mon Sep 17 00:00:00 2001
From: Pluto <pluto@hobbs.farm>
Date: Sun, 8 Mar 2026 23:23:20 -0500
Subject: [PATCH] Fix FCM integration build errors

- Fix ClippyResponseBus subscription to use SharedFlow.collect()
- Fix MatrixRestClient.putAccountData() to use httpClient not client
- Add missing Log import to MatrixRestClient
---
 app/src/main/java/farm/hobbs/clippyauto/VoiceLoop.kt        | 6 ++++--
 .../java/farm/hobbs/clippyauto/matrix/MatrixRestClient.kt   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/farm/hobbs/clippyauto/VoiceLoop.kt b/app/src/main/java/farm/hobbs/clippyauto/VoiceLoop.kt
index 671b158..845d4f2 100644
--- a/app/src/main/java/farm/hobbs/clippyauto/VoiceLoop.kt
+++ b/app/src/main/java/farm/hobbs/clippyauto/VoiceLoop.kt
@@ -96,8 +96,10 @@ class VoiceLoop(
         )
 
         // Subscribe to FCM fast path
-        ClippyResponseBus.subscribe { response, _ ->
-            scope.launch { handleClippyResponse(response, path = "fcm") }
+        scope.launch {
+            ClippyResponseBus.responses.collect { response ->
+                handleClippyResponse(response.text, path = response.path)
+            }
         }
 
         // Start network monitoring
diff --git a/app/src/main/java/farm/hobbs/clippyauto/matrix/MatrixRestClient.kt b/app/src/main/java/farm/hobbs/clippyauto/matrix/MatrixRestClient.kt
index 2f5e2d1..4668da3 100644
--- a/app/src/main/java/farm/hobbs/clippyauto/matrix/MatrixRestClient.kt
+++ b/app/src/main/java/farm/hobbs/clippyauto/matrix/MatrixRestClient.kt
@@ -1,4 +1,5 @@
 package farm.hobbs.clippyauto.matrix
+import android.util.Log
 
 import io.ktor.client.*
 import io.ktor.client.call.*
@@ -171,7 +172,7 @@ class MatrixRestClient(
      */
     suspend fun putAccountData(userId: String, type: String, data: Map<String, String>): Boolean {
         return try {
-            val response = client.put("$homeserverUrl/_matrix/client/v3/user/$userId/account_data/$type") {
+            val response = httpClient.put("$homeserverUrl/_matrix/client/v3/user/$userId/account_data/$type") {
                 header("Authorization", "Bearer $accessToken")
                 contentType(ContentType.Application.Json)
                 setBody(buildJsonObject {