feature(room preview): Add option to forget room, improve the room preview screen for banned rooms.

Some internal refactoring was done too:
- Remove RoomInfo.isPublic to only use JoinRule.
- Also take into account restricted access rooms for previews.

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

@@ -25,8 +25,8 @@ import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
-import io.element.android.libraries.matrix.api.room.PendingRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
@@ -55,7 +55,7 @@ interface MatrixClient : Closeable {
     val sessionCoroutineScope: CoroutineScope
     val ignoredUsersFlow: StateFlow<ImmutableList<UserId>>
     suspend fun getRoom(roomId: RoomId): MatrixRoom?
-    suspend fun getPendingRoom(roomId: RoomId): PendingRoom?
+    suspend fun getPendingRoom(roomId: RoomId): RoomPreview?
     suspend fun findDM(userId: UserId): RoomId?
     suspend fun ignoreUser(userId: UserId): Result<Unit>
     suspend fun unignoreUser(userId: UserId): Result<Unit>

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt

@@ -28,7 +28,6 @@ data class MatrixRoomInfo(
     val topic: String?,
     val avatarUrl: String?,
     val isDirect: Boolean,
-    val isPublic: Boolean,
     val joinRule: JoinRule?,
     val isSpace: Boolean,
     val isTombstoned: Boolean,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt

@@ -20,6 +20,7 @@ data class RoomMember(
     val normalizedPowerLevel: Long,
     val isIgnored: Boolean,
     val role: Role,
+    val membershipChangeReason: String?,
 ) {
     /**
      * Role of the RoomMember, based on its [powerLevel].

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomPreview.kt

@@ -10,11 +10,16 @@ package io.element.android.libraries.matrix.api.room
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 
-/** A reference to a room the current user has knocked to or has been invited to, with the ability to leave the room. */
-interface PendingRoom : AutoCloseable {
+/** A reference to a room either invited, knocked or banned. */
+interface RoomPreview : AutoCloseable {
     val sessionId: SessionId
     val roomId: RoomId
 
     /** Leave the room ie.decline invite or cancel knock. */
     suspend fun leave(): Result<Unit>
+
+    /**
+     * Forget the room if we had access to it, and it was left or banned.
+     */
+    suspend fun forget(): Result<Unit>
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreviewInfo.kt

@@ -9,7 +9,9 @@ package io.element.android.libraries.matrix.api.room.preview
 
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.api.room.join.JoinRule
 
 data class RoomPreviewInfo(
     /** The room id for this room. */
@@ -28,12 +30,8 @@ data class RoomPreviewInfo(
     val roomType: RoomType,
     /** Is the history world-readable for this room? */
     val isHistoryWorldReadable: Boolean,
-    /** Is the room joined by the current user? */
-    val isJoined: Boolean,
-    /** Is the current user invited to this room? */
-    val isInvited: Boolean,
-    /** is the join rule public for this room? */
-    val isPublic: Boolean,
-    /** Can we knock (or restricted-knock) to this room? */
-    val canKnock: Boolean,
+    /** the membership of the current user. */
+    val membership: CurrentUserMembership?,
+    /** The room's join rule. */
+    val joinRule: JoinRule,
 )

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -13,6 +13,7 @@ import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScope
 import io.element.android.libraries.core.data.tryOrNull
+import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.DeviceId
@@ -32,9 +33,9 @@ import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.PendingRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
@@ -50,6 +51,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.impl.core.toProgressWatcher
 import io.element.android.libraries.matrix.impl.encryption.RustEncryptionService
+import io.element.android.libraries.matrix.impl.exception.mapClientException
 import io.element.android.libraries.matrix.impl.media.RustMediaLoader
 import io.element.android.libraries.matrix.impl.notification.RustNotificationService
 import io.element.android.libraries.matrix.impl.notificationsettings.RustNotificationSettingsService
@@ -261,8 +263,8 @@ class RustMatrixClient(
         return roomFactory.create(roomId)
     }
 
-    override suspend fun getPendingRoom(roomId: RoomId): PendingRoom? {
-        return roomFactory.createPendingRoom(roomId)
+    override suspend fun getPendingRoom(roomId: RoomId): RoomPreview? {
+        return roomFactory.createRoomPreview(roomId)
     }
 
     /**
@@ -393,7 +395,7 @@ class RustMatrixClient(
                 null
             }
         }
-    }
+    }.mapFailure { it.mapClientException() }
 
     override suspend fun joinRoomByIdOrAlias(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomSummary?> = withContext(sessionDispatcher) {
         runCatching {
@@ -407,7 +409,7 @@ class RustMatrixClient(
                 Timber.e(e, "Timeout waiting for the room to be available in the room list")
                 null
             }
-        }
+        }.mapFailure { it.mapClientException() }
     }
 
     override suspend fun knockRoom(roomIdOrAlias: RoomIdOrAlias, message: String, serverNames: List<String>): Result<RoomSummary?> = withContext(
@@ -421,7 +423,7 @@ class RustMatrixClient(
                 Timber.e(e, "Timeout waiting for the room to be available in the room list")
                 null
             }
-        }
+        }.mapFailure { it.mapClientException() }
     }
 
     override suspend fun trackRecentlyVisitedRoom(roomId: RoomId): Result<Unit> = withContext(sessionDispatcher) {
@@ -456,7 +458,7 @@ class RustMatrixClient(
             }.use { roomPreview ->
                 RoomPreviewInfoMapper.map(roomPreview.info())
             }
-        }
+        }.mapFailure { it.mapClientException() }
     }
 
     override fun syncService(): SyncService = rustSyncService

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt

@@ -37,7 +37,6 @@ class MatrixRoomInfoMapper {
             topic = it.topic,
             avatarUrl = it.avatarUrl,
             isDirect = it.isDirect,
-            isPublic = it.isPublic,
             joinRule = it.joinRule?.map(),
             isSpace = it.isSpace,
             isTombstoned = it.isTombstoned,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt

@@ -16,8 +16,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.PendingRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.awaitLoaded
 import io.element.android.libraries.matrix.impl.roomlist.fullRoomWithTimeline
@@ -28,7 +28,6 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import org.matrix.rustcomponents.sdk.Membership
 import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.RoomListException
 import org.matrix.rustcomponents.sdk.RoomListItem
@@ -36,7 +35,6 @@ import timber.log.Timber
 import org.matrix.rustcomponents.sdk.RoomListService as InnerRoomListService
 
 private const val CACHE_SIZE = 16
-private val PENDING_MEMBERSHIPS = setOf(Membership.INVITED, Membership.KNOCKED)
 
 class RustRoomFactory(
     private val sessionId: SessionId,
@@ -125,7 +123,7 @@ class RustRoomFactory(
         }
     }
 
-    suspend fun createPendingRoom(roomId: RoomId): PendingRoom? = withContext(dispatcher) {
+    suspend fun createRoomPreview(roomId: RoomId): RoomPreview? = withContext(dispatcher) {
         if (isDestroyed) {
             Timber.d("Room factory is destroyed, returning null for $roomId")
             return@withContext null
@@ -135,17 +133,17 @@ class RustRoomFactory(
             Timber.d("Room not found for $roomId")
             return@withContext null
         }
-        if (roomListItem.membership() !in PENDING_MEMBERSHIPS) {
-            Timber.d("Room $roomId is not in pending state")
+        if (roomListItem.membership() !in RustRoomPreview.ALLOWED_MEMBERSHIPS) {
+            Timber.d("Room $roomId is not in allowed membership")
             return@withContext null
         }
         val innerRoom = try {
             roomListItem.previewRoom(via = emptyList())
         } catch (e: Exception) {
-            Timber.e(e, "Failed to get pending room for $roomId")
+            Timber.e(e, "Failed to get room preview for $roomId")
             return@withContext null
         }
-        RustPendingRoom(
+        RustRoomPreview(
             sessionId = sessionId,
             roomId = roomId,
             inner = innerRoom,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomPreview.kt

@@ -9,22 +9,31 @@ package io.element.android.libraries.matrix.impl.room
 
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.room.PendingRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import org.matrix.rustcomponents.sdk.RoomPreview
+import io.element.android.libraries.matrix.api.room.RoomPreview
+import org.matrix.rustcomponents.sdk.Membership
+import org.matrix.rustcomponents.sdk.RoomPreview as InnerRoomPreview
 
-class RustPendingRoom(
+class RustRoomPreview(
     override val sessionId: SessionId,
     override val roomId: RoomId,
-    private val inner: RoomPreview,
+    private val inner: InnerRoomPreview,
     private val roomMembershipObserver: RoomMembershipObserver,
-) : PendingRoom {
+) : RoomPreview {
+    companion object {
+        val ALLOWED_MEMBERSHIPS = setOf(Membership.INVITED, Membership.KNOCKED, Membership.BANNED)
+    }
+
     override suspend fun leave(): Result<Unit> = runCatching {
         inner.leave()
     }.onSuccess {
         roomMembershipObserver.notifyUserLeftRoom(roomId)
     }
 
+    override suspend fun forget(): Result<Unit> = runCatching {
+        inner.forget()
+    }
+
     override fun close() {
         inner.destroy()
     }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt

@@ -25,6 +25,7 @@ object RoomMemberMapper {
         normalizedPowerLevel = roomMember.normalizedPowerLevel,
         isIgnored = roomMember.isIgnored,
         role = mapRole(roomMember.suggestedRoleForPowerLevel),
+        membershipChangeReason = roomMember.membershipChangeReason
     )
 
     fun mapRole(role: RoomMemberRole): RoomMember.Role =

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt

@@ -11,9 +11,8 @@ import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
+import io.element.android.libraries.matrix.impl.room.join.map
 import io.element.android.libraries.matrix.impl.room.map
-import org.matrix.rustcomponents.sdk.JoinRule
-import org.matrix.rustcomponents.sdk.Membership
 import org.matrix.rustcomponents.sdk.RoomPreviewInfo as RustRoomPreviewInfo
 
 object RoomPreviewInfoMapper {
@@ -27,10 +26,8 @@ object RoomPreviewInfoMapper {
             numberOfJoinedMembers = info.numJoinedMembers.toLong(),
             roomType = info.roomType.map(),
             isHistoryWorldReadable = info.isHistoryWorldReadable.orFalse(),
-            isJoined = info.membership == Membership.JOINED,
-            isInvited = info.membership == Membership.INVITED,
-            isPublic = info.joinRule == JoinRule.Public,
-            canKnock = info.joinRule == JoinRule.Knock
+            membership = info.membership?.map(),
+            joinRule = info.joinRule.map(),
         )
     }
 }

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapperTest.kt

@@ -85,7 +85,6 @@ class MatrixRoomInfoMapperTest {
                 topic = "topic",
                 avatarUrl = AN_AVATAR_URL,
                 isDirect = true,
-                isPublic = false,
                 isSpace = false,
                 isTombstoned = false,
                 isFavorite = false,
@@ -167,7 +166,6 @@ class MatrixRoomInfoMapperTest {
                 topic = null,
                 avatarUrl = null,
                 isDirect = false,
-                isPublic = true,
                 joinRule = null,
                 isSpace = false,
                 isTombstoned = false,

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapperTest.kt

@@ -8,14 +8,16 @@
 package io.element.android.libraries.matrix.impl.room.preview
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomPreviewInfo
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.JoinRule
 import org.matrix.rustcomponents.sdk.Membership
+import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
 
 class RoomPreviewInfoMapperTest {
     @Test
@@ -23,7 +25,7 @@ class RoomPreviewInfoMapperTest {
         assertThat(
             RoomPreviewInfoMapper.map(
                 info = aRustRoomPreviewInfo(
-                    membership = null,
+                    membership = Membership.JOINED,
                 )
             )
         ).isEqualTo(
@@ -36,10 +38,8 @@ class RoomPreviewInfoMapperTest {
                 numberOfJoinedMembers = 1L,
                 roomType = RoomType.Room,
                 isHistoryWorldReadable = true,
-                isJoined = false,
-                isInvited = false,
-                isPublic = true,
-                canKnock = false,
+                membership = CurrentUserMembership.JOINED,
+                joinRule = JoinRule.Public,
             )
         )
     }
@@ -51,7 +51,7 @@ class RoomPreviewInfoMapperTest {
                 info = aRustRoomPreviewInfo(
                     canonicalAlias = null,
                     membership = Membership.JOINED,
-                    joinRule = JoinRule.Knock,
+                    joinRule = RustJoinRule.Knock,
                 )
             )
         ).isEqualTo(
@@ -64,10 +64,8 @@ class RoomPreviewInfoMapperTest {
                 numberOfJoinedMembers = 1L,
                 roomType = RoomType.Room,
                 isHistoryWorldReadable = true,
-                isJoined = true,
-                isInvited = false,
-                isPublic = false,
-                canKnock = true,
+                membership = CurrentUserMembership.JOINED,
+                joinRule = JoinRule.Knock,
             )
         )
     }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -23,8 +23,8 @@ import io.element.android.libraries.matrix.api.notificationsettings.Notification
 import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
 import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.PendingRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
@@ -105,7 +105,7 @@ class FakeMatrixClient(
     private var createDmResult: Result<RoomId> = Result.success(A_ROOM_ID)
     private var findDmResult: RoomId? = A_ROOM_ID
     private val getRoomResults = mutableMapOf<RoomId, MatrixRoom>()
-    val getPendingRoomResults = mutableMapOf<RoomId, PendingRoom>()
+    val getRoomPreviewResults = mutableMapOf<RoomId, RoomPreview>()
     private val searchUserResults = mutableMapOf<String, Result<MatrixSearchUserResults>>()
     private val getProfileResults = mutableMapOf<UserId, Result<MatrixUser>>()
     private var uploadMediaResult: Result<String> = Result.success(AN_AVATAR_URL)
@@ -132,8 +132,8 @@ class FakeMatrixClient(
         return getRoomResults[roomId]
     }
 
-    override suspend fun getPendingRoom(roomId: RoomId): PendingRoom? {
-        return getPendingRoomResults[roomId]
+    override suspend fun getPendingRoom(roomId: RoomId): RoomPreview? {
+        return getRoomPreviewResults[roomId]
     }
 
     override suspend fun findDM(userId: UserId): RoomId? {

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeRoomPreview.kt

@@ -9,20 +9,25 @@ package io.element.android.libraries.matrix.test.room
 
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.room.PendingRoom
+import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
 
-class FakePendingRoom(
+class FakeRoomPreview(
     override val sessionId: SessionId = A_SESSION_ID,
     override val roomId: RoomId = A_ROOM_ID,
-    private val declineInviteResult: () -> Result<Unit> = { lambdaError() }
-) : PendingRoom {
+    private val declineInviteResult: () -> Result<Unit> = { lambdaError() },
+    private val forgetRoomResult: () -> Result<Unit> = { lambdaError() },
+) : RoomPreview {
     override suspend fun leave(): Result<Unit> = simulateLongTask {
         declineInviteResult()
     }
 
+    override suspend fun forget(): Result<Unit> = simulateLongTask {
+        forgetRoomResult()
+    }
+
     override fun close() = Unit
 }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt

@@ -34,7 +34,6 @@ fun aRoomInfo(
     topic: String? = A_ROOM_TOPIC,
     avatarUrl: String? = AN_AVATAR_URL,
     isDirect: Boolean = false,
-    isPublic: Boolean = true,
     joinRule: JoinRule? = JoinRule.Public,
     isSpace: Boolean = false,
     isTombstoned: Boolean = false,
@@ -67,7 +66,6 @@ fun aRoomInfo(
     topic = topic,
     avatarUrl = avatarUrl,
     isDirect = isDirect,
-    isPublic = isPublic,
     joinRule = joinRule,
     isSpace = isSpace,
     isTombstoned = isTombstoned,

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomMemberFixture.kt

@@ -21,6 +21,7 @@ fun aRoomMember(
     normalizedPowerLevel: Long = 0L,
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.USER,
+    membershipChangeReason: String? = null,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -31,4 +32,5 @@ fun aRoomMember(
     normalizedPowerLevel = normalizedPowerLevel,
     isIgnored = isIgnored,
     role = role,
+    membershipChangeReason = membershipChangeReason,
 )

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.room
+
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
+import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.api.room.join.JoinRule
+import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
+import io.element.android.libraries.matrix.test.AN_AVATAR_URL
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
+
+fun aRoomPreviewInfo(
+    roomId: RoomId = A_ROOM_ID,
+    name: String? = A_ROOM_NAME,
+    topic: String? = A_ROOM_TOPIC,
+    avatarUrl: String? = AN_AVATAR_URL,
+    joinRule: JoinRule = JoinRule.Public,
+    isSpace: Boolean = false,
+    canonicalAlias: RoomAlias? = null,
+    currentUserMembership: CurrentUserMembership? = null,
+    numberOfJoinedMembers: Long = 1,
+    isHistoryWorldReadable: Boolean = true,
+) = RoomPreviewInfo(
+    roomId = roomId,
+    name = name,
+    topic = topic,
+    avatarUrl = avatarUrl,
+    joinRule = joinRule,
+    canonicalAlias = canonicalAlias,
+    numberOfJoinedMembers = numberOfJoinedMembers,
+    roomType = if (isSpace) RoomType.Space else RoomType.Room,
+    isHistoryWorldReadable = isHistoryWorldReadable,
+    membership = currentUserMembership,
+)

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt

@@ -47,7 +47,6 @@ fun aRoomSummary(
     topic: String? = A_ROOM_TOPIC,
     avatarUrl: String? = null,
     isDirect: Boolean = false,
-    isPublic: Boolean = true,
     joinRule: JoinRule? = JoinRule.Public,
     isSpace: Boolean = false,
     isTombstoned: Boolean = false,
@@ -82,7 +81,6 @@ fun aRoomSummary(
         topic = topic,
         avatarUrl = avatarUrl,
         isDirect = isDirect,
-        isPublic = isPublic,
         joinRule = joinRule,
         isSpace = isSpace,
         isTombstoned = isTombstoned,

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/InviteSenderView.kt

@@ -55,8 +55,9 @@ internal fun InviteSenderViewPreview() = ElementPreview {
                 id = "@bob:example.com",
                 name = "Bob",
                 url = null,
-                size = AvatarSize.InviteSender
-            )
+                size = AvatarSize.InviteSender,
+            ),
+            membershipChangeReason = null,
         )
     )
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt

@@ -26,6 +26,7 @@ data class InviteSender(
     val userId: UserId,
     val displayName: String,
     val avatarData: AvatarData,
+    val membershipChangeReason: String?,
 ) {
     @Composable
     fun annotatedString(): AnnotatedString {
@@ -52,4 +53,5 @@ fun RoomMember.toInviteSender() = InviteSender(
     userId = userId,
     displayName = displayName ?: "",
     avatarData = getAvatarData(size = AvatarSize.InviteSender),
+    membershipChangeReason = membershipChangeReason
 )

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -271,6 +271,7 @@ Reason: %1$s."</string>
   <string name="common_verified">"Verified"</string>
   <string name="common_verify_device">"Verify device"</string>
   <string name="common_verify_identity">"Verify identity"</string>
+  <string name="common_verify_user">"Verify user"</string>
   <string name="common_video">"Video"</string>
   <string name="common_voice_message">"Voice message"</string>
   <string name="common_waiting">"Waiting…"</string>
@@ -297,6 +298,7 @@ Reason: %1$s."</string>
   <string name="error_missing_location_auth_android">"%1$s does not have permission to access your location. You can enable access in Settings."</string>
   <string name="error_missing_location_rationale_android">"%1$s does not have permission to access your location. Enable access below."</string>
   <string name="error_missing_microphone_voice_rationale_android">"%1$s does not have permission to access your microphone. Enable access to record a voice message."</string>
+  <string name="error_network_or_server_issue">"This may be due to network or server issues."</string>
   <string name="error_room_address_already_exists">"This room address already exists. Please try editing the room address field or change the room name"</string>
   <string name="error_room_address_invalid_symbols">"Some characters are not allowed. Only letters, digits and the following symbols are supported ! $ &amp; ‘ ( ) * + / ; = ? @ [ ] - . _"</string>
   <string name="error_some_messages_have_not_been_sent">"Some messages have not been sent"</string>