Clean up TSStorageManager usage.
This commit is contained in:
parent
d3efb2e1c9
commit
f88b954ab5
|
@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
- (instancetype)init NS_UNAVAILABLE;
|
||||
- (instancetype)initStorage NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
- (void)setDatabaseInitialized;
|
||||
- (void)setSyncRegistrationsAreComplete;
|
||||
|
||||
+ (void)resetAllStorage;
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
|
|||
|
||||
@protocol OWSDatabaseConnectionDelegate <NSObject>
|
||||
|
||||
- (BOOL)isDatabaseInitialized;
|
||||
- (BOOL)areSyncRegistrationsAreComplete;
|
||||
|
||||
@end
|
||||
|
||||
|
@ -80,7 +80,7 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
|
|||
{
|
||||
id<OWSDatabaseConnectionDelegate> delegate = self.delegate;
|
||||
OWSAssert(delegate);
|
||||
OWSAssert(delegate.isDatabaseInitialized);
|
||||
OWSAssert(delegate.areSyncRegistrationsAreComplete);
|
||||
|
||||
[super readWriteWithBlock:block];
|
||||
}
|
||||
|
@ -89,7 +89,7 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
|
|||
{
|
||||
id<OWSDatabaseConnectionDelegate> delegate = self.delegate;
|
||||
OWSAssert(delegate);
|
||||
OWSAssert(delegate.isDatabaseInitialized);
|
||||
OWSAssert(delegate.areSyncRegistrationsAreComplete);
|
||||
|
||||
[super asyncReadWriteWithBlock:block];
|
||||
}
|
||||
|
@ -99,7 +99,7 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
|
|||
{
|
||||
id<OWSDatabaseConnectionDelegate> delegate = self.delegate;
|
||||
OWSAssert(delegate);
|
||||
OWSAssert(delegate.isDatabaseInitialized);
|
||||
OWSAssert(delegate.areSyncRegistrationsAreComplete);
|
||||
|
||||
[super asyncReadWriteWithBlock:block completionBlock:completionBlock];
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
|
|||
{
|
||||
id<OWSDatabaseConnectionDelegate> delegate = self.delegate;
|
||||
OWSAssert(delegate);
|
||||
OWSAssert(delegate.isDatabaseInitialized);
|
||||
OWSAssert(delegate.areSyncRegistrationsAreComplete);
|
||||
|
||||
[super asyncReadWriteWithBlock:block completionQueue:completionQueue completionBlock:completionBlock];
|
||||
}
|
||||
|
@ -232,7 +232,7 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
|
|||
@interface OWSStorage () <OWSDatabaseConnectionDelegate>
|
||||
|
||||
@property (atomic, nullable) YapDatabase *database;
|
||||
@property (atomic) BOOL isDatabaseInitialized;
|
||||
@property (atomic) BOOL areSyncRegistrationsAreComplete;
|
||||
|
||||
@end
|
||||
|
||||
|
@ -270,11 +270,11 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
|
|||
return self;
|
||||
}
|
||||
|
||||
- (void)setDatabaseInitialized
|
||||
- (void)setSyncRegistrationsAreComplete
|
||||
{
|
||||
OWSAssert(!self.isDatabaseInitialized);
|
||||
OWSAssert(!self.areSyncRegistrationsAreComplete);
|
||||
|
||||
self.isDatabaseInitialized = YES;
|
||||
self.areSyncRegistrationsAreComplete = YES;
|
||||
}
|
||||
|
||||
- (BOOL)tryToLoadDatabase
|
||||
|
|
|
@ -86,7 +86,7 @@ NSString *const TSStorageManagerExceptionName_CouldNotCreateDatabaseDirectory
|
|||
// seeing, this issue only seems to affect sync and not async registrations. We've always
|
||||
// been opening write transactions before the async registrations complete without negative
|
||||
// consequences.
|
||||
[self setDatabaseInitialized];
|
||||
[self setSyncRegistrationsAreComplete];
|
||||
|
||||
// Run the blocking migrations.
|
||||
//
|
||||
|
|
Loading…
Reference in New Issue