Change Room’s Access to/from Space members

features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNode.kt

@@ -9,6 +9,7 @@
 package io.element.android.features.securityandprivacy.impl
 
 import android.os.Parcelable
+import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.Lifecycle
@@ -24,6 +25,7 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
 import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissions
 import io.element.android.features.securityandprivacy.impl.editroomaddress.EditRoomAddressNode
+import io.element.android.features.securityandprivacy.impl.manageauthorizedspaces.ManageAuthorizedSpacesNode
 import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
@@ -58,10 +60,15 @@ class SecurityAndPrivacyFlowNode(
 
         @Parcelize
         data object EditRoomAddress : NavTarget
+
+        @Parcelize
+        data object ManageAuthorizedSpaces : NavTarget
     }
 
     private val callback: SecurityAndPrivacyEntryPoint.Callback = callback()
-    private val navigator = BackstackSecurityAndPrivacyNavigator(callback, backstack)
+
+    @VisibleForTesting
+    val navigator = BackstackSecurityAndPrivacyNavigator(callback, backstack)
 
     override fun onBuilt() {
         super.onBuilt()
@@ -89,6 +96,9 @@ class SecurityAndPrivacyFlowNode(
             NavTarget.EditRoomAddress -> {
                 createNode<EditRoomAddressNode>(buildContext, plugins = listOf(navigator))
             }
+            NavTarget.ManageAuthorizedSpaces -> {
+                createNode<ManageAuthorizedSpacesNode>(buildContext, plugins = listOf(navigator))
+            }
         }
     }
 

features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyNavigator.kt

@@ -18,6 +18,8 @@ interface SecurityAndPrivacyNavigator : Plugin {
     fun onDone()
     fun openEditRoomAddress()
     fun closeEditRoomAddress()
+    fun openManageAuthorizedSpaces()
+    fun closeManageAuthorizedSpaces()
 }
 
 class BackstackSecurityAndPrivacyNavigator(
@@ -35,4 +37,12 @@ class BackstackSecurityAndPrivacyNavigator(
     override fun closeEditRoomAddress() {
         backStack.pop()
     }
+
+    override fun openManageAuthorizedSpaces() {
+        backStack.push(SecurityAndPrivacyFlowNode.NavTarget.ManageAuthorizedSpaces)
+    }
+
+    override fun closeManageAuthorizedSpaces() {
+        backStack.pop()
+    }
 }

features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesEvent.kt

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.impl.manageauthorizedspaces
+
+import io.element.android.libraries.matrix.api.core.RoomId
+
+sealed interface ManageAuthorizedSpacesEvent {
+    data object Cancel : ManageAuthorizedSpacesEvent
+    data object Done : ManageAuthorizedSpacesEvent
+    data class ToggleSpace(val roomId: RoomId) : ManageAuthorizedSpacesEvent
+}

features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesNode.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.impl.manageauthorizedspaces
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import com.bumble.appyx.core.plugin.plugins
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.appyx.launchMolecule
+import io.element.android.libraries.di.RoomScope
+
+@ContributesNode(RoomScope::class)
+@AssistedInject
+class ManageAuthorizedSpacesNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    presenter: ManageAuthorizedSpacesPresenter,
+) : Node(buildContext, plugins = plugins) {
+    private val stateFlow = launchMolecule { presenter.present() }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state by stateFlow.collectAsState()
+        ManageAuthorizedSpacesView(
+            state = state,
+            modifier = modifier
+        )
+    }
+}

features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesPresenter.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.impl.manageauthorizedspaces
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.architecture.Presenter
+import kotlinx.collections.immutable.toImmutableList
+
+@Inject
+class ManageAuthorizedSpacesPresenter(
+    private val spaceSelectionStateHolder: SpaceSelectionStateHolder,
+) : Presenter<ManageAuthorizedSpacesState> {
+    @Composable
+    override fun present(): ManageAuthorizedSpacesState {
+        val spaceSelectionState by spaceSelectionStateHolder.state.collectAsState()
+        fun handleEvent(event: ManageAuthorizedSpacesEvent) {
+            when (event) {
+                is ManageAuthorizedSpacesEvent.ToggleSpace -> {
+                    val currentSelectedIds = spaceSelectionState.selectedSpaceIds
+                    val newSelectedIds = if (currentSelectedIds.contains(event.roomId)) {
+                        currentSelectedIds.minus(event.roomId).toImmutableList()
+                    } else {
+                        currentSelectedIds.plus(event.roomId).toImmutableList()
+                    }
+                    spaceSelectionStateHolder.updateSelectedSpaceIds(newSelectedIds)
+                }
+                ManageAuthorizedSpacesEvent.Done -> {
+                    spaceSelectionStateHolder.setCompletion(SpaceSelectionState.Completion.Completed)
+                }
+                ManageAuthorizedSpacesEvent.Cancel -> {
+                    spaceSelectionStateHolder.setCompletion(SpaceSelectionState.Completion.Cancelled)
+                }
+            }
+        }
+
+        return ManageAuthorizedSpacesState(
+            selectableSpaces = spaceSelectionState.selectableSpaces,
+            unknownSpaceIds = spaceSelectionState.unknownSpaceIds,
+            selectedIds = spaceSelectionState.selectedSpaceIds,
+            eventSink = ::handleEvent,
+        )
+    }
+}

features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesState.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.impl.manageauthorizedspaces
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.spaces.SpaceRoom
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableSet
+
+data class ManageAuthorizedSpacesState(
+    val selectableSpaces: ImmutableSet<SpaceRoom>,
+    val unknownSpaceIds: ImmutableList<RoomId>,
+    val selectedIds: ImmutableList<RoomId>,
+    val eventSink: (ManageAuthorizedSpacesEvent) -> Unit
+) {
+    val isDoneButtonEnabled = selectedIds.isNotEmpty()
+}

features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesStateProvider.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securityandprivacy.impl.manageauthorizedspaces
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.spaces.SpaceRoom
+import io.element.android.libraries.previewutils.room.aSpaceRoom
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableSet
+
+open class ManageAuthorizedSpacesStateProvider : PreviewParameterProvider<ManageAuthorizedSpacesState> {
+    override val values: Sequence<ManageAuthorizedSpacesState>
+        get() = sequenceOf(
+            aManageAuthorizedSpacesState(),
+            aManageAuthorizedSpacesState(
+                unknownSpaceIds = listOf(aRoomId(99))
+            ),
+            aManageAuthorizedSpacesState(
+                selectedIds = listOf(aRoomId(1), aRoomId(3)),
+            ),
+        )
+}
+
+private fun aRoomId(index: Int) = RoomId("!roomId$index:matrix.org")
+
+private fun aSpaceRoomList(count: Int): List<SpaceRoom> {
+    return (1..count).map { index ->
+        aSpaceRoom(
+            roomId = aRoomId(index),
+            displayName = "Space $index",
+            canonicalAlias = if (index % 2 == 0) {
+                RoomAlias("#space$index:matrix.org")
+            } else {
+                null
+            }
+        )
+    }
+}
+
+fun aManageAuthorizedSpacesState(
+    selectableSpaces: List<SpaceRoom> = aSpaceRoomList(5),
+    unknownSpaceIds: List<RoomId> = emptyList(),
+    selectedIds: List<RoomId> = emptyList(),
+    eventSink: (ManageAuthorizedSpacesEvent) -> Unit = {},
+) = ManageAuthorizedSpacesState(
+    selectableSpaces = selectableSpaces.toImmutableSet(),
+    unknownSpaceIds = unknownSpaceIds.toImmutableList(),
+    selectedIds = selectedIds.toImmutableList(),
+    eventSink = eventSink,
+)