From 9769d482dae690f290ba882832121e99429ec23e Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 10 Apr 2018 10:48:22 -0400
Subject: [PATCH] Respond to CR.

---
 .../ViewControllers/ConversationView/ConversationViewItem.m | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index 6c47fceb6..a8c14c96f 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -658,7 +658,11 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
             TSIncomingMessage *incomingMessage = (TSIncomingMessage *)self.interaction;
             if (incomingMessage.hasAttachments) {
                 NSString *attachmentId = incomingMessage.attachmentIds.firstObject;
-                TSAttachment *_Nullable attachment = [TSAttachment fetchObjectWithUniqueID:attachmentId];
+                __block TSAttachment *_Nullable attachment = nil;
+                [[OWSPrimaryStorage.sharedManager newDatabaseConnection]
+                    readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+                        attachment = [TSAttachment fetchObjectWithUniqueID:attachmentId transaction:transaction];
+                    }];
                 if (![attachment isKindOfClass:[TSAttachmentStream class]]) {
                     // Don't let users reply to attachments which aren't yet downloaded
                     // (or otherwise missing on disk).