From b7bc247574c004a1b0ef60284cbbb3a6feb980ee Mon Sep 17 00:00:00 2001
From: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Date: Sat, 21 Feb 2026 16:57:02 -0800
Subject: [PATCH] Update Meshtastic/Helpers/TAK/TAKServerManager.swift

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 Meshtastic/Helpers/TAK/TAKServerManager.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Meshtastic/Helpers/TAK/TAKServerManager.swift b/Meshtastic/Helpers/TAK/TAKServerManager.swift
index 94b2c7b2..c759d52e 100644
--- a/Meshtastic/Helpers/TAK/TAKServerManager.swift
+++ b/Meshtastic/Helpers/TAK/TAKServerManager.swift
@@ -585,7 +585,10 @@ final class TAKServerManager: ObservableObject {
 			}
 
 			let newKey = generateChannelKey(size: 32)
-			let newPsk = Data(base64Encoded: newKey) ?? Data()
+			guard let newPsk = Data(base64Encoded: newKey) else {
+				Logger.tak.error("Failed to decode generated channel key; aborting primary channel fix")
+				return false
+			}
 
 			primaryChannel.name = "TAK"
 			primaryChannel.psk = newPsk