Debug

Signal/src/AppDelegate.m

@@ -587,6 +587,8 @@ static BOOL isInternalTestVersion = NO;
         return;
     }
 
+    [self.pushRegistrationManager didReceiveVanillaPushToken:deviceToken];
+
     OWSLogInfo(@"Registering for push notifications with token: %@.", deviceToken);
     BOOL isUsingFullAPNs = [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
     if (isUsingFullAPNs) {

Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m

@@ -2,6 +2,8 @@
 //  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
+@import PromiseKit;
+
 #import "NotificationSettingsViewController.h"
 #import "NotificationSettingsOptionsViewController.h"
 #import "OWSSoundSettingsViewController.h"
@@ -139,7 +141,7 @@
     [NSUserDefaults.standardUserDefaults setBool:sender.on forKey:@"isUsingFullAPNs"];
     OWSSyncPushTokensJob *syncTokensJob = [[OWSSyncPushTokensJob alloc] initWithAccountManager:AppEnvironment.shared.accountManager preferences:Environment.shared.preferences];
     syncTokensJob.uploadOnlyIfStale = NO;
-    __unused AnyPromise *promise = [syncTokensJob run];
+    [[syncTokensJob run] retainUntilComplete];
 }
 
 @end

Signal/src/environment/PushRegistrationManager.swift

@@ -63,10 +63,8 @@ public enum PushRegistrationError: Error {
                 throw PushRegistrationError.pushNotSupported(description: "Push not supported on simulators")
             }
 
-            return self.registerForVanillaPushToken().then { vanillaPushToken -> Promise<(pushToken: String, voipToken: String)> in
-                self.registerForVoipPushToken().map { voipPushToken in
-                    (pushToken: vanillaPushToken, voipToken: voipPushToken)
-                }
+            return self.registerForVanillaPushToken().map { vanillaPushToken -> (pushToken: String, voipToken: String) in
+                return (pushToken: vanillaPushToken, voipToken: "")
             }
         }
     }

SignalServiceKit/src/Account/TSAccountManager.m

@@ -300,8 +300,9 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa
                                  remainingRetries:(int)remainingRetries
 {
     BOOL isUsingFullAPNs = [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
-    AnyPromise *promise = isUsingFullAPNs ? [LKPushNotificationManager registerWithToken:pushToken hexEncodedPublicKey:self.localNumber isForcedUpdate:isForcedUpdate]
-        : [LKPushNotificationManager registerWithToken:pushToken isForcedUpdate:isForcedUpdate];
+    NSData *pushTokenAsData = [NSData dataFromHexString:pushToken];
+    AnyPromise *promise = isUsingFullAPNs ? [LKPushNotificationManager registerWithToken:pushTokenAsData hexEncodedPublicKey:self.localNumber isForcedUpdate:isForcedUpdate]
+        : [LKPushNotificationManager registerWithToken:pushTokenAsData isForcedUpdate:isForcedUpdate];
     promise
     .then(^() {
         successHandler();