felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-30 13:16:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move presentation of the loading spinner into AuthenticationCoordinator for new users.

Browse Source 
Also moves key verification out of a bridge presenter in AuthenticationVC and into the AuthenticationCoordinator.
This commit is contained in:
Doug
2022-02-17 16:50:02 +00:00
parent 3695e25867
commit 3e4aab55cd
10 changed files with 279 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Onboarding/OnboardingCoordinator.swift
+21 -5
View File
@@ -54,8 +54,8 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
private var navigationRouter: NavigationRouterType {
parameters.router
}
// Keep a strong ref as we need to init authVC early to preload its view (it is *really* slow to do in realtime)
private var authenticationCoordinator: AuthenticationCoordinatorProtocol = AuthenticationCoordinator()
// Keep a strong ref as we need to init authVC early to preload its view
private let authenticationCoordinator: AuthenticationCoordinatorProtocol
private var isShowingAuthentication = false
// MARK: Screen results
@@ -72,6 +72,11 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
init(parameters: OnboardingCoordinatorParameters) {
self.parameters = parameters
// Preload the authVC (it is *really* slow to load in realtime)
let authenticationParameters = AuthenticationCoordinatorParameters(navigationRouter: parameters.router)
authenticationCoordinator = AuthenticationCoordinator(parameters: authenticationParameters)
super.init()
}
@@ -178,9 +183,16 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
MXLog.debug("[OnboardingCoordinator] showAuthenticationScreen")
let coordinator = authenticationCoordinator
coordinator.completion = { [weak self, weak coordinator] authenticationType in
coordinator.completion = { [weak self, weak coordinator] result in
guard let self = self, let coordinator = coordinator else { return }
self.authenticationCoordinator(coordinator, didCompleteWith: authenticationType)
switch result {
case .didLogin(let session):
self.authenticationCoordinator(coordinator, didLoginWith: session)
case .didComplete(let authenticationType):
self.authenticationCoordinator(coordinator, didCompleteWith: authenticationType)
}
}
// Due to needing to preload the authVC, this breaks the Coordinator init/start pattern.
@@ -200,7 +212,6 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
coordinator.start()
add(childCoordinator: coordinator)
authenticationCoordinator = coordinator
if customHomeserver != nil || customIdentityServer != nil {
coordinator.updateHomeserver(customHomeserver, andIdentityServer: customIdentityServer)
@@ -217,6 +228,11 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
isShowingAuthentication = true
}
private func authenticationCoordinator(_ coordinator: AuthenticationCoordinatorProtocol, didLoginWith session: MXSession) {
// TODO: Show next screens whilst waiting for the everything to load.
// May need to move the spinner and key verification up to here in order to coordinate properly.
}
/// Displays the next view in the flow after the authentication screen.
private func authenticationCoordinator(_ coordinator: AuthenticationCoordinatorProtocol, didCompleteWith authenticationType: MXKAuthenticationType) {
completion?()