Clean up precision ranges for locations on the map report and public key

meshtastic · Sep 7, 2024 · 4f813c1 · 4f813c1
1 parent 10751e3
commit 4f813c1
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 50 deletions.
diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift
@@ -35,7 +35,6 @@ struct UserList: View {
 	var boolFilters: [Bool] {[
 		isFavorite,
 		isOnline,
-		isPkiEncrypted,
 		isEnvironment,
 		distanceFilter,
 		roleFilter
@@ -45,11 +44,12 @@ struct UserList: View {
 		sortDescriptors: [NSSortDescriptor(key: "lastMessage", ascending: false),
 						  NSSortDescriptor(key: "userNode.favorite", ascending: false),
 						  NSSortDescriptor(key: "pkiEncrypted", ascending: false),
+						  NSSortDescriptor(key: "userNode.lastHeard", ascending: false),
 						  NSSortDescriptor(key: "longName", ascending: true)],
-		predicate: NSPredicate(format: "hwModelId != nil"),
+		predicate: NSPredicate(format: "longName != ''"),
 		animation: .default
 	)
-	private var users: FetchedResults<UserEntity>
+	var users: FetchedResults<UserEntity>
 
 	@Binding var node: NodeInfoEntity?
 	@Binding var userSelection: UserEntity?
@@ -202,34 +202,55 @@ struct UserList: View {
 				DirectMessagesHelp()
 			}
 			.onChange(of: searchText) { _ in
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
 			}
 			.onChange(of: viaLora) { _ in
 				if !viaLora && !viaMqtt {
 					viaMqtt = true
 				}
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
 			}
 			.onChange(of: viaMqtt) { _ in
 				if !viaLora && !viaMqtt {
 					viaLora = true
 				}
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
 			}
 			.onChange(of: [deviceRoles]) { _ in
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
 			}
 			.onChange(of: hopsAway) { _ in
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
 			}
 			.onChange(of: [boolFilters]) { _ in
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
 			}
 			.onChange(of: maxDistance) { _ in
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
+			}
+			.onChange(of: isPkiEncrypted) { _ in
+				Task {
+					await searchUserList()
+				}
 			}
 			.onAppear {
-				searchUserList()
+				Task {
+					await searchUserList()
+				}
 			}
 			.safeAreaInset(edge: .bottom, alignment: .leading) {
 				HStack {
@@ -267,8 +288,7 @@ struct UserList: View {
 				.scrollDismissesKeyboard(.immediately)
 		}
 	}
-
-	private func searchUserList() {
+	private func searchUserList() async {
 
 		/// Case Insensitive Search Text Predicates
 		let searchPredicates = ["userId", "numString", "hwModel", "hwDisplayName", "longName", "shortName"].map { property in

diff --git a/Meshtastic/Views/Settings/Channels.swift b/Meshtastic/Views/Settings/Channels.swift
@@ -93,7 +93,7 @@ struct Channels: View {
 								preciseLocation = true
 								positionsEnabled = true
 								if channelKey == "AQ==" {
-									positionPrecision = 13
+									positionPrecision = 14
 									preciseLocation = false
 								}
 							} else if !supportedVersion && channelRole == 2 {
@@ -103,8 +103,8 @@ struct Channels: View {
 							} else {
 								if channelKey == "AQ==" {
 									preciseLocation = false
-									if (positionPrecision > 0 && positionPrecision < 10) || positionPrecision > 16 {
-										positionPrecision = 13
+									if (positionPrecision > 0 && positionPrecision < 11) || positionPrecision > 14 {
+										positionPrecision = 14
 									}
 								} else if positionPrecision == 32 {
 									preciseLocation = true

diff --git a/Meshtastic/Views/Settings/Channels/ChannelForm.swift b/Meshtastic/Views/Settings/Channels/ChannelForm.swift
@@ -158,7 +158,7 @@ struct ChannelForm: View {
 							VStack(alignment: .leading) {
 								Label("Approximate Location", systemImage: "location.slash.circle.fill")
 
-								Slider(value: $positionPrecision, in: 10...16, step: 1) {
+								Slider(value: $positionPrecision, in: 11...14, step: 1) {
 								} minimumValueLabel: {
 									Image(systemName: "minus")
 								} maximumValueLabel: {

diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
@@ -32,7 +32,6 @@ struct MQTTConfig: View {
 	@State var nearbyTopics = [String]()
 	@State var mapReportingEnabled = false
 	@State var mapPublishIntervalSecs = 3600
-	@State var preciseLocation: Bool = false
 	@State var mapPositionPrecision: Double = 13.0
 
 	let locale = Locale.current
@@ -105,35 +104,17 @@ struct MQTTConfig: View {
 							}
 						}
 						.pickerStyle(DefaultPickerStyle())
-
 						VStack(alignment: .leading) {
-							Toggle(isOn: $preciseLocation) {
-								Label("Precise Location", systemImage: "scope")
-							}
-							.toggleStyle(SwitchToggleStyle(tint: .accentColor))
-							.listRowSeparator(.visible)
-							.onChange(of: preciseLocation) { pl in
-								if pl == false {
-									mapPositionPrecision = 12
-								} else {
-									mapPositionPrecision = 32
-								}
-							}
-						}
-
-						if !preciseLocation {
-							VStack(alignment: .leading) {
-								Label("Approximate Location", systemImage: "location.slash.circle.fill")
-								Slider(value: $mapPositionPrecision, in: 11...16, step: 1) {
-								} minimumValueLabel: {
-									Image(systemName: "minus")
-								} maximumValueLabel: {
-									Image(systemName: "plus")
-								}
-								Text(PositionPrecision(rawValue: Int(mapPositionPrecision))?.description ?? "")
-									.foregroundColor(.gray)
-									.font(.callout)
+							Label("Approximate Location", systemImage: "location.slash.circle.fill")
+							Slider(value: $mapPositionPrecision, in: 11...14, step: 1) {
+							} minimumValueLabel: {
+								Image(systemName: "minus")
+							} maximumValueLabel: {
+								Image(systemName: "plus")
 							}
+							Text(PositionPrecision(rawValue: Int(mapPositionPrecision))?.description ?? "")
+								.foregroundColor(.gray)
+								.font(.callout)
 						}
 					}
 				}
@@ -429,11 +410,12 @@ struct MQTTConfig: View {
 		self.mqttConnected = bleManager.mqttProxyConnected
 		self.mapReportingEnabled = node?.mqttConfig?.mapReportingEnabled ?? false
 		self.mapPublishIntervalSecs = Int(node?.mqttConfig?.mapPublishIntervalSecs ?? 3600)
-		self.mapPositionPrecision = Double(node?.mqttConfig?.mapPositionPrecision ?? 12)
-		if mapPositionPrecision == 0.0 {
-			self.mapPositionPrecision = 12
+		self.mapPositionPrecision = Double(node?.mqttConfig?.mapPositionPrecision ?? 14)
+		if mapPositionPrecision < 11 || mapPositionPrecision > 14 {
+			self.mapPositionPrecision = 14
+			self.hasChanges = true
+		} else {
+			self.hasChanges = false
 		}
-		self.preciseLocation = mapPositionPrecision == 32
-		self.hasChanges = false
 	}
 }