From 920e200593e618bd3559097e2e1dcb941a425768 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Wed, 20 Jul 2022 15:06:18 -0700
Subject: [PATCH] Add txPower to loraConfigEntity, isLicensed to user

---
 .../MeshtasticDataModel v 4.xcdatamodel/contents      |  6 ++++--
 Meshtastic/Views/Bluetooth/Connect.swift              |  2 +-
 Meshtastic/Views/Messages/UserMessageList.swift       | 11 ++++++++++-
 Meshtastic/Views/Nodes/NodeDetail.swift               |  5 +++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents
index d8b141ee..525bc183 100644
--- a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents	
+++ b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents	
@@ -43,6 +43,7 @@
         <attribute name="modemPreset" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="num" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="regionCode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="txPower" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <relationship name="loRaConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="loRaConfig" inverseEntity="NodeInfoEntity"/>
     </entity>
     <entity name="MessageEntity" representedClassName="MessageEntity" syncable="YES" codeGenerationType="class">
@@ -175,6 +176,7 @@
     </entity>
     <entity name="UserEntity" representedClassName="UserEntity" syncable="YES" codeGenerationType="class">
         <attribute name="hwModel" attributeType="String"/>
+        <attribute name="isLicensed" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="longName" attributeType="String"/>
         <attribute name="macaddr" optional="YES" attributeType="Binary"/>
         <attribute name="num" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
@@ -196,7 +198,7 @@
         <element name="DeviceConfigEntity" positionX="45" positionY="144" width="128" height="104"/>
         <element name="DisplayConfigEntity" positionX="54" positionY="153" width="128" height="104"/>
         <element name="ExternalNotificationConfigEntity" positionX="63" positionY="162" width="128" height="149"/>
-        <element name="LoRaConfigEntity" positionX="45" positionY="144" width="128" height="104"/>
+        <element name="LoRaConfigEntity" positionX="45" positionY="144" width="128" height="119"/>
         <element name="MessageEntity" positionX="-36" positionY="63" width="128" height="230"/>
         <element name="MyInfoEntity" positionX="-18" positionY="81" width="128" height="209"/>
         <element name="NodeInfoEntity" positionX="-63" positionY="-18" width="128" height="299"/>
@@ -206,6 +208,6 @@
         <element name="SerialConfigEntity" positionX="54" positionY="153" width="128" height="164"/>
         <element name="TelemetryConfigEntity" positionX="72" positionY="171" width="128" height="179"/>
         <element name="TelemetryEntity" positionX="160" positionY="192" width="128" height="209"/>
-        <element name="UserEntity" positionX="0" positionY="144" width="128" height="215"/>
+        <element name="UserEntity" positionX="0" positionY="144" width="128" height="230"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift
index 53ea4be8..5268c5e2 100644
--- a/Meshtastic/Views/Bluetooth/Connect.swift
+++ b/Meshtastic/Views/Bluetooth/Connect.swift
@@ -146,7 +146,7 @@ struct Connect: View {
 
 					if bleManager.peripherals.count > 0 {
 						Section(header: Text("Available Radios").font(.title)) {
-							ForEach(bleManager.peripherals.filter({ $0.peripheral.state == CBPeripheralState.disconnected }).sorted(by: { $0.name < $1.name })) { peripheral in
+							ForEach(bleManager.peripherals.filter({ $0.peripheral.state == CBPeripheralState.disconnected }).sorted(by: { $0.rssi > $1.rssi })) { peripheral in
 								HStack {
 									Image(systemName: "circle.fill")
 										.imageScale(.large).foregroundColor(.gray)
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index 9e87f10c..e4941797 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -225,7 +225,16 @@ struct UserMessageList: View {
 														VStack {
 															
 															let ackDate = Date(timeIntervalSince1970: TimeInterval(message.ackTimestamp))
-															Text("ACK \(ackDate, style: .date) \(ackDate, style: .time)").font(.caption2).foregroundColor(.gray)
+															
+															let sixMonthsAgo = Calendar.current.date(byAdding: .month, value: -6, to: Date())
+															if ackDate >= sixMonthsAgo! {
+																
+																Text("ACK \(ackDate, style: .date) \(ackDate, style: .time)").font(.caption2).foregroundColor(.gray)
+																
+															} else {
+																
+																Text("Unknown Age").font(.caption2).foregroundColor(.gray)
+															}
 														}
 													}
 													if message.ackSNR != 0 {
diff --git a/Meshtastic/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift
index 5d784f4e..0d3a2262 100644
--- a/Meshtastic/Views/Nodes/NodeDetail.swift
+++ b/Meshtastic/Views/Nodes/NodeDetail.swift
@@ -79,10 +79,12 @@ struct NodeDetail: View {
 					ScrollView {
 																	
 						if self.bleManager.connectedPeripheral != nil && self.bleManager.connectedPeripheral.num == node.num && self.bleManager.connectedPeripheral.num == node.num {
+							
+							Divider()
 							HStack {
 								
 								if  hwModelString == "TBEAM" || hwModelString == "TECHO" || hwModelString.contains("4631") {
-									
+								
 									Button(action: {
 										
 										isPresentingShutdownConfirm = true
@@ -136,7 +138,6 @@ struct NodeDetail: View {
 								}
 							}
 							.padding(5)
-							Divider()
 						}
 						
 						if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {