From adba73a4e534f286d8c8a66c93a0ae220762a60d Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Thu, 16 Jun 2022 08:53:58 -0700
Subject: [PATCH] Bump version to 1.3.19

---
 Meshtastic Apple.xcodeproj/project.pbxproj    | 4 ++--
 MeshtasticApple/Helpers/BLEManager.swift      | 7 ++++---
 MeshtasticApple/Views/Bluetooth/Connect.swift | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Meshtastic Apple.xcodeproj/project.pbxproj b/Meshtastic Apple.xcodeproj/project.pbxproj
index b80f1fc6..2d2a36f9 100644
--- a/Meshtastic Apple.xcodeproj/project.pbxproj	
+++ b/Meshtastic Apple.xcodeproj/project.pbxproj	
@@ -809,7 +809,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.18;
+				MARKETING_VERSION = 1.3.19;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -840,7 +840,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.18;
+				MARKETING_VERSION = 1.3.19;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
diff --git a/MeshtasticApple/Helpers/BLEManager.swift b/MeshtasticApple/Helpers/BLEManager.swift
index f9fdd787..1d897de1 100644
--- a/MeshtasticApple/Helpers/BLEManager.swift
+++ b/MeshtasticApple/Helpers/BLEManager.swift
@@ -198,7 +198,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 		}
 		
 		let today = Date()
-		let visibleDuration = Calendar.current.date(byAdding: .second, value: -4, to: today)!
+		let visibleDuration = Calendar.current.date(byAdding: .second, value: -2, to: today)!
 		peripherals.removeAll(where: { $0.lastUpdate <= visibleDuration})
     }
 
@@ -744,7 +744,8 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 		meshPacket.from	= 0 //UInt32(connectedPeripheral.num)
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
 		meshPacket.priority =  MeshPacket.Priority.reliable
-		meshPacket.wantAck = false
+		meshPacket.wantAck = wantResponse
+
 		meshPacket.hopLimit = 0
 		
 		var dataMessage = DataMessage()
@@ -779,7 +780,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 		meshPacket.from	= 0 //UInt32(connectedPeripheral.num)
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
 		meshPacket.priority =  MeshPacket.Priority.reliable
-		meshPacket.wantAck = false
+		meshPacket.wantAck = wantResponse
 		meshPacket.hopLimit = 0
 		
 		var dataMessage = DataMessage()
diff --git a/MeshtasticApple/Views/Bluetooth/Connect.swift b/MeshtasticApple/Views/Bluetooth/Connect.swift
index ed171bf3..98578eea 100644
--- a/MeshtasticApple/Views/Bluetooth/Connect.swift
+++ b/MeshtasticApple/Views/Bluetooth/Connect.swift
@@ -24,7 +24,7 @@ struct Connect: View {
     var body: some View {
 		
 		let firmwareVersion = bleManager.lastConnnectionVersion
-		let minimumVersion = "1.3.16"
+		let minimumVersion = "1.3.19"
 		let supportedVersion = firmwareVersion == "0.0.0" ||  minimumVersion.compare(firmwareVersion, options: .numeric) == .orderedAscending || minimumVersion.compare(firmwareVersion, options: .numeric) == .orderedSame
 		
 		NavigationView {
@@ -38,7 +38,7 @@ struct Connect: View {
 
 							Section(header: Text("Upgrade your Firmware").font(.title)) {
 
-								Text("🚨 1.3 ALPHA PREVIEW Your firmware version is unsupported by the preview the minimum firmware version is \(minimumVersion).").font(.subheadline).foregroundColor(.red)
+								Text("🚨 1.3 ALPHA PREVIEW Your firmware version is unsupported by the preview the minimum firmware version is \(minimumVersion) this is a hard limit.").font(.subheadline).foregroundColor(.red)
 							}
 							.textCase(nil)
 						}