From 99dc509b6f0a3b099bf6349636955b17998904a6 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 18 Sep 2022 20:23:34 -0300 Subject: [PATCH] fix channel settings --- app/src/main/java/com/geeksville/mesh/model/Channel.kt | 4 ++-- app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt | 4 ++-- app/src/test/java/com/geeksville/mesh/model/ChannelSetTest.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/Channel.kt b/app/src/main/java/com/geeksville/mesh/model/Channel.kt index 34a8f67b7..5b9077aca 100644 --- a/app/src/main/java/com/geeksville/mesh/model/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/Channel.kt @@ -42,8 +42,8 @@ data class Channel( else when (loraConfig.modemPreset) { ModemPreset.SHORT_FAST -> "ShortFast" ModemPreset.SHORT_SLOW -> "ShortSlow" - ModemPreset.MEDIUM_FAST -> "MidFast" - ModemPreset.MEDIUM_SLOW -> "MidSlow" + ModemPreset.MEDIUM_FAST -> "MediumFast" + ModemPreset.MEDIUM_SLOW -> "MediumSlow" ModemPreset.LONG_FAST -> "LongFast" ModemPreset.LONG_SLOW -> "LongSlow" ModemPreset.VERY_LONG_SLOW -> "VLongSlow" diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt index 9fa70cb10..25ad2d77b 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt @@ -177,7 +177,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging { ) { val newSet = ChannelSet( channelSet { - settings[0] = newChannel + settings.add(newChannel) loraConfig = newLoRaConfig }) // Try to change the radio, if it fails, tell the user why and throw away their edits @@ -303,7 +303,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging { val random = SecureRandom() val bytes = ByteArray(32) random.nextBytes(bytes) - newSettings.copy { + newSettings = newSettings.copy { name = newName.take(11) // proto max_size:12 psk = ByteString.copyFrom(bytes) } diff --git a/app/src/test/java/com/geeksville/mesh/model/ChannelSetTest.kt b/app/src/test/java/com/geeksville/mesh/model/ChannelSetTest.kt index c305363a2..524b23ff0 100644 --- a/app/src/test/java/com/geeksville/mesh/model/ChannelSetTest.kt +++ b/app/src/test/java/com/geeksville/mesh/model/ChannelSetTest.kt @@ -8,10 +8,10 @@ class ChannelSetTest { /** make sure we match the python and device code behavior */ @Test fun matchPython() { - val url = Uri.parse("https://www.meshtastic.org/e/#CgUiAQEYAg") + val url = Uri.parse("https://www.meshtastic.org/e/#CgUYAiIBAQ") val cs = ChannelSet(url) Assert.assertEquals("LongFast", cs.primaryChannel!!.name) - Assert.assertEquals("#LongFast-I", cs.primaryChannel!!.humanName) + Assert.assertEquals("#LongFast-K", cs.primaryChannel!!.humanName) Assert.assertEquals(url, cs.getChannelUrl(false)) } }