From 2ce4d39f9e99bcc6ee0063e3fa901dadc73aee66 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 6 Jan 2017 09:01:20 -0500 Subject: [PATCH] Respond to CR. // FREEBIE --- Podfile.lock | 4 ++-- Signal/Signal-Prefix.pch | 2 +- Signal/src/AppDelegate.m | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index d626ffc17..8a70a1a8d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -32,7 +32,7 @@ PODS: - JSQMessagesViewController (7.3.4): - JSQSystemSoundPlayer (~> 2.0.1) - JSQSystemSoundPlayer (2.0.1) - - libPhoneNumber-iOS (0.9.2) + - libPhoneNumber-iOS (0.9.1) - Mantle (2.1.0): - Mantle/extobjc (= 2.1.0) - Mantle/extobjc (2.1.0) @@ -154,7 +154,7 @@ SPEC CHECKSUMS: HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a JSQMessagesViewController: 39fed975e3c9f8eba7292071e29eeb541d105e66 JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d - libPhoneNumber-iOS: a8bffdec18c37728360f6771fe021302f1e0b497 + libPhoneNumber-iOS: 81ad1e6bfcf46e668636333269afbfe60399a55b Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b OpenSSL: 246ffb948e9d56466727fd318134af35f5aa764e PastelogKit: 7b475be4cf577713506a943dd940bcc0499c8bca diff --git a/Signal/Signal-Prefix.pch b/Signal/Signal-Prefix.pch index e3578a1d4..30e5aba65 100644 --- a/Signal/Signal-Prefix.pch +++ b/Signal/Signal-Prefix.pch @@ -16,7 +16,7 @@ #endif #import "iOSVersions.h" - #import "Asserts.h" + #import #define SignalAlertView(title,msg) [[[UIAlertView alloc] initWithTitle:title message:msg delegate:nil cancelButtonTitle:NSLocalizedString(@"OK", @"") otherButtonTitles:nil, nil] show] #define SignalReportError [Pastelog reportErrorAndSubmitLogsWithAlertTitle:NSLocalizedString(@"ERROR_WAS_DETECTED_TITLE", @"") alertBody:NSLocalizedString(@"ERROR_WAS_DETECTED_SUBMIT", @"")]; diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index f6d0869fa..13a1aecb6 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -238,12 +238,12 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; // signing. [TSSocketManager becomeActiveFromForeground]; [[Environment getCurrent].contactsManager verifyABPermission]; + + // This will fetch new messages, if we're using domain + // fronting. + [[PushManager sharedManager] applicationDidBecomeActive]; }]; - if ([TSAccountManager isRegistered]) { - [[PushManager sharedManager] applicationDidBecomeActive]; - } - [self removeScreenProtection]; }