mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-01 01:03:01 +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>
235 lines
8.3 KiB
Swift
235 lines
8.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 Foundation
|
|
import MatrixRustSDK
|
|
|
|
private final class WeakSessionVerificationControllerProxy: SessionVerificationControllerDelegate {
|
|
@MainActor private weak var proxy: SessionVerificationControllerProxy?
|
|
|
|
@MainActor init(proxy: SessionVerificationControllerProxy) {
|
|
self.proxy = proxy
|
|
}
|
|
|
|
// MARK: - SessionVerificationControllerDelegate
|
|
|
|
// The delegate methods are called by the SDK from arbitrary threads,
|
|
// hop to the main actor where the proxy lives.
|
|
|
|
func didReceiveVerificationRequest(details: MatrixRustSDK.SessionVerificationRequestDetails) {
|
|
Task { @MainActor in
|
|
self.proxy?.didReceiveVerificationRequest(details: details)
|
|
}
|
|
}
|
|
|
|
func didReceiveVerificationData(data: MatrixRustSDK.SessionVerificationData) {
|
|
switch data {
|
|
// We can handle only emojis for now
|
|
case .emojis(let emojis, _):
|
|
Task { @MainActor in
|
|
self.proxy?.didReceiveData(emojis)
|
|
}
|
|
default:
|
|
break
|
|
}
|
|
}
|
|
|
|
func didAcceptVerificationRequest() {
|
|
Task { @MainActor in
|
|
self.proxy?.didAcceptVerificationRequest()
|
|
}
|
|
}
|
|
|
|
func didStartSasVerification() {
|
|
Task { @MainActor in
|
|
self.proxy?.didStartSasVerification()
|
|
}
|
|
}
|
|
|
|
func didFail() {
|
|
Task { @MainActor in
|
|
self.proxy?.didFail()
|
|
}
|
|
}
|
|
|
|
func didCancel() {
|
|
Task { @MainActor in
|
|
self.proxy?.didCancel()
|
|
}
|
|
}
|
|
|
|
func didFinish() {
|
|
Task { @MainActor in
|
|
self.proxy?.didFinish()
|
|
}
|
|
}
|
|
}
|
|
|
|
class SessionVerificationControllerProxy: SessionVerificationControllerProxyProtocol {
|
|
private let sessionVerificationController: SessionVerificationController
|
|
|
|
init(sessionVerificationController: SessionVerificationController) {
|
|
self.sessionVerificationController = sessionVerificationController
|
|
sessionVerificationController.setDelegate(delegate: WeakSessionVerificationControllerProxy(proxy: self))
|
|
}
|
|
|
|
deinit {
|
|
sessionVerificationController.setDelegate(delegate: nil)
|
|
}
|
|
|
|
let actions = PassthroughSubject<SessionVerificationControllerProxyAction, Never>()
|
|
|
|
func acknowledgeVerificationRequest(details: SessionVerificationRequestDetails) async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Acknowledging verification request")
|
|
|
|
do {
|
|
try await sessionVerificationController.acknowledgeVerificationRequest(senderId: details.senderProfile.userID, flowId: details.flowID)
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed requesting session verification with error: \(error)")
|
|
return .failure(.failedAcknowledgingVerificationRequest)
|
|
}
|
|
}
|
|
|
|
func acceptVerificationRequest() async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Accepting verification request")
|
|
|
|
do {
|
|
try await sessionVerificationController.acceptVerificationRequest()
|
|
|
|
MXLog.info("Accepted verification request")
|
|
actions.send(.acceptedVerificationRequest)
|
|
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed requesting session verification with error: \(error)")
|
|
return .failure(.failedAcceptingVerificationRequest)
|
|
}
|
|
}
|
|
|
|
func requestDeviceVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Requesting device verification")
|
|
|
|
do {
|
|
try await sessionVerificationController.requestDeviceVerification()
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed requesting device verification with error: \(error)")
|
|
return .failure(.failedRequestingVerification)
|
|
}
|
|
}
|
|
|
|
func requestUserVerification(_ userID: String) async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Requesting user verification")
|
|
|
|
do {
|
|
try await sessionVerificationController.requestUserVerification(userId: userID)
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed requesting verification for user \(userID) with error: \(error)")
|
|
return .failure(.failedRequestingVerification)
|
|
}
|
|
}
|
|
|
|
func startSasVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Starting SAS verification")
|
|
|
|
do {
|
|
try await sessionVerificationController.startSasVerification()
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed starting SAS verification with error: \(error)")
|
|
return .failure(.failedStartingSasVerification)
|
|
}
|
|
}
|
|
|
|
func approveVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Approving verification")
|
|
|
|
do {
|
|
try await sessionVerificationController.approveVerification()
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed approving verification with error: \(error)")
|
|
return .failure(.failedApprovingVerification)
|
|
}
|
|
}
|
|
|
|
func declineVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Declining verification")
|
|
|
|
do {
|
|
try await sessionVerificationController.declineVerification()
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed declining verification with error: \(error)")
|
|
return .failure(.failedDecliningVerification)
|
|
}
|
|
}
|
|
|
|
func cancelVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
|
|
MXLog.info("Cancelling verification")
|
|
|
|
do {
|
|
try await sessionVerificationController.cancelVerification()
|
|
return .success(())
|
|
} catch {
|
|
MXLog.error("Failed cancelling verification with error: \(error)")
|
|
return .failure(.failedCancellingVerification)
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
fileprivate func didReceiveVerificationRequest(details: MatrixRustSDK.SessionVerificationRequestDetails) {
|
|
MXLog.info("Received verification request \(details)")
|
|
|
|
let details = SessionVerificationRequestDetails(senderProfile: UserProfileProxy(sdkUserProfile: details.senderProfile),
|
|
flowID: details.flowId,
|
|
deviceID: details.deviceId,
|
|
deviceDisplayName: details.deviceDisplayName,
|
|
firstSeenDate: Date(timeIntervalSince1970: TimeInterval(details.firstSeenTimestamp / 1000)))
|
|
|
|
actions.send(.receivedVerificationRequest(details: details))
|
|
}
|
|
|
|
fileprivate func didAcceptVerificationRequest() {
|
|
// Noop because the rust side state machine changes states before sending
|
|
// the actual request, leading to race conditions with the SAS verification
|
|
// startup. The `acceptedVerificationRequest` is now called from the `startSasVerification`
|
|
// method above.
|
|
}
|
|
|
|
fileprivate func didStartSasVerification() {
|
|
MXLog.info("Started SAS verification")
|
|
|
|
actions.send(.startedSasVerification)
|
|
}
|
|
|
|
fileprivate func didReceiveData(_ data: [MatrixRustSDK.SessionVerificationEmoji]) {
|
|
MXLog.info("Received verification data")
|
|
|
|
actions.send(.receivedVerificationData(data.map { emoji in
|
|
SessionVerificationEmoji(symbol: emoji.symbol(), description: emoji.description())
|
|
}))
|
|
}
|
|
|
|
fileprivate func didFail() {
|
|
actions.send(.failed)
|
|
}
|
|
|
|
fileprivate func didFinish() {
|
|
actions.send(.finished)
|
|
}
|
|
|
|
fileprivate func didCancel() {
|
|
actions.send(.cancelled)
|
|
}
|
|
}
|