File tree Expand file tree Collapse file tree 4 files changed +9
-13
lines changed
app/src/main/java/com/geeksville/mesh/service
model/src/androidTest/kotlin/org/meshtastic/core/model
ui/src/main/kotlin/org/meshtastic/core/ui/qr Expand file tree Collapse file tree 4 files changed +9
-13
lines changed Original file line number Diff line number Diff line change @@ -175,7 +175,7 @@ constructor(
175175 maxChannels = 8 ,
176176 hasWifi = metadata?.hasWifi == true ,
177177 deviceId = device_id.utf8(),
178- pioEnv = myInfo.pio_env,
178+ pioEnv = myInfo.pio_env,
179179 )
180180 }
181181 if (metadata != null ) {
Original file line number Diff line number Diff line change 11/*
2- * Copyright (c) 2025 Meshtastic LLC
2+ * Copyright (c) 2025-2026 Meshtastic LLC
33 *
44 * This program is free software: you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
1414 * You should have received a copy of the GNU General Public License
1515 * along with this program. If not, see <https://www.gnu.org/licenses/>.
1616 */
17-
1817package org.meshtastic.core.model
1918
2019import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -30,10 +29,7 @@ import org.meshtastic.proto.ChannelSet
3029class ChannelTest {
3130 @Test
3231 fun channelUrlGood () {
33- val ch = ChannelSet (
34- settings = listOf (Channel .default.settings),
35- lora_config = Channel .default.loraConfig
36- )
32+ val ch = ChannelSet (settings = listOf (Channel .default.settings), lora_config = Channel .default.loraConfig)
3733 val channelUrl = ch.getChannelUrl()
3834
3935 Assert .assertTrue(channelUrl.toString().startsWith(URL_PREFIX ))
Original file line number Diff line number Diff line change 11/*
2- * Copyright (c) 2025 Meshtastic LLC
2+ * Copyright (c) 2025-2026 Meshtastic LLC
33 *
44 * This program is free software: you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
1414 * You should have received a copy of the GNU General Public License
1515 * along with this program. If not, see <https://www.gnu.org/licenses/>.
1616 */
17-
1817package org.meshtastic.core.model.util
1918
2019import android.net.Uri
Original file line number Diff line number Diff line change @@ -123,10 +123,11 @@ fun ScannedQrCodeDialog(
123123 } else {
124124 // When adding (not replacing), include all previous channels + selected new channels.
125125 // Since 'channelSet.settings' already contains the merged distinct list, we just filter it.
126- val result = channelSet.settings.filterIndexed { i, _ ->
127- val isExisting = i < channels.settings.size
128- isExisting || channelSelections.getOrNull(i) == true
129- }
126+ val result =
127+ channelSet.settings.filterIndexed { i, _ ->
128+ val isExisting = i < channels.settings.size
129+ isExisting || channelSelections.getOrNull(i) == true
130+ }
130131 channelSet.copy(settings = result)
131132 }
132133
You can’t perform that action at this time.
0 commit comments