From 619c3a7f84ef7acf91128a8711332bd1ba539ff5 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 17 Apr 2020 14:32:26 +1000
Subject: [PATCH] Debug

---
 Signal/src/AppDelegate.m                                    | 2 ++
 .../AppSettings/NotificationSettingsViewController.m        | 4 +++-
 Signal/src/environment/PushRegistrationManager.swift        | 6 ++----
 SignalServiceKit/src/Account/TSAccountManager.m             | 5 +++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 72379bd5f..0c0b46db3 100644
--- a/Signal/src/AppDelegate.m
+++ b/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) {
diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m
index dcc236ed4..ee87a589b 100644
--- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m
+++ b/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
diff --git a/Signal/src/environment/PushRegistrationManager.swift b/Signal/src/environment/PushRegistrationManager.swift
index acadafecd..856719d9a 100644
--- a/Signal/src/environment/PushRegistrationManager.swift
+++ b/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: "")
             }
         }
     }
diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m
index 7820467cf..4c9029336 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/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();