From 8d53a775d27c2d6ee0208a6a0a05327dacc70cbc Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 4 Aug 2021 14:48:32 +1000 Subject: [PATCH] Revert "delete real message and sync message together" This reverts commit cc17a952e090d077062765a8b77ea1fafa9459c0. --- Session/Conversations/ConversationViewItem.m | 13 +++---------- .../Messages/Signal/TSOutgoingMessage.h | 2 -- .../Messages/Signal/TSOutgoingMessage.m | 2 -- .../Sending & Receiving/MessageSender.swift | 3 +-- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Session/Conversations/ConversationViewItem.m b/Session/Conversations/ConversationViewItem.m index aa457da61..e9db68a4e 100644 --- a/Session/Conversations/ConversationViewItem.m +++ b/Session/Conversations/ConversationViewItem.m @@ -979,6 +979,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (void)deleteRemotelyAction { + // TODO: closed group and one-on-one chat TSMessage *message = (TSMessage *)self.interaction; if (self.isGroupThread) { @@ -1009,22 +1010,14 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) }) retainUntilComplete]; } else { NSString *groupPublicKey = [LKGroupUtilities getDecodedGroupID:groupThread.groupModel.groupId]; - NSArray *serverHashes = @[message.serverHash]; - if ([message isKindOfClass:[TSOutgoingMessage class]] && ((TSOutgoingMessage *)message).syncMessageServerHash != nil) { - serverHashes = @[message.serverHash, ((TSOutgoingMessage *)message).syncMessageServerHash]; - } - [[SNSnodeAPI deleteMessageForPublickKey:groupPublicKey serverHashes:serverHashes].catch(^(NSError *error) { + [[SNSnodeAPI deleteMessageForPublickKey:groupPublicKey serverHashes:@[message.serverHash]].catch(^(NSError *error) { // Roll back [self.interaction save]; }) retainUntilComplete]; } } else { TSContactThread *contactThread = (TSContactThread *)self.interaction.thread; - NSArray *serverHashes = @[message.serverHash]; - if ([message isKindOfClass:[TSOutgoingMessage class]] && ((TSOutgoingMessage *)message).syncMessageServerHash != nil) { - serverHashes = @[message.serverHash, ((TSOutgoingMessage *)message).syncMessageServerHash]; - } - [[SNSnodeAPI deleteMessageForPublickKey:contactThread.contactSessionID serverHashes:serverHashes].catch(^(NSError *error) { + [[SNSnodeAPI deleteMessageForPublickKey:contactThread.contactSessionID serverHashes:@[message.serverHash]].catch(^(NSError *error) { // Roll back [self.interaction save]; }) retainUntilComplete]; diff --git a/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.h b/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.h index 22c0a8a78..f38a173f7 100644 --- a/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.h +++ b/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.h @@ -133,8 +133,6 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { @property (nonatomic, readonly) BOOL isVoiceMessage; -@property (nonatomic, nullable) NSString *syncMessageServerHash; - + (nullable instancetype)findMessageWithTimestamp:(uint64_t)timestamp; - (BOOL)shouldBeSaved; diff --git a/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.m b/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.m index c28037270..0ee9be72c 100644 --- a/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.m +++ b/SessionMessagingKit/Messages/Signal/TSOutgoingMessage.m @@ -206,8 +206,6 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt if (!self) { return self; } - - _syncMessageServerHash = nil; _hasSyncedTranscript = NO; diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 70017db79..c34c9dde8 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -332,8 +332,7 @@ public final class MessageSender : NSObject { Storage.shared.addReceivedMessageTimestamp(message.sentTimestamp!, using: transaction) // Get the visible message if possible if let tsMessage = TSOutgoingMessage.find(withTimestamp: message.sentTimestamp!) { - if (!isSyncMessage) { tsMessage.serverHash = message.serverHash } - else { tsMessage.syncMessageServerHash = message.serverHash } + tsMessage.serverHash = message.serverHash // Track the open group server message ID tsMessage.openGroupServerMessageID = message.openGroupServerMessageID ?? 0 tsMessage.save(with: transaction)