kgess-mirror/element-x-ios
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2026-01-12 06:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

update the history visibility state, only if allowed, and also update the history visibility value
Some checks are pending
Unit Tests / Tests (push) Waiting to run
Details
Unit Tests (Enterprise) / Tests (Enterprise) (push) Waiting to run
Details

Browse source
This commit is contained in:
Mauro Romito 2026-01-07 15:07:25 +01:00 • committed by Mauro
parent 4a24db7758
commit 8e0ccd0015
1 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift
View file

@ -87,6 +87,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
private func setupSubscriptions() {
context.$viewState
.drop { $0.isSpace || !$0.canEditHistoryVisibility }
.map(\.availableVisibilityOptions)
.removeDuplicates()
// To allow the view to update properly
@ -101,6 +102,20 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
}
.store(in: &cancellables)
context.$viewState
.drop { !$0.canEditAddress }
.map(\.bindings.desiredSettings.accessType)
.removeDuplicates()
// To allow the view to update properly
.receive(on: DispatchQueue.main)
.sink { [weak self] accessType in
guard let self else { return }
if state.bindings.desiredSettings.isVisibileInRoomDirectory == true, !accessType.isAddressRequired {
state.bindings.desiredSettings.isVisibileInRoomDirectory = false
}
}
.store(in: &cancellables)
let userIDServerName = clientProxy.userIDServerName
let infoPublisher = roomProxy.infoPublisher
@ -179,29 +194,27 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
var hasFailures = false
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.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.canEditJoinRule, state.currentSettings.accessType != state.bindings.desiredSettings.accessType {
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 {
// 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 {
@ -217,7 +230,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
}
}
if state.canEditAddress, state.currentSettings.isVisibileInRoomDirectory != state.bindings.desiredSettings.isVisibileInRoomDirectory {
if state.currentSettings.isVisibileInRoomDirectory != state.bindings.desiredSettings.isVisibileInRoomDirectory {
let visibility: RoomVisibility = state.bindings.desiredSettings.isVisibileInRoomDirectory == true ? .public : .private
switch await roomProxy.updateRoomDirectoryVisibility(visibility) {