Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Message queuing : use redactEvent on timeline instead of room.

Browse source
This commit is contained in:
ganfra 2024-06-06 15:23:28 +02:00
parent 41e5a6dd40
commit 7100a9d619
5 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
View file

@ -130,8 +130,6 @@ interface MatrixRoom : Closeable {
suspend fun sendMessage(body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit>
suspend fun redactEvent(eventId: EventId, reason: String? = null): Result<Unit>
suspend fun sendImage(
file: File,
thumbnailFile: File?,

6
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
View file

@ -324,12 +324,6 @@ class RustMatrixRoom(
return liveTimeline.sendMessage(body, htmlBody, mentions)
}
override suspend fun redactEvent(eventId: EventId, reason: String?) = withContext(roomDispatcher) {
runCatching {
innerRoom.redact(eventId.value, reason)
}
}
override suspend fun leave(): Result<Unit> = withContext(roomDispatcher) {
runCatching {
innerRoom.leave()

14
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
View file

@ -112,7 +112,7 @@ class FakeMatrixRoom(
private var updateUserRoleResult = Result.success(Unit)
private var toggleReactionResult = Result.success(Unit)
private var retrySendMessageResult = Result.success(Unit)
private var cancelSendResult = Result.success(Unit)
private var cancelSendResult = Result.success(true)
private var forwardEventResult = Result.success(Unit)
private var reportContentResult = Result.success(Unit)
private var kickUserResult = Result.success(Unit)
@ -281,7 +281,7 @@ class FakeMatrixRoom(
return retrySendMessageResult
}
override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> {
override suspend fun cancelSend(transactionId: TransactionId): Result<Boolean> {
cancelSendCount++
return cancelSendResult
}
@ -294,14 +294,6 @@ class FakeMatrixRoom(
return eventPermalinkResult(eventId)
}
var redactEventEventIdParam: EventId? = null
private set
override suspend fun redactEvent(eventId: EventId, reason: String?): Result<Unit> {
redactEventEventIdParam = eventId
return Result.success(Unit)
}
override suspend fun leave(): Result<Unit> {
return leaveRoomLambda()
}
@ -626,7 +618,7 @@ class FakeMatrixRoom(
retrySendMessageResult = result
}
fun givenCancelSendResult(result: Result<Unit>) {
fun givenCancelSendResult(result: Result<Boolean>) {
cancelSendResult = result
}