Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace getRoomPreview by getRoomPreviewFromRoomId.

Browse source 
We do not need `getRoomPreviewFromRoomAlias` since we always resolve the Alias first.
This commit is contained in:
Benoit Marty 2024-05-17 12:01:57 +02:00
parent 9d4cfd8e20
commit f06a01f894
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
View file

@ -42,7 +42,6 @@ import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.matrix.api.MatrixClient
import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
import io.element.android.libraries.matrix.api.room.CurrentUserMembership
import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
import io.element.android.libraries.matrix.api.room.RoomType
@ -96,7 +95,7 @@ class JoinRoomPresenter @AssistedInject constructor(
}
else -> {
value = ContentState.Loading(roomIdOrAlias)
val result = matrixClient.getRoomPreview(roomId.toRoomIdOrAlias())
val result = matrixClient.getRoomPreviewFromRoomId(roomId, serverNames)
value = result.fold(
onSuccess = { roomPreview ->
roomPreview.toContentState()

6
features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
View file

@ -366,7 +366,7 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewResult = {
getRoomPreviewFromRoomIdResult = { _, _ ->
Result.success(
RoomPreview(
roomId = A_ROOM_ID,
@ -411,7 +411,7 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded with error`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewResult = {
getRoomPreviewFromRoomIdResult = { _, _ ->
Result.failure(AN_EXCEPTION)
}
)
@ -449,7 +449,7 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded with error 403`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewResult = {
getRoomPreviewFromRoomIdResult = { _, _ ->
Result.failure(Exception("403"))
}
)