Merge branch 'charlesmchen/linkPreviewsAttachmentCleanup'

Signal/src/util/OWSOrphanDataCleaner.m

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSOrphanDataCleaner.h"
@@ -297,9 +297,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
     __block NSSet *threadIds;
     // Messages
     NSMutableSet<NSString *> *orphanInteractionIds = [NSMutableSet new];
-    NSMutableSet<NSString *> *messageAttachmentIds = [NSMutableSet new];
+    NSMutableSet<NSString *> *allMessageAttachmentIds = [NSMutableSet new];
-    NSMutableSet<NSString *> *quotedReplyThumbnailAttachmentIds = [NSMutableSet new];
-    NSMutableSet<NSString *> *contactShareAvatarAttachmentIds = [NSMutableSet new];
     [databaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
         [transaction
             enumerateKeysAndObjectsInCollection:TSAttachmentStream.collection
@@ -351,21 +349,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
                                          }
 
                                          TSMessage *message = (TSMessage *)interaction;
-                                         if (message.attachmentIds.count > 0) {
+                                         [allMessageAttachmentIds addObjectsFromArray:message.allAttachmentIds];
-                                             [messageAttachmentIds addObjectsFromArray:message.attachmentIds];
-                                         }
-
-                                         TSQuotedMessage *_Nullable quotedMessage = message.quotedMessage;
-                                         if (quotedMessage) {
-                                             [quotedReplyThumbnailAttachmentIds
-                                                 addObjectsFromArray:quotedMessage.thumbnailAttachmentStreamIds];
-                                         }
-
-                                         OWSContact *_Nullable contactShare = message.contactShare;
-                                         if (contactShare && contactShare.avatarAttachmentId) {
-                                             [contactShareAvatarAttachmentIds
-                                                 addObject:contactShare.avatarAttachmentId];
-                                         }
                                      }];
     }];
     if (shouldAbort) {
@@ -390,15 +374,11 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *);
     [self printPaths:missingAttachmentFilePaths.allObjects label:@"missing attachment file paths"];
 
     OWSLogDebug(@"attachmentIds: %zu", allAttachmentIds.count);
-    OWSLogDebug(@"messageAttachmentIds: %zu", messageAttachmentIds.count);
+    OWSLogDebug(@"allMessageAttachmentIds: %zu", allMessageAttachmentIds.count);
-    OWSLogDebug(@"quotedReplyThumbnailAttachmentIds: %zu", quotedReplyThumbnailAttachmentIds.count);
-    OWSLogDebug(@"contactShareAvatarAttachmentIds: %zu", contactShareAvatarAttachmentIds.count);
 
     NSMutableSet<NSString *> *orphanAttachmentIds = [allAttachmentIds mutableCopy];
-    [orphanAttachmentIds minusSet:messageAttachmentIds];
+    [orphanAttachmentIds minusSet:allMessageAttachmentIds];
-    [orphanAttachmentIds minusSet:quotedReplyThumbnailAttachmentIds];
+    NSMutableSet<NSString *> *missingAttachmentIds = [allMessageAttachmentIds mutableCopy];
-    [orphanAttachmentIds minusSet:contactShareAvatarAttachmentIds];
-    NSMutableSet<NSString *> *missingAttachmentIds = [messageAttachmentIds mutableCopy];
     [missingAttachmentIds minusSet:allAttachmentIds];
 
     OWSLogDebug(@"orphan attachmentIds: %zu", orphanAttachmentIds.count);

SignalServiceKit/src/Messages/Interactions/TSMessage.h

@@ -48,6 +48,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)removeAttachment:(TSAttachment *)attachment
              transaction:(YapDatabaseReadWriteTransaction *)transaction NS_SWIFT_NAME(removeAttachment(_:transaction:));
 
+// Returns ids for all attachments, including message ("body") attachments,
+// quoted reply thumbnails, contact share avatars, link preview images, etc.
+- (NSArray<NSString *> *)allAttachmentIds;
+
 - (BOOL)isMediaAlbumWithTransaction:(YapDatabaseReadTransaction *)transaction;
 
 - (void)setQuotedMessageThumbnailAttachmentStream:(TSAttachmentStream *)attachmentStream;

SignalServiceKit/src/Messages/Interactions/TSMessage.m

@@ -184,6 +184,28 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
     return self.attachmentIds ? (self.attachmentIds.count > 0) : NO;
 }
 
+- (NSArray<NSString *> *)allAttachmentIds
+{
+    NSMutableArray<NSString *> *result = [NSMutableArray new];
+    if (self.attachmentIds.count > 0) {
+        [result addObjectsFromArray:self.attachmentIds];
+    }
+
+    if (self.quotedMessage) {
+        [result addObjectsFromArray:self.quotedMessage.thumbnailAttachmentStreamIds];
+    }
+
+    if (self.contactShare.avatarAttachmentId) {
+        [result addObject:self.contactShare.avatarAttachmentId];
+    }
+
+    if (self.linkPreview.imageAttachmentId) {
+        [result addObject:self.linkPreview.imageAttachmentId];
+    }
+
+    return [result copy];
+}
+
 - (NSArray<TSAttachment *> *)attachmentsWithTransaction:(YapDatabaseReadTransaction *)transaction
 {
     NSMutableArray<TSAttachment *> *attachments = [NSMutableArray new];
@@ -338,7 +360,7 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 {
     [super removeWithTransaction:transaction];
 
-    for (NSString *attachmentId in self.attachmentIds) {
+    for (NSString *attachmentId in self.allAttachmentIds) {
         // We need to fetch each attachment, since [TSAttachment removeWithTransaction:] does important work.
         TSAttachment *_Nullable attachment =
             [TSAttachment fetchObjectWithUniqueID:attachmentId transaction:transaction];
@@ -349,14 +371,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
         [attachment removeWithTransaction:transaction];
     };
 
-    if (self.contactShare.avatarAttachmentId) {
-        [self.contactShare removeAvatarAttachmentWithTransaction:transaction];
-    }
-
-    if (self.linkPreview.imageAttachmentId) {
-        [self.linkPreview removeAttachmentWithTransaction:transaction];
-    }
-
     // Updates inbox thread preview
     [self touchThreadWithTransaction:transaction];
 }

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -1437,15 +1437,10 @@ NS_ASSUME_NONNULL_BEGIN
         [incomingMessage markAsReadAtTimestamp:envelope.timestamp sendReadReceipt:NO transaction:transaction];
     }
 
-    NSMutableArray<NSString *> *otherAttachmentIds = [NSMutableArray new];
+    // Download the "non-message body" attachments.
-    if (incomingMessage.quotedMessage.thumbnailAttachmentPointerId.length > 0) {
+    NSMutableArray<NSString *> *otherAttachmentIds = [incomingMessage.allAttachmentIds mutableCopy];
-        [otherAttachmentIds addObject:incomingMessage.quotedMessage.thumbnailAttachmentPointerId];
+    if (incomingMessage.attachmentIds) {
-    }
+        [otherAttachmentIds removeObjectsInArray:incomingMessage.attachmentIds];
-    if (incomingMessage.contactShare.avatarAttachmentId.length > 0) {
-        [otherAttachmentIds addObject:incomingMessage.contactShare.avatarAttachmentId];
-    }
-    if (incomingMessage.linkPreview.imageAttachmentId.length > 0) {
-        [otherAttachmentIds addObject:incomingMessage.linkPreview.imageAttachmentId];
     }
     for (NSString *attachmentId in otherAttachmentIds) {
         TSAttachmentPointer *_Nullable attachmentPointer =