swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the Recovery Key option is shown on the IdentityConfirmationScreen when available. (#3699)

Browse Source 
There was a race condition where 2 different states could be processed at the same time.

* Fix unit test
The view model wasn't stored, so relying the current value publisher didn't have time to fire before deinit.
This commit is contained in:
Doug 2025-01-23 12:39:53 +00:00 committed by GitHub
parent 88e63b297e
commit a70189d318
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/IdentityConfirmationScreenViewModel.swift
View File

@ -25,18 +25,13 @@ class IdentityConfirmationScreenViewModel: IdentityConfirmationScreenViewModelTy
super.init(initialViewState: IdentityConfirmationScreenViewState(learnMoreURL: appSettings.encryptionURL)) super.init(initialViewState: IdentityConfirmationScreenViewState(learnMoreURL: appSettings.encryptionURL))
userSession.sessionSecurityStatePublisher Task { [weak self] in
.receive(on: DispatchQueue.main) for await state in userSession.sessionSecurityStatePublisher.values {
.sink { [weak self] state in // We need to call this inside an AsyncSequence otherwise there's a race condition when the method suspends.
Task {
await self?.updateWithSessionSecurityState(state) await self?.updateWithSessionSecurityState(state)
} }
} }
.store(in: &cancellables) .store(in: &cancellables)
Task {
await updateWithSessionSecurityState(userSession.sessionSecurityStatePublisher.value)
}
} }
// MARK: - Public // MARK: - Public

4
ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/View/IdentityConfirmationScreen.swift
View File

@ -104,6 +104,8 @@ struct IdentityConfirmationScreen: View {
// MARK: - Previews // MARK: - Previews
struct IdentityConfirmationScreen_Previews: PreviewProvider, TestablePreview { struct IdentityConfirmationScreen_Previews: PreviewProvider, TestablePreview {
static var viewModel = makeViewModel()
static var previews: some View { static var previews: some View {
NavigationStack { NavigationStack {
IdentityConfirmationScreen(context: viewModel.context) IdentityConfirmationScreen(context: viewModel.context)
@ -113,7 +115,7 @@ struct IdentityConfirmationScreen_Previews: PreviewProvider, TestablePreview {
}) })
} }
private static var viewModel: IdentityConfirmationScreenViewModel { static func makeViewModel() -> IdentityConfirmationScreenViewModel {
let clientProxy = ClientProxyMock(.init()) let clientProxy = ClientProxyMock(.init())
let userSession = UserSessionMock(.init(clientProxy: clientProxy)) let userSession = UserSessionMock(.init(clientProxy: clientProxy))
userSession.sessionSecurityStatePublisher = CurrentValuePublisher<SessionSecurityState, Never>(.init(verificationState: .unverified, recoveryState: .enabled)) userSession.sessionSecurityStatePublisher = CurrentValuePublisher<SessionSecurityState, Never>(.init(verificationState: .unverified, recoveryState: .enabled))