From 8457a2faea01bc62ab1d972b963bc696726eb1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Wed, 15 Oct 2025 22:35:49 +0800 Subject: [PATCH] fix: Remove unknown room display condition (#5514) --- .../joinroom/impl/JoinRoomPresenter.kt | 8 +--- .../joinroom/impl/JoinRoomPresenterTest.kt | 40 +------------------ 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt index 6e123630d6..2d737a17d4 100644 --- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt +++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt @@ -39,8 +39,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.exception.ClientException -import io.element.android.libraries.matrix.api.exception.ErrorKind import io.element.android.libraries.matrix.api.room.CurrentUserMembership import io.element.android.libraries.matrix.api.room.RoomInfo import io.element.android.libraries.matrix.api.room.RoomMembershipDetails @@ -141,11 +139,7 @@ class JoinRoomPresenter( preview.previewInfo.toContentState(membershipDetails) }, onFailure = { throwable -> - if (throwable is ClientException.MatrixApi && (throwable.kind == ErrorKind.NotFound || throwable.kind == ErrorKind.Forbidden)) { - ContentState.UnknownRoom - } else { - ContentState.Failure(throwable) - } + ContentState.UnknownRoom } ) } diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt index 10b5c1a712..0aed9ca424 100644 --- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt +++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt @@ -1193,46 +1193,8 @@ class JoinRoomPresenterTest { skipItems(1) awaitItem().also { state -> assertThat(state.contentState).isEqualTo( - ContentState.Failure(error = AN_EXCEPTION) + ContentState.UnknownRoom ) - state.eventSink(JoinRoomEvents.RetryFetchingContent) - } - skipItems(1) - awaitItem().also { state -> - assertThat(state.contentState).isEqualTo(ContentState.Loading) - } - awaitItem().also { state -> - assertThat(state.contentState).isEqualTo( - ContentState.Failure(error = AN_EXCEPTION) - ) - } - } - } - - @Test - fun `present - when room is not known RoomPreview is loaded with error - dismiss`() = runTest { - val client = FakeMatrixClient( - getNotJoinedRoomResult = { _, _ -> - Result.failure(AN_EXCEPTION) - }, - spaceService = FakeSpaceService( - spaceRoomListResult = { FakeSpaceRoomList() }, - ), - ) - val presenter = createJoinRoomPresenter( - matrixClient = client - ) - presenter.test { - skipItems(1) - awaitItem().also { state -> - assertThat(state.contentState).isEqualTo( - ContentState.Failure(error = AN_EXCEPTION) - ) - state.eventSink(JoinRoomEvents.DismissErrorAndHideContent) - } - skipItems(1) - awaitItem().also { state -> - assertThat(state.contentState).isEqualTo(ContentState.Dismissing) } } }