From ef57b4a6c9fa0f93d94a6e47f4b96990a0e37833 Mon Sep 17 00:00:00 2001
From: dubsector <dubsector@protonmail.com>
Date: Tue, 25 Nov 2025 17:56:19 -0500
Subject: [PATCH] Prevent Range Test from running on public/default channel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added logic in RangeTestConfigItemList.kt to detect when the primary channel is using the default/public PSK.

Disabled the entire Range Test configuration UI when the device is on a public channel.

Added a backend safety check to ensure the Range Test module cannot be enabled even if the UI is bypassed.

Automatically forces enabled = false in the module config when public channel conditions are detected.

Ensures behavior matches existing code style and Meshtastic’s definition of “public channel.”
---
 .../radio/component/RangeTestConfigItemList.kt        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt
index 59c49092e7..de648a8405 100644
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt
@@ -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,
         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)
         },
     ) {
@@ -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,
                 )
@@ -72,7 +73,7 @@ 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() } },
                 )
@@ -80,7 +81,7 @@ fun RangeTestConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onB
                 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,
                 )