Update dependency org.matrix.rustcomponents:sdk-android to v26.05.6 (#6734)
* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.6 * Fix API breaks: - Add `RoomMember.isServiceMember`. - Add `beacon` and `beaconInfo` power levels. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <jorgem@element.io>
This commit is contained in:
parent
c1e212c244
commit
c8db7a5bcb
11 changed files with 29 additions and 4 deletions
|
|
@ -301,7 +301,9 @@ class ConfigureRoomPresenterTest {
|
||||||
roomName = 0,
|
roomName = 0,
|
||||||
roomAvatar = 0,
|
roomAvatar = 0,
|
||||||
roomTopic = 0,
|
roomTopic = 0,
|
||||||
spaceChild = 0
|
spaceChild = 0,
|
||||||
|
beacon = 0,
|
||||||
|
beaconInfo = 0,
|
||||||
),
|
),
|
||||||
users = persistentMapOf(),
|
users = persistentMapOf(),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -63,5 +63,8 @@ private fun previewPermissions(): RoomPowerLevelsValues {
|
||||||
// SpaceManagement section
|
// SpaceManagement section
|
||||||
spaceChild = RoomMember.Role.Moderator.powerLevel,
|
spaceChild = RoomMember.Role.Moderator.powerLevel,
|
||||||
stateDefault = RoomMember.Role.Moderator.powerLevel,
|
stateDefault = RoomMember.Role.Moderator.powerLevel,
|
||||||
|
// Live location beacon section
|
||||||
|
beacon = RoomMember.Role.Admin.powerLevel,
|
||||||
|
beaconInfo = RoomMember.Role.Moderator.powerLevel,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,9 @@ class ChangeRoomPermissionsPresenterTest {
|
||||||
roomName = Moderator.powerLevel,
|
roomName = Moderator.powerLevel,
|
||||||
roomAvatar = Moderator.powerLevel,
|
roomAvatar = Moderator.powerLevel,
|
||||||
roomTopic = Moderator.powerLevel,
|
roomTopic = Moderator.powerLevel,
|
||||||
spaceChild = initialPermissions.spaceChild
|
spaceChild = initialPermissions.spaceChild,
|
||||||
|
beacon = initialPermissions.beacon,
|
||||||
|
beaconInfo = initialPermissions.beaconInfo,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -178,7 +178,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
|
# 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
|
# 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.
|
# only fix API breaks and may add some TODOs.
|
||||||
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.05.4"
|
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.05.6"
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
||||||
|
|
|
||||||
|
|
@ -19,4 +19,6 @@ data class RoomPowerLevelsValues(
|
||||||
val roomAvatar: Long,
|
val roomAvatar: Long,
|
||||||
val roomTopic: Long,
|
val roomTopic: Long,
|
||||||
val spaceChild: Long,
|
val spaceChild: Long,
|
||||||
|
val beacon: Long,
|
||||||
|
val beaconInfo: Long,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@ object RoomPowerLevelsValuesMapper {
|
||||||
roomAvatar = values.roomAvatar,
|
roomAvatar = values.roomAvatar,
|
||||||
roomTopic = values.roomTopic,
|
roomTopic = values.roomTopic,
|
||||||
spaceChild = values.spaceChild,
|
spaceChild = values.spaceChild,
|
||||||
|
beacon = values.beacon,
|
||||||
|
beaconInfo = values.beaconInfo,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ internal fun aRustRoomMember(
|
||||||
isIgnored: Boolean = false,
|
isIgnored: Boolean = false,
|
||||||
role: RoomMemberRole = RoomMemberRole.USER,
|
role: RoomMemberRole = RoomMemberRole.USER,
|
||||||
membershipChangeReason: String? = null,
|
membershipChangeReason: String? = null,
|
||||||
|
isServiceMember: Boolean = false,
|
||||||
) = RoomMember(
|
) = RoomMember(
|
||||||
userId = userId.value,
|
userId = userId.value,
|
||||||
displayName = displayName,
|
displayName = displayName,
|
||||||
|
|
@ -34,4 +35,5 @@ internal fun aRustRoomMember(
|
||||||
isIgnored = isIgnored,
|
isIgnored = isIgnored,
|
||||||
suggestedRoleForPowerLevel = role,
|
suggestedRoleForPowerLevel = role,
|
||||||
membershipChangeReason = membershipChangeReason,
|
membershipChangeReason = membershipChangeReason,
|
||||||
|
isServiceMember = isServiceMember,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,8 @@ internal fun aRustRoomPowerLevelsValues(
|
||||||
roomAvatar: Long,
|
roomAvatar: Long,
|
||||||
roomTopic: Long,
|
roomTopic: Long,
|
||||||
spaceChild: Long,
|
spaceChild: Long,
|
||||||
|
beacon: Long,
|
||||||
|
beaconInfo: Long,
|
||||||
) = RoomPowerLevelsValues(
|
) = RoomPowerLevelsValues(
|
||||||
ban = ban,
|
ban = ban,
|
||||||
invite = invite,
|
invite = invite,
|
||||||
|
|
@ -33,5 +35,7 @@ internal fun aRustRoomPowerLevelsValues(
|
||||||
roomName = roomName,
|
roomName = roomName,
|
||||||
roomAvatar = roomAvatar,
|
roomAvatar = roomAvatar,
|
||||||
roomTopic = roomTopic,
|
roomTopic = roomTopic,
|
||||||
spaceChild = spaceChild
|
spaceChild = spaceChild,
|
||||||
|
beacon = beacon,
|
||||||
|
beaconInfo = beaconInfo,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -32,4 +32,6 @@ fun defaultFfiRoomPowerLevelValues() = RoomPowerLevelsValues(
|
||||||
roomTopic = 50,
|
roomTopic = 50,
|
||||||
spaceChild = 50,
|
spaceChild = 50,
|
||||||
usersDefault = 0,
|
usersDefault = 0,
|
||||||
|
beacon = 0,
|
||||||
|
beaconInfo = 0,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,8 @@ class RoomPowerLevelsValuesMapperTest {
|
||||||
roomAvatar = 9,
|
roomAvatar = 9,
|
||||||
roomTopic = 10,
|
roomTopic = 10,
|
||||||
spaceChild = 11,
|
spaceChild = 11,
|
||||||
|
beacon = 12,
|
||||||
|
beaconInfo = 13,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
).isEqualTo(
|
).isEqualTo(
|
||||||
|
|
@ -44,6 +46,8 @@ class RoomPowerLevelsValuesMapperTest {
|
||||||
roomAvatar = 9,
|
roomAvatar = 9,
|
||||||
roomTopic = 10,
|
roomTopic = 10,
|
||||||
spaceChild = 11,
|
spaceChild = 11,
|
||||||
|
beacon = 12,
|
||||||
|
beaconInfo = 13,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -223,4 +223,6 @@ fun defaultRoomPowerLevelValues() = RoomPowerLevelsValues(
|
||||||
roomAvatar = 50,
|
roomAvatar = 50,
|
||||||
roomTopic = 50,
|
roomTopic = 50,
|
||||||
spaceChild = 50,
|
spaceChild = 50,
|
||||||
|
beacon = 0,
|
||||||
|
beaconInfo = 0,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue