mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-10 01:01:36 +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>
160 lines
5.6 KiB
Swift
160 lines
5.6 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 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 CoreLocation
|
|
import SwiftUI
|
|
|
|
class AccessibilityTestsAppCoordinator: AppCoordinatorProtocol {
|
|
var windowManager: any SecureWindowManagerProtocol
|
|
|
|
func handleDeepLink(_ url: URL, isExternalURL: Bool, windowType: SecondaryWindowType?) -> Bool {
|
|
fatalError("Not implemented")
|
|
}
|
|
|
|
func handleAppRoute(_ appRoute: AppRoute, windowType: SecondaryWindowType?) {
|
|
fatalError("Not implemented.")
|
|
}
|
|
|
|
func handlePotentialPhishingAttempt(url: URL, openURLAction: @escaping (URL) -> Void) -> Bool {
|
|
fatalError("Not implemented")
|
|
}
|
|
|
|
func handleUserActivity(_ userActivity: NSUserActivity) {
|
|
fatalError("Not implemented")
|
|
}
|
|
|
|
private let previewsWrapper: PreviewsWrapper
|
|
|
|
private var cancellables = Set<AnyCancellable>()
|
|
|
|
init(appDelegate: AppDelegate) {
|
|
windowManager = WindowManager(appDelegate: appDelegate)
|
|
// disabling View animations
|
|
UIView.setAnimationsEnabled(false)
|
|
|
|
MXLog.configure(currentTarget: "accessibility-tests")
|
|
|
|
guard let name = ProcessInfo.accessibilityViewID,
|
|
let previewType = TestablePreviewsDictionary.dictionary[name] else {
|
|
fatalError("Unable to launch with unknown screen.")
|
|
}
|
|
previewsWrapper = .init(name: name, previews: previewType._allPreviews)
|
|
|
|
setupSignalling()
|
|
// Used to perform the request check before the tests run on CI, so it can be immediately dismissed.
|
|
CLLocationManager().requestWhenInUseAuthorization()
|
|
}
|
|
|
|
func toPresentable() -> AnyView {
|
|
AnyView(PreviewsWrapperView(wrapper: previewsWrapper))
|
|
}
|
|
|
|
private func setupSignalling() {
|
|
do {
|
|
let client = try UITestsSignalling.Client(mode: .app)
|
|
client.signals.sink { [weak self] signal in
|
|
guard let self else { return }
|
|
switch signal {
|
|
case .accessibilityAudit(let auditSignal):
|
|
switch auditSignal {
|
|
case .nextPreview:
|
|
Task { [weak self] in
|
|
guard let self else { return }
|
|
await previewsWrapper.updateCurrentIndex()
|
|
do {
|
|
guard !previewsWrapper.isDone else {
|
|
try client.send(.accessibilityAudit(.noMorePreviews))
|
|
return
|
|
}
|
|
|
|
try client.send(.accessibilityAudit(.nextPreviewReady(name: previewsWrapper.previewName)))
|
|
} catch {
|
|
fatalError("Failed sending signal: \(signal)")
|
|
}
|
|
}
|
|
default:
|
|
break
|
|
}
|
|
default:
|
|
break
|
|
}
|
|
}
|
|
.store(in: &cancellables)
|
|
} catch {
|
|
fatalError("Unable to start client signalling")
|
|
}
|
|
}
|
|
}
|
|
|
|
struct PreviewsWrapperView: View {
|
|
let wrapper: PreviewsWrapper
|
|
@Environment(\.dynamicTypeSize) var dynamicTypeSize
|
|
|
|
var body: some View {
|
|
if wrapper.currentIndex >= 0, !wrapper.isDone {
|
|
wrapper.currentPreview.content
|
|
.id("\(wrapper.previewName)-\(dynamicTypeSize)")
|
|
}
|
|
}
|
|
}
|
|
|
|
@Observable final class PreviewsWrapper {
|
|
private let name: String
|
|
private let previews: [_Preview]
|
|
private(set) var currentIndex = -1
|
|
var currentPreview: _Preview {
|
|
previews[currentIndex]
|
|
}
|
|
|
|
private(set) var isDone = false
|
|
|
|
var previewName: String {
|
|
"\(name)-\(currentPreview.displayName ?? String(currentIndex))"
|
|
}
|
|
|
|
init(name: String, previews: [_Preview]) {
|
|
self.name = name
|
|
self.previews = previews
|
|
}
|
|
|
|
func updateCurrentIndex() async {
|
|
let newIndex = currentIndex + 1
|
|
guard newIndex < previews.count else {
|
|
isDone = true
|
|
return
|
|
}
|
|
let newPreview = previews[newIndex]
|
|
var fulfillmentSource: SnapshotFulfillmentPreferenceKey.Source?
|
|
let preferenceReadingView = newPreview.content.onPreferenceChange(SnapshotFulfillmentPreferenceKey.self) { fulfillmentSource = $0?.source }
|
|
|
|
// Render an image of the view in order to trigger the preference updates to occur.
|
|
let imageRenderer = ImageRenderer(content: preferenceReadingView)
|
|
_ = imageRenderer.uiImage
|
|
|
|
switch fulfillmentSource {
|
|
case .publisher(let publisher):
|
|
// Not sure why but some publishers seem to not properly communicate their completion,
|
|
// so we added a timeout. Since we are going to migrate from publishers to streams,
|
|
// this is a temporary solution
|
|
var iterator = publisher
|
|
.timeout(.seconds(1), scheduler: DispatchQueue.main)
|
|
.values
|
|
.makeAsyncIterator()
|
|
while let value = await iterator.next(isolation: #isolation), value == false { }
|
|
case .sequence(let sequence):
|
|
var iterator = sequence.makeAsyncIterator()
|
|
while let value = await iterator.next(isolation: #isolation), value == false { }
|
|
case .none:
|
|
break
|
|
}
|
|
|
|
currentIndex = newIndex
|
|
}
|
|
}
|