letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Rename canManageRooms to canEditSpaceGraph

Browse Source
This commit is contained in:
ganfra
2026-01-15 12:40:47 +01:00
parent 834a4ae2a7
commit 0af9a17cd9
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt
View File

@@ -228,7 +228,7 @@ class SpacePresenter(
canAccessSpaceSettings = canAccessSpaceSettings,
isManageMode = isManageMode,
selectedRoomIds = selectedRoomIds.toImmutableSet(),
canManageRooms = permissions.canManageRooms,
canEditSpaceGraph = permissions.canEditSpaceGraph,
removeRoomsAction = removeRoomsAction,
eventSink = ::handleEvent,
)

4
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt
View File

@@ -30,7 +30,7 @@ data class SpaceState(
val canAccessSpaceSettings: Boolean,
val isManageMode: Boolean,
val selectedRoomIds: ImmutableSet<RoomId>,
val canManageRooms: Boolean,
val canEditSpaceGraph: Boolean,
val removeRoomsAction: AsyncAction<Unit>,
val eventSink: (SpaceEvents) -> Unit
) {
@@ -42,7 +42,7 @@ data class SpaceState(
val currentSpaceDisplayName = currentSpace?.displayName ?: currentSpaceId.value
val showManageRoomsAction: Boolean = canManageRooms && children.any { spaceRoom -> !spaceRoom.isSpace }
val showManageRoomsAction: Boolean = canEditSpaceGraph && children.any { spaceRoom -> !spaceRoom.isSpace }
val selectedCount: Int = selectedRoomIds.size
val isRemoveButtonEnabled: Boolean = selectedRoomIds.isNotEmpty()
}

2
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
View File

@@ -91,7 +91,7 @@ fun aSpaceState(
canAccessSpaceSettings = canAccessSpaceSettings,
isManageMode = isManageMode,
selectedRoomIds = selectedRoomIds.toImmutableSet(),
canManageRooms = canManageRooms,
canEditSpaceGraph = canManageRooms,
removeRoomsAction = removeRoomsAction,
eventSink = eventSink,
)

6
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt
View File

@@ -20,7 +20,7 @@ data class SpaceSettingsPermissions(
val editDetailsPermissions: RoomDetailsEditPermissions,
val canEditRolesAndPermissions: Boolean,
val securityAndPrivacyPermissions: SecurityAndPrivacyPermissions,
val canManageRooms: Boolean,
val canEditSpaceGraph: Boolean,
) {
fun hasAny(joinRule: JoinRule?): Boolean {
return editDetailsPermissions.hasAny ||
@@ -33,7 +33,7 @@ data class SpaceSettingsPermissions(
editDetailsPermissions = RoomDetailsEditPermissions.DEFAULT,
canEditRolesAndPermissions = false,
securityAndPrivacyPermissions = SecurityAndPrivacyPermissions.DEFAULT,
canManageRooms = false,
canEditSpaceGraph = false,
)
}
}
@@ -43,6 +43,6 @@ fun RoomPermissions.spaceSettingsPermissions(): SpaceSettingsPermissions {
editDetailsPermissions = roomDetailsEditPermissions(),
canEditRolesAndPermissions = canEditRolesAndPermissions(),
securityAndPrivacyPermissions = securityAndPrivacyPermissions(),
canManageRooms = canOwnUserSendState(StateEventType.SpaceChild),
canEditSpaceGraph = canOwnUserSendState(StateEventType.SpaceChild) || canOwnUserSendState(StateEventType.SpaceParent),
)
}