clean & rollback to fix the issue that the date will not show after a message has been deleted

pull/484/head
ryanzhao 4 years ago
parent b714565480
commit 278f962488

@ -974,7 +974,9 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
- (void)deleteLocallyAction - (void)deleteLocallyAction
{ {
TSMessage *message = (TSMessage *)self.interaction;
[LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[MessageInvalidator invalidate:message with:transaction];
[self.interaction removeWithTransaction:transaction]; [self.interaction removeWithTransaction:transaction];
if (self.interaction.interactionType == OWSInteractionType_OutgoingMessage) { if (self.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
[LKStorage.shared cancelPendingMessageSendJobIfNeededForMessage:self.interaction.timestamp using:transaction]; [LKStorage.shared cancelPendingMessageSendJobIfNeededForMessage:self.interaction.timestamp using:transaction];
@ -984,7 +986,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
- (void)deleteRemotelyAction - (void)deleteRemotelyAction
{ {
// TODO: closed group and one-on-one chat
TSMessage *message = (TSMessage *)self.interaction; TSMessage *message = (TSMessage *)self.interaction;
if (self.isGroupThread) { if (self.isGroupThread) {

@ -823,13 +823,18 @@ NS_ASSUME_NONNULL_BEGIN
return [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; return [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate];
} }
if ([viewItem.interaction isKindOfClass:TSMessage.class]) { if (!viewItem.hasCachedLayoutState) {
TSMessage *message = (TSMessage *)viewItem.interaction;
if ([MessageInvalidator isInvalidated:message]) {
[updatedItemSet addObject:itemId]; [updatedItemSet addObject:itemId];
[updatedNeighborItemSet addObject:itemId]; [updatedNeighborItemSet addObject:itemId];
} }
}
// if ([viewItem.interaction isKindOfClass:TSMessage.class]) {
// TSMessage *message = (TSMessage *)viewItem.interaction;
// if ([MessageInvalidator isInvalidated:message]) {
// [updatedItemSet addObject:itemId];
// [updatedNeighborItemSet addObject:itemId];
// }
// }
} }
// 3. Updates. // 3. Updates.

Loading…
Cancel
Save