mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-15 12:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try/catch for individual sensor updates (#3203)

Browse source 
- Individual sensor update exceptions weren't caught like for multiple sensor updates
This commit is contained in:
Joris Pelgröm 2023-01-11 22:38:46 +01:00 committed by GitHub
parent 527325f153
commit 081fd8b8c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
common/src/main/java/io/homeassistant/companion/android/common/sensors/SensorReceiverBase.kt
View file

@ -338,9 +338,15 @@ abstract class SensorReceiverBase : BroadcastReceiver() {
context: Context,
sensorId: String
) {
val sensorManager = managers.firstOrNull { it.getAvailableSensors(context).any { s -> s.id == sensorId } }
sensorManager?.requestSensorUpdate(context)
val basicSensor = sensorManager?.getAvailableSensors(context)?.firstOrNull { it.id == sensorId }
val sensorManager = managers.firstOrNull {
it.getAvailableSensors(context).any { s -> s.id == sensorId }
} ?: return
try {
sensorManager.requestSensorUpdate(context)
} catch (e: Exception) {
Log.e(tag, "Issue requesting updates for ${context.getString(sensorManager.name)}", e)
}
val basicSensor = sensorManager.getAvailableSensors(context).firstOrNull { it.id == sensorId }
val fullSensor = sensorDao.getFull(sensorId)
if (
fullSensor != null && fullSensor.sensor.enabled &&
@ -350,12 +356,16 @@ abstract class SensorReceiverBase : BroadcastReceiver() {
fullSensor.sensor.icon != fullSensor.sensor.lastSentIcon
)
) {
integrationUseCase.updateSensors(arrayOf(fullSensor.toSensorRegistration(basicSensor)))
sensorDao.updateLastSentStateAndIcon(
basicSensor.id,
fullSensor.sensor.state,
fullSensor.sensor.icon
)
try {
integrationUseCase.updateSensors(arrayOf(fullSensor.toSensorRegistration(basicSensor)))
sensorDao.updateLastSentStateAndIcon(
basicSensor.id,
fullSensor.sensor.state,
fullSensor.sensor.icon
)
} catch (e: Exception) {
Log.e(tag, "Exception while updating individual sensor.", e)
}
}
}