Check session state in registered check to avoid using transferred se…

…rvers more (#5037) Check server session state in registered check to avoid transferred servers
home-assistant · Feb 8, 2025 · 4a3ece7 · 4a3ece7
1 parent df01039
commit 4a3ece7
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...src/main/java/io/homeassistant/companion/android/common/data/servers/ServerManagerImpl.kt b/...src/main/java/io/homeassistant/companion/android/common/data/servers/ServerManagerImpl.kt
@@ -3,6 +3,7 @@ package io.homeassistant.companion.android.common.data.servers
 import io.homeassistant.companion.android.common.data.LocalStorage
 import io.homeassistant.companion.android.common.data.authentication.AuthenticationRepository
 import io.homeassistant.companion.android.common.data.authentication.AuthenticationRepositoryFactory
+import io.homeassistant.companion.android.common.data.authentication.SessionState
 import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
 import io.homeassistant.companion.android.common.data.integration.IntegrationRepositoryFactory
 import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
@@ -85,7 +86,11 @@ class ServerManagerImpl @Inject constructor(
     }
 
     override fun isRegistered(): Boolean =
-        mutableServers.values.any { it.type == ServerType.DEFAULT && it.connection.isRegistered() }
+        mutableServers.values.any {
+            it.type == ServerType.DEFAULT &&
+                it.connection.isRegistered() &&
+                authenticationRepository(it.id).getSessionState() == SessionState.CONNECTED
+        }
 
     override suspend fun addServer(server: Server): Int {
         val newServer = server.copy(