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

Use ack errors for admin message log

Browse source
This commit is contained in:
Garth Vander Houwen 2022-12-30 17:24:01 -08:00
parent 7c7bcda7c6
commit ed9f66148c
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meshtastic/Views/Messages/ChannelMessageList.swift
View file

@ -120,7 +120,7 @@ struct ChannelMessageList: View {
Text("waiting")
} else if currentUser && message.ackError > 0 {
let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
}
if currentUser {
VStack {
@ -184,7 +184,7 @@ struct ChannelMessageList: View {
Text("Waiting to be acknowledged. . .").font(.caption2).foregroundColor(.orange)
} else if currentUser && message.ackError > 0 {
let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
.font(.caption2).foregroundColor(.red)
}
}

6
Meshtastic/Views/Messages/UserMessageList.swift
View file

@ -123,7 +123,7 @@ struct UserMessageList: View {
Text("waiting")
} else if currentUser && message.ackError > 0 {
let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
}
if currentUser {
VStack {
@ -182,12 +182,12 @@ struct UserMessageList: View {
let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
if currentUser && message.receivedACK {
// Ack Received
Text("\(ackErrorVal?.display ?? "No Error" )").font(.caption2).foregroundColor(message.realACK ? .gray : .orange)
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").font(.caption2).foregroundColor(message.realACK ? .gray : .orange)
} else if currentUser && message.ackError == 0 {
// Empty Error
Text("Waiting to be acknowledged. . .").font(.caption2).foregroundColor(.orange)
} else if currentUser && message.ackError > 0 {
Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
.font(.caption2).foregroundColor(.red)
}
}

7
Meshtastic/Views/Settings/AdminMessageList.swift
View file

@ -37,15 +37,16 @@ struct AdminMessageList: View {
Image(systemName: "checkmark.square")
.foregroundColor(.gray)
.font(.caption)
Text("Acknowledged: \(Date(timeIntervalSince1970: TimeInterval(am.ackTimestamp)).formattedDate(format: "h:mm:ss a"))")
Text("acknowledged: \(Date(timeIntervalSince1970: TimeInterval(am.ackTimestamp)).formattedDate(format: "h:mm:ss a"))")
.foregroundColor(.gray)
.font(.caption)
} else {
let ackErrorVal = RoutingError(rawValue: Int(am.ackError))
Image(systemName: "square")
.foregroundColor(.gray)
.font(.caption)
Text("Not Acknowledged")
Text(ackErrorVal?.display ?? "Empty Ack Error")
.foregroundColor(.gray)
.font(.caption)
}
@ -53,7 +54,7 @@ struct AdminMessageList: View {
}
}
}
.navigationTitle("Admin Message Log")
.navigationTitle("admin.log")
.navigationBarItems(trailing:
ZStack {