keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 06d84860ae
commit 815ccbdcd1
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

24
Signal/src/util/OWSOrphanDataCleaner.m
Unescape Escape View File

@ -264,12 +264,12 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
return nil; return nil;
} }
NSMutableSet<NSString *> *allFilePaths = [NSMutableSet new]; NSMutableSet<NSString *> *allOnDiskFilePaths = [NSMutableSet new];
[allFilePaths unionSet:legacyAttachmentFilePaths]; [allOnDiskFilePaths unionSet:legacyAttachmentFilePaths];
[allFilePaths unionSet:sharedDataAttachmentFilePaths]; [allOnDiskFilePaths unionSet:sharedDataAttachmentFilePaths];
[allFilePaths unionSet:legacyProfileAvatarsFilePaths]; [allOnDiskFilePaths unionSet:legacyProfileAvatarsFilePaths];
[allFilePaths unionSet:sharedDataProfileAvatarFilePaths]; [allOnDiskFilePaths unionSet:sharedDataProfileAvatarFilePaths];
[allFilePaths addObjectsFromArray:tempFilePaths]; [allOnDiskFilePaths addObjectsFromArray:tempFilePaths];
NSSet<NSString *> *profileAvatarFilePaths = [OWSUserProfile allProfileAvatarFilePaths]; NSSet<NSString *> *profileAvatarFilePaths = [OWSUserProfile allProfileAvatarFilePaths];
@ -277,13 +277,13 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
return nil; return nil;
} }
NSNumber *_Nullable totalFileSize = [self fileSizeOfFilePathsSafe:allFilePaths.allObjects]; NSNumber *_Nullable totalFileSize = [self fileSizeOfFilePathsSafe:allOnDiskFilePaths.allObjects];
if (!totalFileSize || !self.isMainAppAndActive) { if (!totalFileSize || !self.isMainAppAndActive) {
return nil; return nil;
} }
NSUInteger fileCount = allFilePaths.count; NSUInteger fileCount = allOnDiskFilePaths.count;
// Attachments // Attachments
__block int attachmentStreamCount = 0; __block int attachmentStreamCount = 0;
@ -375,11 +375,11 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
DDLogDebug(@"%@ attachmentStreams: %d", self.logTag, attachmentStreamCount); DDLogDebug(@"%@ attachmentStreams: %d", self.logTag, attachmentStreamCount);
DDLogDebug(@"%@ attachmentStreams with file paths: %zu", self.logTag, allAttachmentFilePaths.count); DDLogDebug(@"%@ attachmentStreams with file paths: %zu", self.logTag, allAttachmentFilePaths.count);
NSMutableSet<NSString *> *orphanFilePaths = [allFilePaths mutableCopy]; NSMutableSet<NSString *> *orphanFilePaths = [allOnDiskFilePaths mutableCopy];
[orphanFilePaths minusSet:allAttachmentFilePaths]; [orphanFilePaths minusSet:allAttachmentFilePaths];
[orphanFilePaths minusSet:profileAvatarFilePaths]; [orphanFilePaths minusSet:profileAvatarFilePaths];
NSMutableSet<NSString *> *missingAttachmentFilePaths = [allAttachmentFilePaths mutableCopy]; NSMutableSet<NSString *> *missingAttachmentFilePaths = [allAttachmentFilePaths mutableCopy];
[missingAttachmentFilePaths minusSet:allFilePaths]; [missingAttachmentFilePaths minusSet:allOnDiskFilePaths];
DDLogDebug(@"%@ orphan file paths: %zu", self.logTag, orphanFilePaths.count); DDLogDebug(@"%@ orphan file paths: %zu", self.logTag, orphanFilePaths.count);
DDLogDebug(@"%@ missing attachment file paths: %zu", self.logTag, missingAttachmentFilePaths.count); DDLogDebug(@"%@ missing attachment file paths: %zu", self.logTag, missingAttachmentFilePaths.count);
@ -415,7 +415,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager]; OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager];
YapDatabaseConnection *databaseConnection = primaryStorage.newDatabaseConnection; YapDatabaseConnection *databaseConnection = primaryStorage.dbReadWriteConnection;
// In production, only clean up once per app version. // In production, only clean up once per app version.
#ifndef DEBUG #ifndef DEBUG
@ -438,7 +438,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
+ (void)auditAndCleanup:(BOOL)shouldRemoveOrphans + (void)auditAndCleanup:(BOOL)shouldRemoveOrphans
{ {
OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager]; OWSPrimaryStorage *primaryStorage = [OWSPrimaryStorage sharedManager];
YapDatabaseConnection *databaseConnection = primaryStorage.newDatabaseConnection; YapDatabaseConnection *databaseConnection = primaryStorage.dbReadWriteConnection;
[self auditAndCleanup:shouldRemoveOrphans databaseConnection:databaseConnection]; [self auditAndCleanup:shouldRemoveOrphans databaseConnection:databaseConnection];
} }

Write Preview
Loading…
Cancel
Save