From a9459757f0482d2ccee51476a9e98962d133218b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 9 Apr 2018 09:11:56 -0400 Subject: [PATCH] Lingering var renames QuotedReplyDraft -> QuotedReplyModel // FREEBIE --- .../ConversationView/ConversationInputToolbar.h | 2 +- .../ConversationView/ConversationInputToolbar.m | 12 ++++++------ .../ConversationViewController.m | 16 ++++++++-------- .../ViewControllers/DebugUI/DebugUIMessages.m | 8 ++++---- Signal/src/views/QuotedReplyPreview.swift | 14 +++++++------- SignalServiceKit/src/Messages/OWSMessageUtils.h | 4 ++-- SignalServiceKit/src/Messages/OWSMessageUtils.m | 14 +++++++------- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h index f95e5c315..f1ee7eeba 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h @@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)cancelVoiceMemoIfNecessary; -@property (nonatomic, nullable) OWSQuotedReplyModel *quotedReplyDraft; +@property (nonatomic, nullable) OWSQuotedReplyModel *quotedReply; @end diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 04e7439db..578d5c3f8 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -250,9 +250,9 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5; [self ensureContentConstraints]; } -- (void)setQuotedReplyDraft:(nullable OWSQuotedReplyModel *)quotedReplyDraft +- (void)setQuotedReply:(nullable OWSQuotedReplyModel *)quotedReply { - if (quotedReplyDraft == _quotedReplyDraft) { + if (quotedReply == _quotedReply) { return; } @@ -261,14 +261,14 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5; } OWSAssert(self.quotedMessagePreview == nil); - _quotedReplyDraft = quotedReplyDraft; + _quotedReply = quotedReply; - if (!quotedReplyDraft) { + if (!quotedReply) { [self clearQuotedMessagePreview]; return; } - self.quotedMessagePreview = [[QuotedReplyPreview alloc] initWithQuotedReplyDraft:quotedReplyDraft]; + self.quotedMessagePreview = [[QuotedReplyPreview alloc] initWithQuotedReply:quotedReply]; self.quotedMessagePreview.delegate = self; // TODO animate @@ -759,7 +759,7 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5; - (void)quotedReplyPreviewDidPressCancel:(QuotedReplyPreview *)preview { - self.quotedReplyDraft = nil; + self.quotedReply = nil; } @end diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 67aea0aa8..9889f62cb 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2148,17 +2148,17 @@ typedef enum : NSUInteger { return; } - __block OWSQuotedReplyModel *quotedReplyDraft; + __block OWSQuotedReplyModel *quotedReply; [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { - quotedReplyDraft = [OWSMessageUtils quotedReplyDraftForMessage:message transaction:transaction]; + quotedReply = [OWSMessageUtils quotedReplyForMessage:message transaction:transaction]; }]; - if (![quotedReplyDraft isKindOfClass:[OWSQuotedReplyModel class]]) { - OWSFail(@"%@ unexpected quotedMessage: %@", self.logTag, quotedReplyDraft.class); + if (![quotedReply isKindOfClass:[OWSQuotedReplyModel class]]) { + OWSFail(@"%@ unexpected quotedMessage: %@", self.logTag, quotedReply.class); return; } - self.inputToolbar.quotedReplyDraft = quotedReplyDraft; + self.inputToolbar.quotedReply = quotedReply; [self.inputToolbar beginEditingTextMessage]; } @@ -2429,7 +2429,7 @@ typedef enum : NSUInteger { [self updateLastVisibleTimestamp:message.timestampForSorting]; self.lastMessageSentDate = [NSDate new]; [self clearUnreadMessagesIndicator]; - self.inputToolbar.quotedReplyDraft = nil; + self.inputToolbar.quotedReply = nil; if ([Environment.preferences soundInForeground]) { [JSQSystemSoundPlayer jsq_playMessageSentSound]; @@ -2764,7 +2764,7 @@ typedef enum : NSUInteger { (unsigned long)[attachment dataLength], [attachment mimeType]); - TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReplyDraft buildQuotedMessage]; + TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReply buildQuotedMessage]; BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; TSOutgoingMessage *message = [ThreadUtil sendMessageWithAttachment:attachment inThread:self.thread @@ -4026,7 +4026,7 @@ typedef enum : NSUInteger { BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; TSOutgoingMessage *message; - TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReplyDraft buildQuotedMessage]; + TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReply buildQuotedMessage]; if ([text lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) { DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:text]; SignalAttachment *attachment = diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 8924f0e15..c9d14e832 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -1969,8 +1969,8 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded quotedMessage:nil transaction:transaction]; OWSAssert(messageToQuote); - quotedMessage = [[OWSMessageUtils quotedReplyDraftForMessage:messageToQuote transaction:transaction] - buildQuotedMessage]; + quotedMessage = + [[OWSMessageUtils quotedReplyForMessage:messageToQuote transaction:transaction] buildQuotedMessage]; } else { TSOutgoingMessage *_Nullable messageToQuote = [self createFakeOutgoingMessage:thread messageBody:quotedMessageBodyWIndex @@ -1981,8 +1981,8 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded quotedMessage:nil transaction:transaction]; OWSAssert(messageToQuote); - quotedMessage = [[OWSMessageUtils quotedReplyDraftForMessage:messageToQuote transaction:transaction] - buildQuotedMessage]; + quotedMessage = + [[OWSMessageUtils quotedReplyForMessage:messageToQuote transaction:transaction] buildQuotedMessage]; } OWSAssert(quotedMessage); diff --git a/Signal/src/views/QuotedReplyPreview.swift b/Signal/src/views/QuotedReplyPreview.swift index 399ec1e14..b8d70af3a 100644 --- a/Signal/src/views/QuotedReplyPreview.swift +++ b/Signal/src/views/QuotedReplyPreview.swift @@ -17,10 +17,10 @@ class QuotedReplyPreview: UIView { fatalError("init(coder:) has not been implemented") } - init(quotedReplyDraft: OWSQuotedReplyModel) { + init(quotedReply: OWSQuotedReplyModel) { super.init(frame: .zero) - let isQuotingSelf = quotedReplyDraft.authorId == TSAccountManager.localNumber() + let isQuotingSelf = quotedReply.authorId == TSAccountManager.localNumber() // used for stripe and author // FIXME actual colors TBD @@ -34,7 +34,7 @@ class QuotedReplyPreview: UIView { if isQuotingSelf { authorLabel.text = NSLocalizedString("MEDIA_GALLERY_SENDER_NAME_YOU", comment: "") } else { - authorLabel.text = Environment.current().contactsManager.displayName(forPhoneIdentifier: quotedReplyDraft.authorId) + authorLabel.text = Environment.current().contactsManager.displayName(forPhoneIdentifier: quotedReply.authorId) } authorLabel.font = .ows_dynamicTypeHeadline @@ -43,16 +43,16 @@ class QuotedReplyPreview: UIView { bodyLabel.font = .ows_footnote bodyLabel.text = { - if let contentType = quotedReplyDraft.contentType { + if let contentType = quotedReply.contentType { let emoji = TSAttachmentStream.emoji(forMimeType: contentType) - return "\(emoji) \(quotedReplyDraft.body ?? "")" + return "\(emoji) \(quotedReply.body ?? "")" } else { - return quotedReplyDraft.body + return quotedReply.body } }() let thumbnailView: UIView? = { - if let image = quotedReplyDraft.thumbnailImage { + if let image = quotedReply.thumbnailImage { let imageView = UIImageView(image: image) imageView.contentMode = .scaleAspectFill imageView.autoPinToSquareAspectRatio() diff --git a/SignalServiceKit/src/Messages/OWSMessageUtils.h b/SignalServiceKit/src/Messages/OWSMessageUtils.h index 5691dca35..b9153e0d2 100644 --- a/SignalServiceKit/src/Messages/OWSMessageUtils.h +++ b/SignalServiceKit/src/Messages/OWSMessageUtils.h @@ -20,8 +20,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)updateApplicationBadgeCount; -+ (nullable OWSQuotedReplyModel *)quotedReplyDraftForMessage:(TSMessage *)message - transaction:(YapDatabaseReadTransaction *)transaction; ++ (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message + transaction:(YapDatabaseReadTransaction *)transaction; @end diff --git a/SignalServiceKit/src/Messages/OWSMessageUtils.m b/SignalServiceKit/src/Messages/OWSMessageUtils.m index 6c7fb49c0..9c4bff662 100644 --- a/SignalServiceKit/src/Messages/OWSMessageUtils.m +++ b/SignalServiceKit/src/Messages/OWSMessageUtils.m @@ -104,8 +104,8 @@ NS_ASSUME_NONNULL_BEGIN return numberOfItems; } -+ (nullable OWSQuotedReplyModel *)quotedReplyDraftForMessage:(TSMessage *)message - transaction:(YapDatabaseReadTransaction *)transaction; ++ (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message + transaction:(YapDatabaseReadTransaction *)transaction; { OWSAssert(message); OWSAssert(transaction); @@ -124,13 +124,13 @@ NS_ASSUME_NONNULL_BEGIN }(); OWSAssert(authorId.length > 0); - return [self quotedReplyDraftForMessage:message authorId:authorId thread:thread transaction:transaction]; + return [self quotedReplyForMessage:message authorId:authorId thread:thread transaction:transaction]; } -+ (nullable OWSQuotedReplyModel *)quotedReplyDraftForMessage:(TSMessage *)message - authorId:(NSString *)authorId - thread:(TSThread *)thread - transaction:(YapDatabaseReadTransaction *)transaction ++ (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message + authorId:(NSString *)authorId + thread:(TSThread *)thread + transaction:(YapDatabaseReadTransaction *)transaction { OWSAssert(message); OWSAssert(authorId.length > 0);