letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Make MatrixClient return a RoomPreview instance, not a RoomPreviewInfo one.

Browse Source
This commit is contained in:
Jorge Martín
2025-02-10 16:17:24 +01:00
committed by Jorge Martin Espinosa
parent 19fcd005fc
commit 311fbb84f7
11 changed files with 101 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
View File

@@ -104,10 +104,12 @@ class JoinRoomPresenter @AssistedInject constructor(
}
else -> {
value = ContentState.Loading
val result = matrixClient.getRoomPreviewInfo(roomIdOrAlias, serverNames)
val result = matrixClient.getRoomPreview(roomIdOrAlias, serverNames)
value = result.fold(
onSuccess = { previewInfo ->
previewInfo.toContentState()
onSuccess = { preview ->
preview.info.toContentState()
},
onFailure = { throwable ->
if (throwable is ClientException.MatrixApi && (throwable.kind == ErrorKind.NotFound || throwable.kind == ErrorKind.Forbidden)) {

67
features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
View File

@@ -257,6 +257,19 @@ class JoinRoomPresenterTest {
fun `present - when room is banned, then join authorization is equal to IsBanned`() = runTest {
val roomSummary = aRoomSummary(currentUserMembership = CurrentUserMembership.BANNED, joinRule = JoinRule.Public)
val matrixClient = FakeMatrixClient().apply {
val matrixClient = FakeMatrixClient(
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreview(
info = aRoomPreviewInfo(
roomId = A_ROOM_ID,
joinRule = JoinRule.Public,
currentUserMembership = CurrentUserMembership.BANNED,
),
)
)
}
).apply {
getRoomSummaryFlowLambda = { _ ->
flowOf(Optional.of(roomSummary))
}
@@ -504,19 +517,21 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreviewInfo(
roomId = A_ROOM_ID,
canonicalAlias = RoomAlias("#alias:matrix.org"),
name = "Room name",
topic = "Room topic",
avatarUrl = "avatarUrl",
numberOfJoinedMembers = 2,
isSpace = false,
isHistoryWorldReadable = false,
joinRule = JoinRule.Public,
currentUserMembership = null,
aRoomPreview(
info = aRoomPreviewInfo(
roomId = A_ROOM_ID,
canonicalAlias = RoomAlias("#alias:matrix.org"),
name = "Room name",
topic = "Room topic",
avatarUrl = "avatarUrl",
numberOfJoinedMembers = 2,
isSpace = false,
isHistoryWorldReadable = false,
joinRule = JoinRule.Public,
currentUserMembership = null,
)
)
)
}
@@ -547,9 +562,9 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded as Private`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreviewInfo(joinRule = JoinRule.Private)
aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Private))
)
}
)
@@ -567,9 +582,9 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded as Custom`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreviewInfo(joinRule = JoinRule.Custom("custom"))
aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Custom("custom")))
)
}
)
@@ -587,9 +602,9 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded as Invite`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreviewInfo(joinRule = JoinRule.Invite)
aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Invite))
)
}
)
@@ -607,9 +622,9 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded as KnockRestricted`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreviewInfo(joinRule = JoinRule.KnockRestricted(emptyList()))
aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.KnockRestricted(emptyList())))
)
}
)
@@ -627,9 +642,9 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded as Restricted`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreviewInfo(joinRule = JoinRule.Restricted(emptyList()))
aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Restricted(emptyList())))
)
}
)
@@ -647,9 +662,9 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded as Space`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.success(
aRoomPreviewInfo(isSpace = true)
aRoomPreview(info = aRoomPreviewInfo(isSpace = true))
)
}
)
@@ -667,7 +682,7 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded with error`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.failure(AN_EXCEPTION)
}
)
@@ -697,7 +712,7 @@ class JoinRoomPresenterTest {
@Test
fun `present - when room is not known RoomPreview is loaded with error Forbidden`() = runTest {
val client = FakeMatrixClient(
getRoomPreviewInfoResult = { _, _ ->
getRoomPreviewResult = { _, _ ->
Result.failure(ClientException.MatrixApi(ErrorKind.Forbidden, "403", "Forbidden"))
}
)