oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
ryanzhao 2021-08-06 17:30:18 +10:00
parent b714565480
commit 278f962488
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Session/Conversations/ConversationViewItem.m
View File

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

17
Session/Conversations/ConversationViewModel.m
View File

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