From de933b1f3403c938ed180acc1440dad98cb702b2 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Thu, 12 Sep 2024 19:06:19 +0200
Subject: [PATCH] Send failure verified user : expose new methods on
 MatrixRoom.

---
 .../libraries/matrix/api/room/MatrixRoom.kt   |  5 +++++
 .../matrix/impl/room/RustMatrixRoom.kt        | 21 +++++++++++++++++--
 .../matrix/test/room/FakeMatrixRoom.kt        | 14 ++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
index 2d8c807ce0..25340684d6 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
@@ -7,6 +7,7 @@
 
 package io.element.android.libraries.matrix.api.room
 
+import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.core.RoomAlias
@@ -349,5 +350,9 @@ interface MatrixRoom : Closeable {
      */
     suspend fun clearComposerDraft(): Result<Unit>
 
+    suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, transactionId: TransactionId): Result<Unit>
+    suspend fun withdrawVerificationAndResend(userIds: List<UserId>, transactionId: TransactionId): Result<Unit>
+
     override fun close() = destroy()
+
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
index aad3777071..381063f0e1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -459,8 +459,8 @@ class RustMatrixRoom(
         return liveTimeline.forwardEvent(eventId, roomIds)
     }
 
-    override suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit> {
-        return Result.failure(UnsupportedOperationException("Not supported"))
+    override suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit> = runCatching {
+        innerRoom.tryResend(transactionId.value)
     }
 
     override suspend fun cancelSend(transactionId: TransactionId): Result<Boolean> {
@@ -645,6 +645,23 @@ class RustMatrixRoom(
         innerRoom.clearComposerDraft()
     }
 
+    override suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, transactionId: TransactionId) = runCatching {
+        innerRoom.ignoreDeviceTrustAndResend(
+            devices = devices
+                .entries.associate { entry ->
+                    entry.key.value to entry.value.map { it.value }
+                },
+            transactionId = transactionId.value
+        )
+    }
+
+    override suspend fun withdrawVerificationAndResend(userIds: List<UserId>, transactionId: TransactionId) = runCatching {
+        innerRoom.withdrawVerificationAndResend(
+            userIds = userIds.map { it.value },
+            transactionId = transactionId.value
+        )
+    }
+
     private fun createTimeline(
         timeline: InnerTimeline,
         mode: Timeline.Mode,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
index 4f35c37d4d..2290897f11 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@@ -7,6 +7,7 @@
 
 package io.element.android.libraries.matrix.test.room
 
+import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.core.RoomAlias
@@ -134,7 +135,10 @@ class FakeMatrixRoom(
     private val loadComposerDraftLambda: () -> Result<ComposerDraft?> = { Result.success<ComposerDraft?>(null) },
     private val clearComposerDraftLambda: () -> Result<Unit> = { Result.success(Unit) },
     private val subscribeToSyncLambda: () -> Unit = { lambdaError() },
-) : MatrixRoom {
+    private val ignoreDeviceTrustAndResendResult: (Map<UserId, List<DeviceId>>, TransactionId) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val withdrawVerificationAndResendResult: (List<UserId>, TransactionId) -> Result<Unit> = { _, _ -> lambdaError() },
+
+    ) : MatrixRoom {
     private val _roomInfoFlow: MutableSharedFlow<MatrixRoomInfo> = MutableSharedFlow(replay = 1)
     override val roomInfoFlow: Flow<MatrixRoomInfo> = _roomInfoFlow
 
@@ -492,6 +496,14 @@ class FakeMatrixRoom(
         return getWidgetDriverResult(widgetSettings)
     }
 
+    override suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, transactionId: TransactionId): Result<Unit> {
+        return ignoreDeviceTrustAndResendResult(devices, transactionId)
+    }
+
+    override suspend fun withdrawVerificationAndResend(userIds: List<UserId>, transactionId: TransactionId): Result<Unit> {
+        return withdrawVerificationAndResendResult(userIds, transactionId)
+    }
+
     fun givenRoomMembersState(state: MatrixRoomMembersState) {
         membersStateFlow.value = state
     }