Merge branch 'charlesmchen/dbConnForOrphanDataCleaner'

pull/1/head
Michael Kirk 6 years ago
commit 3ee1c078fc

@ -457,7 +457,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager]; OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager];
YapDatabaseConnection *databaseConnection = primaryStorage.dbReadWriteConnection; YapDatabaseConnection *databaseConnection = [primaryStorage newDatabaseConnection];
if (![self shouldAuditOnLaunch:databaseConnection]) { if (![self shouldAuditOnLaunch:databaseConnection]) {
return; return;
@ -479,7 +479,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
+ (void)auditAndCleanup:(BOOL)shouldRemoveOrphans completion:(dispatch_block_t)completion + (void)auditAndCleanup:(BOOL)shouldRemoveOrphans completion:(dispatch_block_t)completion
{ {
OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager]; OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager];
YapDatabaseConnection *databaseConnection = primaryStorage.dbReadWriteConnection; YapDatabaseConnection *databaseConnection = [primaryStorage newDatabaseConnection];
[self auditAndCleanup:shouldRemoveOrphans databaseConnection:databaseConnection completion:completion]; [self auditAndCleanup:shouldRemoveOrphans databaseConnection:databaseConnection completion:completion];
} }

Loading…
Cancel
Save