From 73db16e068b07ccd217c74be3ae20490bac1a564 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 9 May 2017 10:45:41 -0400
Subject: [PATCH] Improve logging around push token sync.

// FREEBIE
---
 Signal/src/AppDelegate.m                                 | 4 ++--
 Signal/src/Models/SyncPushTokensJob.swift                | 7 +++----
 .../AdvancedSettingsTableViewController.m                | 2 ++
 Signal/src/ViewControllers/SignalsViewController.m       | 9 ++++++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 691a455b7..3688a6cd4 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -157,10 +157,10 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
                                           accountManager:[Environment getCurrent].accountManager
                                              preferences:[Environment preferences]]
                     .then(^{
-                        DDLogDebug(@"%@ Successfully ran syncPushTokensJob.", self.tag);
+                        DDLogWarn(@"%@ Successfully ran syncPushTokensJob.", self.tag);
                     })
                     .catch(^(NSError *_Nonnull error) {
-                        DDLogDebug(@"%@ Failed to run syncPushTokensJob with error: %@", self.tag, error);
+                        DDLogError(@"%@ Failed to run syncPushTokensJob with error: %@", self.tag, error);
                     });
 
                 // Clean up any messages that expired since last launch.
diff --git a/Signal/src/Models/SyncPushTokensJob.swift b/Signal/src/Models/SyncPushTokensJob.swift
index f5b11815b..1f2187830 100644
--- a/Signal/src/Models/SyncPushTokensJob.swift
+++ b/Signal/src/Models/SyncPushTokensJob.swift
@@ -43,13 +43,12 @@ class SyncPushTokensJob: NSObject {
             }
 
             guard shouldUploadTokens else {
-                Logger.info("\(self.TAG) skipping push token upload")
+                Logger.warn("\(self.TAG) Skipping push token upload. pushToken: \(pushToken), voipToken: \(voipToken)")
                 return Promise(value: ())
             }
 
-            Logger.info("\(self.TAG) Sending new tokens to account servers.")
+            Logger.warn("\(self.TAG) Sending new tokens to account servers. pushToken: \(pushToken), voipToken: \(voipToken)")
             return self.accountManager.updatePushTokens(pushToken:pushToken, voipToken:voipToken).then {
-                Logger.info("\(self.TAG) Recording tokens locally.")
                 return self.recordNewPushTokens(pushToken:pushToken, voipToken:voipToken)
             }
         }
@@ -70,7 +69,7 @@ class SyncPushTokensJob: NSObject {
     }
 
     private func recordNewPushTokens(pushToken: String, voipToken: String) -> Promise<Void> {
-        Logger.info("\(TAG) Recording new push tokens.")
+        Logger.warn("\(self.TAG) Recording new push tokens. pushToken: \(pushToken), voipToken: \(voipToken)")
 
         if (pushToken != self.preferences.getPushToken()) {
             Logger.info("\(TAG) Recording new plain push token")
diff --git a/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m
index 068260d4c..bc84cd846 100644
--- a/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m
+++ b/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m
@@ -137,9 +137,11 @@ typedef NS_ENUM(NSInteger, AdvancedSettingsTableViewControllerSection) {
         syncJob.uploadOnlyIfStale = NO;
         [syncJob run]
             .then(^{
+                DDLogWarn(@"%@ Successfully ran syncPushTokensJob.", self.tag);
                 SignalAlertView(NSLocalizedString(@"PUSH_REGISTER_SUCCESS", @"Alert title"), nil);
             })
             .catch(^(NSError *error) {
+                DDLogError(@"%@ Failed to run syncPushTokensJob with error: %@", self.tag, error);
                 SignalAlertView(NSLocalizedString(@"REGISTRATION_BODY", @"Alert title"), error.localizedDescription);
             });
 
diff --git a/Signal/src/ViewControllers/SignalsViewController.m b/Signal/src/ViewControllers/SignalsViewController.m
index 6b07a2539..196cdaa04 100644
--- a/Signal/src/ViewControllers/SignalsViewController.m
+++ b/Signal/src/ViewControllers/SignalsViewController.m
@@ -17,6 +17,7 @@
 #import "TSStorageManager.h"
 #import "UIUtil.h"
 #import "VersionMigrations.h"
+#import <PromiseKit/AnyPromise.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/TSMessagesManager.h>
@@ -350,7 +351,13 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
         [[OWSSyncPushTokensJob alloc] initWithPushManager:[PushManager sharedManager]
                                            accountManager:self.accountManager
                                               preferences:[Environment preferences]];
-    [syncPushTokensJob run];
+    [syncPushTokensJob run]
+        .then(^{
+            DDLogWarn(@"%@ Successfully ran syncPushTokensJob.", self.tag);
+        })
+        .catch(^(NSError *_Nonnull error) {
+            DDLogError(@"%@ Failed to run syncPushTokensJob with error: %@", self.tag, error);
+        });
 }
 
 - (void)tableViewSetUp {