fix: Remove unknown room display condition (#5514)
This commit is contained in:
parent
e74ec97ec0
commit
8457a2faea
2 changed files with 2 additions and 46 deletions
|
|
@ -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.MatrixClient
|
||||||
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.RoomIdOrAlias
|
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.CurrentUserMembership
|
||||||
import io.element.android.libraries.matrix.api.room.RoomInfo
|
import io.element.android.libraries.matrix.api.room.RoomInfo
|
||||||
import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
|
import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
|
||||||
|
|
@ -141,11 +139,7 @@ class JoinRoomPresenter(
|
||||||
preview.previewInfo.toContentState(membershipDetails)
|
preview.previewInfo.toContentState(membershipDetails)
|
||||||
},
|
},
|
||||||
onFailure = { throwable ->
|
onFailure = { throwable ->
|
||||||
if (throwable is ClientException.MatrixApi && (throwable.kind == ErrorKind.NotFound || throwable.kind == ErrorKind.Forbidden)) {
|
ContentState.UnknownRoom
|
||||||
ContentState.UnknownRoom
|
|
||||||
} else {
|
|
||||||
ContentState.Failure(throwable)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1193,46 +1193,8 @@ class JoinRoomPresenterTest {
|
||||||
skipItems(1)
|
skipItems(1)
|
||||||
awaitItem().also { state ->
|
awaitItem().also { state ->
|
||||||
assertThat(state.contentState).isEqualTo(
|
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)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue