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

Redact and event ID, not an item ID.

Browse Source
This commit is contained in:
Doug
2022-09-14 12:19:24 +01:00
committed by Doug
parent f19240d2f6
commit 91795a0d19
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+3 -3
View File
@@ -150,7 +150,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
displayError(.alert(ElementL10n.roomTimelinePermalinkCreationFailure)) displayError(.alert(ElementL10n.roomTimelinePermalinkCreationFailure))
} }
case .redact: case .redact:
redactItem(itemId) redact(itemId)
} }
} }
@@ -163,9 +163,9 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
} }
} }
private func redactItem(_ itemID: String) { private func redact(_ eventID: String) {
Task { Task {
await timelineController.redactItem(itemID) await timelineController.redact(eventID)
} }
} }
} }
ElementX/Sources/Services/Room/MockRoomProxy.swift
+1 -1
View File
@@ -58,7 +58,7 @@ struct MockRoomProxy: RoomProxyProtocol {
.failure(.failedSendingMessage) .failure(.failedSendingMessage)
} }
func redactItem(_ itemId: String) async -> Result<Void, RoomProxyError> { func redact(_ eventID: String) async -> Result<Void, RoomProxyError> {
.failure(.failedRedactingEvent) .failure(.failedRedactingEvent)
} }
} }
ElementX/Sources/Services/Room/RoomProxy.swift
+2 -2
View File
@@ -194,14 +194,14 @@ class RoomProxy: RoomProxyProtocol {
.value .value
} }
func redactItem(_ itemId: String) async -> Result<Void, RoomProxyError> { func redactItem(_ eventID: String) async -> Result<Void, RoomProxyError> {
#warning("Redactions to be enabled on next SDK release.") #warning("Redactions to be enabled on next SDK release.")
return .failure(.failedRedactingEvent) return .failure(.failedRedactingEvent)
// let transactionID = genTransactionId() // let transactionID = genTransactionId()
// //
// return await Task { // return await Task {
// do { // do {
// try room.redact(eventId: itemId, reason: nil, txnId: transactionID) // try room.redact(eventId: eventID, reason: nil, txnId: transactionID)
// return .success(()) // return .success(())
// } catch { // } catch {
// return .failure(.failedRedactingEvent) // return .failure(.failedRedactingEvent)
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
+1 -1
View File
@@ -57,7 +57,7 @@ protocol RoomProxyProtocol {
func sendMessage(_ message: String) async -> Result<Void, RoomProxyError> func sendMessage(_ message: String) async -> Result<Void, RoomProxyError>
func redactItem(_ itemId: String) async -> Result<Void, RoomProxyError> func redact(_ eventID: String) async -> Result<Void, RoomProxyError>
var callbacks: PassthroughSubject<RoomProxyCallback, Never> { get } var callbacks: PassthroughSubject<RoomProxyCallback, Never> { get }
} }
ElementX/Sources/Services/Timeline/MockRoomTimelineController.swift
+1 -1
View File
@@ -66,5 +66,5 @@ class MockRoomTimelineController: RoomTimelineControllerProtocol {
func sendMessage(_ message: String) async { } func sendMessage(_ message: String) async { }
func redactItem(_ itemId: String) async { } func redact(_ eventID: String) async { }
} }
ElementX/Sources/Services/Timeline/RoomTimelineController.swift
+2 -2
View File
@@ -104,8 +104,8 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
} }
} }
func redactItem(_ itemId: String) async { func redact(_ eventID: String) async {
switch await timelineProvider.redactItem(itemId) { switch await timelineProvider.redact(eventID) {
default: default:
break break
} }
ElementX/Sources/Services/Timeline/RoomTimelineControllerProtocol.swift
+1 -1
View File
@@ -41,5 +41,5 @@ protocol RoomTimelineControllerProtocol {
func sendMessage(_ message: String) async func sendMessage(_ message: String) async
func redactItem(_ itemId: String) async func redact(_ eventID: String) async
} }
ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift
+2 -2
View File
@@ -60,8 +60,8 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
} }
} }
func redactItem(_ itemID: String) async -> Result<Void, RoomTimelineProviderError> { func redact(_ eventID: String) async -> Result<Void, RoomTimelineProviderError> {
switch await roomProxy.redactItem(itemID) { switch await roomProxy.redact(eventID) {
case .success: case .success:
return .success(()) return .success(())
case .failure: case .failure:
ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift
+1 -1
View File
@@ -37,5 +37,5 @@ protocol RoomTimelineProviderProtocol {
func sendMessage(_ message: String) async -> Result<Void, RoomTimelineProviderError> func sendMessage(_ message: String) async -> Result<Void, RoomTimelineProviderError>
func redactItem(_ itemID: String) async -> Result<Void, RoomTimelineProviderError> func redact(_ eventID: String) async -> Result<Void, RoomTimelineProviderError>
} }