Respond to CR.

SignalServiceKit/src/Messages/Interactions/TSMessage.m

@@ -282,22 +282,11 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 // TODO deprecate this and implement something like previewTextWithTransaction: for all TSInteractions
 - (NSString *)description
 {
-    if (self.body.length > 0) {
+    __block NSString *result;
-        // Use the message text/caption, if any.
+    [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        return self.body;
+        result = [self previewTextWithTransaction:transaction];
-    } else if ([self hasAttachments]) {
+    }];
-        NSString *attachmentId = self.attachmentIds[0];
+    return result;
-        TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:attachmentId];
-        if (attachment) {
-            return attachment.description;
-        } else {
-            return NSLocalizedString(@"UNKNOWN_ATTACHMENT_LABEL", @"In Inbox view, last message label for thread with corrupted attachment.");
-        }
-    } else {
-        OWSFail(@"%@ message has neither body nor attachment.", self.logTag);
-        // TODO: We should do better here.
-        return @"";
-    }
 }
 
 - (void)removeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction