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

Clean up AppDelegate

Browse Source
pull/231/head
nielsandriesse 5 years ago
parent 8d42491778
commit 4c6f25343f
3 changed files with 15 additions and 378 deletions
Show Stats Download Patch File Download Diff File

374
Signal/src/AppDelegate.m
Unescape Escape View File

@ -166,21 +166,13 @@ static NSTimeInterval launchStartedAt;
- (void)applicationDidEnterBackground:(UIApplication *)application - (void)applicationDidEnterBackground:(UIApplication *)application
{ {
OWSLogInfo(@"applicationDidEnterBackground");
[DDLog flushLog]; [DDLog flushLog];
// Loki: Stop pollers
[self stopPoller]; [self stopPoller];
[self stopClosedGroupPoller]; [self stopClosedGroupPoller];
[self stopOpenGroupPollers]; [self stopOpenGroupPollers];
} }
- (void)applicationWillEnterForeground:(UIApplication *)application
{
OWSLogInfo(@"applicationWillEnterForeground");
}
- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application - (void)applicationDidReceiveMemoryWarning:(UIApplication *)application
{ {
OWSLogInfo(@"applicationDidReceiveMemoryWarning"); OWSLogInfo(@"applicationDidReceiveMemoryWarning");
@ -188,11 +180,8 @@ static NSTimeInterval launchStartedAt;
- (void)applicationWillTerminate:(UIApplication *)application - (void)applicationWillTerminate:(UIApplication *)application
{ {
OWSLogInfo(@"applicationWillTerminate");
[DDLog flushLog]; [DDLog flushLog];
// Loki: Stop pollers
[self stopPoller]; [self stopPoller];
[self stopClosedGroupPoller]; [self stopClosedGroupPoller];
[self stopOpenGroupPollers]; [self stopOpenGroupPollers];
@ -200,7 +189,7 @@ static NSTimeInterval launchStartedAt;
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// This should be the first thing we do. // This should be the first thing we do
SetCurrentAppContext([MainAppContext new]); SetCurrentAppContext([MainAppContext new]);
launchStartedAt = CACurrentMediaTime(); launchStartedAt = CACurrentMediaTime();
@ -218,7 +207,6 @@ static NSTimeInterval launchStartedAt;
[DebugLogger.sharedLogger enableFileLogging]; [DebugLogger.sharedLogger enableFileLogging];
} }
OWSLogWarn(@"application:didFinishLaunchingWithOptions");
[Cryptography seedRandom]; [Cryptography seedRandom];
// XXX - careful when moving this. It must happen before we initialize OWSPrimaryStorage. // XXX - careful when moving this. It must happen before we initialize OWSPrimaryStorage.
@ -233,18 +221,6 @@ static NSTimeInterval launchStartedAt;
} }
#endif #endif
// We need to do this _after_ we set up logging, when the keychain is unlocked,
// but before we access YapDatabase, files on disk, or NSUserDefaults
if (![self ensureIsReadyForAppExtensions]) {
// If this method has failed; do nothing.
//
// ensureIsReadyForAppExtensions will show a failure mode UI that
// lets users report this error.
OWSLogInfo(@"application:didFinishLaunchingWithOptions failed");
return YES;
}
[AppVersion sharedInstance]; [AppVersion sharedInstance];
[self startupLogging]; [self startupLogging];
@ -257,7 +233,7 @@ static NSTimeInterval launchStartedAt;
[AppSetup [AppSetup
setupEnvironmentWithAppSpecificSingletonBlock:^{ setupEnvironmentWithAppSpecificSingletonBlock:^{
// Create AppEnvironment. // Create AppEnvironment
[AppEnvironment.shared setup]; [AppEnvironment.shared setup];
[SignalApp.sharedApp setup]; [SignalApp.sharedApp setup];
} }
@ -328,11 +304,9 @@ static NSTimeInterval launchStartedAt;
*/ */
- (void)verifyDBKeysAvailableBeforeBackgroundLaunch - (void)verifyDBKeysAvailableBeforeBackgroundLaunch
{ {
if ([UIApplication sharedApplication].applicationState != UIApplicationStateBackground) { if ([UIApplication sharedApplication].applicationState != UIApplicationStateBackground) { return; }
return;
}
if (![OWSPrimaryStorage isDatabasePasswordAccessible]) { if (!OWSPrimaryStorage.isDatabasePasswordAccessible) {
OWSLogInfo(@"Exiting because we are in the background and the database password is not accessible."); OWSLogInfo(@"Exiting because we are in the background and the database password is not accessible.");
UILocalNotification *notification = [UILocalNotification new]; UILocalNotification *notification = [UILocalNotification new];
@ -354,72 +328,6 @@ static NSTimeInterval launchStartedAt;
} }
} }
- (BOOL)ensureIsReadyForAppExtensions
{
// Given how sensitive this migration is, we verbosely
// log the contents of all involved paths before and after.
//
// TODO: Remove this logging once we have high confidence
// in our migration logic.
NSArray<NSString *> *paths = @[
OWSPrimaryStorage.legacyDatabaseFilePath,
OWSPrimaryStorage.legacyDatabaseFilePath_SHM,
OWSPrimaryStorage.legacyDatabaseFilePath_WAL,
OWSPrimaryStorage.sharedDataDatabaseFilePath,
OWSPrimaryStorage.sharedDataDatabaseFilePath_SHM,
OWSPrimaryStorage.sharedDataDatabaseFilePath_WAL,
];
NSFileManager *fileManager = [NSFileManager defaultManager];
for (NSString *path in paths) {
if ([fileManager fileExistsAtPath:path]) {
OWSLogInfo(@"storage file: %@, %@", path, [OWSFileSystem fileSizeOfPath:path]);
}
}
if ([OWSPreferences isReadyForAppExtensions]) {
return YES;
}
OWSBackgroundTask *_Nullable backgroundTask = [OWSBackgroundTask backgroundTaskWithLabelStr:__PRETTY_FUNCTION__];
SUPPRESS_DEADSTORE_WARNING(backgroundTask);
if ([NSFileManager.defaultManager fileExistsAtPath:OWSPrimaryStorage.legacyDatabaseFilePath]) {
OWSLogInfo(
@"Legacy Database file size: %@", [OWSFileSystem fileSizeOfPath:OWSPrimaryStorage.legacyDatabaseFilePath]);
OWSLogInfo(@"\t Legacy SHM file size: %@",
[OWSFileSystem fileSizeOfPath:OWSPrimaryStorage.legacyDatabaseFilePath_SHM]);
OWSLogInfo(@"\t Legacy WAL file size: %@",
[OWSFileSystem fileSizeOfPath:OWSPrimaryStorage.legacyDatabaseFilePath_WAL]);
}
NSError *_Nullable error = [self convertDatabaseIfNecessary];
if (!error) {
[NSUserDefaults migrateToSharedUserDefaults];
}
if (!error) {
error = [OWSPrimaryStorage migrateToSharedData];
}
if (!error) {
error = [OWSUserProfile migrateToSharedData];
}
if (!error) {
error = [TSAttachmentStream migrateToSharedData];
}
if (error) {
OWSFailDebug(@"Database conversion failed: %@", error);
[self showLaunchFailureUI:error];
return NO;
}
OWSAssertDebug(backgroundTask);
backgroundTask = nil;
return YES;
}
- (void)showLaunchFailureUI:(NSError *)error - (void)showLaunchFailureUI:(NSError *)error
{ {
// Disable normal functioning of app. // Disable normal functioning of app.
@ -455,53 +363,6 @@ static NSTimeInterval launchStartedAt;
[fromViewController presentAlert:alert]; [fromViewController presentAlert:alert];
} }
- (nullable NSError *)convertDatabaseIfNecessary
{
OWSLogInfo(@"");
NSString *databaseFilePath = [OWSPrimaryStorage legacyDatabaseFilePath];
if (![[NSFileManager defaultManager] fileExistsAtPath:databaseFilePath]) {
OWSLogVerbose(@"No legacy database file found");
return nil;
}
NSError *_Nullable error;
NSData *_Nullable databasePassword = [OWSStorage tryToLoadDatabaseLegacyPassphrase:&error];
if (!databasePassword || error) {
return (error
?: OWSErrorWithCodeDescription(
OWSErrorCodeDatabaseConversionFatalError, @"Failed to load database password"));
}
YapRecordDatabaseSaltBlock recordSaltBlock = ^(NSData *saltData) {
OWSLogVerbose(@"saltData: %@", saltData.hexadecimalString);
// Derive and store the raw cipher key spec, to avoid the ongoing tax of future KDF
NSData *_Nullable keySpecData =
[YapDatabaseCryptoUtils deriveDatabaseKeySpecForPassword:databasePassword saltData:saltData];
if (!keySpecData) {
OWSLogError(@"Failed to derive key spec.");
return NO;
}
[OWSStorage storeDatabaseCipherKeySpec:keySpecData];
return YES;
};
YapDatabaseOptions *dbOptions = [OWSStorage defaultDatabaseOptions];
error = [YapDatabaseCryptoUtils convertDatabaseIfNecessary:databaseFilePath
databasePassword:databasePassword
options:dbOptions
recordSaltBlock:recordSaltBlock];
if (!error) {
[OWSStorage removeLegacyPassphrase];
}
return error;
}
- (void)startupLogging - (void)startupLogging
{ {
OWSLogInfo(@"iOS Version: %@", [UIDevice currentDevice].systemVersion); OWSLogInfo(@"iOS Version: %@", [UIDevice currentDevice].systemVersion);
@ -585,56 +446,9 @@ static NSTimeInterval launchStartedAt;
return; return;
} }
OWSLogInfo(@"Registered legacy notification settings.");
[self.notificationPresenter didRegisterLegacyNotificationSettings]; [self.notificationPresenter didRegisterLegacyNotificationSettings];
} }
- (BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
sourceApplication:(NSString *)sourceApplication
annotation:(id)annotation
{
OWSAssertIsOnMainThread();
if (self.didAppLaunchFail) {
OWSFailDebug(@"App launch failed");
return NO;
}
if (!AppReadiness.isAppReady) {
OWSLogWarn(@"Ignoring openURL: app not ready.");
// We don't need to use [AppReadiness runNowOrWhenAppDidBecomeReady:];
// the only URLs we handle in Signal iOS at the moment are used
// for resuming the verification step of the registration flow.
return NO;
}
if ([url.scheme isEqualToString:kURLSchemeSGNLKey]) {
if ([url.host hasPrefix:kURLHostVerifyPrefix] && ![self.tsAccountManager isRegistered]) {
id signupController = SignalApp.sharedApp.signUpFlowNavigationController;
if ([signupController isKindOfClass:[OWSNavigationController class]]) {
OWSNavigationController *navController = (OWSNavigationController *)signupController;
UIViewController *controller = [navController.childViewControllers lastObject];
if ([controller isKindOfClass:[OnboardingVerificationViewController class]]) {
OnboardingVerificationViewController *verificationView
= (OnboardingVerificationViewController *)controller;
NSString *verificationCode = [url.path substringFromIndex:1];
[verificationView setVerificationCodeAndTryToVerify:verificationCode];
return YES;
} else {
OWSLogWarn(@"Not the verification view controller we expected. Got %@ instead.",
NSStringFromClass(controller.class));
}
}
} else {
OWSFailDebug(@"Application opened with an unknown URL action: %@", url.host);
}
} else {
OWSFailDebug(@"Application opened with an unknown URL scheme: %@", url.scheme);
}
return NO;
}
- (void)applicationDidBecomeActive:(UIApplication *)application { - (void)applicationDidBecomeActive:(UIApplication *)application {
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
@ -643,7 +457,6 @@ static NSTimeInterval launchStartedAt;
return; return;
} }
OWSLogWarn(@"applicationDidBecomeActive");
if (CurrentAppContext().isRunningTests) { if (CurrentAppContext().isRunningTests) {
return; return;
} }
@ -662,27 +475,12 @@ static NSTimeInterval launchStartedAt;
// On every activation, clear old temp directories. // On every activation, clear old temp directories.
ClearOldTemporaryDirectories(); ClearOldTemporaryDirectories();
OWSLogInfo(@"applicationDidBecomeActive completed");
} }
- (void)enableBackgroundRefreshIfNecessary - (void)enableBackgroundRefreshIfNecessary
{ {
BOOL isUsingFullAPNs = [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
if (isUsingFullAPNs) { return; }
[AppReadiness runNowOrWhenAppDidBecomeReady:^{ [AppReadiness runNowOrWhenAppDidBecomeReady:^{
[UIApplication.sharedApplication setMinimumBackgroundFetchInterval:UIApplicationBackgroundFetchIntervalMinimum]; [UIApplication.sharedApplication setMinimumBackgroundFetchInterval:UIApplicationBackgroundFetchIntervalMinimum];
// Loki: Original code
// ========
// if (OWS2FAManager.sharedManager.is2FAEnabled && [self.tsAccountManager isRegisteredAndReady]) {
// // Ping server once a day to keep-alive 2FA clients.
// const NSTimeInterval kBackgroundRefreshInterval = 24 * 60 * 60;
// [[UIApplication sharedApplication] setMinimumBackgroundFetchInterval:kBackgroundRefreshInterval];
// } else {
// [[UIApplication sharedApplication]
// setMinimumBackgroundFetchInterval:UIApplicationBackgroundFetchIntervalNever];
// }
// ========
}]; }];
} }
@ -690,8 +488,6 @@ static NSTimeInterval launchStartedAt;
{ {
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
OWSLogWarn(@"handleActivation");
// 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];
@ -744,19 +540,15 @@ static NSTimeInterval launchStartedAt;
NSString *userHexEncodedPublicKey = self.tsAccountManager.localNumber; NSString *userHexEncodedPublicKey = self.tsAccountManager.localNumber;
// Loki: Start pollers
[self startPollerIfNeeded]; [self startPollerIfNeeded];
[self startClosedGroupPollerIfNeeded]; [self startClosedGroupPollerIfNeeded];
[self startOpenGroupPollersIfNeeded]; [self startOpenGroupPollersIfNeeded];
// Loki: Get device links
[[LKFileServerAPI getDeviceLinksAssociatedWithHexEncodedPublicKey:userHexEncodedPublicKey] retainUntilComplete];
// Loki: Update profile picture if needed // Loki: Update profile picture if needed
NSUserDefaults *userDefaults = NSUserDefaults.standardUserDefaults; NSUserDefaults *userDefaults = NSUserDefaults.standardUserDefaults;
NSDate *now = [NSDate new]; NSDate *now = [NSDate new];
NSDate *lastProfilePictureUpload = (NSDate *)[userDefaults objectForKey:@"lastProfilePictureUpload"]; NSDate *lastProfilePictureUpload = (NSDate *)[userDefaults objectForKey:@"lastProfilePictureUpload"];
if (lastProfilePictureUpload != nil && [now timeIntervalSinceDate:lastProfilePictureUpload] > 14 * 24 * 60 * 60) { if (lastProfilePictureUpload != nil && [now timeIntervalSinceDate:lastProfilePictureUpload] > 4 * 24 * 60 * 60) {
OWSProfileManager *profileManager = OWSProfileManager.sharedManager; OWSProfileManager *profileManager = OWSProfileManager.sharedManager;
NSString *displayName = [profileManager profileNameForRecipientWithID:userHexEncodedPublicKey]; NSString *displayName = [profileManager profileNameForRecipientWithID:userHexEncodedPublicKey];
UIImage *profilePicture = [profileManager profileAvatarForRecipientId:userHexEncodedPublicKey]; UIImage *profilePicture = [profileManager profileAvatarForRecipientId:userHexEncodedPublicKey];
@ -777,22 +569,8 @@ static NSTimeInterval launchStartedAt;
[OWSSyncPushTokensJob runWithAccountManager:AppEnvironment.shared.accountManager [OWSSyncPushTokensJob runWithAccountManager:AppEnvironment.shared.accountManager
preferences:Environment.shared.preferences]; preferences:Environment.shared.preferences];
} }
if ([OWS2FAManager sharedManager].isDueForReminder) {
if (!self.hasInitialRootViewController || self.window.rootViewController == nil) {
OWSLogDebug(@"Skipping 2FA reminder since there isn't yet an initial view controller.");
} else {
UIViewController *rootViewController = self.window.rootViewController;
OWSNavigationController *reminderNavController =
[OWS2FAReminderViewController wrappedInNavController];
[rootViewController presentViewController:reminderNavController animated:YES completion:nil];
}
}
}); });
} }
OWSLogInfo(@"handleActivation completed");
} }
- (void)applicationWillResignActive:(UIApplication *)application - (void)applicationWillResignActive:(UIApplication *)application
@ -804,8 +582,6 @@ static NSTimeInterval launchStartedAt;
return; return;
} }
OWSLogWarn(@"applicationWillResignActive");
[self clearAllNotificationsAndRestoreBadgeCount]; [self clearAllNotificationsAndRestoreBadgeCount];
[DDLog flushLog]; [DDLog flushLog];
@ -859,7 +635,6 @@ static NSTimeInterval launchStartedAt;
}]; }];
} }
#pragma mark - Orientation #pragma mark - Orientation
- (UIInterfaceOrientationMask)application:(UIApplication *)application - (UIInterfaceOrientationMask)application:(UIApplication *)application
@ -868,97 +643,8 @@ static NSTimeInterval launchStartedAt;
return UIInterfaceOrientationMaskPortrait; return UIInterfaceOrientationMaskPortrait;
} }
- (BOOL)hasCall
{
return self.windowManager.hasCall;
}
#pragma mark Push Notifications Delegate Methods #pragma mark Push Notifications Delegate Methods
- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
OWSAssertIsOnMainThread();
if (self.didAppLaunchFail) {
OWSFailDebug(@"App launch failed");
return;
}
if (!(AppReadiness.isAppReady && [self.tsAccountManager isRegisteredAndReady])) {
OWSLogInfo(@"Ignoring remote notification; app not ready.");
return;
}
[LKLogger print:@"[Loki] Silent push notification received; fetching messages."];
__block AnyPromise *fetchMessagesPromise = [AppEnvironment.shared.messageFetcherJob run].then(^{
fetchMessagesPromise = nil;
}).catch(^{
fetchMessagesPromise = nil;
});
[fetchMessagesPromise retainUntilComplete];
__block NSDictionary<NSString *, LKPublicChat *> *publicChats;
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChats = [LKDatabaseUtilities getAllPublicChats:transaction];
}];
for (LKPublicChat *publicChat in publicChats) {
if (![publicChat isKindOfClass:LKPublicChat.class]) { continue; }
LKPublicChatPoller *poller = [[LKPublicChatPoller alloc] initForPublicChat:publicChat];
[poller stop];
AnyPromise *fetchGroupMessagesPromise = [poller pollForNewMessages];
[fetchGroupMessagesPromise retainUntilComplete];
}
}
- (void)application:(UIApplication *)application
didReceiveRemoteNotification:(NSDictionary *)userInfo
fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
OWSAssertIsOnMainThread();
if (self.didAppLaunchFail) {
OWSFailDebug(@"App launch failed");
return;
}
if (!(AppReadiness.isAppReady && [self.tsAccountManager isRegisteredAndReady])) {
OWSLogInfo(@"Ignoring remote notification; app not ready.");
return;
}
CurrentAppContext().wasWokenUpBySilentPushNotification = true;
[LKLogger print:@"[Loki] Silent push notification received; fetching messages."];
NSMutableArray *promises = [NSMutableArray new];
__block AnyPromise *fetchMessagesPromise = [AppEnvironment.shared.messageFetcherJob run].then(^{
fetchMessagesPromise = nil;
}).catch(^{
fetchMessagesPromise = nil;
});
[promises addObject:fetchMessagesPromise];
[fetchMessagesPromise retainUntilComplete];
__block NSDictionary<NSString *, LKPublicChat *> *publicChats;
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChats = [LKDatabaseUtilities getAllPublicChats:transaction];
}];
for (LKPublicChat *publicChat in publicChats.allValues) {
if (![publicChat isKindOfClass:LKPublicChat.class]) { continue; } // For some reason publicChat is sometimes a base 64 encoded string...
LKPublicChatPoller *poller = [[LKPublicChatPoller alloc] initForPublicChat:publicChat];
[poller stop];
AnyPromise *fetchGroupMessagesPromise = [poller pollForNewMessages];
[promises addObject:fetchGroupMessagesPromise];
[fetchGroupMessagesPromise retainUntilComplete];
}
PMKJoin(promises).then(^(id results) {
completionHandler(UIBackgroundFetchResultNewData);
CurrentAppContext().wasWokenUpBySilentPushNotification = false;
}).catch(^(id error) {
completionHandler(UIBackgroundFetchResultFailed);
CurrentAppContext().wasWokenUpBySilentPushNotification = false;
});
}
- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification { - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
@ -1022,8 +708,6 @@ static NSTimeInterval launchStartedAt;
withResponseInfo:(NSDictionary *)responseInfo withResponseInfo:(NSDictionary *)responseInfo
completionHandler:(void (^)())completionHandler completionHandler:(void (^)())completionHandler
{ {
OWSLogInfo(@"Handling action with identifier: %@", identifier);
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
if (self.didAppLaunchFail) { if (self.didAppLaunchFail) {
@ -1055,8 +739,6 @@ static NSTimeInterval launchStartedAt;
- (void)application:(UIApplication *)application - (void)application:(UIApplication *)application
performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler
{ {
BOOL isUsingFullAPNs = [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
if (isUsingFullAPNs) { return; }
NSLog(@"[Loki] Performing background fetch."); NSLog(@"[Loki] Performing background fetch.");
[AppReadiness runNowOrWhenAppDidBecomeReady:^{ [AppReadiness runNowOrWhenAppDidBecomeReady:^{
NSMutableArray *promises = [NSMutableArray new]; NSMutableArray *promises = [NSMutableArray new];
@ -1113,7 +795,7 @@ static NSTimeInterval launchStartedAt;
{ {
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
// App isn't ready until storage is ready AND all version migrations are complete. // App isn't ready until storage is ready AND all version migrations are complete
if (!self.areVersionMigrationsComplete) { if (!self.areVersionMigrationsComplete) {
return; return;
} }
@ -1121,12 +803,10 @@ static NSTimeInterval launchStartedAt;
return; return;
} }
if ([AppReadiness isAppReady]) { if ([AppReadiness isAppReady]) {
// Only mark the app as ready once. // Only mark the app as ready once
return; return;
} }
OWSLogInfo(@"checkIfAppIsReady");
// TODO: Once "app ready" logic is moved into AppSetup, move this line there. // TODO: Once "app ready" logic is moved into AppSetup, move this line there.
[self.profileManager ensureLocalProfileCached]; [self.profileManager ensureLocalProfileCached];
@ -1134,13 +814,9 @@ static NSTimeInterval launchStartedAt;
// it will also run all deferred blocks. // it will also run all deferred blocks.
[AppReadiness setAppIsReady]; [AppReadiness setAppIsReady];
if (CurrentAppContext().isRunningTests) { if (CurrentAppContext().isRunningTests) { return; }
OWSLogVerbose(@"Skipping post-launch logic in tests.");
return;
}
if ([self.tsAccountManager isRegistered]) { if ([self.tsAccountManager isRegistered]) {
OWSLogInfo(@"localNumber: %@", [TSAccountManager localNumber]);
// This should happen at any launch, background or foreground // This should happen at any launch, background or foreground
__unused AnyPromise *pushTokenpromise = __unused AnyPromise *pushTokenpromise =
@ -1174,8 +850,8 @@ static NSTimeInterval launchStartedAt;
// //
// TODO: Release to production once we have analytics. // TODO: Release to production once we have analytics.
// TODO: Orphan cleanup is somewhat expensive - not least in doing a bunch // TODO: Orphan cleanup is somewhat expensive - not least in doing a bunch
// of disk access. We might want to only run it "once per version" // TODO: of disk access. We might want to only run it "once per version"
// or something like that in production. // TODO: or something like that in production.
[OWSOrphanDataCleaner auditOnLaunchIfNecessary]; [OWSOrphanDataCleaner auditOnLaunchIfNecessary];
#endif #endif
@ -1232,17 +908,9 @@ static NSTimeInterval launchStartedAt;
{ {
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
OWSLogInfo(@"registrationStateDidChange");
[self enableBackgroundRefreshIfNecessary]; [self enableBackgroundRefreshIfNecessary];
if ([self.tsAccountManager isRegistered]) { if ([self.tsAccountManager isRegistered]) {
OWSLogInfo(@"localNumber: %@", [self.tsAccountManager localNumber]);
[LKStorage writeSyncWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[ExperienceUpgradeFinder.sharedManager markAllAsSeenWithTransaction:transaction];
} error:nil];
// Start running the disappearing messages job in case the newly registered user // Start running the disappearing messages job in case the newly registered user
// enables this feature // enables this feature
[self.disappearingMessagesJob startIfNecessary]; [self.disappearingMessagesJob startIfNecessary];
@ -1250,14 +918,10 @@ static NSTimeInterval launchStartedAt;
// For non-legacy users, read receipts are on by default. // For non-legacy users, read receipts are on by default.
[self.readReceiptManager setAreReadReceiptsEnabled:YES]; [self.readReceiptManager setAreReadReceiptsEnabled:YES];
// Loki: Start pollers
[self startPollerIfNeeded]; [self startPollerIfNeeded];
[self startClosedGroupPollerIfNeeded]; [self startClosedGroupPollerIfNeeded];
[self startOpenGroupPollersIfNeeded]; [self startOpenGroupPollersIfNeeded];
// Loki: Get device links
[[LKFileServerAPI getDeviceLinksAssociatedWithHexEncodedPublicKey:self.tsAccountManager.localNumber] retainUntilComplete]; // TODO: Is this even needed?
} }
} }
@ -1270,16 +934,9 @@ static NSTimeInterval launchStartedAt;
{ {
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
OWSLogInfo(@"ensureRootViewController"); if (!AppReadiness.isAppReady || self.hasInitialRootViewController) { return; }
if (!AppReadiness.isAppReady || self.hasInitialRootViewController) {
return;
}
self.hasInitialRootViewController = YES; self.hasInitialRootViewController = YES;
NSTimeInterval startupDuration = CACurrentMediaTime() - launchStartedAt;
OWSLogInfo(@"Presenting app %.2f seconds after launch started.", startupDuration);
UIViewController *rootViewController; UIViewController *rootViewController;
BOOL navigationBarHidden = NO; BOOL navigationBarHidden = NO;
if ([self.tsAccountManager isRegistered]) { if ([self.tsAccountManager isRegistered]) {
@ -1298,8 +955,6 @@ static NSTimeInterval launchStartedAt;
navigationController.navigationBarHidden = navigationBarHidden; navigationController.navigationBarHidden = navigationBarHidden;
self.window.rootViewController = navigationController; self.window.rootViewController = navigationController;
[AppUpdateNag.sharedInstance showAppUpgradeNagIfNecessary];
[UIViewController attemptRotationToDeviceOrientation]; [UIViewController attemptRotationToDeviceOrientation];
} }
@ -1311,7 +966,6 @@ static NSTimeInterval launchStartedAt;
CGPoint location = [[[event allTouches] anyObject] locationInView:[self window]]; CGPoint location = [[[event allTouches] anyObject] locationInView:[self window]];
CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame; CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
if (CGRectContainsPoint(statusBarFrame, location)) { if (CGRectContainsPoint(statusBarFrame, location)) {
OWSLogDebug(@"touched status bar");
[[NSNotificationCenter defaultCenter] postNotificationName:TappedStatusBarNotification object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:TappedStatusBarNotification object:nil];
} }
} }
@ -1327,7 +981,6 @@ static NSTimeInterval launchStartedAt;
withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler
__IOS_AVAILABLE(10.0)__TVOS_AVAILABLE(10.0)__WATCHOS_AVAILABLE(3.0)__OSX_AVAILABLE(10.14) __IOS_AVAILABLE(10.0)__TVOS_AVAILABLE(10.0)__WATCHOS_AVAILABLE(3.0)__OSX_AVAILABLE(10.14)
{ {
OWSLogInfo(@"");
if (notification.request.content.userInfo[@"remote"]) { if (notification.request.content.userInfo[@"remote"]) {
OWSLogInfo(@"[Loki] Ignoring remote notifications while the app is in the foreground."); OWSLogInfo(@"[Loki] Ignoring remote notifications while the app is in the foreground.");
return; return;
@ -1352,7 +1005,6 @@ static NSTimeInterval launchStartedAt;
withCompletionHandler:(void (^)(void))completionHandler __IOS_AVAILABLE(10.0)__WATCHOS_AVAILABLE(3.0) withCompletionHandler:(void (^)(void))completionHandler __IOS_AVAILABLE(10.0)__WATCHOS_AVAILABLE(3.0)
__OSX_AVAILABLE(10.14)__TVOS_PROHIBITED __OSX_AVAILABLE(10.14)__TVOS_PROHIBITED
{ {
OWSLogInfo(@"");
[AppReadiness runNowOrWhenAppDidBecomeReady:^() { [AppReadiness runNowOrWhenAppDidBecomeReady:^() {
[self.userNotificationActionHandler handleNotificationResponse:response completionHandler:completionHandler]; [self.userNotificationActionHandler handleNotificationResponse:response completionHandler:completionHandler];
}]; }];
@ -1366,7 +1018,7 @@ static NSTimeInterval launchStartedAt;
openSettingsForNotification:(nullable UNNotification *)notification __IOS_AVAILABLE(12.0) openSettingsForNotification:(nullable UNNotification *)notification __IOS_AVAILABLE(12.0)
__OSX_AVAILABLE(10.14)__WATCHOS_PROHIBITED __TVOS_PROHIBITED __OSX_AVAILABLE(10.14)__WATCHOS_PROHIBITED __TVOS_PROHIBITED
{ {
OWSLogInfo(@"");
} }
#pragma mark - Loki #pragma mark - Loki

9
Signal/src/Jobs/SyncPushTokensJob.swift
Unescape Escape View File

@ -31,40 +31,31 @@ class SyncPushTokensJob: NSObject {
} }
func run() -> Promise<Void> { func run() -> Promise<Void> {
Logger.info("Starting.")
let runPromise = firstly { let runPromise = firstly {
return self.pushRegistrationManager.requestPushTokens() return self.pushRegistrationManager.requestPushTokens()
}.then { (pushToken: String, voipToken: String) -> Promise<Void> in }.then { (pushToken: String, voipToken: String) -> Promise<Void> in
Logger.info("finished: requesting push tokens")
var shouldUploadTokens = false var shouldUploadTokens = false
if self.preferences.getPushToken() != pushToken || self.preferences.getVoipToken() != voipToken { if self.preferences.getPushToken() != pushToken || self.preferences.getVoipToken() != voipToken {
Logger.debug("Push tokens changed.")
shouldUploadTokens = true shouldUploadTokens = true
} else if !self.uploadOnlyIfStale { } else if !self.uploadOnlyIfStale {
Logger.debug("Forced uploading, even though tokens didn't change.")
shouldUploadTokens = true shouldUploadTokens = true
} }
if AppVersion.sharedInstance().lastAppVersion != AppVersion.sharedInstance().currentAppVersion { if AppVersion.sharedInstance().lastAppVersion != AppVersion.sharedInstance().currentAppVersion {
Logger.info("Uploading due to fresh install or app upgrade.")
shouldUploadTokens = true shouldUploadTokens = true
} }
guard shouldUploadTokens else { guard shouldUploadTokens else {
Logger.info("No reason to upload pushToken: \(redact(pushToken)), voipToken: \(redact(voipToken))")
return Promise.value(()) return Promise.value(())
} }
Logger.warn("uploading tokens to account servers. pushToken: \(redact(pushToken)), voipToken: \(redact(voipToken))")
return firstly { return firstly {
self.accountManager.updatePushTokens(pushToken: pushToken, voipToken: voipToken, isForcedUpdate: shouldUploadTokens) self.accountManager.updatePushTokens(pushToken: pushToken, voipToken: voipToken, isForcedUpdate: shouldUploadTokens)
}.done { _ in }.done { _ in
self.recordPushTokensLocally(pushToken: pushToken, voipToken: voipToken) self.recordPushTokensLocally(pushToken: pushToken, voipToken: voipToken)
} }
}.done {
Logger.info("completed successfully.")
} }
runPromise.retainUntilComplete() runPromise.retainUntilComplete()

10
Signal/src/environment/PushRegistrationManager.swift
Unescape Escape View File

@ -54,8 +54,6 @@ public enum PushRegistrationError: Error {
// MARK: Public interface // MARK: Public interface
public func requestPushTokens() -> Promise<(pushToken: String, voipToken: String)> { public func requestPushTokens() -> Promise<(pushToken: String, voipToken: String)> {
Logger.info("")
return firstly { return firstly {
self.registerUserNotificationSettings() self.registerUserNotificationSettings()
}.then { () -> Promise<(pushToken: String, voipToken: String)> in }.then { () -> Promise<(pushToken: String, voipToken: String)> in
@ -127,7 +125,6 @@ public enum PushRegistrationError: Error {
// return any requested push tokens. // return any requested push tokens.
public func registerUserNotificationSettings() -> Promise<Void> { public func registerUserNotificationSettings() -> Promise<Void> {
AssertIsOnMainThread() AssertIsOnMainThread()
Logger.info("registering user notification settings")
return notificationPresenter.registerNotificationSettings() return notificationPresenter.registerNotificationSettings()
} }
@ -158,16 +155,14 @@ public enum PushRegistrationError: Error {
private func registerForVanillaPushToken() -> Promise<String> { private func registerForVanillaPushToken() -> Promise<String> {
AssertIsOnMainThread() AssertIsOnMainThread()
Logger.info("")
guard self.vanillaTokenPromise == nil else { guard self.vanillaTokenPromise == nil else {
let promise = vanillaTokenPromise! let promise = vanillaTokenPromise!
assert(promise.isPending) assert(promise.isPending)
Logger.info("alreay pending promise for vanilla push token")
return promise.map { $0.hexEncodedString } return promise.map { $0.hexEncodedString }
} }
// No pending vanilla token yet. Create a new promise // No pending vanilla token yet; create a new promise
let (promise, resolver) = Promise<Data>.pending() let (promise, resolver) = Promise<Data>.pending()
self.vanillaTokenPromise = promise self.vanillaTokenPromise = promise
self.vanillaTokenResolver = resolver self.vanillaTokenResolver = resolver
@ -196,11 +191,10 @@ public enum PushRegistrationError: Error {
} }
}.map { (pushTokenData: Data) -> String in }.map { (pushTokenData: Data) -> String in
if self.isSusceptibleToFailedPushRegistration { if self.isSusceptibleToFailedPushRegistration {
// Sentinal in case this bug is fixed. // Sentinal in case this bug is fixed
owsFailDebug("Device was unexpectedly able to complete push registration even though it was susceptible to failure.") owsFailDebug("Device was unexpectedly able to complete push registration even though it was susceptible to failure.")
} }
Logger.info("successfully registered for vanilla push notifications")
return pushTokenData.hexEncodedString return pushTokenData.hexEncodedString
}.ensure { }.ensure {
self.vanillaTokenPromise = nil self.vanillaTokenPromise = nil

Write Preview
Loading…
Cancel
Save