meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

More graceful failures

Browse source
This commit is contained in:
Benjamin Faershtein 2025-06-05 08:24:17 -07:00
parent 8d65985521
commit bd666a742c
4 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Localizable.xcstrings
View file

@ -34355,6 +34355,9 @@
}
}
}
},
"Waypoiny Failed to Send" : {
},
"Weather Conditions" : {
"localizations" : {

2
Meshtastic/Extensions/CoreData/WaypointEntityExtension.swift
View file

@ -58,7 +58,7 @@ extension WaypointEntity: MKAnnotation {
@MainActor
public var coordinate: CLLocationCoordinate2D {
get {
waypointCoordinate ?? LocationsHandler.currentLocation
waypointCoordinate ?? LocationsHandler.DefaultLocation
}
set {
latitudeI = Int32(newValue.latitude * 1e7)

2
Meshtastic/Helpers/BLEManager.swift
View file

@ -1183,7 +1183,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
}
public func sendWaypoint(waypoint: Waypoint) -> Bool {
if waypoint.latitudeI == 373346000 && waypoint.longitudeI == -1220090000 {
if waypoint.latitudeI == 0 && waypoint.longitudeI == 0 {
return false
}
var success = false

19
Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
View file

@ -30,6 +30,7 @@ struct WaypointForm: View {
@State private var lockedTo: Int64 = 0
@State private var detents: Set<PresentationDetent> = [.medium, .fraction(0.85)]
@State private var selectedDetent: PresentationDetent = .medium
@State private var waypointFailedAlert: Bool = false
var body: some View {
NavigationStack {
@ -47,7 +48,7 @@ struct WaypointForm: View {
.textSelection(.enabled)
.foregroundColor(.secondary)
.font(.caption)
Button {
let currentLoc = LocationsHandler.currentLocation
waypoint.coordinate.longitude = currentLoc.longitude
@ -80,6 +81,7 @@ struct WaypointForm: View {
name = String(name.dropLast())
totalBytes = name.utf8.count
}
waypoint.name = name.count > 0 ? name : "Dropped Pin"
}
}
HStack {
@ -175,8 +177,8 @@ struct WaypointForm: View {
if bleManager.sendWaypoint(waypoint: newWaypoint) {
dismiss()
} else {
dismiss()
Logger.mesh.warning("Send waypoint failed")
waypointFailedAlert = true
}
} else {
Logger.mesh.warning("Send waypoint failed, node not connected")
@ -241,8 +243,8 @@ struct WaypointForm: View {
}
dismiss()
} else {
dismiss()
Logger.mesh.warning("Send waypoint failed")
waypointFailedAlert = true
}
})
}
@ -376,6 +378,17 @@ struct WaypointForm: View {
}
}
}
.alert("Waypoiny Failed to Send", isPresented: $waypointFailedAlert) {
Button("OK", role: .cancel) {
bleManager.context.delete(waypoint)
do {
try bleManager.context.save()
} catch {
bleManager.context.rollback()
}
dismiss()
}
}
.onDisappear {
if waypoint.id == 0 {
// New, unsent waypoint created by the user: delete it