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

repo(release): merge changes from 2.7.0 to main (#3070)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
Co-authored-by: DaneEvans <dane@goneepic.com>
This commit is contained in:
James Rich 2025-09-10 15:59:57 -05:00 • committed by GitHub
parent 94f30ef540
commit 3c726457eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 84 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -420,7 +420,7 @@ private fun VersionChecks(viewModel: UIViewModel) {
LaunchedEffect(connectionState, myNodeInfo) {
if (connectionState == ConnectionState.CONNECTED) {
myNodeInfo?.let { info ->
val isOld = info.minAppVersion > BuildConfig.VERSION_CODE
val isOld = info.minAppVersion > BuildConfig.VERSION_CODE && BuildConfig.DEBUG.not()
if (isOld) {
viewModel.showAlert(
context.getString(R.string.app_too_old),

4
app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
View file

@ -57,7 +57,7 @@ object LanguageUtils : Logging {
context.resources.getXml(R.xml.locales_config).use {
while (it.eventType != XmlPullParser.END_DOCUMENT) {
if (it.eventType == XmlPullParser.START_TAG && it.name == "locale") {
languageTags += it.getAttributeValue(0)
it.getAttributeValue(0)?.let { tag -> languageTags += tag }
}
it.next()
}
@ -66,7 +66,7 @@ object LanguageUtils : Logging {
errormsg("Error parsing locale_config.xml ${e.message}")
}
return languageTags.associateBy { tag ->
val loc = Locale(tag)
val loc = Locale.forLanguageTag(tag)
when (tag) {
SYSTEM_DEFAULT -> context.getString(R.string.preferences_system_default)
"fr-HT" -> context.getString(R.string.fr_HT)