feature(security&privacy): make spaceSelection part of the state

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

@@ -126,6 +126,12 @@ class SecurityAndPrivacyPresenter(
             value = (joinedParentSpaces + nonParentJoinedSpaces).toImmutableSet()
         }
 
+        val spaceSelection by remember {
+            derivedStateOf {
+                getSpaceSelection(selectableJoinedSpaces, savedSettings.roomAccess)
+            }
+        }
+
         var showEnableEncryptionConfirmation by remember(savedSettings.isEncrypted) { mutableStateOf(false) }
         val permissions by room.permissionsAsState(SecurityAndPrivacyPermissions.DEFAULT) { perms ->
             perms.securityAndPrivacyPermissions()
@@ -183,8 +189,7 @@ class SecurityAndPrivacyPresenter(
                 }
                 SecurityAndPrivacyEvent.ManageAuthorizedSpaces -> navigator.openManageAuthorizedSpaces()
                 SecurityAndPrivacyEvent.SelectSpaceMemberAccess -> handleSpaceMemberAccessSelection(
-                    selectableJoinedSpaces = selectableJoinedSpaces,
+                    spaceSelection = spaceSelection,
-                    savedAccess = savedSettings.roomAccess,
                     editedAccess = editedRoomAccess,
                 )
             }
@@ -206,6 +211,7 @@ class SecurityAndPrivacyPresenter(
             permissions = permissions,
             isSpace = roomInfo.isSpace,
             selectableJoinedSpaces = selectableJoinedSpaces,
+            spaceSelection = spaceSelection,
             eventSink = ::handleEvent,
         )
 
@@ -230,15 +236,13 @@ class SecurityAndPrivacyPresenter(
     }
 
     private fun handleSpaceMemberAccessSelection(
-        selectableJoinedSpaces: Set<SpaceRoom>,
+        spaceSelection: SpaceSelection,
-        savedAccess: SecurityAndPrivacyRoomAccess,
         editedAccess: MutableState<SecurityAndPrivacyRoomAccess>,
     ) {
-        if(editedAccess.value is SecurityAndPrivacyRoomAccess.SpaceMember) {
+        if (editedAccess.value is SecurityAndPrivacyRoomAccess.SpaceMember) {
             return
         }
-        val spaceSelection = getSpaceSelection(selectableJoinedSpaces, savedAccess)
+        when (spaceSelection) {
-        when(spaceSelection){
             is SpaceSelection.None -> Unit
             is SpaceSelection.Multiple -> navigator.openManageAuthorizedSpaces()
             is SpaceSelection.Single -> {

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

@@ -30,6 +30,7 @@ data class SecurityAndPrivacyState(
     val isSpace: Boolean,
     private val permissions: SecurityAndPrivacyPermissions,
     private val selectableJoinedSpaces: ImmutableSet<SpaceRoom>,
+    private val spaceSelection: SpaceSelection,
     val eventSink: (SecurityAndPrivacyEvent) -> Unit
 ) {
 

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

@@ -122,6 +122,7 @@ fun aSecurityAndPrivacyState(
     isKnockEnabled: Boolean = true,
     isSpace: Boolean = false,
     selectableJoinedSpaces: Set<SpaceRoom> = emptySet(),
+    spaceSelection: SpaceSelection = SpaceSelection.None,
     eventSink: (SecurityAndPrivacyEvent) -> Unit = {}
 ) = SecurityAndPrivacyState(
     editedSettings = editedSettings,
@@ -133,5 +134,6 @@ fun aSecurityAndPrivacyState(
     permissions = permissions,
     isSpace = isSpace,
     selectableJoinedSpaces = selectableJoinedSpaces.toImmutableSet(),
+    spaceSelection = SpaceSelection.None,
     eventSink = eventSink,
 )