From 295646e5faeb295906d5b8fe26e1e40c2e97a36f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 2 Nov 2017 09:58:33 -0400 Subject: [PATCH] Rebase cleanup // FREEBIE --- .../src/ViewControllers/DebugUI/DebugUIMisc.m | 34 ++++++++----------- .../src/Account/TSAccountManager.m | 4 +-- SignalServiceKit/src/Account/TSAttributes.m | 4 +-- .../src/Network/WebSockets/TSSocketManager.m | 2 ++ 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m index 69edb9314..6ffea00b7 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m @@ -80,32 +80,26 @@ NS_ASSUME_NONNULL_BEGIN @"deactivated until you complete re-registration." proceedTitle:@"Proceed" proceedAction:^(UIAlertAction *_Nonnull action) { - DDLogError(@"Re-registering."); - - [[TSAccountManager sharedInstance] resetForRegistration]; - OWSSyncPushTokensJob *syncPushTokensJob = [ - [OWSSyncPushTokensJob alloc] - initWithPushManager:[PushManager sharedManager] - accountManager:[Environment getCurrent].accountManager - preferences:[Environment getCurrent].preferences]; - syncPushTokensJob.uploadOnlyIfStale = NO; - __unused id promise = [syncPushTokensJob run]; - - RegistrationViewController *viewController = - [RegistrationViewController new]; - OWSNavigationController *navigationController = - [[OWSNavigationController alloc] - initWithRootViewController:viewController]; - navigationController.navigationBarHidden = YES; - [UIApplication sharedApplication] - .delegate.window.rootViewController - = navigationController; + [self reregister]; }]; }]]; return [OWSTableSection sectionWithTitle:self.name items:items]; } +- (void)reregister +{ + DDLogInfo(@"%@ re-registering.", self.tag); + [[TSAccountManager sharedInstance] resetForRegistration]; + + RegistrationViewController *viewController = [RegistrationViewController new]; + OWSNavigationController *navigationController = + [[OWSNavigationController alloc] initWithRootViewController:viewController]; + navigationController.navigationBarHidden = YES; + + [UIApplication sharedApplication].delegate.window.rootViewController = navigationController; +} + + (void)setManualCensorshipCircumventionEnabled:(BOOL)isEnabled { OWSCountryMetadata *countryMetadata = nil; diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index 6af08e06b..1b050cdd9 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -336,7 +336,7 @@ NSString *const TSAccountManager_ServerSignalingKey = @"TSStorageServerSignaling case 200: case 204: { DDLogInfo(@"%@ Verification code accepted.", self.tag); - [self storeServerToken:authToken signalingKey:signalingKey]; + [self storeServerAuthToken:authToken signalingKey:signalingKey]; [TSPreKeyManager registerPreKeysWithMode:RefreshPreKeysMode_SignedAndOneTime success:successBlock failure:failureBlock]; @@ -411,7 +411,7 @@ NSString *const TSAccountManager_ServerSignalingKey = @"TSStorageServerSignaling inCollection:TSAccountManager_UserAccountCollection]; } -- (void)storeServerToken:(NSString *)authToken signalingKey:(NSString *)signalingKey +- (void)storeServerAuthToken:(NSString *)authToken signalingKey:(NSString *)signalingKey { [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [transaction setObject:authToken diff --git a/SignalServiceKit/src/Account/TSAttributes.m b/SignalServiceKit/src/Account/TSAttributes.m index 8ac6cc7de..9e0889c5b 100644 --- a/SignalServiceKit/src/Account/TSAttributes.m +++ b/SignalServiceKit/src/Account/TSAttributes.m @@ -11,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN + (NSDictionary *)attributesFromStorageWithManualMessageFetching:(BOOL)isEnabled { - return [self attributesWithSignalingKey:[TSStorageManager signalingKey] - serverAuthToken:[TSStorageManager serverAuthToken] + return [self attributesWithSignalingKey:TSAccountManager.signalingKey + serverAuthToken:TSAccountManager.serverAuthToken manualMessageFetching:isEnabled]; } diff --git a/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m b/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m index 8edbac46f..29515c6ee 100644 --- a/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m +++ b/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m @@ -379,7 +379,9 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_ [self requestSocketAliveForAtLeastSeconds:kBackgroundKeepSocketAliveDurationSeconds]; if ([message.path isEqualToString:@"/api/v1/message"] && [message.verb isEqualToString:@"PUT"]) { + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + NSData *decryptedPayload = [Cryptography decryptAppleMessagePayload:message.body withSignalingKey:TSAccountManager.signalingKey];