From ba70fbb77e4f7026e900dfb854fc1ba6a20b27cd Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Fri, 13 Sep 2024 11:43:41 +0200
Subject: [PATCH] Send state : introduce Failed.VerifiedUser interface.

---
 .../api/timeline/item/event/LocalEventSendState.kt     | 10 +++++++---
 .../timeline/item/event/EventTimelineItemMapper.kt     |  5 ++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt
index 92242faf18..452073bb25 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt
@@ -8,6 +8,7 @@
 package io.element.android.libraries.matrix.api.timeline.item.event
 
 import androidx.compose.runtime.Immutable
+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.UserId
 
@@ -18,21 +19,24 @@ sealed interface LocalEventSendState {
         data class Unknown(val error: String) : Failed
         data object CrossSigningNotSetup : Failed
         data object SendingFromUnverifiedDevice : Failed
+
+        sealed interface VerifiedUser : Failed
         data class VerifiedUserHasUnsignedDevice(
             /**
              * The unsigned devices belonging to verified users. A map from user ID
              * to a list of device IDs.
              */
-            val devices: Map<UserId, List<String>>
-        ) : Failed
+            val devices: Map<UserId, List<DeviceId>>
+        ) : VerifiedUser
 
         data class VerifiedUserChangedIdentity(
             /**
              * The users that were previously verified but are no longer.
              */
             val users: List<UserId>
-        ) : Failed
+        ) : VerifiedUser
     }
+
     data class Sent(
         val eventId: EventId
     ) : LocalEventSendState
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
index 5f170c9387..f83d6d0672 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
@@ -7,6 +7,7 @@
 
 package io.element.android.libraries.matrix.impl.timeline.item.event
 
+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.TransactionId
 import io.element.android.libraries.matrix.api.core.UserId
@@ -87,7 +88,9 @@ fun RustEventSendState?.map(): LocalEventSendState? {
         }
         is RustEventSendState.VerifiedUserHasUnsignedDevice -> {
             LocalEventSendState.Failed.VerifiedUserHasUnsignedDevice(
-                devices = devices.mapKeys { UserId(it.key) }
+                devices = devices.entries.associate { entry ->
+                    UserId(entry.key) to entry.value.map { DeviceId(it) }
+                }
             )
         }
         EventSendState.CrossSigningNotSetup -> LocalEventSendState.Failed.CrossSigningNotSetup