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

Avoid getting roomInfo again. Also add a test to cover the case of non-null inviter.

Browse source
This commit is contained in:
Benoit Marty 2024-04-19 10:33:19 +02:00
parent cf49677ffa
commit 87f89244a6
2 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,6 @@ import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
import io.element.android.libraries.matrix.api.room.preview.RoomPreview
import io.element.android.libraries.matrix.ui.model.InviteSender
import io.element.android.libraries.matrix.ui.model.toInviteSender
import kotlinx.coroutines.flow.first
import java.util.Optional
import kotlin.jvm.optionals.getOrNull
@ -78,22 +77,16 @@ class JoinRoomPresenter @AssistedInject constructor(
else -> {
value = ContentState.Loading(roomIdOrAlias)
val result = matrixClient.getRoomPreview(roomId.toRoomIdOrAlias())
result.fold(
onSuccess = {
value = it.toContentState(null)
if (it.isInvited) {
// Get the inviteSender
matrixClient.getRoomInfoFlow(roomId).first()
.getOrNull()
?.inviter
?.toInviteSender()
?.let { inviteSender ->
value = it.toContentState(inviteSender)
}
}
value = result.fold(
onSuccess = { roomPreview ->
val inviteSender = roomInfo.getOrNull()
?.takeIf { roomPreview.isInvited }
?.inviter
?.toInviteSender()
roomPreview.toContentState(inviteSender)
},
onFailure = { throwable ->
value = if (throwable.message?.contains("403") == true) {
if (throwable.message?.contains("403") == true) {
ContentState.UnknownRoom(roomIdOrAlias)
} else {
ContentState.Failure(roomIdOrAlias, throwable)