oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Lingering var renames QuotedReplyDraft -> QuotedReplyModel

Browse source 
// FREEBIE
This commit is contained in:
Michael Kirk 2018-04-09 09:11:56 -04:00
parent f1714bf252
commit a9459757f0
7 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
View file

@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)cancelVoiceMemoIfNecessary; - (void)cancelVoiceMemoIfNecessary;
@property (nonatomic, nullable) OWSQuotedReplyModel *quotedReplyDraft; @property (nonatomic, nullable) OWSQuotedReplyModel *quotedReply;
@end @end

12
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
View file

@ -250,9 +250,9 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
[self ensureContentConstraints]; [self ensureContentConstraints];
} }
- (void)setQuotedReplyDraft:(nullable OWSQuotedReplyModel *)quotedReplyDraft - (void)setQuotedReply:(nullable OWSQuotedReplyModel *)quotedReply
{ {
if (quotedReplyDraft == _quotedReplyDraft) { if (quotedReply == _quotedReply) {
return; return;
} }
@ -261,14 +261,14 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
} }
OWSAssert(self.quotedMessagePreview == nil); OWSAssert(self.quotedMessagePreview == nil);
_quotedReplyDraft = quotedReplyDraft; _quotedReply = quotedReply;
if (!quotedReplyDraft) { if (!quotedReply) {
[self clearQuotedMessagePreview]; [self clearQuotedMessagePreview];
return; return;
} }
self.quotedMessagePreview = [[QuotedReplyPreview alloc] initWithQuotedReplyDraft:quotedReplyDraft]; self.quotedMessagePreview = [[QuotedReplyPreview alloc] initWithQuotedReply:quotedReply];
self.quotedMessagePreview.delegate = self; self.quotedMessagePreview.delegate = self;
// TODO animate // TODO animate
@ -759,7 +759,7 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
- (void)quotedReplyPreviewDidPressCancel:(QuotedReplyPreview *)preview - (void)quotedReplyPreviewDidPressCancel:(QuotedReplyPreview *)preview
{ {
self.quotedReplyDraft = nil; self.quotedReply = nil;
} }
@end @end

16
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View file

@ -2148,17 +2148,17 @@ typedef enum : NSUInteger {
return; return;
} }
__block OWSQuotedReplyModel *quotedReplyDraft; __block OWSQuotedReplyModel *quotedReply;
[self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
quotedReplyDraft = [OWSMessageUtils quotedReplyDraftForMessage:message transaction:transaction]; quotedReply = [OWSMessageUtils quotedReplyForMessage:message transaction:transaction];
}]; }];
if (![quotedReplyDraft isKindOfClass:[OWSQuotedReplyModel class]]) { if (![quotedReply isKindOfClass:[OWSQuotedReplyModel class]]) {
OWSFail(@"%@ unexpected quotedMessage: %@", self.logTag, quotedReplyDraft.class); OWSFail(@"%@ unexpected quotedMessage: %@", self.logTag, quotedReply.class);
return; return;
} }
self.inputToolbar.quotedReplyDraft = quotedReplyDraft; self.inputToolbar.quotedReply = quotedReply;
[self.inputToolbar beginEditingTextMessage]; [self.inputToolbar beginEditingTextMessage];
} }
@ -2429,7 +2429,7 @@ typedef enum : NSUInteger {
[self updateLastVisibleTimestamp:message.timestampForSorting]; [self updateLastVisibleTimestamp:message.timestampForSorting];
self.lastMessageSentDate = [NSDate new]; self.lastMessageSentDate = [NSDate new];
[self clearUnreadMessagesIndicator]; [self clearUnreadMessagesIndicator];
self.inputToolbar.quotedReplyDraft = nil; self.inputToolbar.quotedReply = nil;
if ([Environment.preferences soundInForeground]) { if ([Environment.preferences soundInForeground]) {
[JSQSystemSoundPlayer jsq_playMessageSentSound]; [JSQSystemSoundPlayer jsq_playMessageSentSound];
@ -2764,7 +2764,7 @@ typedef enum : NSUInteger {
(unsigned long)[attachment dataLength], (unsigned long)[attachment dataLength],
[attachment mimeType]); [attachment mimeType]);
TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReplyDraft buildQuotedMessage]; TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReply buildQuotedMessage];
BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread];
TSOutgoingMessage *message = [ThreadUtil sendMessageWithAttachment:attachment TSOutgoingMessage *message = [ThreadUtil sendMessageWithAttachment:attachment
inThread:self.thread inThread:self.thread
@ -4026,7 +4026,7 @@ typedef enum : NSUInteger {
BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread];
TSOutgoingMessage *message; TSOutgoingMessage *message;
TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReplyDraft buildQuotedMessage]; TSQuotedMessage *_Nullable quotedMessage = [self.inputToolbar.quotedReply buildQuotedMessage];
if ([text lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) { if ([text lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) {
DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:text]; DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:text];
SignalAttachment *attachment = SignalAttachment *attachment =

8
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
View file

@ -1969,8 +1969,8 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
quotedMessage:nil quotedMessage:nil
transaction:transaction]; transaction:transaction];
OWSAssert(messageToQuote); OWSAssert(messageToQuote);
quotedMessage = [[OWSMessageUtils quotedReplyDraftForMessage:messageToQuote transaction:transaction] quotedMessage =
buildQuotedMessage]; [[OWSMessageUtils quotedReplyForMessage:messageToQuote transaction:transaction] buildQuotedMessage];
} else { } else {
TSOutgoingMessage *_Nullable messageToQuote = [self createFakeOutgoingMessage:thread TSOutgoingMessage *_Nullable messageToQuote = [self createFakeOutgoingMessage:thread
messageBody:quotedMessageBodyWIndex messageBody:quotedMessageBodyWIndex
@ -1981,8 +1981,8 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
quotedMessage:nil quotedMessage:nil
transaction:transaction]; transaction:transaction];
OWSAssert(messageToQuote); OWSAssert(messageToQuote);
quotedMessage = [[OWSMessageUtils quotedReplyDraftForMessage:messageToQuote transaction:transaction] quotedMessage =
buildQuotedMessage]; [[OWSMessageUtils quotedReplyForMessage:messageToQuote transaction:transaction] buildQuotedMessage];
} }
OWSAssert(quotedMessage); OWSAssert(quotedMessage);

14
Signal/src/views/QuotedReplyPreview.swift
View file

@ -17,10 +17,10 @@ class QuotedReplyPreview: UIView {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
init(quotedReplyDraft: OWSQuotedReplyModel) { init(quotedReply: OWSQuotedReplyModel) {
super.init(frame: .zero) super.init(frame: .zero)
let isQuotingSelf = quotedReplyDraft.authorId == TSAccountManager.localNumber() let isQuotingSelf = quotedReply.authorId == TSAccountManager.localNumber()
// used for stripe and author // used for stripe and author
// FIXME actual colors TBD // FIXME actual colors TBD
@ -34,7 +34,7 @@ class QuotedReplyPreview: UIView {
if isQuotingSelf { if isQuotingSelf {
authorLabel.text = NSLocalizedString("MEDIA_GALLERY_SENDER_NAME_YOU", comment: "") authorLabel.text = NSLocalizedString("MEDIA_GALLERY_SENDER_NAME_YOU", comment: "")
} else { } else {
authorLabel.text = Environment.current().contactsManager.displayName(forPhoneIdentifier: quotedReplyDraft.authorId) authorLabel.text = Environment.current().contactsManager.displayName(forPhoneIdentifier: quotedReply.authorId)
} }
authorLabel.font = .ows_dynamicTypeHeadline authorLabel.font = .ows_dynamicTypeHeadline
@ -43,16 +43,16 @@ class QuotedReplyPreview: UIView {
bodyLabel.font = .ows_footnote bodyLabel.font = .ows_footnote
bodyLabel.text = { bodyLabel.text = {
if let contentType = quotedReplyDraft.contentType { if let contentType = quotedReply.contentType {
let emoji = TSAttachmentStream.emoji(forMimeType: contentType) let emoji = TSAttachmentStream.emoji(forMimeType: contentType)
return "\(emoji) \(quotedReplyDraft.body ?? "")" return "\(emoji) \(quotedReply.body ?? "")"
} else { } else {
return quotedReplyDraft.body return quotedReply.body
} }
}() }()
let thumbnailView: UIView? = { let thumbnailView: UIView? = {
if let image = quotedReplyDraft.thumbnailImage { if let image = quotedReply.thumbnailImage {
let imageView = UIImageView(image: image) let imageView = UIImageView(image: image)
imageView.contentMode = .scaleAspectFill imageView.contentMode = .scaleAspectFill
imageView.autoPinToSquareAspectRatio() imageView.autoPinToSquareAspectRatio()

2
SignalServiceKit/src/Messages/OWSMessageUtils.h
View file

@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)updateApplicationBadgeCount; - (void)updateApplicationBadgeCount;
+ (nullable OWSQuotedReplyModel *)quotedReplyDraftForMessage:(TSMessage *)message + (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message
transaction:(YapDatabaseReadTransaction *)transaction; transaction:(YapDatabaseReadTransaction *)transaction;
@end @end

6
SignalServiceKit/src/Messages/OWSMessageUtils.m
View file

@ -104,7 +104,7 @@ NS_ASSUME_NONNULL_BEGIN
return numberOfItems; return numberOfItems;
} }
+ (nullable OWSQuotedReplyModel *)quotedReplyDraftForMessage:(TSMessage *)message + (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message
transaction:(YapDatabaseReadTransaction *)transaction; transaction:(YapDatabaseReadTransaction *)transaction;
{ {
OWSAssert(message); OWSAssert(message);
@ -124,10 +124,10 @@ NS_ASSUME_NONNULL_BEGIN
}(); }();
OWSAssert(authorId.length > 0); 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 + (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message
authorId:(NSString *)authorId authorId:(NSString *)authorId
thread:(TSThread *)thread thread:(TSThread *)thread
transaction:(YapDatabaseReadTransaction *)transaction transaction:(YapDatabaseReadTransaction *)transaction