From 6c824efac3bb1bba597e77867d7d2fd103d818e3 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 7 Jan 2026 11:50:08 +0100 Subject: [PATCH] check permissions and if a space before calling sec and privacy APIs --- .../SecurityAndPrivacyScreenViewModel.swift | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift b/ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift index e74bab29a..9f4ffb634 100644 --- a/ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift +++ b/ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift @@ -179,27 +179,29 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType, var hasFailures = false - if state.currentSettings.isEncryptionEnabled != state.bindings.desiredSettings.isEncryptionEnabled { - switch await roomProxy.enableEncryption() { - case .success: - state.currentSettings.isEncryptionEnabled = state.bindings.desiredSettings.isEncryptionEnabled - case .failure: - userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown)) - hasFailures = true + if !state.isSpace { + if state.canEnableEncryption, state.currentSettings.isEncryptionEnabled != state.bindings.desiredSettings.isEncryptionEnabled { + switch await roomProxy.enableEncryption() { + case .success: + state.currentSettings.isEncryptionEnabled = state.bindings.desiredSettings.isEncryptionEnabled + case .failure: + userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown)) + hasFailures = true + } + } + + if state.canEditHistoryVisibility, state.currentSettings.historyVisibility != state.bindings.desiredSettings.historyVisibility { + switch await roomProxy.updateHistoryVisibility(state.bindings.desiredSettings.historyVisibility.toRoomHistoryVisibility) { + case .success: + state.currentSettings.historyVisibility = state.bindings.desiredSettings.historyVisibility + case .failure: + userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown)) + hasFailures = true + } } } - if state.currentSettings.historyVisibility != state.bindings.desiredSettings.historyVisibility { - switch await roomProxy.updateHistoryVisibility(state.bindings.desiredSettings.historyVisibility.toRoomHistoryVisibility) { - case .success: - state.currentSettings.historyVisibility = state.bindings.desiredSettings.historyVisibility - case .failure: - userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown)) - hasFailures = true - } - } - - if state.currentSettings.accessType != state.bindings.desiredSettings.accessType { + if state.canEditJoinRule, state.currentSettings.accessType != state.bindings.desiredSettings.accessType { // When a user changes join rules to something other than knock or public, // the room should be automatically made invisible (private) in the room directory. if state.currentSettings.accessType != .askToJoin, state.currentSettings.accessType != .anyone { @@ -215,7 +217,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType, } } - if state.currentSettings.isVisibileInRoomDirectory != state.bindings.desiredSettings.isVisibileInRoomDirectory { + if state.canEditAddress, state.currentSettings.isVisibileInRoomDirectory != state.bindings.desiredSettings.isVisibileInRoomDirectory { let visibility: RoomVisibility = state.bindings.desiredSettings.isVisibileInRoomDirectory == true ? .public : .private switch await roomProxy.updateRoomDirectoryVisibility(visibility) {