From 501b05ca593ef29ccd117c3231b872500117020d Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 23 May 2022 16:32:54 -0300 Subject: [PATCH] limit channel names to 11 characters --- app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt | 2 +- app/src/main/res/layout/channel_fragment.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 edd3b641d..649247d05 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt @@ -316,7 +316,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging { val random = SecureRandom() val bytes = ByteArray(32) random.nextBytes(bytes) - newSettings.name = newName + newSettings.name = newName.take(11) 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 77b252e7d..4f2bdb17f 100644 --- a/app/src/main/res/layout/channel_fragment.xml +++ b/app/src/main/res/layout/channel_fragment.xml @@ -13,6 +13,8 @@ android:layout_marginTop="16dp" android:layout_marginEnd="64dp" android:hint="@string/channel_name" + app:counterEnabled="true" + app:counterMaxLength="11" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -23,7 +25,6 @@ android:layout_height="wrap_content" android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890- " android:imeOptions="actionDone" - android:maxLength="15" android:singleLine="true" android:text="@string/unset" />