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

improvement: dedupe canRetry definition

Browse source
This commit is contained in:
Austin Payne 2024-02-17 13:26:49 -07:00
parent d0f84662db
commit bb0acba742
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
View file

@ -17,4 +17,8 @@ extension MessageEntity {
let time = messageTimestamp <= 0 ? receivedTimestamp : messageTimestamp
return Date(timeIntervalSince1970: TimeInterval(time))
}
var canRetry: Bool {
return ackError == 9 || ackError == 5 || ackError == 3
}
}

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

@ -119,7 +119,7 @@ struct ChannelMessageList: View {
.padding(.bottom)
.id(channel.allPrivateMessages.firstIndex(of: message))
if currentUser && (message.ackError == 9 || message.ackError == 5 || message.ackError == 3) {
if currentUser && message.canRetry {
RetryButton(message: message)
}

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

@ -113,7 +113,7 @@ struct UserMessageList: View {
.padding(.bottom)
.id(user.messageList.firstIndex(of: message))
if currentUser && (message.ackError == 9 || message.ackError == 5 || message.ackError == 3) || (message.receivedACK && !message.realACK) {
if currentUser && message.canRetry || (message.receivedACK && !message.realACK) {
RetryButton(message: message)
}