From 432af13b63c7efaaded432192741914055b88386 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 4 Jan 2019 10:57:13 -0700 Subject: [PATCH] Fix timer update message. This was broken in 5671fd252 while resolving merge conflicts from applying the sortId changes. --- SignalServiceKit/src/Messages/OWSMessageManager.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index ecc24734e..e6f74ac5f 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1237,7 +1237,7 @@ NS_ASSUME_NONNULL_BEGIN [[OWSDisappearingMessagesJob sharedJob] becomeConsistentWithDisappearingDuration:dataMessage.expireTimer thread:newGroupThread createdByRemoteRecipientId:nil - createdInExistingGroup:NO + createdInExistingGroup:YES transaction:transaction]; // MJK TODO - should be safe to remove senderTimestamp @@ -1278,7 +1278,7 @@ NS_ASSUME_NONNULL_BEGIN [[OWSDisappearingMessagesJob sharedJob] becomeConsistentWithDisappearingDuration:dataMessage.expireTimer thread:oldGroupThread createdByRemoteRecipientId:envelope.source - createdInExistingGroup:YES + createdInExistingGroup:NO transaction:transaction]; TSQuotedMessage *_Nullable quotedMessage = [TSQuotedMessage quotedMessageForDataMessage:dataMessage