Lingering var renames QuotedReplyDraft -> QuotedReplyModel

// FREEBIE

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
 

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

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 =

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);
 

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()

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
 

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);