Skip to content

Prevent Range Test from running on public/default channel #3816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent Range Test from running on public/default channel #3816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ...rc/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ fun RangeTestConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onB
title = stringResource(Res.string.range_test),
onBack = onBack,
configState = formState,
enabled = state.connected,
enabled = state.connected && !isPublicPrimaryChannel,
Copy link
Collaborator

@jamesarich jamesarich Nov 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's deduplicatestate.connected && !isPublicPrimaryChannel and hoist into a value that can be reused

responseState = state.responseState,
onDismissPacketResponse = viewModel::clearPacketResponse,
onSave = {
val config = moduleConfig { rangeTest = it }
val safeRangeTest = if (isPublicPrimaryChannel && it.enabled) it.copy { this.enabled = false } else it
val config = moduleConfig { rangeTest = safeRangeTest }
viewModel.setModuleConfig(config)
},
) {
Expand All @@ -63,7 +64,7 @@ fun RangeTestConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onB
SwitchPreference(
title = stringResource(Res.string.range_test_enabled),
checked = formState.value.enabled,
enabled = state.connected,
enabled = state.connected && !isPublicPrimaryChannel,
onCheckedChange = { formState.value = formState.value.copy { this.enabled = it } },
containerColor = CardDefaults.cardColors().containerColor,
)
Expand All @@ -72,15 +73,15 @@ fun RangeTestConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onB
DropDownPreference(
title = stringResource(Res.string.sender_message_interval_seconds),
selectedItem = formState.value.sender.toLong(),
enabled = state.connected,
enabled = state.connected && !isPublicPrimaryChannel,
items = rangeItems.map { it.value to it.toDisplayString() },
onItemSelected = { formState.value = formState.value.copy { sender = it.toInt() } },
)
HorizontalDivider()
SwitchPreference(
title = stringResource(Res.string.save_csv_in_storage_esp32_only),
checked = formState.value.save,
enabled = state.connected,
enabled = state.connected && !isPublicPrimaryChannel,
onCheckedChange = { formState.value = formState.value.copy { save = it } },
containerColor = CardDefaults.cardColors().containerColor,
)
Expand Down
Loading