From ee891f62c70e45b276fa6db13c5e120b6c753d80 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Mon, 1 Apr 2024 12:16:09 -0700
Subject: [PATCH] Add channel fixes

---
 Meshtastic/Views/Settings/Channels.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Meshtastic/Views/Settings/Channels.swift b/Meshtastic/Views/Settings/Channels.swift
index 81a5c39f..8dfddfd2 100644
--- a/Meshtastic/Views/Settings/Channels.swift
+++ b/Meshtastic/Views/Settings/Channels.swift
@@ -161,6 +161,7 @@ struct Channels: View {
 								mutableChannels.add(selectedChannel as Any)
 							}
 							node!.myInfo!.channels = mutableChannels.copy() as? NSOrderedSet
+							context.refresh(selectedChannel!, mergeChanges: true)
 							do {
 								try context.save()
 								print("💾 Saved Channel: \(channel.settings.name)")
@@ -197,6 +198,8 @@ struct Channels: View {
 							channelName = ""
 							channelRole	= 2
 							hasChanges = false
+							
+							_ = bleManager.getChannel(channel: channel, fromUser: node!.user!, toUser: node!.user!)
 						}
 					} label: {
 						Label("save", systemImage: "square.and.arrow.down")
@@ -248,7 +251,7 @@ struct Channels: View {
 					newChannel.downlinkEnabled = downlink
 					newChannel.name = channelName
 					newChannel.role = Int32(channelRole)
-					//newChannel.psk = channelKey
+					newChannel.psk = Data(base64Encoded: channelKey) ?? Data()
 					newChannel.positionPrecision = Int32(positionPrecision)
 					selectedChannel = newChannel