Split MatrixRoom into BaseRoom and JoinedRoom (#4561)

`JoinedRoom` will now contain both a mandatory live timeline reference and all the functionality associated to it.

`BaseRoom` on the other hand will contain only functionality that's shared for both joined and not joined rooms.

`NotJoinedRoom` is a wrapper around `RoomPreviewInfo` data and a possible local `BaseRoom`, if it exists.

The `RustRoomFactory` cache is now gone since the persistent event cache should have the same effect.

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

@@ -44,7 +44,7 @@ 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.getRoomInfoFlow
 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.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomType
 import io.element.android.libraries.matrix.api.room.isDm
@@ -131,7 +131,7 @@ class JoinRoomPresenter @AssistedInject constructor(
                     val result = matrixClient.getRoomPreview(roomIdOrAlias, serverNames)
                     value = result.fold(
                         onSuccess = { preview ->
-                            val membershipInfo = when (preview.info.membership) {
+                            val membershipInfo = when (preview.previewInfo.membership) {
                                 CurrentUserMembership.INVITED,
                                 CurrentUserMembership.BANNED,
                                 CurrentUserMembership.KNOCKED -> {
@@ -139,7 +139,7 @@ class JoinRoomPresenter @AssistedInject constructor(
                                 }
                                 else -> null
                             }
-                            preview.info.toContentState(
+                            preview.previewInfo.toContentState(
                                 senderMember = membershipInfo?.senderMember,
                                 reason = membershipInfo?.currentUserMember?.membershipChangeReason,
                             )
@@ -296,7 +296,7 @@ internal fun RoomDescription.toContentState(): ContentState {
 }
 
 @VisibleForTesting
-internal fun MatrixRoomInfo.toContentState(membershipSender: RoomMember?, reason: String?): ContentState {
+internal fun RoomInfo.toContentState(membershipSender: RoomMember?, reason: String?): ContentState {
     return ContentState.Loaded(
         roomId = id,
         name = name,

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt

@@ -21,8 +21,8 @@ interface CancelKnockRoom {
 class DefaultCancelKnockRoom @Inject constructor(private val client: MatrixClient) : CancelKnockRoom {
     override suspend fun invoke(roomId: RoomId): Result<Unit> {
         return client
-            .getPendingRoom(roomId)
-            ?.leave()
+            .getRoom(roomId)
+            ?.use { it.leave() }
             ?: Result.failure(IllegalStateException("No pending room found"))
     }
 }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt

@@ -20,9 +20,7 @@ interface ForgetRoom {
 @ContributesBinding(SessionScope::class)
 class DefaultForgetRoom @Inject constructor(private val client: MatrixClient) : ForgetRoom {
     override suspend fun invoke(roomId: RoomId): Result<Unit> {
-        return client
-            .getPendingRoom(roomId)
-            ?.forget()
-            ?: Result.failure(IllegalStateException("No pending room found"))
+        return client.getRoom(roomId)?.use { it.forget() }
+            ?: Result.failure(IllegalStateException("Room not found"))
     }
 }

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinBaseRoomPresenterTest.kt

@@ -64,7 +64,7 @@ import org.junit.Test
 import java.util.Optional
 
 @Suppress("LargeClass")
-class JoinRoomPresenterTest {
+class JoinBaseRoomPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -273,7 +273,7 @@ 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(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(
                         info = aRoomPreviewInfo(
@@ -546,7 +546,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(
                         info = aRoomPreviewInfo(
@@ -591,7 +591,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Private`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Private))
                 )
@@ -611,7 +611,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Custom`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Custom("custom")))
                 )
@@ -631,7 +631,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Invite`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Invite))
                 )
@@ -651,7 +651,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as KnockRestricted`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.KnockRestricted(emptyList())))
                 )
@@ -671,7 +671,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Restricted`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Restricted(emptyList())))
                 )
@@ -691,7 +691,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Space`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(isSpace = true))
                 )
@@ -711,7 +711,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded with error`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.failure(AN_EXCEPTION)
             }
         )
@@ -741,7 +741,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded with error Forbidden`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.failure(ClientException.MatrixApi(ErrorKind.Forbidden, "403", "Forbidden", null))
             }
         )

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinBaseRoomViewTest.kt

@@ -25,7 +25,7 @@ import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class JoinRoomViewTest {
+class JoinBaseRoomViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test