From 0af9a17cd99a25e71b55bcd75166ba992d9dd5d0 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 15 Jan 2026 12:40:47 +0100 Subject: [PATCH] Rename canManageRooms to canEditSpaceGraph --- .../android/features/space/impl/root/SpacePresenter.kt | 2 +- .../element/android/features/space/impl/root/SpaceState.kt | 4 ++-- .../android/features/space/impl/root/SpaceStateProvider.kt | 2 +- .../space/impl/settings/SpaceSettingsPermissions.kt | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt index 43febab8c1..475920c0fc 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt @@ -228,7 +228,7 @@ class SpacePresenter( canAccessSpaceSettings = canAccessSpaceSettings, isManageMode = isManageMode, selectedRoomIds = selectedRoomIds.toImmutableSet(), - canManageRooms = permissions.canManageRooms, + canEditSpaceGraph = permissions.canEditSpaceGraph, removeRoomsAction = removeRoomsAction, eventSink = ::handleEvent, ) diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt index 28b04a9a21..df384e68f2 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt @@ -30,7 +30,7 @@ data class SpaceState( val canAccessSpaceSettings: Boolean, val isManageMode: Boolean, val selectedRoomIds: ImmutableSet, - val canManageRooms: Boolean, + val canEditSpaceGraph: Boolean, val removeRoomsAction: AsyncAction, 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() } 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 d70cf1f1b9..90095e9436 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 @@ -91,7 +91,7 @@ fun aSpaceState( canAccessSpaceSettings = canAccessSpaceSettings, isManageMode = isManageMode, selectedRoomIds = selectedRoomIds.toImmutableSet(), - canManageRooms = canManageRooms, + canEditSpaceGraph = canManageRooms, removeRoomsAction = removeRoomsAction, eventSink = eventSink, ) diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt index 8297992b49..c02593f953 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt @@ -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), ) }