pending room : use RoomPreview internally

element-hq · Nov 15, 2024 · 09aa34c · 09aa34c
1 parent c9b35ef
commit 09aa34c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...rix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustPendingRoom.kt b/...rix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustPendingRoom.kt
@@ -10,14 +10,13 @@ package io.element.android.libraries.matrix.impl.room
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.room.PendingRoom
-import org.matrix.rustcomponents.sdk.Room
+import org.matrix.rustcomponents.sdk.RoomPreview
 
 class RustPendingRoom(
     override val sessionId: SessionId,
-    private val inner: Room,
+    override val roomId: RoomId,
+    private val inner: RoomPreview,
 ) : PendingRoom {
-    override val roomId = RoomId(inner.id())
-
     override suspend fun leave(): Result<Unit> = runCatching {
         inner.leave()
     }

diff --git a/...rix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/...rix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
@@ -139,14 +139,14 @@ class RustRoomFactory(
             return@withContext null
         }
         val innerRoom = try {
-            // TODO use new method when available, for now it'll fail for knocked rooms
-            roomListItem.invitedRoom()
+            roomListItem.previewRoom(via = emptyList())
         } catch (e: RoomListException) {
             Timber.e(e, "Failed to get pending room for $roomId")
             return@withContext null
         }
         RustPendingRoom(
             sessionId = sessionId,
+            roomId = roomId,
             inner = innerRoom,
         )
     }