From dee96175bf3fc12bb035c0794974305d59d8829d Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sun, 18 Aug 2024 17:15:55 -0700
Subject: [PATCH] Update admin drop down

---
 .../CoreData/NodeInfoEntityExtension.swift    |  2 +-
 Meshtastic/Extensions/UserDefaults.swift      |  4 +++
 Meshtastic/Views/Settings/AppSettings.swift   |  5 ++++
 .../Views/Settings/SaveChannelQRCode.swift    | 25 +++++++++----------
 Meshtastic/Views/Settings/Settings.swift      |  4 +--
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift b/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
index 7c7a3e27..07ee9117 100644
--- a/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
@@ -60,7 +60,7 @@ extension NodeInfoEntity {
 	}
 
 	var canRemoteAdmin: Bool {
-		if !(securityConfig?.adminKey?.isEmpty ?? true) {
+		if UserDefaults.enableAdministration {
 			return true
 		} else {
 			let adminChannel = myInfo?.channels?.filter { ($0 as AnyObject).name?.lowercased() == "admin" }
diff --git a/Meshtastic/Extensions/UserDefaults.swift b/Meshtastic/Extensions/UserDefaults.swift
index ca8441be..740f04e2 100644
--- a/Meshtastic/Extensions/UserDefaults.swift
+++ b/Meshtastic/Extensions/UserDefaults.swift
@@ -71,6 +71,7 @@ extension UserDefaults {
 		case modemPreset
 		case firmwareVersion
 		case environmentEnableWeatherKit
+		case enableAdministration
 		case testIntEnum
 	}
 
@@ -162,6 +163,9 @@ extension UserDefaults {
 	@UserDefault(.environmentEnableWeatherKit, defaultValue: true)
 	static var environmentEnableWeatherKit: Bool
 
+	@UserDefault(.enableAdministration, defaultValue: false)
+	static var enableAdministration: Bool
+
 	@UserDefault(.testIntEnum, defaultValue: .one)
 	static var testIntEnum: TestIntEnum
 }
diff --git a/Meshtastic/Views/Settings/AppSettings.swift b/Meshtastic/Views/Settings/AppSettings.swift
index f9f46cbc..ef3bc384 100644
--- a/Meshtastic/Views/Settings/AppSettings.swift
+++ b/Meshtastic/Views/Settings/AppSettings.swift
@@ -13,6 +13,7 @@ struct AppSettings: View {
 	@State private var isPresentingCoreDataResetConfirm = false
 	@State private var isPresentingDeleteMapTilesConfirm = false
 	@AppStorage("environmentEnableWeatherKit") private var  environmentEnableWeatherKit: Bool = true
+	@AppStorage("enableAdministration") private var  enableAdministration: Bool = false
 	var body: some View {
 		VStack {
 			Form {
@@ -23,6 +24,10 @@ struct AppSettings: View {
 							UIApplication.shared.open(url)
 						}
 					}
+					Toggle(isOn: $enableAdministration) {
+						Label("Administration", systemImage: "gearshape.2")
+					}
+					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
 				}
 				Section(header: Text("environment")) {
 					VStack(alignment: .leading) {
diff --git a/Meshtastic/Views/Settings/SaveChannelQRCode.swift b/Meshtastic/Views/Settings/SaveChannelQRCode.swift
index fee7877b..ac8138fa 100644
--- a/Meshtastic/Views/Settings/SaveChannelQRCode.swift
+++ b/Meshtastic/Views/Settings/SaveChannelQRCode.swift
@@ -50,6 +50,18 @@ struct SaveChannelQRCode: View {
 					.controlSize(.large)
 					.padding()
 					.disabled(!connectedToDevice)
+#if targetEnvironment(macCatalyst)
+	Button {
+		dismiss()
+	} label: {
+		Label("cancel", systemImage: "xmark")
+
+	}
+	.buttonStyle(.bordered)
+	.buttonBorderShape(.capsule)
+	.controlSize(.large)
+	.padding()
+#endif
 				} else {
 					Button {
 						dismiss()
@@ -62,19 +74,6 @@ struct SaveChannelQRCode: View {
 					.controlSize(.large)
 					.padding()
 				}
-
-			#if targetEnvironment(macCatalyst)
-				Button {
-					dismiss()
-				} label: {
-					Label("cancel", systemImage: "xmark")
-
-				}
-				.buttonStyle(.bordered)
-				.buttonBorderShape(.capsule)
-				.controlSize(.large)
-				.padding()
-			#endif
 			}
 		}
 		.onAppear {
diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift
index 3bf91f3c..510e56d3 100644
--- a/Meshtastic/Views/Settings/Settings.swift
+++ b/Meshtastic/Views/Settings/Settings.swift
@@ -362,7 +362,7 @@ struct Settings: View {
 												Image(systemName: "antenna.radiowaves.left.and.right")
 											}
 											.tag(Int(node.num))
-										} else if node.canRemoteAdmin { /// Nodes using the new PKI system
+										} else if node.canRemoteAdmin && UserDefaults.enableAdministration && node.sessionPasskey != nil { /// Nodes using the new PKI system
 											Label {
 												Text("Remote: \(node.user?.longName ?? "unknown".localized)")
 											} icon: {
@@ -376,7 +376,7 @@ struct Settings: View {
 												Image(systemName: "av.remote")
 											}
 											.tag(Int(node.num))
-										} else if hasAdmin {
+										} else if hasAdmin || node.user?.pkiEncrypted ?? false {
 											Label {
 												Text("Request Admin: \(node.user?.longName ?? "unknown".localized)")
 											} icon: {