kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
fix crash by adding a safe call for hardwareModel
rodzic
b2f34c9b69
commit
45ce1d6e3a
|
@ -47,6 +47,7 @@ import com.geeksville.mesh.repository.api.DeviceHardwareRepository
|
||||||
import com.geeksville.mesh.repository.api.FirmwareReleaseRepository
|
import com.geeksville.mesh.repository.api.FirmwareReleaseRepository
|
||||||
import com.geeksville.mesh.repository.datastore.RadioConfigRepository
|
import com.geeksville.mesh.repository.datastore.RadioConfigRepository
|
||||||
import com.geeksville.mesh.service.ServiceAction
|
import com.geeksville.mesh.service.ServiceAction
|
||||||
|
import com.geeksville.mesh.util.safeNumber
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
@ -260,8 +261,9 @@ constructor(
|
||||||
.onEach { (node, ourNode) ->
|
.onEach { (node, ourNode) ->
|
||||||
// Create a fallback node if not found in database (for hidden clients, etc.)
|
// Create a fallback node if not found in database (for hidden clients, etc.)
|
||||||
val actualNode = node ?: createFallbackNode(destNum)
|
val actualNode = node ?: createFallbackNode(destNum)
|
||||||
val deviceHardware =
|
val deviceHardware = actualNode.user.hwModel.safeNumber().let {
|
||||||
actualNode.user.hwModel.number.let { deviceHardwareRepository.getDeviceHardwareByModel(it) }
|
deviceHardwareRepository.getDeviceHardwareByModel(it)
|
||||||
|
}
|
||||||
_state.update { state ->
|
_state.update { state ->
|
||||||
state.copy(
|
state.copy(
|
||||||
node = actualNode,
|
node = actualNode,
|
||||||
|
|
|
@ -67,6 +67,7 @@ import com.geeksville.mesh.ui.common.components.MainMenuAction
|
||||||
import com.geeksville.mesh.ui.node.components.NodeMenuAction
|
import com.geeksville.mesh.ui.node.components.NodeMenuAction
|
||||||
import com.geeksville.mesh.util.getShortDate
|
import com.geeksville.mesh.util.getShortDate
|
||||||
import com.geeksville.mesh.util.positionToMeter
|
import com.geeksville.mesh.util.positionToMeter
|
||||||
|
import com.geeksville.mesh.util.safeNumber
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
@ -228,8 +229,8 @@ constructor(
|
||||||
val deviceHardware: StateFlow<DeviceHardware?> =
|
val deviceHardware: StateFlow<DeviceHardware?> =
|
||||||
ourNodeInfo
|
ourNodeInfo
|
||||||
.mapNotNull { nodeInfo ->
|
.mapNotNull { nodeInfo ->
|
||||||
nodeInfo?.user?.hwModel?.let {
|
nodeInfo?.user?.hwModel?.let { hwModel ->
|
||||||
deviceHardwareRepository.getDeviceHardwareByModel(it.number).getOrNull()
|
deviceHardwareRepository.getDeviceHardwareByModel(hwModel.safeNumber()).getOrNull()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.stateIn(scope = viewModelScope, started = SharingStarted.WhileSubscribed(5_000), initialValue = null)
|
.stateIn(scope = viewModelScope, started = SharingStarted.WhileSubscribed(5_000), initialValue = null)
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2025 Meshtastic LLC
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.geeksville.mesh.util
|
||||||
|
|
||||||
|
import com.geeksville.mesh.MeshProtos
|
||||||
|
import com.geeksville.mesh.android.BuildUtils.warn
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Safely extracts the hardware model number from a HardwareModel enum.
|
||||||
|
*
|
||||||
|
* This function handles unknown enum values gracefully by catching IllegalArgumentException
|
||||||
|
* and returning a fallback value. This prevents crashes when the app receives data
|
||||||
|
* from devices with hardware models not yet defined in the current protobuf version.
|
||||||
|
*
|
||||||
|
* @param fallbackValue The value to return if the enum is unknown (defaults to 0 for UNSET)
|
||||||
|
* @return The hardware model number, or the fallback value if the enum is unknown
|
||||||
|
*/
|
||||||
|
fun MeshProtos.HardwareModel.safeNumber(fallbackValue: Int = 0): Int {
|
||||||
|
return try {
|
||||||
|
this.number
|
||||||
|
} catch (e: IllegalArgumentException) {
|
||||||
|
warn("Unknown hardware model enum value: $this, using fallback value: $fallbackValue")
|
||||||
|
fallbackValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the hardware model is a known/supported value.
|
||||||
|
*
|
||||||
|
* @return true if the hardware model is known and supported, false otherwise
|
||||||
|
*/
|
||||||
|
fun MeshProtos.HardwareModel.isKnown(): Boolean {
|
||||||
|
return try {
|
||||||
|
this.number
|
||||||
|
true
|
||||||
|
} catch (e: IllegalArgumentException) {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
Ładowanie…
Reference in New Issue