Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deps(sdk): fix api usages

Browse source
This commit is contained in:
ganfra 2025-11-19 13:07:59 +01:00
parent 0ef5576c3b
commit fe65ba1839
11 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
View file

@ -58,5 +58,7 @@ private fun previewPermissions(): RoomPowerLevelsValues {
roomName = RoomMember.Role.Admin.powerLevel,
roomAvatar = RoomMember.Role.Moderator.powerLevel,
roomTopic = RoomMember.Role.User.powerLevel,
// SpaceManagement section
spaceChild = RoomMember.Role.Moderator.powerLevel,
)
}

2
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
View file

@ -154,7 +154,7 @@ class StateContentFormatter(
"RoomHistoryVisibility"
}
}
OtherState.RoomJoinRules -> when (renderingMode) {
is OtherState.RoomJoinRules -> when (renderingMode) {
RenderingMode.RoomList -> {
Timber.v("Filtering timeline item for room state change: $content")
null

1
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevelsValues.kt
View file

@ -22,6 +22,7 @@ data class RoomPowerLevelsValues(
val roomName: Long,
val roomAvatar: Long,
val roomTopic: Long,
val spaceChild: Long,
)
/**

3
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt
View file

@ -9,6 +9,7 @@
package io.element.android.libraries.matrix.api.timeline.item.event
import androidx.compose.runtime.Immutable
import io.element.android.libraries.matrix.api.room.join.JoinRule
@Immutable
sealed interface OtherState {
@ -22,7 +23,7 @@ sealed interface OtherState {
data object RoomEncryption : OtherState
data object RoomGuestAccess : OtherState
data object RoomHistoryVisibility : OtherState
data object RoomJoinRules : OtherState
data class RoomJoinRules(val joinRule: JoinRule?) : OtherState
data class RoomName(val name: String?) : OtherState
data class RoomPinnedEvents(val change: Change) : OtherState {
enum class Change {

1
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapper.kt
View file

@ -24,6 +24,7 @@ object RoomPowerLevelsValuesMapper {
roomName = values.roomName,
roomAvatar = values.roomAvatar,
roomTopic = values.roomTopic,
spaceChild = values.spaceChild,
)
}
}

3
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
View file

@ -32,6 +32,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.UnknownConten
import io.element.android.libraries.matrix.api.timeline.item.event.UtdCause
import io.element.android.libraries.matrix.impl.media.map
import io.element.android.libraries.matrix.impl.poll.map
import io.element.android.libraries.matrix.impl.room.join.map
import kotlinx.collections.immutable.toImmutableList
import kotlinx.collections.immutable.toImmutableMap
import org.matrix.rustcomponents.sdk.EmbeddedEventDetails
@ -210,7 +211,7 @@ private fun RustOtherState.map(): OtherState {
RustOtherState.RoomEncryption -> OtherState.RoomEncryption
RustOtherState.RoomGuestAccess -> OtherState.RoomGuestAccess
RustOtherState.RoomHistoryVisibility -> OtherState.RoomHistoryVisibility
RustOtherState.RoomJoinRules -> OtherState.RoomJoinRules
is RustOtherState.RoomJoinRules -> OtherState.RoomJoinRules(joinRule?.map())
is RustOtherState.RoomName -> OtherState.RoomName(name)
is RustOtherState.RoomPinnedEvents -> OtherState.RoomPinnedEvents(change.map())
is RustOtherState.RoomPowerLevels -> OtherState.RoomUserPowerLevels(users)

2
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevels.kt
View file

@ -21,6 +21,7 @@ internal fun aRustRoomPowerLevelsValues(
roomName: Long,
roomAvatar: Long,
roomTopic: Long,
spaceChild: Long,
) = RoomPowerLevelsValues(
ban = ban,
invite = invite,
@ -32,4 +33,5 @@ internal fun aRustRoomPowerLevelsValues(
roomName = roomName,
roomAvatar = roomAvatar,
roomTopic = roomTopic,
spaceChild = spaceChild
)

1
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomPowerLevels.kt
View file

@ -31,4 +31,5 @@ fun defaultFfiRoomPowerLevelValues() = RoomPowerLevelsValues(
roomTopic = 100,
stateDefault = 0,
usersDefault = 0,
spaceChild = 100,
)

4
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoomTest.kt
View file

@ -16,7 +16,6 @@ import io.element.android.libraries.matrix.api.room.RoomInfo
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.powerlevels.RoomPowerLevels
import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiRoom
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiRoomListService
@ -24,6 +23,7 @@ import io.element.android.libraries.matrix.test.A_DEVICE_ID
import io.element.android.libraries.matrix.test.A_SESSION_ID
import io.element.android.libraries.matrix.test.A_USER_ID
import io.element.android.libraries.matrix.test.room.aRoomInfo
import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevelValues
import io.element.android.tests.testutils.testCoroutineDispatchers
import kotlinx.collections.immutable.persistentMapOf
import kotlinx.coroutines.flow.SharingStarted
@ -128,7 +128,7 @@ class RustBaseRoomTest {
val rustBaseRoom = createRustBaseRoom(
initialRoomInfo = aRoomInfo(
roomPowerLevels = RoomPowerLevels(
values = RoomPowerLevelsValues(50, 50, 50, 50, 50, 50, 50, 50),
values = defaultRoomPowerLevelValues(),
users = persistentMapOf(A_USER_ID to 100L)
)
),

2
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapperTest.kt
View file

@ -29,6 +29,7 @@ class RoomPowerLevelsValuesMapperTest {
roomName = 8,
roomAvatar = 9,
roomTopic = 10,
spaceChild = 11,
)
)
).isEqualTo(
@ -41,6 +42,7 @@ class RoomPowerLevelsValuesMapperTest {
roomName = 8,
roomAvatar = 9,
roomTopic = 10,
spaceChild = 11,
)
)
}

3
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt
View file

@ -260,5 +260,6 @@ fun defaultRoomPowerLevelValues() = RoomPowerLevelsValues(
redactEvents = 50,
roomName = 100,
roomAvatar = 100,
roomTopic = 100
roomTopic = 100,
spaceChild = 100,
)