Respond to CR.

Signal/src/ViewControllers/ColorPickerViewController.swift

@@ -434,6 +434,11 @@ private class MockConversationViewItem: NSObject, ConversationViewItem {
         owsFailDebug("unexpected invocation")
         return nil
     }
+
+    func mediaAlbumHasFailedAttachment() -> Bool {
+        owsFailDebug("unexpected invocation")
+        return false
+    }
 }
 
 private class MockIncomingMessage: TSIncomingMessage {

Signal/src/ViewControllers/ConversationView/Cells/MediaAlbumCellView.swift

@@ -152,7 +152,7 @@ public class MediaAlbumCellView: UIStackView {
         }
 
         for itemView in itemViews {
-            guard moreItemsView == itemView else {
+            guard moreItemsView != itemView else {
                 // Don't display the caption indicator on
                 // the "more" item, if any.
                 continue

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m

@@ -1388,17 +1388,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
                 return;
             }
 
-            if ([mediaAlbumCellView isMoreItemsViewWithMediaView:mediaView]) {
-                for (ConversationMediaAlbumItem *mediaAlbumItem in self.viewItem.mediaAlbumItems) {
-                    if (mediaAlbumItem.isFailedDownload) {
-                        // Treat the tap as a "retry" tap if:
-                        //
-                        // a) the user tapped on the "more items" cell.
-                        // b) there are any failed downloads in the album.
-                        [self.delegate didTapFailedIncomingAttachment:self.viewItem];
-                        return;
-                    }
-                }
+            if ([mediaAlbumCellView isMoreItemsViewWithMediaView:mediaView]
+                && self.viewItem.mediaAlbumHasFailedAttachment) {
+                [self.delegate didTapFailedIncomingAttachment:self.viewItem];
+                return;
             }
 
             TSAttachment *attachment = mediaView.attachment;

Signal/src/ViewControllers/ConversationView/ConversationViewItem.h

@@ -146,6 +146,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 
 - (nullable TSAttachmentStream *)firstValidAlbumAttachment;
 
+- (BOOL)mediaAlbumHasFailedAttachment;
+
 @end
 
 #pragma mark -

Signal/src/ViewControllers/ConversationView/ConversationViewItem.m

@@ -1084,6 +1084,19 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     }
 }
 
+- (BOOL)mediaAlbumHasFailedAttachment
+{
+    OWSAssertDebug(self.messageCellType == OWSMessageCellType_MediaAlbum);
+    OWSAssertDebug(self.mediaAlbumItems.count > 0);
+
+    for (ConversationMediaAlbumItem *mediaAlbumItem in self.mediaAlbumItems) {
+        if (mediaAlbumItem.isFailedDownload) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END