From 6d075747c094ec26dcccc08de01525dcad989a47 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 18 Oct 2018 11:09:56 -0400
Subject: [PATCH] Update local profile after registration and profile key
 rotation.

---
 SignalMessaging/profiles/OWSProfileManager.m    | 7 +++++++
 SignalServiceKit/src/Account/TSAccountManager.m | 1 +
 2 files changed, 8 insertions(+)

diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m
index a90bc5f3d..de7232af5 100644
--- a/SignalMessaging/profiles/OWSProfileManager.m
+++ b/SignalMessaging/profiles/OWSProfileManager.m
@@ -737,6 +737,13 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
             return [self.tsAccountManager updateAccountAttributes];
         });
 
+        // Fetch local profile.
+        promise = promise.then(^(id value) {
+            [self fetchLocalUsersProfile];
+
+            return @(1);
+        });
+
         promise = promise.then(^(id value) {
             [[NSNotificationCenter defaultCenter] postNotificationNameAsync:kNSNotificationName_ProfileKeyDidChange
                                                                      object:nil
diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m
index b834085de..5b1af082b 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/SignalServiceKit/src/Account/TSAccountManager.m
@@ -381,6 +381,7 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa
                     OWSLogInfo(@"Verification code accepted.");
                     [self storeServerAuthToken:authToken signalingKey:signalingKey];
                     [TSPreKeyManager createPreKeysWithSuccess:successBlock failure:failureBlock];
+                    [self.profileManager fetchLocalUsersProfile];
                     break;
                 }
                 default: {