ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handling cancelled as a sendingFailed case (#1161)

Browse Source 
* handling cancelled as a sendingFailed case

* changelog
This commit is contained in:
Mauro
2023-06-26 12:33:15 +02:00
committed by GitHub
parent 0e7562f130
commit 3d3fd5dc66
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift
-2
View File
@@ -74,8 +74,6 @@ struct TimelineItemStatusView: View {
context.sendFailedConfirmationDialogInfo = .init(transactionID: timelineItem.properties.transactionID) context.sendFailedConfirmationDialogInfo = .init(transactionID: timelineItem.properties.transactionID)
} }
} }
case .cancelled:
EmptyView()
} }
} }
ElementX/Sources/Services/Timeline/TimelineItemProxy.swift
+2 -4
View File
@@ -39,7 +39,6 @@ enum TimelineItemDeliveryStatus: Hashable {
case sending case sending
case sent case sent
case sendingFailed case sendingFailed
case cancelled
} }
/// A light wrapper around event timeline items returned from Rust. /// A light wrapper around event timeline items returned from Rust.
@@ -66,12 +65,11 @@ struct EventTimelineItemProxy {
switch localSendState { switch localSendState {
case .notSentYet: case .notSentYet:
return .sending return .sending
case .sendingFailed: // cancelled is exactly like sendingFailed but does not contain an error
case .sendingFailed, .cancelled:
return .sendingFailed return .sendingFailed
case .sent: case .sent:
return .sent return .sent
case .cancelled:
return .cancelled
} }
} }
changelog.d/1160.bugfix
+1
View File
@@ -0,0 +1 @@
Handled the cancelled state of a message properly as a failure state.