mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:33:26 +00:00
a520d94760
* Enable Swift 6.2 with default main actor isolation for the app target Turn on SWIFT_VERSION 6.2, SWIFT_APPROACHABLE_CONCURRENCY and SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor for the ElementX target, matching the NSE and Share Extension (which already use 6.2 without the main actor default). # Conflicts: # ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update the code generation templates for Swift 6 Emit nonisolated/@unchecked Sendable mocks and nonisolated string enums, and mark async mock methods @concurrent so they keep suspending like the real implementations (otherwise intermediate states are unobservable in tests). Includes the regenerated mocks and strings. # Conflicts: # ElementX/Sources/Mocks/Generated/GeneratedMocks.swift * Make the data layer and services nonisolated and Sendable Annotate the value-type models, Rust SDK proxy wrappers, timeline item graph, settings, logging and NSE-shared types as nonisolated, and conform the service protocols to Sendable so their existentials can cross isolation boundaries. These types run off the main actor and no longer inherit the target's default main actor isolation. * Adopt the new isolation across call sites, mocks and signatures Update call sites, closure signatures and mock configuration helpers to match the nonisolated/Sendable data layer, including the main actor isolated mock inits and the @Sendable filter on recentlyVisitedRooms. ^ Conflicts: ^ ElementX/Sources/Services/SecureBackup/SecureBackupController.swift * Remove redundant @MainActor annotations With the app target defaulting to main actor isolation, the explicit @MainActor on view models, coordinators, views and their protocols is no longer required. * Fix concurrency hotspots surfaced by the migration Resolve the room summary main-thread deadlock by moving diff processing onto AsyncStreams, add the SDKListener.onMainActor FIFO bridge for SDK callbacks, hop KVO/timer/UIKit callbacks to the main actor via assumeIsolated, add isolated deinits, and apply the few justified nonisolated(unsafe) escapes for queue-confined Apple APIs. * Fix the unit tests for Swift 6 concurrency Hop the waitForConfirmation body onto the caller's actor (Swift Testing runs confirmation closures off-actor), and adjust the affected suites and async signatures. * offload diffs on concurrent threads instead of main actor * make room info protocols sendable * use a task group for fetching data so that everything runs concurrently in the TextRoomTimelineView when getting the preview. * use the generic onMainActor implementation, which already makes a stream and send the continuation on the main actor. * small pr comments issues being addressed * update enterprise * Update StaticCode to 1.1.0 and specify the required Swift isolation. * fix ElementCallServiceTests * update enterprise * re-generate mocks * update enterprise * enterprise new code conformed to swift 6 --------- Co-authored-by: Doug <douglase@element.io>
230 lines
9.3 KiB
Swift
230 lines
9.3 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2022-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
import SwiftUI
|
|
|
|
typealias RoomChangeRolesScreenViewModelType = StateStoreViewModelV2<RoomChangeRolesScreenViewState, RoomChangeRolesScreenViewAction>
|
|
|
|
class RoomChangeRolesScreenViewModel: RoomChangeRolesScreenViewModelType, RoomChangeRolesScreenViewModelProtocol {
|
|
private let roomProxy: JoinedRoomProxyProtocol
|
|
private let userIndicatorController: UserIndicatorControllerProtocol
|
|
private let analytics: AnalyticsServiceProtocol
|
|
|
|
private let actionsSubject: PassthroughSubject<RoomChangeRolesScreenViewModelAction, Never> = .init()
|
|
var actionsPublisher: AnyPublisher<RoomChangeRolesScreenViewModelAction, Never> {
|
|
actionsSubject.eraseToAnyPublisher()
|
|
}
|
|
|
|
init(mode: RoomRole,
|
|
roomProxy: JoinedRoomProxyProtocol,
|
|
mediaProvider: MediaProviderProtocol,
|
|
userIndicatorController: UserIndicatorControllerProtocol,
|
|
analytics: AnalyticsServiceProtocol) {
|
|
guard mode != .user || mode != .creator else { fatalError("Invalid screen configuration: \(mode)") }
|
|
|
|
self.roomProxy = roomProxy
|
|
self.userIndicatorController = userIndicatorController
|
|
self.analytics = analytics
|
|
|
|
super.init(initialViewState: RoomChangeRolesScreenViewState(mode: mode,
|
|
ownRole: roomProxy.membersPublisher.value.first { $0.userID == roomProxy.id }?.role ?? .administrator),
|
|
mediaProvider: mediaProvider)
|
|
|
|
roomProxy.membersPublisher
|
|
.receive(on: DispatchQueue.main)
|
|
.sink { [weak self] members in
|
|
self?.updateMembers(members)
|
|
}
|
|
.store(in: &cancellables)
|
|
|
|
roomProxy.timeline.timelineItemProvider.membershipChangePublisher.sink { [roomProxy] in
|
|
Task { await roomProxy.updateMembers() }
|
|
}
|
|
.store(in: &cancellables)
|
|
|
|
updateMembers(roomProxy.membersPublisher.value)
|
|
}
|
|
|
|
// MARK: - Public
|
|
|
|
override func process(viewAction: RoomChangeRolesScreenViewAction) {
|
|
MXLog.info("View model: received view action: \(viewAction)")
|
|
|
|
switch viewAction {
|
|
case .toggleMember(let member):
|
|
toggleMember(member)
|
|
case .demoteMember(let member):
|
|
demoteMember(member)
|
|
case .save:
|
|
if !state.membersToPromote.isEmpty {
|
|
if state.mode == .administrator, state.ownRole == .administrator {
|
|
showPromotionWarning()
|
|
return
|
|
} else if state.mode == .owner {
|
|
showTransferOwnershipWarning()
|
|
return
|
|
}
|
|
}
|
|
Task { await save() }
|
|
case .cancel:
|
|
confirmDiscardChanges()
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func updateMembers(_ members: [RoomMemberProxyProtocol]) {
|
|
var owners = [RoomMemberDetails]()
|
|
var administrators = [RoomMemberDetails]()
|
|
var moderators = [RoomMemberDetails]()
|
|
var users = [RoomMemberDetails]()
|
|
|
|
for member in members.sorted() {
|
|
if member.userID == roomProxy.ownUserID {
|
|
state.ownRole = member.role
|
|
}
|
|
|
|
guard member.isActive else { continue }
|
|
let memberDetails = RoomMemberDetails(withProxy: member)
|
|
|
|
switch memberDetails.role {
|
|
case .creator, .owner:
|
|
owners.append(memberDetails)
|
|
case .administrator:
|
|
administrators.append(memberDetails)
|
|
case .moderator:
|
|
moderators.append(memberDetails)
|
|
case .user:
|
|
users.append(memberDetails)
|
|
}
|
|
}
|
|
|
|
state.owners = owners
|
|
state.administrators = administrators
|
|
state.moderators = moderators
|
|
state.users = users
|
|
}
|
|
|
|
private func toggleMember(_ member: RoomMemberDetails) {
|
|
if state.membersToPromote.contains(member) {
|
|
state.membersToPromote.remove(member)
|
|
} else if state.membersToDemote.contains(member) {
|
|
state.membersToDemote.remove(member)
|
|
state.lastPromotedMember = member
|
|
} else if member.role >= state.mode, member.role <= state.maxDemotableRole {
|
|
state.membersToDemote.insert(member)
|
|
} else if member.role < state.mode {
|
|
state.membersToPromote.insert(member)
|
|
state.lastPromotedMember = member
|
|
}
|
|
}
|
|
|
|
private func demoteMember(_ member: RoomMemberDetails) {
|
|
if state.membersToPromote.contains(member) {
|
|
state.membersToPromote.remove(member)
|
|
} else {
|
|
state.membersToDemote.insert(member)
|
|
}
|
|
}
|
|
|
|
private func showPromotionWarning() {
|
|
context.alertInfo = AlertInfo(id: .promotionWarning,
|
|
title: L10n.screenRoomChangeRoleConfirmAddAdminTitle,
|
|
message: L10n.screenRoomChangeRoleConfirmAddAdminDescription,
|
|
primaryButton: .init(title: L10n.actionContinue) {
|
|
Task { await self.save() }
|
|
},
|
|
secondaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil))
|
|
}
|
|
|
|
private func showTransferOwnershipWarning() {
|
|
context.alertInfo = AlertInfo(id: .transferOwnershipWarning,
|
|
title: L10n.screenRoomChangeRoleConfirmChangeOwnersTitle,
|
|
message: L10n.screenRoomChangeRoleConfirmChangeOwnersDescription,
|
|
primaryButton: .init(title: L10n.actionContinue, role: .destructive) {
|
|
Task { await self.save() }
|
|
},
|
|
secondaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil))
|
|
}
|
|
|
|
private func save() async {
|
|
showSavingIndicator()
|
|
|
|
defer {
|
|
hideSavingIndicator()
|
|
}
|
|
|
|
let promotingUpdates = state.membersToPromote.map { ($0.id, state.mode.powerLevelValue) }
|
|
let demotingUpdates = state.membersToDemote.map { ($0.id, Int64(0)) }
|
|
|
|
// A task we can await until the room's info gets modified with the new power levels.
|
|
// Note: Ignore the first value as the publisher is backed by a current value subject.
|
|
let infoTask = Task {
|
|
var iterator = roomProxy.infoPublisher.values.makeAsyncIterator()
|
|
_ = await iterator.next(isolation: #isolation) // The publisher's current value.
|
|
_ = await iterator.next(isolation: #isolation)
|
|
}
|
|
|
|
switch await roomProxy.updatePowerLevelsForUsers(promotingUpdates + demotingUpdates) {
|
|
case .success:
|
|
MXLog.info("Success")
|
|
|
|
// Call updateMembers so the count is correct on the root screen.
|
|
_ = await infoTask.value
|
|
await roomProxy.updateMembers()
|
|
|
|
trackChanges(promotionCount: promotingUpdates.count,
|
|
demotionCount: demotingUpdates.count)
|
|
|
|
actionsSubject.send(.complete)
|
|
case .failure:
|
|
context.alertInfo = AlertInfo(id: .error)
|
|
}
|
|
}
|
|
|
|
private func confirmDiscardChanges() {
|
|
if state.hasChanges {
|
|
state.bindings.alertInfo = AlertInfo(id: .discardChanges,
|
|
title: L10n.screenRoomChangeRoleUnsavedChangesTitle,
|
|
message: L10n.screenRoomChangeRoleUnsavedChangesDescription,
|
|
primaryButton: .init(title: L10n.actionSave) { Task { await self.save() } },
|
|
secondaryButton: .init(title: L10n.actionDiscard, role: .cancel) { self.actionsSubject.send(.complete) })
|
|
} else {
|
|
actionsSubject.send(.complete)
|
|
}
|
|
}
|
|
|
|
// MARK: Loading indicator
|
|
|
|
private static let indicatorID = "SavingRoomRoles"
|
|
|
|
private func showSavingIndicator() {
|
|
userIndicatorController.submitIndicator(UserIndicator(id: Self.indicatorID,
|
|
type: .modal(progress: .indeterminate, interactiveDismissDisabled: true, allowsInteraction: false),
|
|
title: L10n.commonSaving,
|
|
persistent: true))
|
|
}
|
|
|
|
private func hideSavingIndicator() {
|
|
userIndicatorController.retractIndicatorWithId(Self.indicatorID)
|
|
}
|
|
|
|
// MARK: Analytics
|
|
|
|
private func trackChanges(promotionCount: Int, demotionCount: Int) {
|
|
for _ in 0..<promotionCount {
|
|
analytics.trackRoomModeration(action: .ChangeMemberRole, role: state.mode)
|
|
}
|
|
|
|
for _ in 0..<demotionCount {
|
|
analytics.trackRoomModeration(action: .ChangeMemberRole, role: .user)
|
|
}
|
|
}
|
|
}
|