From 6b58b4cbdeabaabffc3c99db5114fe33896ba6af Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 18 Dec 2017 23:00:11 -0500
Subject: [PATCH] Rework database view registration.

---
 .../src/Storage/OWSStorage+Subclass.h         | 23 +++++++++++++++++++
 SignalServiceKit/src/Storage/OWSStorage.h     |  8 -------
 SignalServiceKit/src/Storage/OWSStorage.m     |  1 +
 .../src/Storage/TSStorageManager.m            |  1 +
 4 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 SignalServiceKit/src/Storage/OWSStorage+Subclass.h

diff --git a/SignalServiceKit/src/Storage/OWSStorage+Subclass.h b/SignalServiceKit/src/Storage/OWSStorage+Subclass.h
new file mode 100644
index 000000000..511a224ae
--- /dev/null
+++ b/SignalServiceKit/src/Storage/OWSStorage+Subclass.h
@@ -0,0 +1,23 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
+#import "OWSStorage.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface OWSStorage (Subclass)
+
+- (void)runSyncRegistrations;
+- (void)runAsyncRegistrationsWithCompletion:(void (^_Nonnull)(void))completion;
+
+- (BOOL)areAsyncRegistrationsComplete;
+- (BOOL)areSyncRegistrationsComplete;
+
+- (NSString *)dbPath;
+
+- (void)resetStorage;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Storage/OWSStorage.h b/SignalServiceKit/src/Storage/OWSStorage.h
index 943fa8ca7..9da7e3e84 100644
--- a/SignalServiceKit/src/Storage/OWSStorage.h
+++ b/SignalServiceKit/src/Storage/OWSStorage.h
@@ -17,12 +17,6 @@ extern NSString *const StorageIsReadyNotification;
 
 + (BOOL)isStorageReady;
 
-- (void)runSyncRegistrations;
-- (void)runAsyncRegistrationsWithCompletion:(void (^_Nonnull)(void))completion;
-
-- (BOOL)areAsyncRegistrationsComplete;
-- (BOOL)areSyncRegistrationsComplete;
-
 /**
  * The safeBlockingMigrationsBlock block will
  * run any outstanding version migrations that are a) blocking and b) safe
@@ -44,8 +38,6 @@ extern NSString *const StorageIsReadyNotification;
                completionBlock:(nullable void (^)(BOOL ready))completionBlock;
 - (nullable id)registeredExtension:(NSString *)extensionName;
 
-- (void)resetStorage;
-
 #pragma mark - Password
 
 /**
diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m
index ad99f4a21..08645a8e7 100644
--- a/SignalServiceKit/src/Storage/OWSStorage.m
+++ b/SignalServiceKit/src/Storage/OWSStorage.m
@@ -6,6 +6,7 @@
 #import "AppContext.h"
 #import "NSData+Base64.h"
 #import "NSNotificationCenter+OWS.h"
+#import "OWSStorage+Subclass.h"
 #import "TSAttachmentStream.h"
 #import "TSStorageManager.h"
 #import <Curve25519Kit/Randomness.h>
diff --git a/SignalServiceKit/src/Storage/TSStorageManager.m b/SignalServiceKit/src/Storage/TSStorageManager.m
index 0d55a3ef6..2138a88af 100644
--- a/SignalServiceKit/src/Storage/TSStorageManager.m
+++ b/SignalServiceKit/src/Storage/TSStorageManager.m
@@ -11,6 +11,7 @@
 #import "OWSFileSystem.h"
 #import "OWSIncomingMessageFinder.h"
 #import "OWSMessageReceiver.h"
+#import "OWSStorage+Subclass.h"
 #import "TSDatabaseSecondaryIndexes.h"
 #import "TSDatabaseView.h"