diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt index 5ad8feecc0..7416976d74 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt @@ -136,6 +136,7 @@ private fun aSpaceInfo( successorRoom = null, roomVersion = "11", privilegedCreatorRole = false, + isLowPriority = false, ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd15ad1d58..6b3c4b9a90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -176,7 +176,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt # All new features should not be implemented in the pull request that upgrades the version, developers should # only fix API breaks and may add some TODOs. -matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.2.16" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.02.19" # Others coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt index 9a789187ca..37bc4bccf7 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt @@ -76,6 +76,7 @@ data class RoomInfo( val successorRoom: SuccessorRoom?, val roomVersion: String?, val privilegedCreatorRole: Boolean, + val isLowPriority: Boolean, ) { val aliases: List get() = listOfNotNull(canonicalAlias) + alternativeAliases diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt index 36da41f28a..405c7a1812 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt @@ -74,6 +74,7 @@ class RoomInfoMapper { successorRoom = it.successorRoom?.map(), roomVersion = it.roomVersion, privilegedCreatorRole = it.privilegedCreatorsRole, + isLowPriority = it.isLowPriority, ) } } diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt index cb5836c0b3..7709e9f7ba 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt @@ -59,6 +59,7 @@ internal fun aRustRoomInfo( roomVersion: String? = "11", privilegedCreatorsRole: Boolean = false, serviceMembers: List = emptyList(), + isLowPriority: Boolean = false, ) = RoomInfo( id = id, displayName = displayName, @@ -96,4 +97,5 @@ internal fun aRustRoomInfo( roomVersion = roomVersion, privilegedCreatorsRole = privilegedCreatorsRole, serviceMembers = serviceMembers, + isLowPriority = isLowPriority, ) diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt index 5c1c4a2aa3..77306dcdd9 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt @@ -80,6 +80,7 @@ class RoomInfoMapperTest { historyVisibility = RustRoomHistoryVisibility.Joined, roomVersion = "12", privilegedCreatorsRole = true, + isLowPriority = true, ) ) ).isEqualTo( @@ -128,6 +129,7 @@ class RoomInfoMapperTest { successorRoom = null, roomVersion = "12", privilegedCreatorRole = true, + isLowPriority = true, ) ) } @@ -171,6 +173,7 @@ class RoomInfoMapperTest { roomCreators = null, roomVersion = "12", privilegedCreatorsRole = true, + isLowPriority = true, ) ) ).isEqualTo( @@ -213,6 +216,7 @@ class RoomInfoMapperTest { historyVisibility = RoomHistoryVisibility.Joined, roomVersion = "12", privilegedCreatorRole = true, + isLowPriority = true, ) ) } diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt index 71ed8b83be..4002c7e5fb 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt @@ -68,6 +68,7 @@ fun aRoomInfo( historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined, roomVersion: String? = "11", privilegedCreatorRole: Boolean = false, + isLowPriority: Boolean = false, ) = RoomInfo( id = id, name = name, @@ -104,4 +105,5 @@ fun aRoomInfo( historyVisibility = historyVisibility, roomVersion = roomVersion, privilegedCreatorRole = privilegedCreatorRole, + isLowPriority = isLowPriority, ) diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt index 8568e3c916..f8d1aefeec 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt @@ -78,6 +78,7 @@ fun aRoomSummary( latestEvent: LatestEventValue = aRemoteLatestEvent(), roomVersion: String? = "11", privilegedCreatorRole: Boolean = false, + isLowPriority: Boolean = false, ) = RoomSummary( info = RoomInfo( id = roomId, @@ -115,6 +116,7 @@ fun aRoomSummary( historyVisibility = historyVisibility, roomVersion = roomVersion, privilegedCreatorRole = privilegedCreatorRole, + isLowPriority = isLowPriority, ), latestEvent = latestEvent, )