meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(#1787): handle unknown hardware details crash (#1789)

Browse source
This commit is contained in:
James Rich 2025-04-26 19:37:49 -05:00 • committed by GitHub
parent 00ac8d504c
commit 1bd6173f9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
90 changed files with 15108 additions and 35821 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
View file

@ -229,8 +229,11 @@ class MetricsViewModel @Inject constructor(
.onEach { node ->
_state.update { state -> state.copy(node = node) }
node?.user?.hwModel?.let { hwModel ->
_state.update { state ->
state.copy(deviceHardware = getDeviceHardwareFromHardwareModel(hwModel))
val deviceHardware = getDeviceHardwareFromHardwareModel(hwModel)
deviceHardware?.let {
_state.update { state ->
state.copy(deviceHardware = it)
}
}
}
}
@ -348,12 +351,14 @@ class MetricsViewModel @Inject constructor(
try {
val json =
app.assets.open("device_hardware.json").bufferedReader().use { it.readText() }
deviceHardwareList = Json.decodeFromString<List<DeviceHardwareDto>>(json)
.map { it.toDeviceHardware() }
deviceHardwareList = Json.decodeFromString<List<DeviceHardware>>(json)
return deviceHardwareList.find { it.hwModel == hwModel.number }
} catch (ex: IOException) {
errormsg("Can't read device_hardware.json error: ${ex.message}")
} catch (ex: IllegalArgumentException) {
errormsg(ex.message.toString())
}
}
return deviceHardwareList.find { it.hwModel == hwModel.number }
return null
}
}