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

Change type of items in alternativeAliases from String to RoomAlias

Browse source
This commit is contained in:
Benoit Marty 2024-09-12 13:54:40 +02:00 • committed by Benoit Marty
parent 33f8d2d013
commit b842a53106
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ data class MatrixRoomInfo(
val isTombstoned: Boolean, val isTombstoned: Boolean,
val isFavorite: Boolean, val isFavorite: Boolean,
val canonicalAlias: RoomAlias?, val canonicalAlias: RoomAlias?,
val alternativeAliases: ImmutableList<String>, val alternativeAliases: ImmutableList<RoomAlias>,
val currentUserMembership: CurrentUserMembership, val currentUserMembership: CurrentUserMembership,
val inviter: RoomMember?, val inviter: RoomMember?,
val activeMembersCount: Long, val activeMembersCount: Long,

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

@ -39,7 +39,7 @@ class MatrixRoomInfoMapper {
isTombstoned = it.isTombstoned, isTombstoned = it.isTombstoned,
isFavorite = it.isFavourite, isFavorite = it.isFavourite,
canonicalAlias = it.canonicalAlias?.let(::RoomAlias), canonicalAlias = it.canonicalAlias?.let(::RoomAlias),
alternativeAliases = it.alternativeAliases.toImmutableList(), alternativeAliases = it.alternativeAliases.map(::RoomAlias).toImmutableList(),
currentUserMembership = it.membership.map(), currentUserMembership = it.membership.map(),
inviter = it.inviter?.let(RoomMemberMapper::map), inviter = it.inviter?.let(RoomMemberMapper::map),
activeMembersCount = it.activeMembersCount.toLong(), activeMembersCount = it.activeMembersCount.toLong(),

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

@ -520,7 +520,7 @@ fun aRoomInfo(
isTombstoned: Boolean = false, isTombstoned: Boolean = false,
isFavorite: Boolean = false, isFavorite: Boolean = false,
canonicalAlias: RoomAlias? = null, canonicalAlias: RoomAlias? = null,
alternativeAliases: List<String> = emptyList(), alternativeAliases: List<RoomAlias> = emptyList(),
currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED, currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
inviter: RoomMember? = null, inviter: RoomMember? = null,
activeMembersCount: Long = 1, activeMembersCount: Long = 1,