diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ec8d09c31..fdf47e077 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3953,7 +3953,7 @@ typedef enum : NSUInteger { uint32_t expiresInSeconds = [groupThread disappearingMessagesDurationWithTransaction:transaction]; message = [TSOutgoingMessage outgoingMessageInThread:groupThread - groupMetaMessage:TSGroupMessageUpdate + groupMetaMessage:TSGroupMetaMessageUpdate expiresInSeconds:expiresInSeconds]; [message updateWithCustomMessage:updateGroupInfo transaction:transaction]; }]; diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 34b7f1635..558ef8ce2 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -3857,7 +3857,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac OWSAssert(thread); TSOutgoingMessage *message = - [TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMessageNew expiresInSeconds:0]; + [TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMetaMessageNew expiresInSeconds:0]; [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)]; OWSMessageSender *messageSender = [Environment current].messageSender; @@ -4193,7 +4193,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; OWSLogError(@"resurrectNewOutgoingMessages2 timestamp: %llu.", message.timestamp); @@ -4273,7 +4273,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; [message saveWithTransaction:transaction]; @@ -4532,7 +4532,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:isVoiceMessage - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:quotedMessage contactShare:contactShare]; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index cffdb72b8..47dea884d 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -1083,7 +1083,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self presentViewController:removingFromGroup animated:YES completion:nil]; TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread - groupMetaMessage:TSGroupMessageQuit + groupMetaMessage:TSGroupMetaMessageQuit expiresInSeconds:0]; [self.messageSender enqueueMessage:message success:^{ diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index 5d259e1f1..a7d5cf47f 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -478,7 +478,7 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68; canCancel:NO backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) { TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread - groupMetaMessage:TSGroupMessageNew + groupMetaMessage:TSGroupMetaMessageNew expiresInSeconds:0]; [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)]; diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index 3850856cd..ba4372d2b 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -987,7 +987,7 @@ const CGFloat kIconViewLength = 24; { TSGroupThread *gThread = (TSGroupThread *)self.thread; TSOutgoingMessage *message = - [TSOutgoingMessage outgoingMessageInThread:gThread groupMetaMessage:TSGroupMessageQuit expiresInSeconds:0]; + [TSOutgoingMessage outgoingMessageInThread:gThread groupMetaMessage:TSGroupMetaMessageQuit expiresInSeconds:0]; [self.messageSender enqueueMessage:message success:^{ OWSLogInfo(@"Successfully left group."); diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index ebc67b71b..413ee4151 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -136,7 +136,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:expiresInSeconds expireStartedAt:0 isVoiceMessage:[attachment isVoiceMessage] - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:[quotedReplyModel buildQuotedMessageForSending] contactShare:nil]; @@ -187,7 +187,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:expiresInSeconds expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:contactShare]; diff --git a/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m b/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m index 83ab36a64..d16457ab3 100644 --- a/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m +++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; if (!self) { diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index 976768e32..fd03db173 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -93,7 +93,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:transcript.expirationDuration expireStartedAt:transcript.expirationStartedAt isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:transcript.quotedMessage contactShare:transcript.contact]; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m index ea305573d..f457b3c85 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m index 627ee76d9..0a966ef8a 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; if (!self) { diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m index 2144542f2..cdeff4811 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; if (!self) { diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m index 6ece14215..7d1a73529 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; diff --git a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m index 21503e86a..20781aafc 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; } diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h index 94ba60837..e23a4de10 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h @@ -41,12 +41,12 @@ typedef NS_ENUM(NSInteger, OWSOutgoingMessageRecipientState) { NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientState value); typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { - TSGroupMessageUnspecified, - TSGroupMessageNew, - TSGroupMessageUpdate, - TSGroupMessageDeliver, - TSGroupMessageQuit, - TSGroupMessageRequestInfo, + TSGroupMetaMessageUnspecified, + TSGroupMetaMessageNew, + TSGroupMetaMessageUpdate, + TSGroupMetaMessageDeliver, + TSGroupMetaMessageQuit, + TSGroupMetaMessageRequestInfo, }; @class SSKProtoAttachmentPointer; diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 3e11df6bf..5bc9f01db 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -268,7 +268,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt expiresInSeconds:expiresInSeconds expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:quotedMessage contactShare:nil]; } @@ -316,15 +316,15 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt if ([thread isKindOfClass:TSGroupThread.class]) { // Unless specified, we assume group messages are "Delivery" i.e. normal messages. - if (groupMetaMessage == TSGroupMessageUnspecified) { - _groupMetaMessage = TSGroupMessageDeliver; + if (groupMetaMessage == TSGroupMetaMessageUnspecified) { + _groupMetaMessage = TSGroupMetaMessageDeliver; } else { _groupMetaMessage = groupMetaMessage; } } else { - OWSAssert(groupMetaMessage == TSGroupMessageUnspecified); + OWSAssert(groupMetaMessage == TSGroupMetaMessageUnspecified); // Specifying a group meta message only makes sense for Group threads - _groupMetaMessage = TSGroupMessageUnspecified; + _groupMetaMessage = TSGroupMetaMessageUnspecified; } _isVoiceMessage = isVoiceMessage; @@ -436,7 +436,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt - (BOOL)shouldBeSaved { - if (self.groupMetaMessage == TSGroupMessageDeliver || self.groupMetaMessage == TSGroupMessageUnspecified) { + if (self.groupMetaMessage == TSGroupMetaMessageDeliver || self.groupMetaMessage == TSGroupMetaMessageUnspecified) { return YES; } @@ -827,11 +827,11 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt SSKProtoGroupContextBuilder *groupBuilder = [SSKProtoGroupContextBuilder new]; switch (self.groupMetaMessage) { - case TSGroupMessageQuit: + case TSGroupMetaMessageQuit: [groupBuilder setType:SSKProtoGroupContextTypeQuit]; break; - case TSGroupMessageUpdate: - case TSGroupMessageNew: { + case TSGroupMetaMessageUpdate: + case TSGroupMetaMessageNew: { if (gThread.groupModel.groupImage != nil && self.attachmentIds.count == 1) { attachmentWasGroupAvatar = YES; SSKProtoAttachmentPointer *_Nullable attachmentProto = diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index f0cdcf275..ae2c9b9be 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -886,7 +886,7 @@ NS_ASSUME_NONNULL_BEGIN uint32_t expiresInSeconds = [gThread disappearingMessagesDurationWithTransaction:transaction]; TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:gThread - groupMetaMessage:TSGroupMessageUpdate + groupMetaMessage:TSGroupMetaMessageUpdate expiresInSeconds:expiresInSeconds]; [message updateWithCustomMessage:updateGroupInfo transaction:transaction]; diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index cf48c0f9c..004ef619d 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1398,10 +1398,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; - (void)saveGroupMessage:(TSOutgoingMessage *)message inThread:(TSThread *)thread { - if (message.groupMetaMessage == TSGroupMessageDeliver) { + if (message.groupMetaMessage == TSGroupMetaMessageDeliver) { // TODO: Why is this necessary? [message save]; - } else if (message.groupMetaMessage == TSGroupMessageQuit) { + } else if (message.groupMetaMessage == TSGroupMetaMessageQuit) { [[[TSInfoMessage alloc] initWithTimestamp:message.timestamp inThread:thread messageType:TSInfoMessageTypeGroupQuit diff --git a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m index 7432f69e0..904ac9a6a 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; if (!self) { diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m index 6326f5bfa..f34ac4496 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; if (!self) { diff --git a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m index dd77b3744..5e5955228 100644 --- a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m +++ b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m @@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO - groupMetaMessage:TSGroupMessageUnspecified + groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil]; }