Merge branch 'charlesmchen/slowLaunchRelease'

pull/1/head
Matthew Chen 8 years ago
commit 3939dbba2d

@ -134,7 +134,7 @@ CHECKOUT OPTIONS:
:commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308 :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
:git: https://github.com/WhisperSystems/JSQMessagesViewController.git :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
SignalServiceKit: SignalServiceKit:
:commit: 7af758bc67e80f788d4efa72678ad113dc930802 :commit: ed249840c61ab48a7fcd762d7d4b01dc78dff0a6
:git: https://github.com/WhisperSystems/SignalServiceKit.git :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket: SocketRocket:
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

@ -188,6 +188,8 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
name:kNSNotificationName_DatabaseViewRegistrationComplete name:kNSNotificationName_DatabaseViewRegistrationComplete
object:nil]; object:nil];
DDLogInfo(@"%@ application: didFinishLaunchingWithOptions completed.", self.tag);
return YES; return YES;
} }
@ -203,6 +205,7 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
[VersionMigrations isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]) { [VersionMigrations isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]) {
shouldShowUpgradeLabel = YES; shouldShowUpgradeLabel = YES;
} }
DDLogInfo(@"%@ shouldShowUpgradeLabel: %d", self.tag, shouldShowUpgradeLabel);
if (shouldShowUpgradeLabel) { if (shouldShowUpgradeLabel) {
UIView *rootView = viewController.view; UIView *rootView = viewController.view;
UIImageView *iconView = nil; UIImageView *iconView = nil;
@ -491,6 +494,8 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
// Always check prekeys after app launches, and sometimes check on app activation. // Always check prekeys after app launches, and sometimes check on app activation.
[TSPreKeyManager checkPreKeysIfNecessary]; [TSPreKeyManager checkPreKeysIfNecessary];
DDLogInfo(@"%@ applicationDidBecomeActive completed.", self.tag);
} }
- (void)applicationWillResignActive:(UIApplication *)application { - (void)applicationWillResignActive:(UIApplication *)application {

Loading…
Cancel
Save