From a1c876d32ebb594e6cd281cc53c2eec5b76f99a8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Apr 2024 11:26:35 +0200
Subject: [PATCH] Remove useless case. If user is invited, roomInfo will be
 present.

---
 .../features/joinroom/impl/JoinRoomPresenter.kt   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 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 3edfb97d93..fbf4aeab31 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
@@ -38,10 +38,8 @@ 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.preview.RoomPreview
-import io.element.android.libraries.matrix.ui.model.InviteSender
 import io.element.android.libraries.matrix.ui.model.toInviteSender
 import java.util.Optional
-import kotlin.jvm.optionals.getOrNull
 
 class JoinRoomPresenter @AssistedInject constructor(
     @Assisted private val roomId: RoomId,
@@ -79,11 +77,7 @@ class JoinRoomPresenter @AssistedInject constructor(
                     val result = matrixClient.getRoomPreview(roomId.toRoomIdOrAlias())
                     value = result.fold(
                         onSuccess = { roomPreview ->
-                            val inviteSender = roomInfo.getOrNull()
-                                ?.takeIf { roomPreview.isInvited }
-                                ?.inviter
-                                ?.toInviteSender()
-                            roomPreview.toContentState(inviteSender)
+                            roomPreview.toContentState()
                         },
                         onFailure = { throwable ->
                             if (throwable.message?.contains("403") == true) {
@@ -127,9 +121,7 @@ class JoinRoomPresenter @AssistedInject constructor(
     }
 }
 
-private fun RoomPreview.toContentState(
-    inviteSender: InviteSender?
-): ContentState {
+private fun RoomPreview.toContentState(): ContentState {
     return ContentState.Loaded(
         roomId = roomId,
         name = name,
@@ -139,7 +131,8 @@ private fun RoomPreview.toContentState(
         isDirect = false,
         roomAvatarUrl = avatarUrl,
         joinAuthorisationStatus = when {
-            isInvited -> JoinAuthorisationStatus.IsInvited(inviteSender)
+            // Note when isInvited, roomInfo will be used, so if this happen, it will be temporary.
+            isInvited -> JoinAuthorisationStatus.IsInvited(null)
             canKnock -> JoinAuthorisationStatus.CanKnock
             isPublic -> JoinAuthorisationStatus.CanJoin
             else -> JoinAuthorisationStatus.Unknown