From 815ccbdcd161b711df628b752bd26167e3190c8e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 2 Aug 2018 15:31:21 -0400 Subject: [PATCH] Respond to CR. --- Signal/src/util/OWSOrphanDataCleaner.m | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Signal/src/util/OWSOrphanDataCleaner.m b/Signal/src/util/OWSOrphanDataCleaner.m index 128f902b3..9fb838973 100644 --- a/Signal/src/util/OWSOrphanDataCleaner.m +++ b/Signal/src/util/OWSOrphanDataCleaner.m @@ -264,12 +264,12 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *); return nil; } - NSMutableSet *allFilePaths = [NSMutableSet new]; - [allFilePaths unionSet:legacyAttachmentFilePaths]; - [allFilePaths unionSet:sharedDataAttachmentFilePaths]; - [allFilePaths unionSet:legacyProfileAvatarsFilePaths]; - [allFilePaths unionSet:sharedDataProfileAvatarFilePaths]; - [allFilePaths addObjectsFromArray:tempFilePaths]; + NSMutableSet *allOnDiskFilePaths = [NSMutableSet new]; + [allOnDiskFilePaths unionSet:legacyAttachmentFilePaths]; + [allOnDiskFilePaths unionSet:sharedDataAttachmentFilePaths]; + [allOnDiskFilePaths unionSet:legacyProfileAvatarsFilePaths]; + [allOnDiskFilePaths unionSet:sharedDataProfileAvatarFilePaths]; + [allOnDiskFilePaths addObjectsFromArray:tempFilePaths]; NSSet *profileAvatarFilePaths = [OWSUserProfile allProfileAvatarFilePaths]; @@ -277,13 +277,13 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *); return nil; } - NSNumber *_Nullable totalFileSize = [self fileSizeOfFilePathsSafe:allFilePaths.allObjects]; + NSNumber *_Nullable totalFileSize = [self fileSizeOfFilePathsSafe:allOnDiskFilePaths.allObjects]; if (!totalFileSize || !self.isMainAppAndActive) { return nil; } - NSUInteger fileCount = allFilePaths.count; + NSUInteger fileCount = allOnDiskFilePaths.count; // Attachments __block int attachmentStreamCount = 0; @@ -375,11 +375,11 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *); DDLogDebug(@"%@ attachmentStreams: %d", self.logTag, attachmentStreamCount); DDLogDebug(@"%@ attachmentStreams with file paths: %zu", self.logTag, allAttachmentFilePaths.count); - NSMutableSet *orphanFilePaths = [allFilePaths mutableCopy]; + NSMutableSet *orphanFilePaths = [allOnDiskFilePaths mutableCopy]; [orphanFilePaths minusSet:allAttachmentFilePaths]; [orphanFilePaths minusSet:profileAvatarFilePaths]; NSMutableSet *missingAttachmentFilePaths = [allAttachmentFilePaths mutableCopy]; - [missingAttachmentFilePaths minusSet:allFilePaths]; + [missingAttachmentFilePaths minusSet:allOnDiskFilePaths]; DDLogDebug(@"%@ orphan file paths: %zu", self.logTag, orphanFilePaths.count); DDLogDebug(@"%@ missing attachment file paths: %zu", self.logTag, missingAttachmentFilePaths.count); @@ -415,7 +415,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *); OWSAssertIsOnMainThread(); OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager]; - YapDatabaseConnection *databaseConnection = primaryStorage.newDatabaseConnection; + YapDatabaseConnection *databaseConnection = primaryStorage.dbReadWriteConnection; // In production, only clean up once per app version. #ifndef DEBUG @@ -438,7 +438,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *); + (void)auditAndCleanup:(BOOL)shouldRemoveOrphans { OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager]; - YapDatabaseConnection *databaseConnection = primaryStorage.newDatabaseConnection; + YapDatabaseConnection *databaseConnection = primaryStorage.dbReadWriteConnection; [self auditAndCleanup:shouldRemoveOrphans databaseConnection:databaseConnection]; }