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

refactor: recommended and required firmware updates (#2012)

Browse source
This commit is contained in:
James Rich 2025-06-03 19:58:21 -05:00 • committed by GitHub
parent 868d705b2d
commit 38982bc37b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 57 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/geeksville/mesh/ui/Main.kt
View file

@ -49,6 +49,7 @@ import androidx.compose.material3.TopAppBar
import androidx.compose.material3.rememberTooltipState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.mutableStateOf
@ -195,6 +196,8 @@ private fun VersionChecks(
val connectionState by viewModel.connectionState.collectAsStateWithLifecycle()
val myNodeInfo by viewModel.myNodeInfo.collectAsStateWithLifecycle()
val context = LocalContext.current
val latestStableFirmwareRelease by
viewModel.latestStableFirmwareRelease.collectAsState(DeviceVersion("2.6.4"))
// Check if the device is running an old app version or firmware version
LaunchedEffect(connectionState, myNodeInfo) {
if (connectionState == MeshService.ConnectionState.CONNECTED) {
@ -211,18 +214,31 @@ private fun VersionChecks(
MeshService.changeDeviceAddress(context, service, "n")
}
)
} else if (curVer < MeshService.minDeviceVersion) {
} else if (curVer < MeshService.absoluteMinDeviceVersion) {
val title = context.getString(R.string.firmware_too_old)
val message = context.getString(R.string.firmware_old)
viewModel.showAlert(
title = title,
message = message,
html = message,
dismissable = false,
onConfirm = {
val service = viewModel.meshService ?: return@showAlert
MeshService.changeDeviceAddress(context, service, "n")
}
)
} else if (curVer < MeshService.minDeviceVersion) {
val title = context.getString(R.string.should_update_firmware)
val message =
context.getString(
R.string.should_update,
latestStableFirmwareRelease.asString
)
viewModel.showAlert(
title = title,
message = message,
dismissable = false,
onConfirm = {}
)
}
}
}

2
app/src/main/java/com/geeksville/mesh/ui/common/components/AlertDialogs.kt
View file

@ -55,7 +55,7 @@ fun SimpleAlertDialog(
style = SpanStyle(
textDecoration = TextDecoration.Underline,
fontStyle = FontStyle.Italic,
color = MaterialTheme.colorScheme.tertiary
color = MaterialTheme.colorScheme.primary
)
)
)