Message queuing : introduce redactEvent on timeline object and remove retrySendMessage.

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

@@ -160,7 +160,7 @@ interface MatrixRoom : Closeable {
 
     suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit>
 
-    suspend fun cancelSend(transactionId: TransactionId): Result<Unit>
+    suspend fun cancelSend(transactionId: TransactionId): Result<Boolean>
 
     suspend fun leave(): Result<Unit>
 

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt

@@ -77,6 +77,8 @@ interface Timeline : AutoCloseable {
         progressCallback: ProgressCallback?
     ): Result<MediaUploadHandler>
 
+    suspend fun redactEvent(eventId: EventId?, transactionId: TransactionId?, reason: String?): Result<Boolean>
+
     suspend fun sendAudio(file: File, audioInfo: AudioInfo, progressCallback: ProgressCallback?): Result<MediaUploadHandler>
 
     suspend fun sendFile(file: File, fileInfo: FileInfo, progressCallback: ProgressCallback?): Result<MediaUploadHandler>
@@ -85,9 +87,7 @@ interface Timeline : AutoCloseable {
 
     suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit>
 
-    suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit>
+    suspend fun cancelSend(transactionId: TransactionId): Result<Boolean>
-
-    suspend fun cancelSend(transactionId: TransactionId): Result<Unit>
 
     /**
      * Share a location message in the room.
@@ -162,4 +162,5 @@ interface Timeline : AutoCloseable {
         waveform: List<Float>,
         progressCallback: ProgressCallback?
     ): Result<MediaUploadHandler>
+
 }

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

@@ -435,10 +435,10 @@ class RustMatrixRoom(
     }
 
     override suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit> {
-        return liveTimeline.retrySendMessage(transactionId)
+        return Result.failure(UnsupportedOperationException("Not supported"))
     }
 
-    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> {
+    override suspend fun cancelSend(transactionId: TransactionId): Result<Boolean> {
         return liveTimeline.cancelSend(transactionId)
     }
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt

@@ -265,6 +265,27 @@ class RustTimeline(
         messageEventContentFromParts(body, htmlBody).withMentions(mentions.map()).use { content ->
             runCatching {
                 inner.send(content)
+                Unit
+            }
+        }
+    }
+
+    override suspend fun redactEvent(eventId: EventId?, transactionId: TransactionId?, reason: String?): Result<Boolean> = withContext(dispatcher) {
+        runCatching {
+            when {
+                eventId != null -> {
+                    inner.getEventTimelineItemByEventId(eventId.value).use {
+                        inner.redactEvent(item = it, reason = reason)
+                    }
+                }
+                transactionId != null -> {
+                    inner.getEventTimelineItemByTransactionId(transactionId.value).use {
+                        inner.redactEvent(item = it, reason = reason)
+                    }
+                }
+                else -> {
+                    error("Either eventId or transactionId must be non-null")
+                }
             }
         }
     }
@@ -277,21 +298,27 @@ class RustTimeline(
         mentions: List<Mention>,
     ): Result<Unit> =
         withContext(dispatcher) {
-            if (originalEventId != null) {
+            runCatching {
-                runCatching {
+                when {
-                    val editedEvent = specialModeEventTimelineItem ?: inner.getEventTimelineItemByEventId(originalEventId.value)
+                    originalEventId != null -> {
-                    editedEvent.use {
+                        val editedEvent = specialModeEventTimelineItem ?: inner.getEventTimelineItemByEventId(originalEventId.value)
-                        inner.edit(
+                        editedEvent.use {
-                            newContent = messageEventContentFromParts(body, htmlBody).withMentions(mentions.map()),
+                            inner.edit(
-                            editItem = it,
+                                newContent = messageEventContentFromParts(body, htmlBody).withMentions(mentions.map()),
-                        )
+                                editItem = it,
+                            )
+                        }
+                        specialModeEventTimelineItem = null
+                    }
+                    transactionId != null -> {
+                        inner.getEventTimelineItemByTransactionId(transactionId.value).use {
+                            inner.redactEvent(item = it, reason = null)
+                        }
+                        Unit
+                    }
+                    else -> {
+                        error("Either originalEventId or transactionId must be non null")
                     }
-                    specialModeEventTimelineItem = null
-                }
-            } else {
-                runCatching {
-                    transactionId?.let { cancelSend(it) }
-                    inner.send(messageEventContentFromParts(body, htmlBody))
                 }
             }
         }
@@ -395,17 +422,7 @@ class RustTimeline(
         }
     }
 
-    override suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit> = withContext(dispatcher) {
+    override suspend fun cancelSend(transactionId: TransactionId): Result<Boolean> = redactEvent(eventId = null, transactionId = transactionId, reason = null)
-        runCatching {
-            inner.retrySend(transactionId.value)
-        }
-    }
-
-    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> = withContext(dispatcher) {
-        runCatching {
-            inner.cancelSend(transactionId.value)
-        }
-    }
 
     override suspend fun sendLocation(
         body: String,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt

@@ -79,7 +79,6 @@ fun RustEventSendState?.map(): LocalEventSendState? {
         RustEventSendState.NotSentYet -> LocalEventSendState.NotSentYet
         is RustEventSendState.SendingFailed -> LocalEventSendState.SendingFailed(error)
         is RustEventSendState.Sent -> LocalEventSendState.Sent(EventId(eventId))
-        RustEventSendState.Cancelled -> LocalEventSendState.Canceled
     }
 }
 

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt

@@ -69,6 +69,16 @@ class FakeTimeline(
         mentions: List<Mention>,
     ): Result<Unit> = sendMessageLambda(body, htmlBody, mentions)
 
+    var redactEventLambda: (eventId: EventId?, transactionId: TransactionId?, reason: String?) -> Result<Boolean> = { _, _, _ ->
+        Result.success(true)
+    }
+
+    override suspend fun redactEvent(
+        eventId: EventId?,
+        transactionId: TransactionId?,
+        reason: String?
+    ): Result<Boolean> = redactEventLambda(eventId, transactionId, reason)
+
     var editMessageLambda: (
         originalEventId: EventId?,
         transactionId: TransactionId?,
@@ -216,11 +226,7 @@ class FakeTimeline(
     var forwardEventLambda: (eventId: EventId, roomIds: List<RoomId>) -> Result<Unit> = { _, _ -> Result.success(Unit) }
     override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit> = forwardEventLambda(eventId, roomIds)
 
-    var retrySendMessageLambda: (transactionId: TransactionId) -> Result<Unit> = { Result.success(Unit) }
+    override suspend fun cancelSend(transactionId: TransactionId): Result<Boolean> = redactEvent(null, transactionId, null)
-    override suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit> = retrySendMessageLambda(transactionId)
-
-    var cancelSendLambda: (transactionId: TransactionId) -> Result<Unit> = { Result.success(Unit) }
-    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> = cancelSendLambda(transactionId)
 
     var sendLocationLambda: (
         body: String,