From ebbe96a5d56c4e59186bda583e4d6d51cb59ce32 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 29 Jan 2018 13:40:16 -0500 Subject: [PATCH] Clean up ahead of PR. --- Signal/src/AppDelegate.m | 10 ---------- SignalServiceKit/src/Storage/OWSStorage.h | 4 ++++ SignalServiceKit/src/Storage/TSDatabaseView.m | 8 ++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index f50c57d29..803cf51a3 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -854,16 +854,6 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; [[OWSProfileManager sharedManager] ensureLocalProfileCached]; -//#ifdef DEBUG -// // A bug in orphan cleanup could be disastrous so let's only -// // run it in DEBUG builds for a few releases. -// // -// // TODO: Release to production once we have analytics. -// // TODO: Orphan cleanup is somewhat expensive - not least in doing a bunch -// // of disk access. We might want to only run it "once per version" -// // or something like that in production. -// [OWSOrphanedDataCleaner auditAndCleanupAsync:nil]; -//#endif [OWSProfileManager.sharedManager fetchLocalUsersProfile]; [[OWSReadReceiptManager sharedManager] prepareCachedValues]; diff --git a/SignalServiceKit/src/Storage/OWSStorage.h b/SignalServiceKit/src/Storage/OWSStorage.h index 6d83f4030..9101cc3cc 100644 --- a/SignalServiceKit/src/Storage/OWSStorage.h +++ b/SignalServiceKit/src/Storage/OWSStorage.h @@ -53,8 +53,12 @@ extern NSString *const StorageIsReadyNotification; // TODO: Deprecate? - (nullable YapDatabaseConnection *)newDatabaseConnection; +#ifdef DEBUG - (BOOL)registerExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName; +#endif + - (void)asyncRegisterExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName; + - (nullable id)registeredExtension:(NSString *)extensionName; - (unsigned long long)databaseFileSize; diff --git a/SignalServiceKit/src/Storage/TSDatabaseView.m b/SignalServiceKit/src/Storage/TSDatabaseView.m index 65b51668b..ad601577f 100644 --- a/SignalServiceKit/src/Storage/TSDatabaseView.m +++ b/SignalServiceKit/src/Storage/TSDatabaseView.m @@ -29,6 +29,14 @@ NSString *const TSUnseenDatabaseViewExtensionName = @"TSUnseenDatabaseViewExtens NSString *const TSThreadSpecialMessagesDatabaseViewExtensionName = @"TSThreadSpecialMessagesDatabaseViewExtensionName"; NSString *const TSSecondaryDevicesDatabaseViewExtensionName = @"TSSecondaryDevicesDatabaseViewExtensionName"; +@interface OWSStorage (TSDatabaseView) + +- (BOOL)registerExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName; + +@end + +#pragma mark - + @implementation TSDatabaseView + (void)registerCrossProcessNotifier:(OWSStorage *)storage