From c5744321ba707bf36a1112ce9c282de18dc3d298 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 28 Nov 2018 10:02:48 -0500
Subject: [PATCH] Backup misc collections.

---
 Signal/src/util/Backup/OWSBackupExportJob.m  |  5 +++++
 Signal/src/util/Backup/OWSBackupImportJob.m  | 16 ++++++++++++++++
 SignalMessaging/profiles/OWSProfileManager.h |  2 ++
 3 files changed, 23 insertions(+)

diff --git a/Signal/src/util/Backup/OWSBackupExportJob.m b/Signal/src/util/Backup/OWSBackupExportJob.m
index 53ef93cb0..2e1cf1dbc 100644
--- a/Signal/src/util/Backup/OWSBackupExportJob.m
+++ b/Signal/src/util/Backup/OWSBackupExportJob.m
@@ -642,6 +642,11 @@ NS_ASSUME_NONNULL_BEGIN
             }
         }
 
+        for (NSString *collection in [exportedCollections.allObjects sortedArrayUsingSelector:@selector(compare:)]) {
+            OWSLogVerbose(@"Exported collection: %@", collection);
+        }
+        OWSLogVerbose(@"Exported collections: %lu", (unsigned long)exportedCollections.count);
+
         NSSet<NSString *> *allCollections = [NSSet setWithArray:transaction.allCollections];
         NSMutableSet *unexportedCollections = [allCollections mutableCopy];
         [unexportedCollections minusSet:exportedCollections];
diff --git a/Signal/src/util/Backup/OWSBackupImportJob.m b/Signal/src/util/Backup/OWSBackupImportJob.m
index b6a6d591e..5bc7333ca 100644
--- a/Signal/src/util/Backup/OWSBackupImportJob.m
+++ b/Signal/src/util/Backup/OWSBackupImportJob.m
@@ -44,6 +44,18 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
     return SSKEnvironment.shared.primaryStorage;
 }
 
+- (OWSProfileManager *)profileManager
+{
+    return [OWSProfileManager sharedManager];
+}
+
+- (TSAccountManager *)tsAccountManager
+{
+    OWSAssertDebug(SSKEnvironment.shared.tsAccountManager);
+
+    return SSKEnvironment.shared.tsAccountManager;
+}
+
 #pragma mark -
 
 - (void)startAsync
@@ -173,6 +185,10 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
                                     return;
                                 }
 
+                                [weakSelf.profileManager fetchLocalUsersProfile];
+
+                                [weakSelf.tsAccountManager updateAccountAttributes];
+
                                 // Kick off lazy restore.
                                 [OWSBackupLazyRestoreJob runAsync];
 
diff --git a/SignalMessaging/profiles/OWSProfileManager.h b/SignalMessaging/profiles/OWSProfileManager.h
index 9e917cc6d..a35193ab9 100644
--- a/SignalMessaging/profiles/OWSProfileManager.h
+++ b/SignalMessaging/profiles/OWSProfileManager.h
@@ -51,6 +51,8 @@ extern const NSUInteger kOWSProfileManager_MaxAvatarDiameter;
 
 - (BOOL)isProfileNameTooLong:(nullable NSString *)profileName;
 
+- (void)fetchLocalUsersProfile;
+
 #pragma mark - Profile Whitelist
 
 // These methods are for debugging.