Fix compilation errors for upstream API compatibility

Adapt to upstream refactoring: MessagingTokenProvider, servers(),
kotlinx.serialization, and new SettingsPresenter interface.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: 2 people

app/src/full/kotlin/io/homeassistant/companion/android/push/FcmPushProvider.kt

@@ -3,7 +3,7 @@ package io.homeassistant.companion.android.push
 import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
 import io.homeassistant.companion.android.common.push.PushProvider
 import io.homeassistant.companion.android.common.push.PushRegistrationResult
-import io.homeassistant.companion.android.onboarding.getMessagingToken
+import io.homeassistant.companion.android.common.util.MessagingTokenProvider
 import javax.inject.Inject
 import javax.inject.Singleton
 import timber.log.Timber
@@ -15,16 +15,19 @@ import timber.log.Timber
  * so that users with a UnifiedPush distributor will use that instead.
  */
 @Singleton
-class FcmPushProvider @Inject constructor(private val prefsRepository: PrefsRepository) : PushProvider {
+class FcmPushProvider @Inject constructor(
+    private val prefsRepository: PrefsRepository,
+    private val messagingTokenProvider: MessagingTokenProvider,
+) : PushProvider {
 
     override val name: String = NAME
 
     override val priority: Int = 20
 
     override suspend fun isAvailable(): Boolean {
         return try {
-            val token = getMessagingToken()
-            token.isNotBlank()
+            val token = messagingTokenProvider()
+            !token.isBlank()
         } catch (e: Exception) {
             Timber.e(e, "FCM is not available")
             false
@@ -35,22 +38,22 @@ class FcmPushProvider @Inject constructor(private val prefsRepository: PrefsRepo
         // FCM is active only when UnifiedPush is not enabled and a valid token exists.
         if (prefsRepository.isUnifiedPushEnabled()) return false
         return try {
-            val token = getMessagingToken()
-            token.isNotBlank()
+            val token = messagingTokenProvider()
+            !token.isBlank()
         } catch (e: Exception) {
             false
         }
     }
 
     override suspend fun register(): PushRegistrationResult? {
         return try {
-            val token = getMessagingToken()
+            val token = messagingTokenProvider()
             if (token.isBlank()) {
                 Timber.w("FCM token is blank")
                 null
             } else {
                 PushRegistrationResult(
-                    pushToken = token,
+                    pushToken = token.value,
                     pushUrl = "", // Empty URL means use built-in push URL
                     encrypt = false,
                 )

app/src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt

@@ -327,7 +327,9 @@ class MessagingManager @Inject constructor(
             }
         }
         if (!flattened.containsKey("webhook_id")) {
-            serverManager.getServer(serverId)?.let { server ->
+            runBlocking {
+                serverManager.getServer(serverId)
+            }?.let { server ->
                 flattened["webhook_id"] = server.connection.webhookId.toString()
             }
         }

app/src/main/kotlin/io/homeassistant/companion/android/push/WebSocketPushProvider.kt

@@ -35,7 +35,7 @@ class WebSocketPushProvider @Inject constructor(
 
     override suspend fun isActive(): Boolean {
         if (!serverManager.isRegistered()) return false
-        return serverManager.defaultServers.any { server ->
+        return serverManager.servers().any { server ->
             val setting = settingsDao.get(server.id)?.websocketSetting
             setting != null && setting != WebsocketSetting.NEVER
         }

app/src/main/kotlin/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt

@@ -166,6 +166,10 @@ class SettingsPresenterImpl @Inject constructor(
 
     override fun getUnifiedPushDistributors(): List<String> = unifiedPushManager.getDistributors()
 
+    override fun registerUnifiedPushDistributor(context: Context, distributor: String) {
+        unifiedPushManager.saveDistributor(distributor)
+    }
+
     override suspend fun showChangeLog(context: Context) {
         changeLog.showChangeLog(context, true)
     }

app/src/main/kotlin/io/homeassistant/companion/android/unifiedpush/UnifiedPushManager.kt

@@ -8,8 +8,9 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.common.data.integration.DeviceRegistration
 import io.homeassistant.companion.android.common.data.servers.ServerManager
+import io.homeassistant.companion.android.common.util.MessagingToken
+import io.homeassistant.companion.android.common.util.MessagingTokenProvider
 import io.homeassistant.companion.android.notifications.MessagingManager
-import io.homeassistant.companion.android.onboarding.getMessagingToken
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -24,6 +25,7 @@ class UnifiedPushManager @Inject constructor(
     @ApplicationContext val context: Context,
     private val serverManager: ServerManager,
     private val messagingManager: MessagingManager,
+    private val messagingTokenProvider: MessagingTokenProvider,
 ) {
     companion object {
         const val DISTRIBUTOR_DISABLED = "disabled"
@@ -68,10 +70,10 @@ class UnifiedPushManager @Inject constructor(
             val url = endpoint?.url.orEmpty()
             val token = if (endpoint != null) {
                 // Use public key as push token to allow for encryption.
-                endpoint.pubKeySet?.let { it.auth + ":" + it.pubKey } ?: ""
+                MessagingToken(endpoint.pubKeySet?.let { it.auth + ":" + it.pubKey } ?: "")
             } else {
                 // Revert to FCM token when disabling UnifiedPush.
-                getMessagingToken()
+                messagingTokenProvider()
             }
             val registered = messagingManager.isUnifiedPushEnabled()
             messagingManager.setUnifiedPushEnabled(endpoint != null)
@@ -80,8 +82,8 @@ class UnifiedPushManager @Inject constructor(
                 Timber.d("Not trying to update registration since we aren't authenticated.")
                 return@launch
             }
-            val encrypt = endpoint != null && token.isNotBlank()
-            serverManager.defaultServers.forEach {
+            val encrypt = endpoint != null && !token.isBlank()
+            serverManager.servers().forEach {
                 launch {
                     try {
                         serverManager.integrationRepository(it.id).updateRegistration(

app/src/main/kotlin/io/homeassistant/companion/android/unifiedpush/UnifiedPushReceiver.kt

@@ -1,8 +1,10 @@
 package io.homeassistant.companion.android.unifiedpush
 
 import android.content.Context
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.fasterxml.jackson.module.kotlin.readValue
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.jsonPrimitive
 import dagger.hilt.android.AndroidEntryPoint
 import io.homeassistant.companion.android.notifications.MessagingManager
 import javax.inject.Inject
@@ -28,7 +30,10 @@ class UnifiedPushReceiver : MessagingReceiver() {
         Timber.d("From: $instance")
 
         try {
-            val data: Map<String, Any> = jacksonObjectMapper().readValue(message.content)
+            val jsonObject = Json.decodeFromString<JsonObject>(message.content.decodeToString())
+            val data: Map<String, Any> = jsonObject.mapValues { (_, value) ->
+                value.jsonPrimitive.contentOrNull ?: value.toString()
+            }
             messagingManager.handleMessage(data, SOURCE)
         } catch (e: Exception) {
             Timber.e(e, "Failed to parse UnifiedPush message")