Clean up TSStorageManager usage.

2017-12-18 21:42:50 -05:00 · 2017-12-18 21:42:50 -05:00 · d52eba739d
parent 85686d3144
commit d52eba739d
26 changed files with 28 additions and 15 deletions
--- a/SignalMessaging/Views/ThreadViewHelper.m
+++ b/SignalMessaging/Views/ThreadViewHelper.m
@ -7,7 +7,7 @@
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSStorageManager.h>
 #import <SignalServiceKit/TSThread.h>
-#import <YapDatabase/YapDatabaseConnection.h>
+#import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseViewChange.h>
 #import <YapDatabase/YapDatabaseViewConnection.h>

--- a/SignalMessaging/contacts/OWSContactsSyncing.m
+++ b/SignalMessaging/contacts/OWSContactsSyncing.m
@ -6,6 +6,7 @@
 #import "Environment.h"
 #import "OWSContactsManager.h"
 #import "OWSProfileManager.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <SignalServiceKit/DataSource.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/OWSMessageSender.h>
--- a/SignalMessaging/environment/SignalKeyingStorage.m
+++ b/SignalMessaging/environment/SignalKeyingStorage.m
@ -3,6 +3,7 @@
 //

 #import "SignalKeyingStorage.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/TSStorageManager.h>

--- a/SignalMessaging/environment/VersionMigrations.m
+++ b/SignalMessaging/environment/VersionMigrations.m
@ -12,6 +12,7 @@
 #import <SignalServiceKit/NSUserDefaults+OWS.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSNetworkManager.h>
+#import <YapDatabase/YapDatabase.h>

 #define NEEDS_TO_REGISTER_PUSH_KEY @"Register For Push"
 #define NEEDS_TO_REGISTER_ATTRIBUTES @"Register Attributes"
--- a/SignalMessaging/environment/migrations/OWS102MoveLoggingPreferenceToUserDefaults.m
+++ b/SignalMessaging/environment/migrations/OWS102MoveLoggingPreferenceToUserDefaults.m
@ -6,6 +6,7 @@
 #import "DebugLogger.h"
 #import "Environment.h"
 #import "OWSPreferences.h"
+#import <YapDatabase/YapDatabase.h>

 // Increment a similar constant for every future DBMigration
 static NSString *const OWS102MoveLoggingPreferenceToUserDefaultsMigrationId = @"102";
--- a/SignalMessaging/utils/OWSPreferences.m
+++ b/SignalMessaging/utils/OWSPreferences.m
@ -3,6 +3,7 @@
 //

 #import "OWSPreferences.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <SignalServiceKit/NSUserDefaults+OWS.h>
 #import <SignalServiceKit/TSStorageHeaders.h>

--- a/SignalServiceKit/src/Contacts/ContactsUpdater.m
+++ b/SignalServiceKit/src/Contacts/ContactsUpdater.m
@ -10,6 +10,7 @@
 #import "TSContactsIntersectionRequest.h"
 #import "TSNetworkManager.h"
 #import "TSStorageManager.h"
+#import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Devices/OWSDevice.m
+++ b/SignalServiceKit/src/Devices/OWSDevice.m
@ -6,6 +6,7 @@
 #import "NSDate+OWS.h"
 #import "OWSError.h"
 #import "TSStorageManager.h"
+#import "YapDatabaseConnection+OWS.h"
 #import "YapDatabaseConnection.h"
 #import "YapDatabaseTransaction.h"
 #import <Mantle/MTLValueTransformer.h>
--- a/SignalServiceKit/src/Messages/OWSBlockingManager.m
+++ b/SignalServiceKit/src/Messages/OWSBlockingManager.m
@ -8,6 +8,7 @@
 #import "OWSMessageSender.h"
 #import "TSStorageManager.h"
 #import "TextSecureKitEnv.h"
+#import "YapDatabaseConnection+OWS.h"

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
@ -8,7 +8,7 @@
 #import "TSOutgoingMessage.h"
 #import "TSStorageManager.h"
 #import "TSThread.h"
-#import <YapDatabase/YapDatabaseConnection.h>
+#import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseQuery.h>
 #import <YapDatabase/YapDatabaseSecondaryIndex.h>

--- a/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m
+++ b/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m
@ -5,7 +5,7 @@
 #import "OWSFailedAttachmentDownloadsJob.h"
 #import "TSAttachmentPointer.h"
 #import "TSStorageManager.h"
-#import <YapDatabase/YapDatabaseConnection.h>
+#import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseQuery.h>
 #import <YapDatabase/YapDatabaseSecondaryIndex.h>

--- a/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m
+++ b/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m
@ -6,7 +6,7 @@
 #import "TSMessage.h"
 #import "TSOutgoingMessage.h"
 #import "TSStorageManager.h"
-#import <YapDatabase/YapDatabaseConnection.h>
+#import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseQuery.h>
 #import <YapDatabase/YapDatabaseSecondaryIndex.h>

--- a/SignalServiceKit/src/Messages/OWSIdentityManager.m
+++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m
@ -20,6 +20,7 @@
 #import "TSStorageManager+sessionStore.h"
 #import "TSStorageManager.h"
 #import "TextSecureKitEnv.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <Curve25519Kit/Curve25519.h>

--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@ -39,6 +39,7 @@
 #import "TSStorageManager+SessionStore.h"
 #import "TSStorageManager.h"
 #import "TextSecureKitEnv.h"
+#import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m
+++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m
@ -16,6 +16,8 @@
 #import "TSStorageManager.h"
 #import "TextSecureKitEnv.h"
 #import "Threading.h"
+#import "YapDatabaseConnection+OWS.h"
+#import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Network/OWSSignalService.m
+++ b/SignalServiceKit/src/Network/OWSSignalService.m
@ -10,6 +10,7 @@
 #import "TSAccountManager.h"
 #import "TSConstants.h"
 #import "TSStorageManager.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <AFNetworking/AFHTTPSessionManager.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Security/OWSRecipientIdentity.m
+++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.m
@ -4,7 +4,7 @@

 #import "OWSRecipientIdentity.h"
 #import "TSStorageManager.h"
-#import <YapDatabase/YapDatabaseConnection.h>
+#import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+Calling.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+Calling.m
@ -3,6 +3,7 @@
 //

 #import "TSStorageManager+Calling.h"
+#import "YapDatabaseConnection+OWS.h"

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+PreKeyStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+PreKeyStore.m
@ -4,6 +4,7 @@

 #import "TSStorageManager+PreKeyStore.h"
 #import "TSStorageManager+keyFromIntLong.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <AxolotlKit/AxolotlExceptions.h>
 #import <AxolotlKit/SessionBuilder.h>

--- a/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m
@ -4,6 +4,7 @@

 #import "TSStorageManager+SessionStore.h"
 #import <AxolotlKit/SessionRecord.h>
+#import <YapDatabase/YapDatabase.h>

 NSString *const TSStorageManagerSessionStoreCollection = @"TSStorageManagerSessionStoreCollection";
 NSString *const kSessionStoreDBConnectionKey = @"kSessionStoreDBConnectionKey";
--- a/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SignedPreKeyStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SignedPreKeyStore.m
@ -6,6 +6,7 @@
 #import "TSStorageManager+PreKeyStore.h"
 #import "TSStorageManager+SignedPreKeyStore.h"
 #import "TSStorageManager+keyFromIntLong.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <AxolotlKit/AxolotlExceptions.h>
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <Curve25519Kit/Ed25519.h>
--- a/SignalServiceKit/src/Storage/OWSOrphanedDataCleaner.m
+++ b/SignalServiceKit/src/Storage/OWSOrphanedDataCleaner.m
@ -9,6 +9,7 @@
 #import "TSMessage.h"
 #import "TSStorageManager.h"
 #import "TSThread.h"
+#import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Storage/OWSStorage.m
+++ b/SignalServiceKit/src/Storage/OWSStorage.m
@ -9,6 +9,7 @@
 #import "TSStorageManager.h"
 #import <Curve25519Kit/Randomness.h>
 #import <SAMKeychain/SAMKeychain.h>
+#import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Storage/TSStorageManager+messageIDs.m
+++ b/SignalServiceKit/src/Storage/TSStorageManager+messageIDs.m
@ -1,12 +1,9 @@
 //
-//  TSStorageManager+messageIDs.m
-//  Signal
-//
-//  Created by Frederic Jacobs on 24/01/15.
-//  Copyright (c) 2015 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import "TSStorageManager+messageIDs.h"
+#import <YapDatabase/YapDatabase.h>

 #define TSStorageParametersCollection @"TSStorageParametersCollection"
 #define TSMessagesLatestId @"TSMessagesLatestId"
--- a/SignalServiceKit/src/Storage/TSStorageManager.h
+++ b/SignalServiceKit/src/Storage/TSStorageManager.h
@ -4,11 +4,6 @@

 #import "OWSStorage.h"
 #import "TSStorageKeys.h"
-#import "YapDatabaseConnection+OWS.h"
-
-@class ECKeyPair;
-@class PreKeyRecord;
-@class SignedPreKeyRecord;

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Util/OWSAnalytics.m
+++ b/SignalServiceKit/src/Util/OWSAnalytics.m
@ -7,8 +7,10 @@
 #import "OWSBackgroundTask.h"
 #import "OWSQueues.h"
 #import "TSStorageManager.h"
+#import "YapDatabaseConnection+OWS.h"
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import <Reachability/Reachability.h>
+#import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN