From b076f1496451744c26da56073f737c740c214b76 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 27 Sep 2018 14:54:29 -0400 Subject: [PATCH] Swift exit(). --- Signal/src/AppDelegate.m | 7 ++----- Signal/src/environment/SignalApp.m | 2 +- SignalMessaging/environment/VersionMigrations.m | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 02b07b7b4..0255b020d 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -240,8 +240,7 @@ static NSTimeInterval launchStartedAt; [[UIApplication sharedApplication] scheduleLocalNotification:notification]; [UIApplication.sharedApplication setApplicationIconBadgeNumber:1]; - [DDLog flushLog]; - exit(0); + OWSFail(@"!isDatabasePasswordAccessible."); } } @@ -339,9 +338,7 @@ static NSTimeInterval launchStartedAt; style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [Pastelog submitLogsWithCompletion:^{ - OWSLogInfo(@"exiting after sharing debug logs."); - [DDLog flushLog]; - exit(0); + OWSFail(@"exiting after sharing debug logs."); }]; }]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index 7cb04af99..4a55e92ab 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -233,7 +233,7 @@ NS_ASSUME_NONNULL_BEGIN [self clearAllNotifications]; [DebugLogger.sharedLogger wipeLogs]; - exit(0); + OWSFail(@"App data reset."); } + (void)clearAllNotifications diff --git a/SignalMessaging/environment/VersionMigrations.m b/SignalMessaging/environment/VersionMigrations.m index 1bd80604a..6ba53146a 100644 --- a/SignalMessaging/environment/VersionMigrations.m +++ b/SignalMessaging/environment/VersionMigrations.m @@ -69,8 +69,7 @@ NS_ASSUME_NONNULL_BEGIN UIAlertAction *quitAction = [UIAlertAction actionWithTitle:@"Quit" style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { - [DDLog flushLog]; - exit(0); + OWSFail(@"Obsolete install."); }]; [alertController addAction:quitAction];