mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-03 08:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Controls: prevent individual server error from blocking all others (#4262)

Browse Source 
- Catch exceptions thrown while loading all controls on a server level, to make sure that an issue with one server doesn't prevent data from other servers from showing.
This commit is contained in:
Joris Pelgröm 2024-03-11 22:50:22 +01:00 committed by GitHub
parent 4a72229245
commit 6ff3560146
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/io/homeassistant/companion/android/controls/HaControlsProviderService.kt
View File

@ -94,11 +94,11 @@ class HaControlsProviderService : ControlsProviderService() {
return@launch
}
try {
val entities = mutableMapOf<Int, List<Entity<Any>>?>()
val areaForEntity = mutableMapOf<Int, Map<String, AreaRegistryResponse?>>()
serverManager.defaultServers.map { server ->
async {
val entities = mutableMapOf<Int, List<Entity<Any>>?>()
val areaForEntity = mutableMapOf<Int, Map<String, AreaRegistryResponse?>>()
serverManager.defaultServers.map { server ->
async {
try {
val getAreaRegistry = async { serverManager.webSocketRepository(server.id).getAreaRegistry() }
val getDeviceRegistry = async { serverManager.webSocketRepository(server.id).getDeviceRegistry() }
val getEntityRegistry = async { serverManager.webSocketRepository(server.id).getEntityRegistry() }
@ -119,9 +119,13 @@ class HaControlsProviderService : ControlsProviderService() {
}
entities[server.id] = entities[server.id].orEmpty()
.sortedWith(compareBy(nullsLast()) { areaForEntity[server.id]?.get(it.entityId)?.name })
} catch (e: Exception) {
Log.e(TAG, "Unable to load entities/registries for server ${server.id} (${server.friendlyName}), skipping", e)
}
}.awaitAll()
}
}.awaitAll()
try {
val allEntities = mutableListOf<Pair<Int, Entity<Any>>>()
entities.forEach { serverEntities ->
serverEntities.value?.forEach { allEntities += Pair(serverEntities.key, it) }
@ -158,7 +162,7 @@ class HaControlsProviderService : ControlsProviderService() {
subscriber.onNext(it)
}
} catch (e: Exception) {
Log.e(TAG, "Error getting list of entities", e)
Log.e(TAG, "Error building list of entities", e)
}
subscriber.onComplete()
}