From 1691acb59d9a9eab8e8d58ab82c2eceaadd740e6 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Wed, 10 Jan 2024 05:27:05 -0300
Subject: [PATCH] fix: channel PSK validation

---
 .../geeksville/mesh/ui/components/config/EditChannelDialog.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt
index 8815ddaa3..1ecb3e46f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt
@@ -98,7 +98,8 @@ fun EditChannelDialog(
                             try {
                                 pskString = it // empty (no crypto), 128 or 256 bit only
                                 val decoded = Base64.decode(it, base64Flags).toByteString()
-                                if (decoded.size() in setOf(0, 16, 32)) pskInput = decoded
+                                val fullPsk = Channel(channelSettings { psk = decoded }).psk
+                                if (fullPsk.size() in setOf(0, 16, 32)) pskInput = decoded
                             } catch (ex: Throwable) {
                                 // Base64 decode failed, pskError true
                             }