Skip to content

Stopping SensorUpdate if get_config fail #6072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TimoPtr merged 1 commit into from
Nov 20, 2025
Merged

Stopping SensorUpdate if get_config fail #6072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions ...n/src/main/kotlin/io/homeassistant/companion/android/common/sensors/SensorReceiverBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ import androidx.core.content.ContextCompat
import androidx.core.content.getSystemService
import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.data.integration.IntegrationException
import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
import io.homeassistant.companion.android.common.data.integration.SensorRegistration
import io.homeassistant.companion.android.common.data.servers.ServerManager
import io.homeassistant.companion.android.common.data.websocket.impl.entities.GetConfigResponse
import io.homeassistant.companion.android.common.util.CHANNEL_SENSOR_SYNC
import io.homeassistant.companion.android.database.AppDatabase
import io.homeassistant.companion.android.database.sensor.SensorDao
Expand Down Expand Up @@ -60,6 +62,7 @@ abstract class SensorReceiverBase : BroadcastReceiver() {
)
return batteryStatusIntent?.let { BatterySensorManager.getIsCharging(it) } ?: false
}

else -> false
}
}
Expand Down Expand Up @@ -201,22 +204,25 @@ abstract class SensorReceiverBase : BroadcastReceiver() {
server: Server,
sensorDao: SensorDao,
): Boolean {
val currentHAversion = serverManager.integrationRepository(server.id).getHomeAssistantVersion()
val supportsDisabledSensors = serverManager.integrationRepository(
server.id,
).isHomeAssistantVersionAtLeast(2022, 6, 0)
val serverIsTrusted = serverManager.integrationRepository(server.id).isTrusted()
val config: GetConfigResponse
val integrationRepository: IntegrationRepository

try {
integrationRepository = serverManager.integrationRepository(server.id)
config = integrationRepository.getConfig()
} catch (e: Exception) {
Timber.e(e, "Error while getting core config to sync sensor status aborting")
return false
}

val currentHAversion = integrationRepository.getHomeAssistantVersion()
val supportsDisabledSensors = integrationRepository.isHomeAssistantVersionAtLeast(2022, 6, 0)
val serverIsTrusted = integrationRepository.isTrusted()
val coreSensorStatus: Map<String, Boolean>? =
if (supportsDisabledSensors && (serverIsTrusted || (sensorDao.getEnabledCount() ?: 0) > 0)) {
try {
val config = serverManager.integrationRepository(server.id).getConfig().entities
config
?.filter { it.value["disabled"] != null }
?.mapValues { !(it.value["disabled"] as Boolean) } // Map to sensor id -> enabled
} catch (e: Exception) {
Timber.e(e, "Error while getting core config to sync sensor status")
null
}
config.entities
?.filter { it.value["disabled"] != null }
?.mapValues { !(it.value["disabled"] as Boolean) } // Map to sensor id -> enabled
} else {
// Cannot sync disabled, or all sensors disabled and server changes aren't trusted
null
Expand Down Expand Up @@ -350,7 +356,7 @@ abstract class SensorReceiverBase : BroadcastReceiver() {
var success = true
if (enabledRegistrations.isNotEmpty()) {
success = try {
val serverSuccess = serverManager.integrationRepository(server.id).updateSensors(enabledRegistrations)
val serverSuccess = integrationRepository.updateSensors(enabledRegistrations)
enabledRegistrations.forEach {
sensorDao.updateLastSentStateAndIcon(it.uniqueId, it.serverId, it.state.toString(), it.icon)
}
Expand Down
Loading