ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

pending room : use RoomPreview internally

Browse Source
This commit is contained in:
ganfra
2024-11-15 10:52:12 +01:00
parent c9b35eff5c
commit 09aa34c027
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustPendingRoom.kt
+3 -4
View File
@@ -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.RoomId
import io.element.android.libraries.matrix.api.core.SessionId import io.element.android.libraries.matrix.api.core.SessionId
import io.element.android.libraries.matrix.api.room.PendingRoom import io.element.android.libraries.matrix.api.room.PendingRoom
import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.RoomPreview
class RustPendingRoom( class RustPendingRoom(
override val sessionId: SessionId, override val sessionId: SessionId,
private val inner: Room, override val roomId: RoomId,
private val inner: RoomPreview,
) : PendingRoom { ) : PendingRoom {
override val roomId = RoomId(inner.id())
override suspend fun leave(): Result<Unit> = runCatching { override suspend fun leave(): Result<Unit> = runCatching {
inner.leave() inner.leave()
} }
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
+2 -2
View File
@@ -139,14 +139,14 @@ class RustRoomFactory(
return@withContext null return@withContext null
} }
val innerRoom = try { val innerRoom = try {
// TODO use new method when available, for now it'll fail for knocked rooms roomListItem.previewRoom(via = emptyList())
roomListItem.invitedRoom()
} catch (e: RoomListException) { } catch (e: RoomListException) {
Timber.e(e, "Failed to get pending room for $roomId") Timber.e(e, "Failed to get pending room for $roomId")
return@withContext null return@withContext null
} }
RustPendingRoom( RustPendingRoom(
sessionId = sessionId, sessionId = sessionId,
roomId = roomId,
inner = innerRoom, inner = innerRoom,
) )
} }