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

Tidy up presentation of the onboarding flow (#6267)

Browse Source 
Tidy up presentation of the onboarding flow now that the AuthenticationService is used as a delegate.
This commit is contained in:
Doug
2022-06-13 16:48:05 +01:00
committed by GitHub
parent 8e5170685d
commit c2f4da03cd
4 changed files with 46 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/TabBar/MasterTabBarController.m
+14 -53
View File
@@ -63,10 +63,6 @@
@property (nonatomic, readwrite) BOOL isOnboardingCoordinatorPreparing;
@property (nonatomic, readwrite) BOOL isOnboardingInProgress;
// Observer that checks when the Authentication view controller has gone.
@property (nonatomic, readwrite) id addAccountObserver;
@property (nonatomic, readwrite) id removeAccountObserver;
@property (nonatomic) BOOL reviewSessionAlertHasBeenDisplayed;
@end
@@ -241,17 +237,6 @@
currentAlert = nil;
}
if (self.addAccountObserver)
{
[[NSNotificationCenter defaultCenter] removeObserver:self.addAccountObserver];
self.addAccountObserver = nil;
}
if (self.removeAccountObserver)
{
[[NSNotificationCenter defaultCenter] removeObserver:self.removeAccountObserver];
self.removeAccountObserver = nil;
}
if (kThemeServiceDidChangeThemeNotificationObserver)
{
[[NSNotificationCenter defaultCenter] removeObserver:kThemeServiceDidChangeThemeNotificationObserver];
@@ -490,62 +475,38 @@
self.onboardingCoordinatorBridgePresenter = onboardingCoordinatorBridgePresenter;
self.isOnboardingCoordinatorPreparing = NO;
self.addAccountObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKAccountManagerDidAddAccountNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
MXStrongifyAndReturnIfNil(self);
// What was this doing? This should probably happen elsewhere
// self.onboardingCoordinatorBridgePresenter = nil;
[[NSNotificationCenter defaultCenter] removeObserver:self.addAccountObserver];
self.addAccountObserver = nil;
}];
self.removeAccountObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKAccountManagerDidRemoveAccountNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
MXStrongifyAndReturnIfNil(self);
// The user has cleared data for their soft logged out account
// What was this doing? This should probably happen elsewhere
// self.onboardingCoordinatorBridgePresenter = nil;
[[NSNotificationCenter defaultCenter] removeObserver:self.removeAccountObserver];
self.removeAccountObserver = nil;
}];
}
- (void)showOnboardingFlow
{
MXLogDebug(@"[MasterTabBarController] showOnboardingFlow");
// Check whether an authentication screen is not already shown or preparing
if (!self.onboardingCoordinatorBridgePresenter && !self.isOnboardingCoordinatorPreparing)
{
self.isOnboardingCoordinatorPreparing = YES;
self.isOnboardingInProgress = YES;
[self resetReviewSessionsFlags];
[[AppDelegate theDelegate] restoreInitialDisplay:^{
[self presentOnboardingFlow];
}];
}
[self showOnboardingFlowAndResetSessionFlags:YES];
}
- (void)showSoftLogoutOnboardingFlowWithCredentials:(MXCredentials*)credentials;
{
MXLogDebug(@"[MasterTabBarController] showAuthenticationScreenAfterSoftLogout");
AuthenticationService.shared.softLogoutCredentials = credentials;
[self showOnboardingFlowAndResetSessionFlags:NO];
}
- (void)showOnboardingFlowAndResetSessionFlags:(BOOL)resetSessionFlags
{
// Check whether an authentication screen is not already shown or preparing
if (!self.onboardingCoordinatorBridgePresenter && !self.isOnboardingCoordinatorPreparing)
{
self.isOnboardingCoordinatorPreparing = YES;
self.isOnboardingInProgress = YES;
if (resetSessionFlags)
{
[self resetReviewSessionsFlags];
}
[[AppDelegate theDelegate] restoreInitialDisplay:^{
[self presentOnboardingFlow];
}];
}