diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 535d6953d..bbd202024 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -137,7 +137,7 @@ @@ -146,11 +146,11 @@ diff --git a/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt b/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt index 9789bdb13..3d6a6c356 100644 --- a/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt +++ b/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt @@ -15,7 +15,7 @@ data class ChannelSet( ) : Logging { companion object { - const val prefix = "https://www.meshtastic.org/e/#" + const val prefix = "https://meshtastic.org/e/#" private const val base64Flags = Base64.URL_SAFE + Base64.NO_WRAP + Base64.NO_PADDING @@ -65,7 +65,7 @@ data class ChannelSet( // We encode as UPPER case for the QR code URL because QR codes are more efficient for that special case val bitMatrix = multiFormatWriter.encode( - getChannelUrl(true).toString(), + getChannelUrl(false).toString(), BarcodeFormat.QR_CODE, 960, 960 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 524b23ff0..a70c0bbd8 100644 --- a/app/src/test/java/com/geeksville/mesh/model/ChannelSetTest.kt +++ b/app/src/test/java/com/geeksville/mesh/model/ChannelSetTest.kt @@ -8,7 +8,7 @@ class ChannelSetTest { /** make sure we match the python and device code behavior */ @Test fun matchPython() { - val url = Uri.parse("https://www.meshtastic.org/e/#CgUYAiIBAQ") + val url = Uri.parse("https://meshtastic.org/e/#CgUYAiIBAQ") val cs = ChannelSet(url) Assert.assertEquals("LongFast", cs.primaryChannel!!.name) Assert.assertEquals("#LongFast-K", cs.primaryChannel!!.humanName)