From 2e4cae048f3ce71e951175a981d80738d8094daf Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Thu, 13 Oct 2022 00:18:19 -0300
Subject: [PATCH] update QR code convention

---
 app/src/main/AndroidManifest.xml                            | 6 +++---
 app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt   | 4 ++--
 .../test/java/com/geeksville/mesh/model/ChannelSetTest.kt   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 535d6953..bbd20202 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -137,7 +137,7 @@
                 <!-- The QR codes to share channel settings are shared as meshtastic URLS
 
                 an approximate example:
-                http://www.meshtastic.org/e/YXNkZnF3ZXJhc2RmcXdlcmFzZGZxd2Vy
+                http://meshtastic.org/e/YXNkZnF3ZXJhc2RmcXdlcmFzZGZxd2Vy
                 -->
                 <action android:name="android.intent.action.VIEW" />
 
@@ -146,11 +146,11 @@
 
                 <data
                     android:scheme="https"
-                    android:host="www.meshtastic.org"
+                    android:host="meshtastic.org"
                     android:pathPrefix="/e/" />
                 <data
                     android:scheme="https"
-                    android:host="www.meshtastic.org"
+                    android:host="meshtastic.org"
                     android:pathPrefix="/E/" />
             </intent-filter>
 
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 9789bdb1..3d6a6c35 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 524b23ff..a70c0bbd 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)