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

---
 Signal/src/util/Backup/OWSBackup.m            | 34 ++++---------------
 .../src/Messages/OWSBlockingManager.h         |  2 ++
 .../src/Messages/OWSIdentityManager.h         |  2 ++
 .../src/Storage/SSKIncrementingIdFinder.swift |  3 +-
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m
index 5cdcb7c0e..69a8af09a 100644
--- a/Signal/src/util/Backup/OWSBackup.m
+++ b/Signal/src/util/Backup/OWSBackup.m
@@ -8,6 +8,7 @@
 #import "OWSBackupImportJob.h"
 #import "Signal-Swift.h"
 #import <SignalCoreKit/Randomness.h>
+#import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/YapDatabaseConnection+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -53,34 +54,13 @@ NSString *NSStringForBackupImportState(OWSBackupState state)
 
 NSArray<NSString *> *MiscCollectionsToBackup(void)
 {
-    //        IncrementingIdCollection
-    //        OWSContactsManagerCollection
-    //        OWSOrphanDataCleaner_Collection
-    //        OWSPrimaryStorage_OWSBackupCollection
-    //        OWSReadReceiptManagerCollection
-    //        OWSRecipientIdentity
-    //        Signal.ExperienceUpgrade
-    //        SignalAccount
-    //        SignalPreferences
-    //        SignalRecipient
-    //        TSStorageInternalSettingsCollection
-    //        TSStorageManagerIdentityKeyStoreCollection
-    //        TSStorageManagerPreKeyStoreCollection
-    //        TSStorageManagerSessionStoreCollection
-    //        TSStorageManagerSignedPreKeyMetadataCollection
-    //        TSStorageManagerSignedPreKeyStoreCollection
-    //        TSStorageManagerTrustedKeysCollection
-    //        TSStorageUserAccountCollection
-    //        UserProfile
-    //        kOWSProfileManager_UserWhitelistCollection
-    //        kProfileView_Collection
-    //        kTSStorageManagerOWSSyncManagerCollection
-    //        kTSStorageManager_OWSDeviceCollection
-    //        kUDCollection
-    //        kUnidentifiedAccessCollection
-
     return @[
-        OWSPreferencesSignalDatabaseCollection,
+             kOWSBlockingManager_BlockListCollection,
+             OWSUserProfile.collection,
+             SSKIncrementingIdFinder.collectionName,
+             OWSPreferencesSignalDatabaseCollection,
+             OWSPrimaryStorageIdentityKeyStoreCollection,
+             OWSPrimaryStorageTrustedKeysCollection,
     ];
 }
 
diff --git a/SignalServiceKit/src/Messages/OWSBlockingManager.h b/SignalServiceKit/src/Messages/OWSBlockingManager.h
index 3280dd645..40b81f865 100644
--- a/SignalServiceKit/src/Messages/OWSBlockingManager.h
+++ b/SignalServiceKit/src/Messages/OWSBlockingManager.h
@@ -10,6 +10,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 extern NSString *const kNSNotificationName_BlockListDidChange;
 
+extern NSString *const kOWSBlockingManager_BlockListCollection;
+
 // This class can be safely accessed and used from any thread.
 @interface OWSBlockingManager : NSObject
 
diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.h b/SignalServiceKit/src/Messages/OWSIdentityManager.h
index 2d487487d..b436b717d 100644
--- a/SignalServiceKit/src/Messages/OWSIdentityManager.h
+++ b/SignalServiceKit/src/Messages/OWSIdentityManager.h
@@ -7,6 +7,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSString *const OWSPrimaryStorageIdentityKeyStoreCollection;
+
 extern NSString *const OWSPrimaryStorageTrustedKeysCollection;
 
 // This notification will be fired whenever identities are created
diff --git a/SignalServiceKit/src/Storage/SSKIncrementingIdFinder.swift b/SignalServiceKit/src/Storage/SSKIncrementingIdFinder.swift
index d8f06970c..802f2fd50 100644
--- a/SignalServiceKit/src/Storage/SSKIncrementingIdFinder.swift
+++ b/SignalServiceKit/src/Storage/SSKIncrementingIdFinder.swift
@@ -7,7 +7,8 @@ import Foundation
 @objc
 public class SSKIncrementingIdFinder: NSObject {
 
-    private static let collectionName = "IncrementingIdCollection"
+    @objc
+    public static let collectionName = "IncrementingIdCollection"
 
     @objc
     public class func previousId(key: String, transaction: YapDatabaseReadTransaction) -> UInt64 {