Browse Source

Add `MatrixRoomInfo.rawName`.

pull/2849/head
Benoit Marty 4 months ago
parent
commit
12ad232ea8
  1. 3
      libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
  2. 1
      libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
  3. 2
      libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

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

@ -27,7 +27,10 @@ import kotlinx.collections.immutable.ImmutableMap
@Immutable @Immutable
data class MatrixRoomInfo( data class MatrixRoomInfo(
val id: RoomId, val id: RoomId,
/** The room's name from the room state event if received from sync, or one that's been computed otherwise. */
val name: String?, val name: String?,
/** Room name as defined by the room state event only. */
val rawName: String?,
val topic: String?, val topic: String?,
val avatarUrl: String?, val avatarUrl: String?,
val isDirect: Boolean, val isDirect: Boolean,

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

@ -39,6 +39,7 @@ class MatrixRoomInfoMapper(
return MatrixRoomInfo( return MatrixRoomInfo(
id = RoomId(it.id), id = RoomId(it.id),
name = it.displayName, name = it.displayName,
rawName = it.rawName,
topic = it.topic, topic = it.topic,
avatarUrl = it.avatarUrl, avatarUrl = it.avatarUrl,
isDirect = it.isDirect, isDirect = it.isDirect,

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

@ -735,6 +735,7 @@ data class EndPollInvocation(
fun aRoomInfo( fun aRoomInfo(
id: RoomId = A_ROOM_ID, id: RoomId = A_ROOM_ID,
name: String? = A_ROOM_NAME, name: String? = A_ROOM_NAME,
rawName: String? = name,
topic: String? = "A topic", topic: String? = "A topic",
avatarUrl: String? = AN_AVATAR_URL, avatarUrl: String? = AN_AVATAR_URL,
isDirect: Boolean = false, isDirect: Boolean = false,
@ -759,6 +760,7 @@ fun aRoomInfo(
) = MatrixRoomInfo( ) = MatrixRoomInfo(
id = id, id = id,
name = name, name = name,
rawName = rawName,
topic = topic, topic = topic,
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
isDirect = isDirect, isDirect = isDirect,

Loading…
Cancel
Save