From 6a72c65a837c52e740eeaf2ef5d1171cb729cefa Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 21 May 2023 19:31:18 -0300 Subject: [PATCH] fix: channel config request logic --- .../com/geeksville/mesh/ui/DeviceSettingsFragment.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt index c7fd91a57..0bde7504a 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt @@ -257,19 +257,19 @@ fun RadioConfigNavHost(node: NodeInfo, viewModel: UIViewModel = viewModel()) { when (parsed.payloadVariantCase) { AdminProtos.AdminMessage.PayloadVariantCase.GET_CHANNEL_RESPONSE -> { val response = parsed.getChannelResponse - channelList.add(response.index, response.settings) (packetResponseState as PacketResponseState.Loading).completed++ - if (response.index + 1 < maxChannels) { - // Stop once we get to the first disabled entry - if (response.role != ChannelProtos.Channel.Role.DISABLED) { + // Stop once we get to the first disabled entry + if (response.role != ChannelProtos.Channel.Role.DISABLED) { + channelList.add(response.index, response.settings) + if (response.index + 1 < maxChannels) { // Not done yet, request next channel viewModel.getChannel(destNum, response.index + 1) } else { - // Received last channel, get lora config (for default channel names) + // Received max channels, get lora config (for default channel names) viewModel.getConfig(destNum, ConfigType.LORA_CONFIG_VALUE) } } else { - // Received max channels, get lora config (for default channel names) + // Received last channel, get lora config (for default channel names) viewModel.getConfig(destNum, ConfigType.LORA_CONFIG_VALUE) } }