From 7a7fb2aa546195464e604f3f2b434e72face3b04 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 17 Apr 2024 16:44:37 +0200 Subject: [PATCH] Comment out SDK usage. --- .../libraries/matrix/impl/RustMatrixClient.kt | 10 ++-- .../impl/room/preview/RoomPreviewMapper.kt | 47 ++++++++++--------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt index 48683d77ba..82619352c0 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt @@ -61,7 +61,7 @@ import io.element.android.libraries.matrix.impl.room.RoomContentForwarder import io.element.android.libraries.matrix.impl.room.RoomSyncSubscriber import io.element.android.libraries.matrix.impl.room.RustMatrixRoom import io.element.android.libraries.matrix.impl.room.map -import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewMapper +// TODO import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewMapper import io.element.android.libraries.matrix.impl.roomdirectory.RustRoomDirectoryService import io.element.android.libraries.matrix.impl.roomlist.RoomListFactory import io.element.android.libraries.matrix.impl.roomlist.RustRoomListService @@ -466,13 +466,17 @@ class RustMatrixClient( override suspend fun resolveRoomAlias(roomAlias: RoomAlias): Result = withContext(sessionDispatcher) { runCatching { - client.resolveRoomAlias(roomAlias.value).let(::RoomId) + // TODO Waiting for SDK to be released + throw Exception("Not implemented") + // client.resolveRoomAlias(roomAlias.value).let(::RoomId) } } override suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias): Result = withContext(sessionDispatcher) { runCatching { - client.getRoomPreview(roomIdOrAlias.identifier).let(RoomPreviewMapper::map) + // TODO Waiting for SDK to be released + throw Exception("Not implemented") + // client.getRoomPreview(roomIdOrAlias.identifier).let(RoomPreviewMapper::map) } } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt index 75286becda..0497d8aeff 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt @@ -16,26 +16,27 @@ package io.element.android.libraries.matrix.impl.room.preview -import io.element.android.libraries.matrix.api.core.RoomAlias -import io.element.android.libraries.matrix.api.core.RoomId -import io.element.android.libraries.matrix.api.room.preview.RoomPreview -import org.matrix.rustcomponents.sdk.RoomPreview as RustRoomPreview - -object RoomPreviewMapper { - fun map(roomPreview: RustRoomPreview): RoomPreview { - return RoomPreview( - roomId = RoomId(roomPreview.roomId), - canonicalAlias = roomPreview.canonicalAlias?.let(::RoomAlias), - name = roomPreview.name, - topic = roomPreview.topic, - avatarUrl = roomPreview.avatarUrl, - numberOfJoinedMembers = roomPreview.numJoinedMembers.toLong(), - roomType = roomPreview.roomType, - isHistoryWorldReadable = roomPreview.isHistoryWorldReadable, - isJoined = roomPreview.isJoined, - isInvited = roomPreview.isInvited, - isPublic = roomPreview.isPublic, - canKnock = roomPreview.canKnock - ) - } -} +// TODO Restore +// import io.element.android.libraries.matrix.api.core.RoomAlias +// import io.element.android.libraries.matrix.api.core.RoomId +// import io.element.android.libraries.matrix.api.room.preview.RoomPreview +// import org.matrix.rustcomponents.sdk.RoomPreview as RustRoomPreview +// +// object RoomPreviewMapper { +// fun map(roomPreview: RustRoomPreview): RoomPreview { +// return RoomPreview( +// roomId = RoomId(roomPreview.roomId), +// canonicalAlias = roomPreview.canonicalAlias?.let(::RoomAlias), +// name = roomPreview.name, +// topic = roomPreview.topic, +// avatarUrl = roomPreview.avatarUrl, +// numberOfJoinedMembers = roomPreview.numJoinedMembers.toLong(), +// roomType = roomPreview.roomType, +// isHistoryWorldReadable = roomPreview.isHistoryWorldReadable, +// isJoined = roomPreview.isJoined, +// isInvited = roomPreview.isInvited, +// isPublic = roomPreview.isPublic, +// canKnock = roomPreview.canKnock +// ) +// } +// }