From 90486aa49cdf4ebfca5bf8e2d3790ebc8aa01db2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 9 Apr 2018 10:18:49 -0400 Subject: [PATCH] Inline method with one caller, fix formatting // FREEBIE --- .../ViewControllers/DebugUI/DebugUIMessages.m | 22 ++++++++++--------- SignalMessaging/Models/OWSQuotedReplyModel.m | 16 +------------- SignalMessaging/utils/ThreadUtil.m | 20 +++++++++-------- .../Attachments/OWSAttachmentsProcessor.h | 1 - .../src/Messages/Interactions/TSInteraction.h | 1 + 5 files changed, 25 insertions(+), 35 deletions(-) diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 1ea6fed9b..f0068d350 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -3599,11 +3599,12 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded NSString *text = [self randomText]; OWSDisappearingMessagesConfiguration *configuration = [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId transaction:transaction]; - TSOutgoingMessage *message = - [TSOutgoingMessage outgoingMessageInThread:thread - messageBody:text - attachmentId:nil - expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)]; + + uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); + TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread + messageBody:text + attachmentId:nil + expiresInSeconds:expiresInSeconds]; DDLogError(@"%@ insertAndDeleteNewOutgoingMessages timestamp: %llu.", self.logTag, message.timestamp); [messages addObject:message]; } @@ -3628,11 +3629,12 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded OWSDisappearingMessagesConfiguration *configuration = [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId transaction:initialTransaction]; - TSOutgoingMessage *message = - [TSOutgoingMessage outgoingMessageInThread:thread - messageBody:text - attachmentId:nil - expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)]; + + uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); + TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread + messageBody:text + attachmentId:nil + expiresInSeconds:expiresInSeconds]; DDLogError(@"%@ resurrectNewOutgoingMessages1 timestamp: %llu.", self.logTag, message.timestamp); [messages addObject:message]; } diff --git a/SignalMessaging/Models/OWSQuotedReplyModel.m b/SignalMessaging/Models/OWSQuotedReplyModel.m index e7fa512d6..c6b34dc66 100644 --- a/SignalMessaging/Models/OWSQuotedReplyModel.m +++ b/SignalMessaging/Models/OWSQuotedReplyModel.m @@ -50,8 +50,6 @@ _thumbnailImage = thumbnailImage; _contentType = contentType; _sourceFilename = sourceFilename; - - // rename to originalAttachmentStream? _attachmentStream = attachmentStream; return self; @@ -101,6 +99,7 @@ OWSAssert(transaction); TSThread *thread = [message threadWithTransaction:transaction]; + OWSAssert(thread); NSString *_Nullable authorId = ^{ if ([message isKindOfClass:[TSOutgoingMessage class]]) { @@ -114,19 +113,6 @@ }(); OWSAssert(authorId.length > 0); - return [self quotedReplyForMessage:message authorId:authorId thread:thread transaction:transaction]; -} - -+ (nullable OWSQuotedReplyModel *)quotedReplyForMessage:(TSMessage *)message - authorId:(NSString *)authorId - thread:(TSThread *)thread - transaction:(YapDatabaseReadTransaction *)transaction -{ - OWSAssert(message); - OWSAssert(authorId.length > 0); - OWSAssert(thread); - OWSAssert(transaction); - uint64_t timestamp = message.timestamp; NSString *_Nullable quotedText = message.body; BOOL hasText = quotedText.length > 0; diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index b5feac58f..705dcfcb0 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -129,15 +129,17 @@ NS_ASSUME_NONNULL_BEGIN OWSDisappearingMessagesConfiguration *configuration = [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId]; - TSOutgoingMessage *message = [[TSOutgoingMessage alloc] - initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp] - inThread:thread - messageBody:attachment.captionText - attachmentIds:[NSMutableArray new] - expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)expireStartedAt:0 - isVoiceMessage:[attachment isVoiceMessage] - groupMetaMessage:TSGroupMessageNone - quotedMessage:[quotedReplyModel buildQuotedMessage]]; + uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); + TSOutgoingMessage *message = + [[TSOutgoingMessage alloc] initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp] + inThread:thread + messageBody:attachment.captionText + attachmentIds:[NSMutableArray new] + expiresInSeconds:expiresInSeconds + expireStartedAt:0 + isVoiceMessage:[attachment isVoiceMessage] + groupMetaMessage:TSGroupMessageNone + quotedMessage:[quotedReplyModel buildQuotedMessage]]; [messageSender enqueueAttachment:attachment.dataSource contentType:attachment.mimeType diff --git a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h index c80335936..b1a8b19c5 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h +++ b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h @@ -29,7 +29,6 @@ extern NSString *const kAttachmentDownloadAttachmentIDKey; - (instancetype)init NS_UNAVAILABLE; -// TODO make this take one and loop over? - (instancetype)initWithAttachmentProtos:(NSArray *)attachmentProtos relay:(nullable NSString *)relay networkManager:(TSNetworkManager *)networkManager diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h index 8bfae67fc..09e28fa5b 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h +++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h @@ -42,6 +42,7 @@ typedef NS_ENUM(NSInteger, OWSInteractionType) { + (NSArray *)interactionsWithTimestamp:(uint64_t)timestamp ofClass:(Class)clazz withTransaction:(YapDatabaseReadWriteTransaction *)transaction; + + (NSArray *)interactionsWithTimestamp:(uint64_t)timestamp filter:(BOOL (^_Nonnull)(TSInteraction *))filter withTransaction:(YapDatabaseReadWriteTransaction *)transaction;