oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use launch screen as root view controller while database views are loading. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-06-15 17:15:56 -04:00
parent 12df7fae83
commit 16dd87a407
1 changed files with 56 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Signal/src/AppDelegate.m
View File

@ -46,10 +46,10 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
@interface AppDelegate ()
@property (nonatomic) UIWindow *screenProtectionWindow;
@property (nonatomic) UIWindow *databaseViewRegistrationOverlay;
@property (nonatomic) OWSIncomingMessageReadObserver *incomingMessageReadObserver;
@property (nonatomic) OWSStaleNotificationObserver *staleNotificationObserver;
@property (nonatomic) OWSContactsSyncing *contactsSyncing;
@property (nonatomic) BOOL hasInitialRootViewController;
@end
@ -118,15 +118,8 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
if ([TSAccountManager isRegistered]) {
self.window.rootViewController = [[UIStoryboard main] instantiateInitialViewController];
} else {
RegistrationViewController *viewController = [RegistrationViewController new];
UINavigationController *navigationController =
[[UINavigationController alloc] initWithRootViewController:viewController];
navigationController.navigationBarHidden = YES;
self.window.rootViewController = navigationController;
}
// Show the launch screen until the async database view registrations are complete.
self.window.rootViewController = [self loadingRootViewController];
[self.window makeKeyAndVisible];
@ -198,6 +191,43 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
return YES;
}
- (UIViewController *)loadingRootViewController
{
UIViewController *viewController =
[[UIStoryboard storyboardWithName:@"Launch Screen" bundle:nil] instantiateInitialViewController];
BOOL shouldShowUpgradeLabel = NO;
NSString *previousVersion = AppVersion.instance.lastAppVersion;
// We added a number of database views in v2.13.0.
if ([VersionMigrations isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]) {
shouldShowUpgradeLabel = YES;
}
if (shouldShowUpgradeLabel) {
UIView *rootView = viewController.view;
UIImageView *iconView = nil;
for (UIView *subview in viewController.view.subviews) {
if ([subview isKindOfClass:[UIImageView class]]) {
iconView = (UIImageView *)subview;
break;
}
}
if (!iconView) {
OWSFail(@"Database view registration overlay has unexpected contents.");
} else {
UILabel *label = [UILabel new];
label.text = NSLocalizedString(
@"DATABASE_VIEW_OVERLAY_TITLE", @"Indicates that the app is updating its database.");
label.font = [UIFont ows_mediumFontWithSize:18.f];
label.textColor = [UIColor whiteColor];
[rootView addSubview:label];
[label autoHCenterInSuperview];
[label autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:iconView withOffset:25.f];
}
}
return viewController;
}
- (void)setupEnvironment
{
[Environment setCurrent:[Release releaseEnvironment]];
@ -417,7 +447,7 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
[self removeScreenProtection];
[self ensureDatabaseViewRegistrationOverlay];
[self ensureRootViewController];
// Always check prekeys after app launches, and sometimes check on app activation.
[TSPreKeyManager checkPreKeysIfNecessary];
@ -689,68 +719,29 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
{
DDLogInfo(@"databaseViewRegistrationComplete");
[self ensureDatabaseViewRegistrationOverlay];
[self ensureRootViewController];
}
- (void)ensureDatabaseViewRegistrationOverlay
- (void)ensureRootViewController
{
BOOL shouldShowOverlay = [TSDatabaseView hasPendingViewRegistrations];
DDLogInfo(@"ensureRootViewController");
if (!shouldShowOverlay) {
if (self.databaseViewRegistrationOverlay && !self.databaseViewRegistrationOverlay.hidden) {
DDLogWarn(@"Hiding database view registration overlay.");
}
self.databaseViewRegistrationOverlay.hidden = YES;
if ([TSDatabaseView hasPendingViewRegistrations] || self.hasInitialRootViewController) {
return;
}
self.hasInitialRootViewController = YES;
if (!self.databaseViewRegistrationOverlay || self.databaseViewRegistrationOverlay.hidden) {
DDLogWarn(@"Showing database view registration overlay.");
DDLogInfo(@"Presenting initial root view controller");
if ([TSAccountManager isRegistered]) {
self.window.rootViewController = [[UIStoryboard main] instantiateInitialViewController];
} else {
RegistrationViewController *viewController = [RegistrationViewController new];
UINavigationController *navigationController =
[[UINavigationController alloc] initWithRootViewController:viewController];
navigationController.navigationBarHidden = YES;
self.window.rootViewController = navigationController;
}
if (!self.databaseViewRegistrationOverlay) {
// Recycle the "screen lock view", but add a label.
UIWindow *window = [[UIWindow alloc] initWithFrame:self.window.bounds];
window.hidden = YES;
window.opaque = YES;
window.userInteractionEnabled = NO;
window.windowLevel = CGFLOAT_MAX;
window.backgroundColor = UIColor.ows_materialBlueColor;
window.rootViewController =
[[UIStoryboard storyboardWithName:@"Launch Screen" bundle:nil] instantiateInitialViewController];
BOOL shouldShowUpgradeLabel = NO;
NSString *previousVersion = AppVersion.instance.lastAppVersion;
// We added a number of database views in v2.13.0.
if ([VersionMigrations isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]) {
shouldShowUpgradeLabel = YES;
}
if (shouldShowUpgradeLabel) {
UIView *rootView = window.rootViewController.view;
UIImageView *iconView = nil;
for (UIView *subview in rootView.subviews) {
if ([subview isKindOfClass:[UIImageView class]]) {
iconView = (UIImageView *)subview;
break;
}
}
if (!iconView) {
OWSFail(@"Database view registration overlay has unexpected contents.");
} else {
UILabel *label = [UILabel new];
label.text = NSLocalizedString(
@"DATABASE_VIEW_OVERLAY_TITLE", @"Indicates that the app is updating its database.");
label.font = [UIFont ows_mediumFontWithSize:18.f];
label.textColor = [UIColor whiteColor];
[rootView addSubview:label];
[label autoHCenterInSuperview];
[label autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:iconView withOffset:25.f];
}
}
self.databaseViewRegistrationOverlay = window;
}
self.databaseViewRegistrationOverlay.hidden = NO;
}
#pragma mark - Logging