From 55c6d99d988caab7981f7f1bfa310fb24bb3314e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 6 Apr 2018 11:15:21 -0400 Subject: [PATCH] populate draft toolbar // FREEBIE --- .../ConversationView/ConversationInputToolbar.m | 2 +- .../src/Messages/Interactions/TSQuotedMessage.m | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 9a03dc511..d7325096f 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -250,7 +250,7 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5; [self ensureContentConstraints]; } -- (void)setQuotedMessage:(nullable OWSQuotedReplyDraft *)quotedReplyDraft +- (void)setQuotedReplyDraft:(nullable OWSQuotedReplyDraft *)quotedReplyDraft { if (quotedReplyDraft == _quotedReplyDraft) { return; diff --git a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m index 6bb3a51a9..d45c49699 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m @@ -47,6 +47,11 @@ NS_ASSUME_NONNULL_BEGIN return self.attachmentStream.sourceFilename; } +- (nullable NSString *)thumbnailImage +{ + return self.attachmentStream.thumbnailImage; +} + - (instancetype)initWithTimestamp:(uint64_t)timestamp authorId:(NSString *)authorId body:(NSString *_Nullable)body @@ -149,6 +154,13 @@ NS_ASSUME_NONNULL_BEGIN return firstAttachment.contentType; } +- (nullable NSString *)sourceFilename +{ + OWSAttachmentInfo *firstAttachment = self.firstThumbnailAttachment; + + return firstAttachment.sourceFilename; +} + - (BOOL)hasThumbnailAttachments { return self.thumbnailAttachments.count > 0;