From 1404d0d7ebeec2623cd6b33b4db4b35f6ca21d9b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 12 Apr 2017 11:15:15 -0400 Subject: [PATCH] Rework outgoing message state. // FREEBIE --- src/Messages/Interactions/TSErrorMessage.m | 3 +-- src/Messages/Interactions/TSIncomingMessage.m | 3 +-- src/Messages/Interactions/TSInfoMessage.m | 3 +-- src/Messages/Interactions/TSMessage.h | 11 +--------- src/Messages/Interactions/TSMessage.m | 20 ------------------- src/Messages/Interactions/TSOutgoingMessage.h | 2 ++ src/Messages/Interactions/TSOutgoingMessage.m | 6 ++++-- 7 files changed, 10 insertions(+), 38 deletions(-) diff --git a/src/Messages/Interactions/TSErrorMessage.m b/src/Messages/Interactions/TSErrorMessage.m index 74562f9d7..2ffdd3485 100644 --- a/src/Messages/Interactions/TSErrorMessage.m +++ b/src/Messages/Interactions/TSErrorMessage.m @@ -25,8 +25,7 @@ messageBody:nil attachmentIds:@[] expiresInSeconds:0 - expireStartedAt:0 - groupMetaMessage:TSGroupMessageNone]; + expireStartedAt:0]; if (!self) { return self; diff --git a/src/Messages/Interactions/TSIncomingMessage.m b/src/Messages/Interactions/TSIncomingMessage.m index a84b4ebc6..c91ea7cce 100644 --- a/src/Messages/Interactions/TSIncomingMessage.m +++ b/src/Messages/Interactions/TSIncomingMessage.m @@ -47,8 +47,7 @@ NSString *const TSIncomingMessageWasReadOnThisDeviceNotification = @"TSIncomingM messageBody:body attachmentIds:attachmentIds expiresInSeconds:expiresInSeconds - expireStartedAt:0 - groupMetaMessage:TSGroupMessageNone]; + expireStartedAt:0]; if (!self) { return self; diff --git a/src/Messages/Interactions/TSInfoMessage.m b/src/Messages/Interactions/TSInfoMessage.m index 9df6642c6..9411aa409 100644 --- a/src/Messages/Interactions/TSInfoMessage.m +++ b/src/Messages/Interactions/TSInfoMessage.m @@ -23,8 +23,7 @@ NS_ASSUME_NONNULL_BEGIN messageBody:nil attachmentIds:@[] expiresInSeconds:0 - expireStartedAt:0 - groupMetaMessage:TSGroupMessageNone]; + expireStartedAt:0]; if (!self) { return self; diff --git a/src/Messages/Interactions/TSMessage.h b/src/Messages/Interactions/TSMessage.h index b749b629e..15acdc0b9 100644 --- a/src/Messages/Interactions/TSMessage.h +++ b/src/Messages/Interactions/TSMessage.h @@ -24,7 +24,6 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { @property (nonatomic, readonly) NSMutableArray *attachmentIds; @property (nullable, nonatomic) NSString *body; -@property (atomic, readonly) TSGroupMetaMessage groupMetaMessage; @property (nonatomic) uint32_t expiresInSeconds; @property (nonatomic) uint64_t expireStartedAt; @property (nonatomic, readonly) uint64_t expiresAt; @@ -58,15 +57,7 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { messageBody:(nullable NSString *)body attachmentIds:(NSArray *)attachmentIds expiresInSeconds:(uint32_t)expiresInSeconds - expireStartedAt:(uint64_t)expireStartedAt; - -- (instancetype)initWithTimestamp:(uint64_t)timestamp - inThread:(nullable TSThread *)thread - messageBody:(nullable NSString *)body - attachmentIds:(NSArray *)attachmentIds - expiresInSeconds:(uint32_t)expiresInSeconds - expireStartedAt:(uint64_t)expireStartedAt - groupMetaMessage:(TSGroupMetaMessage)groupMetaMessage NS_DESIGNATED_INITIALIZER; + expireStartedAt:(uint64_t)expireStartedAt NS_DESIGNATED_INITIALIZER; - (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; diff --git a/src/Messages/Interactions/TSMessage.m b/src/Messages/Interactions/TSMessage.m index b3cb2a078..42fc86072 100644 --- a/src/Messages/Interactions/TSMessage.m +++ b/src/Messages/Interactions/TSMessage.m @@ -36,8 +36,6 @@ static const NSUInteger OWSMessageSchemaVersion = 3; */ @property (nonatomic, readonly) NSUInteger schemaVersion; -@property (atomic) TSGroupMetaMessage groupMetaMessage; - @end #pragma mark - @@ -93,23 +91,6 @@ static const NSUInteger OWSMessageSchemaVersion = 3; attachmentIds:(NSArray *)attachmentIds expiresInSeconds:(uint32_t)expiresInSeconds expireStartedAt:(uint64_t)expireStartedAt -{ - return [self initWithTimestamp:timestamp - inThread:thread - messageBody:body - attachmentIds:attachmentIds - expiresInSeconds:expiresInSeconds - expireStartedAt:expireStartedAt - groupMetaMessage:TSGroupMessageNone]; -} - -- (instancetype)initWithTimestamp:(uint64_t)timestamp - inThread:(nullable TSThread *)thread - messageBody:(nullable NSString *)body - attachmentIds:(NSArray *)attachmentIds - expiresInSeconds:(uint32_t)expiresInSeconds - expireStartedAt:(uint64_t)expireStartedAt - groupMetaMessage:(TSGroupMetaMessage)groupMetaMessage { self = [super initWithTimestamp:timestamp inThread:thread]; @@ -125,7 +106,6 @@ static const NSUInteger OWSMessageSchemaVersion = 3; _expireStartedAt = expireStartedAt; [self updateExpiresAt]; _receivedAtDate = [NSDate date]; - _groupMetaMessage = groupMetaMessage; return self; } diff --git a/src/Messages/Interactions/TSOutgoingMessage.h b/src/Messages/Interactions/TSOutgoingMessage.h index f58f116d1..cf716b466 100644 --- a/src/Messages/Interactions/TSOutgoingMessage.h +++ b/src/Messages/Interactions/TSOutgoingMessage.h @@ -77,6 +77,8 @@ typedef NS_ENUM(NSInteger, TSOutgoingMessageState) { // A map of attachment id-to-filename. @property (nonatomic, readonly) NSMutableDictionary *attachmentFilenameMap; +@property (atomic, readonly) TSGroupMetaMessage groupMetaMessage; + /** * Whether the message should be serialized as a modern aka Content, or the old style legacy message. * Sync and Call messsages must be sent as Content, but other old style DataMessage payloads should be diff --git a/src/Messages/Interactions/TSOutgoingMessage.m b/src/Messages/Interactions/TSOutgoingMessage.m index c72f3e957..479561d69 100644 --- a/src/Messages/Interactions/TSOutgoingMessage.m +++ b/src/Messages/Interactions/TSOutgoingMessage.m @@ -29,6 +29,8 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec // same recipient. @property (atomic) NSArray *sentRecipients; +@property (atomic) TSGroupMetaMessage groupMetaMessage; + @end #pragma mark - @@ -148,8 +150,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec messageBody:body attachmentIds:attachmentIds expiresInSeconds:expiresInSeconds - expireStartedAt:expireStartedAt - groupMetaMessage:groupMetaMessage]; + expireStartedAt:expireStartedAt]; if (!self) { return self; } @@ -157,6 +158,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec _messageState = TSOutgoingMessageStateAttemptingOut; _sentRecipients = [NSArray new]; _hasSyncedTranscript = NO; + _groupMetaMessage = groupMetaMessage; _attachmentFilenameMap = [NSMutableDictionary new];