mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-01 09:42:39 +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>
96 lines
4.2 KiB
Swift
96 lines
4.2 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-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 LocalAuthentication
|
|
|
|
enum AppLockServiceError: Error {
|
|
/// The operation failed to access the keychain.
|
|
case keychainError
|
|
/// The PIN code was rejected because it isn't long enough, or contains invalid characters.
|
|
case invalidPIN
|
|
/// The PIN code was rejected as an insecure choice.
|
|
case weakPIN
|
|
/// A PIN code hasn't been set yet.
|
|
case pinNotSet
|
|
/// Attempting to use biometric unlock when it isn't yet supported on this device.
|
|
case biometricUnlockNotSupported
|
|
}
|
|
|
|
/// The result of an attempt to unlock the app using Touch ID or Face ID.
|
|
enum AppLockServiceBiometricResult {
|
|
/// Biometric lock was successful.
|
|
case unlocked
|
|
/// Biometric lock failed to authenticate the user. This represents any failure
|
|
/// other than the app being backgrounded during the authentication.
|
|
case failed
|
|
/// Biometric lock was interrupted by the system and did not complete. The expected
|
|
/// cause for this that the app was backgrounded whilst the request was in progress.
|
|
case interrupted
|
|
}
|
|
|
|
protocol AppLockServiceProtocol: AnyObject {
|
|
/// The use of a PIN code is mandatory for this device.
|
|
var isMandatory: Bool { get }
|
|
/// The app has been configured to automatically lock with a PIN code.
|
|
var isEnabled: Bool { get }
|
|
|
|
/// A publisher that advertises when the service has been enabled or disabled.
|
|
var isEnabledPublisher: AnyPublisher<Bool, Never> { get }
|
|
|
|
/// The type of biometric authentication supported by the device.
|
|
var biometryType: LABiometryType { get }
|
|
/// Whether or not the user has enabled unlock via TouchID, FaceID or (possibly) OpticID.
|
|
var biometricUnlockEnabled: Bool { get }
|
|
/// Whether TouchID, FaceID or (possibly) OpticID are trusted, or if the app needs the user
|
|
/// to re-enter their PIN code to re-enable the feature (i.e. to accept a new face or fingerprint).
|
|
var biometricUnlockTrusted: Bool { get }
|
|
|
|
/// Sets the user's PIN code used to unlock the app.
|
|
func setupPINCode(_ pinCode: String) -> Result<Void, AppLockServiceError>
|
|
/// Validates the supplied PIN code is long enough, only contains digits and isn't a weak choice.
|
|
func validate(_ pinCode: String) -> Result<Void, AppLockServiceError>
|
|
/// Enables the use of Touch ID/Face ID as an alternative to the PIN code.
|
|
func enableBiometricUnlock() -> Result<Void, AppLockServiceError>
|
|
/// Disables the use of Touch ID/Face ID as an alternative to the PIN code.
|
|
func disableBiometricUnlock()
|
|
/// Disables the App Lock feature, removing the user's stored PIN code.
|
|
func disable()
|
|
|
|
/// Informs the service that the app has entered the background.
|
|
func applicationDidEnterBackground()
|
|
/// Decides whether the app should be unlocked with a PIN code/biometrics on foregrounding.
|
|
func computeNeedsUnlock(didBecomeActiveAt date: Date) -> Bool
|
|
|
|
/// Attempt to unlock the app with the supplied PIN code.
|
|
func unlock(with pinCode: String) -> Bool
|
|
/// Attempt to unlock the app using FaceID or TouchID.
|
|
func unlockWithBiometrics() async -> AppLockServiceBiometricResult
|
|
|
|
/// The number of attempts the user had made to unlock with a PIN code.
|
|
///
|
|
/// Note: We don't track the biometric attempts as LAContext does that automatically.
|
|
var numberOfPINAttempts: AnyPublisher<Int, Never> { get }
|
|
}
|
|
|
|
// sourcery: AutoMockable
|
|
extension AppLockServiceProtocol { }
|
|
|
|
extension AppLockServiceMock {
|
|
static func mock(pinCode: String? = "2023", isMandatory: Bool = false, biometryType: LABiometryType = .faceID, numberOfPINAttempts: Int = 0) -> AppLockServiceMock {
|
|
let mock = AppLockServiceMock()
|
|
mock.isEnabled = pinCode != nil
|
|
mock.isMandatory = isMandatory
|
|
mock.numberOfPINAttempts = CurrentValueSubject<Int, Never>(numberOfPINAttempts).eraseToAnyPublisher()
|
|
mock.biometryType = biometryType
|
|
mock.biometricUnlockEnabled = biometryType != .none
|
|
mock.unlockWithClosure = { $0 == pinCode }
|
|
return mock
|
|
}
|
|
}
|