From be27ec0957d46746102b6dda0c2be03d476cfa5b Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 18 May 2020 15:15:15 -0300
Subject: [PATCH] Clean up usage of promises around push tokens.

---
 Signal/src/environment/PushRegistrationManager.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Signal/src/environment/PushRegistrationManager.swift b/Signal/src/environment/PushRegistrationManager.swift
index e50035baea..f8988b974d 100644
--- a/Signal/src/environment/PushRegistrationManager.swift
+++ b/Signal/src/environment/PushRegistrationManager.swift
@@ -58,9 +58,9 @@ public enum PushRegistrationError: Error {
     public func requestPushTokens() -> Promise<(pushToken: String, voipToken: String)> {
         Logger.info("")
 
-        return DispatchQueue.main.async(.promise) {
+        return firstly {
             return self.registerUserNotificationSettings()
-        }.then { () -> Promise<(pushToken: String, voipToken: String)> in
+        }.then { (_) -> Promise<(pushToken: String, voipToken: String)> in
             guard !Platform.isSimulator else {
                 throw PushRegistrationError.pushNotSupported(description: "Push not supported on simulators")
             }
@@ -138,8 +138,8 @@ public enum PushRegistrationError: Error {
     // User notification settings must be registered *before* AppDelegate will
     // return any requested push tokens.
     public func registerUserNotificationSettings() -> Promise<Void> {
-        AssertIsOnMainThread()
         Logger.info("registering user notification settings")
+
         return notificationPresenter.registerNotificationSettings()
     }