From d3ac782773a5b50e56c40e13119ff885e896247b Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Wed, 23 Feb 2022 20:11:02 -1000
Subject: [PATCH] Re-enable mesh map setting, fix nil node bug

---
 MeshtasticClient/Info.plist                       |  2 +-
 MeshtasticClient/Views/Nodes/NodeDetail.swift     |  2 +-
 MeshtasticClient/Views/Settings/AppSettings.swift | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MeshtasticClient/Info.plist b/MeshtasticClient/Info.plist
index 85d9e776..1a7b3ab5 100644
--- a/MeshtasticClient/Info.plist
+++ b/MeshtasticClient/Info.plist
@@ -40,7 +40,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
-	<false/>
+	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>We use bluetooth to connect to nearby Meshtastic Devices</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
diff --git a/MeshtasticClient/Views/Nodes/NodeDetail.swift b/MeshtasticClient/Views/Nodes/NodeDetail.swift
index a638828c..a32533c7 100644
--- a/MeshtasticClient/Views/Nodes/NodeDetail.swift
+++ b/MeshtasticClient/Views/Nodes/NodeDetail.swift
@@ -271,7 +271,7 @@ struct NodeDetail: View {
 				.padding(1)
 			}
 		}
-		.navigationTitle(node != nil ? String(node.user!.longName ?? "Unknown") : "Unknown")
+		.navigationTitle((node != nil && node.user != nil)  ? String(node.user!.longName ?? "Unknown") : "Unknown")
 		.navigationBarTitleDisplayMode(.inline)
 		.navigationBarItems(trailing:
 
diff --git a/MeshtasticClient/Views/Settings/AppSettings.swift b/MeshtasticClient/Views/Settings/AppSettings.swift
index 2978d565..6a5b9282 100644
--- a/MeshtasticClient/Views/Settings/AppSettings.swift
+++ b/MeshtasticClient/Views/Settings/AppSettings.swift
@@ -174,12 +174,12 @@ struct AppSettings: View {
 					//	TextField("Custom Tile Server", text: $userSettings.meshMapCustomTileServer)
 					}
 					Section(header: Text("DEBUG")) {
-						// Toggle(isOn: $userSettings.meshActivityLog) {
+						 Toggle(isOn: $userSettings.meshActivityLog) {
 
-						//	Label("Log all Mesh activity", systemImage: "network")
-						// }
-						// .toggleStyle(SwitchToggleStyle(tint: .accentColor))
-						if true {// userSettings.meshActivityLog {
+							Label("Log all Mesh activity", systemImage: "network")
+						 }
+						 .toggleStyle(SwitchToggleStyle(tint: .accentColor))
+						if userSettings.meshActivityLog {
 							NavigationLink(destination: MeshLog()) {
 							Text("View Mesh Log")
 						}