From a9b6fe5978a5d32f44d0a6d35523dd8605b9ddfc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Jun 2018 15:00:45 -0400 Subject: [PATCH] Respond to CR. --- .../ViewControllers/ConversationView/ConversationViewItem.m | 2 +- .../ViewControllers/ConversationView/ConversationViewLayout.h | 2 +- Signal/src/ViewControllers/MessageDetailViewController.swift | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index a89f38ebb..757e4e201 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -263,7 +263,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (CGFloat)vSpacingWithPreviousLayoutItem:(ConversationViewItem *)previousLayoutItem { - OWSAssert(lastItem); + OWSAssert(previousLayoutItem); if (self.interaction.interactionType == OWSInteractionType_UnreadIndicator || previousLayoutItem.interaction.interactionType == OWSInteractionType_UnreadIndicator) { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.h b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.h index 5fc3b17be..f7f0910ad 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.h @@ -23,7 +23,7 @@ typedef NS_ENUM(NSInteger, ConversationViewLayoutAlignment) { - (ConversationViewLayoutAlignment)layoutAlignment; -- (CGFloat)vSpacingWithPreviousLayoutItem:(id)lastLayoutItem; +- (CGFloat)vSpacingWithPreviousLayoutItem:(id)previousLayoutItem; @end diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index 9774ea526..62d837129 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -40,6 +40,8 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele var attachmentStream: TSAttachmentStream? var messageBody: String? + var conversationLayoutInfo: ConversationLayoutInfo + private var contactShareViewHelper: ContactShareViewHelper // MARK: Initializers @@ -57,6 +59,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele self.mode = mode self.uiDatabaseConnection = OWSPrimaryStorage.shared().newDatabaseConnection() self.contactShareViewHelper = ContactShareViewHelper(contactsManager: contactsManager) + self.conversationLayoutInfo = ConversationLayoutInfo(thread: thread) super.init(nibName: nil, bundle: nil) @@ -343,7 +346,6 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele messageBubbleView.viewItem = viewItem messageBubbleView.cellMediaCache = NSCache() let conversationLayoutInfo = ConversationLayoutInfo(thread: thread) - conversationLayoutInfo.viewWidth = self.view.width() messageBubbleView.layoutInfo = conversationLayoutInfo messageBubbleView.configureViews() messageBubbleView.loadContent()