From 7bb35115876d92e147b3f2d7799a06eb5341afe1 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Mon, 5 Apr 2021 15:35:12 +0800
Subject: [PATCH] allow longer channel names (if you include the # prefix and
 suffix

---
 .idea/vcs.xml                                               | 1 -
 app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt | 2 +-
 app/src/main/res/layout/channel_fragment.xml                | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index bc2dfb5ae..8756b8ff2 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -5,6 +5,5 @@
     <mapping directory="$PROJECT_DIR$/app/src/main/proto" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/design" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/geeksville-androidlib" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/mesh_shared/src/main/proto" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
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 2232f1c8f..e006ef038 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -243,7 +243,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
                                 val random = SecureRandom()
                                 val bytes = ByteArray(32)
                                 random.nextBytes(bytes)
-                                newSettings.name = newName // Only change the name if the user did some editing
+                                newSettings.name = newName
                                 newSettings.psk = ByteString.copyFrom(bytes)
                             } else {
                                 debug("Switching back to default channel")
diff --git a/app/src/main/res/layout/channel_fragment.xml b/app/src/main/res/layout/channel_fragment.xml
index 597bcb4bf..b834136f3 100644
--- a/app/src/main/res/layout/channel_fragment.xml
+++ b/app/src/main/res/layout/channel_fragment.xml
@@ -24,7 +24,7 @@
             android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890- "
             android:hint="@string/channel_name"
             android:imeOptions="actionDone"
-            android:maxLength="11"
+            android:maxLength="15"
             android:singleLine="true"
             android:text="@string/unset" />
     </com.google.android.material.textfield.TextInputLayout>