ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 21:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

change(permissions) : allow to change ShareLiveLocation permission

Browse Source
This commit is contained in:
ganfra
2026-05-26 23:17:32 +02:00
parent 09e14e037a
commit f37222e2d8
5 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
+2
View File
@@ -47,6 +47,7 @@ class ChangeRoomPermissionsPresenter(
RoomPermissionsSection.MessagesAndContent -> persistentListOf( RoomPermissionsSection.MessagesAndContent -> persistentListOf(
RoomPermissionType.SEND_EVENTS, RoomPermissionType.SEND_EVENTS,
RoomPermissionType.REDACT_EVENTS, RoomPermissionType.REDACT_EVENTS,
RoomPermissionType.SHARE_LIVE_LOCATION,
) )
RoomPermissionsSection.ManageMembers -> persistentListOf( RoomPermissionsSection.ManageMembers -> persistentListOf(
RoomPermissionType.INVITE, RoomPermissionType.INVITE,
@@ -114,6 +115,7 @@ class ChangeRoomPermissionsPresenter(
RoomPermissionType.ROOM_AVATAR -> currentPermissions?.copy(roomAvatar = powerLevel) RoomPermissionType.ROOM_AVATAR -> currentPermissions?.copy(roomAvatar = powerLevel)
RoomPermissionType.ROOM_TOPIC -> currentPermissions?.copy(roomTopic = powerLevel) RoomPermissionType.ROOM_TOPIC -> currentPermissions?.copy(roomTopic = powerLevel)
RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions?.copy(spaceChild = powerLevel) RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions?.copy(spaceChild = powerLevel)
RoomPermissionType.SHARE_LIVE_LOCATION -> currentPermissions?.copy(beaconInfo = powerLevel, beacon = powerLevel)
} }
} }
is ChangeRoomPermissionsEvent.Save -> coroutineScope.save() is ChangeRoomPermissionsEvent.Save -> coroutineScope.save()
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsState.kt
+2
View File
@@ -65,6 +65,7 @@ data class ChangeRoomPermissionsState(
RoomPermissionType.ROOM_AVATAR -> currentPermissions.roomAvatar RoomPermissionType.ROOM_AVATAR -> currentPermissions.roomAvatar
RoomPermissionType.ROOM_TOPIC -> currentPermissions.roomTopic RoomPermissionType.ROOM_TOPIC -> currentPermissions.roomTopic
RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions.spaceChild RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions.spaceChild
RoomPermissionType.SHARE_LIVE_LOCATION -> maxOf(currentPermissions.beacon, currentPermissions.beaconInfo)
} }
} }
} }
@@ -104,4 +105,5 @@ enum class RoomPermissionType {
ROOM_AVATAR, ROOM_AVATAR,
ROOM_TOPIC, ROOM_TOPIC,
SPACE_MANAGE_ROOMS, SPACE_MANAGE_ROOMS,
SHARE_LIVE_LOCATION,
} }
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsView.kt
+1
View File
@@ -127,6 +127,7 @@ private fun titleForType(type: RoomPermissionType): String = when (type) {
RoomPermissionType.ROOM_AVATAR -> stringResource(R.string.screen_room_change_permissions_room_avatar) RoomPermissionType.ROOM_AVATAR -> stringResource(R.string.screen_room_change_permissions_room_avatar)
RoomPermissionType.ROOM_TOPIC -> stringResource(R.string.screen_room_change_permissions_room_topic) RoomPermissionType.ROOM_TOPIC -> stringResource(R.string.screen_room_change_permissions_room_topic)
RoomPermissionType.SPACE_MANAGE_ROOMS -> stringResource(R.string.screen_room_change_permissions_manage_space_rooms) RoomPermissionType.SPACE_MANAGE_ROOMS -> stringResource(R.string.screen_room_change_permissions_manage_space_rooms)
RoomPermissionType.SHARE_LIVE_LOCATION -> stringResource(R.string.screen_room_change_permissions_live_location)
} }
@PreviewsDayNight @PreviewsDayNight
features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
+1
View File
@@ -66,6 +66,7 @@ class ChangeRoomPermissionsPresenterTest {
assertThat(itemsBySection[RoomPermissionsSection.MessagesAndContent]).containsExactly( assertThat(itemsBySection[RoomPermissionsSection.MessagesAndContent]).containsExactly(
RoomPermissionType.SEND_EVENTS, RoomPermissionType.SEND_EVENTS,
RoomPermissionType.REDACT_EVENTS, RoomPermissionType.REDACT_EVENTS,
RoomPermissionType.SHARE_LIVE_LOCATION,
) )
assertThat(itemsBySection[RoomPermissionsSection.ManageMembers]).containsExactly( assertThat(itemsBySection[RoomPermissionsSection.ManageMembers]).containsExactly(
RoomPermissionType.INVITE, RoomPermissionType.INVITE,
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
+2
View File
@@ -421,6 +421,8 @@ class JoinedRustRoom(
roomAvatar = roomPowerLevelsValues.roomAvatar, roomAvatar = roomPowerLevelsValues.roomAvatar,
roomTopic = roomPowerLevelsValues.roomTopic, roomTopic = roomPowerLevelsValues.roomTopic,
spaceChild = roomPowerLevelsValues.spaceChild, spaceChild = roomPowerLevelsValues.spaceChild,
beacon = roomPowerLevelsValues.beacon,
beaconInfo = roomPowerLevelsValues.beaconInfo,
) )
innerRoom.applyPowerLevelChanges(changes) innerRoom.applyPowerLevelChanges(changes)
} }