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 #3509: MQTT reporting interval not being selected, and sent to node (#3717)

Browse source
This commit is contained in:
Dane Evans 2025-11-17 02:37:44 +11:00 • committed by GitHub
parent 4a46908ddd
commit 12d96b76db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt
View file

@ -72,7 +72,7 @@ fun MQTTConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack:
val consentValid = val consentValid =
if (formState.value.mapReportingEnabled) { if (formState.value.mapReportingEnabled) {
formState.value.mapReportSettings.shouldReportLocation && formState.value.mapReportSettings.shouldReportLocation &&
mqttConfig.mapReportSettings.publishIntervalSecs >= MIN_INTERVAL_SECS formState.value.mapReportSettings.publishIntervalSecs >= MIN_INTERVAL_SECS
} else { } else {
true true
} }

8
feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MapReportingPreference.kt
View file

@ -51,6 +51,7 @@ import org.meshtastic.core.strings.map_reporting_summary
import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.DropDownPreference
import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.core.ui.component.SwitchPreference
import org.meshtastic.core.ui.component.precisionBitsToMeters import org.meshtastic.core.ui.component.precisionBitsToMeters
import org.meshtastic.feature.settings.util.FixedUpdateIntervals
import org.meshtastic.feature.settings.util.IntervalConfiguration import org.meshtastic.feature.settings.util.IntervalConfiguration
import org.meshtastic.feature.settings.util.toDisplayString import org.meshtastic.feature.settings.util.toDisplayString
import kotlin.math.roundToInt import kotlin.math.roundToInt
@ -131,10 +132,11 @@ fun MapReportingPreference(
DropDownPreference( DropDownPreference(
modifier = Modifier.padding(bottom = 16.dp), modifier = Modifier.padding(bottom = 16.dp),
title = stringResource(Res.string.map_reporting_interval_seconds), title = stringResource(Res.string.map_reporting_interval_seconds),
items = publishItems.map { it.value to it.toDisplayString() }, items = publishItems.map { it to it.toDisplayString() },
selectedItem = publishIntervalSecs, selectedItem =
FixedUpdateIntervals.fromValue(publishIntervalSecs.toLong()) ?: publishItems.first(),
enabled = enabled, enabled = enabled,
onItemSelected = { onPublishIntervalSecsChanged(it.toInt()) }, onItemSelected = { onPublishIntervalSecsChanged(it.value.toInt()) },
) )
} }
} }