Rebase cleanup

// FREEBIE

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;

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

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];
 }
 

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];