From e6949a5ae823212d9e12e6d8809d28151dfd411d Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 3 Aug 2021 14:28:46 +1000 Subject: [PATCH 01/10] Fix glitch and add FIXME --- Session/Conversations/ConversationVC.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 19a5fd4ed..6d8b152ed 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -368,7 +368,8 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat shouldScrollToBottom = self.isCloseToBottom } case .update: - self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .fade) + // FIXME: This is called many times when a message is inserted, leading to bad performance + self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .none) shouldScrollToBottom = self.isCloseToBottom default: preconditionFailure() } From 7f0b87a2b22eb863f1396ca60e127a05bb0db844 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 3 Aug 2021 15:36:54 +1000 Subject: [PATCH 02/10] Avoid unnecessary conversation screen updates --- Session.xcodeproj/project.pbxproj | 4 +++ Session/Conversations/ConversationVC.swift | 4 +-- Session/Conversations/ConversationViewModel.m | 14 +++++++--- .../OWSConversationSettingsViewController.m | 2 +- .../DownloadAttachmentModal.swift | 2 +- .../Database/Storage+Messaging.swift | 4 +-- .../Jobs/AttachmentUploadJob.swift | 8 +++--- .../Sending & Receiving/MessageSender.swift | 1 + SessionMessagingKit/Threads/TSGroupThread.h | 2 +- SessionMessagingKit/Threads/TSGroupThread.m | 2 +- .../Utilities/MessageInvalidator.swift | 27 +++++++++++++++++++ 11 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 SessionMessagingKit/Utilities/MessageInvalidator.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index fee9f747f..c8d531f1e 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -169,6 +169,7 @@ B8269D2925C7A4B400488AB4 /* InputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8269D2825C7A4B400488AB4 /* InputView.swift */; }; B8269D3325C7A8C600488AB4 /* InputViewButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8269D3225C7A8C600488AB4 /* InputViewButton.swift */; }; B8269D3D25C7B34D00488AB4 /* InputTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8269D3C25C7B34D00488AB4 /* InputTextView.swift */; }; + B82A0C3826B9098200C1BCE3 /* MessageInvalidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C3726B9098200C1BCE3 /* MessageInvalidator.swift */; }; B82B40882399EB0E00A248E7 /* LandingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B40872399EB0E00A248E7 /* LandingVC.swift */; }; B82B408A2399EC0600A248E7 /* FakeChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B40892399EC0600A248E7 /* FakeChatView.swift */; }; B82B408C239A068800A248E7 /* RegisterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B408B239A068800A248E7 /* RegisterVC.swift */; }; @@ -1149,6 +1150,7 @@ B8269D2825C7A4B400488AB4 /* InputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputView.swift; sourceTree = ""; }; B8269D3225C7A8C600488AB4 /* InputViewButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputViewButton.swift; sourceTree = ""; }; B8269D3C25C7B34D00488AB4 /* InputTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputTextView.swift; sourceTree = ""; }; + B82A0C3726B9098200C1BCE3 /* MessageInvalidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageInvalidator.swift; sourceTree = ""; }; B82B40872399EB0E00A248E7 /* LandingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LandingVC.swift; sourceTree = ""; }; B82B40892399EC0600A248E7 /* FakeChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeChatView.swift; sourceTree = ""; }; B82B408B239A068800A248E7 /* RegisterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterVC.swift; sourceTree = ""; }; @@ -3115,6 +3117,7 @@ C33FDBC1255A581700E217F9 /* General.swift */, B8AE760925ABFB00001A84D2 /* GeneralUtilities.h */, B8AE760A25ABFB5A001A84D2 /* GeneralUtilities.m */, + B82A0C3726B9098200C1BCE3 /* MessageInvalidator.swift */, C3A71D0A2558989C0043A11F /* MessageWrapper.swift */, C3A71D4E25589FF30043A11F /* NSData+messagePadding.h */, C3A71D4825589FF20043A11F /* NSData+messagePadding.m */, @@ -4746,6 +4749,7 @@ C32C5C01256DC9A0003C73A2 /* OWSIdentityManager.m in Sources */, C32C59C4256DB41F003C73A2 /* TSContactThread.m in Sources */, C32C5AB0256DBE8F003C73A2 /* TSOutgoingMessage.m in Sources */, + B82A0C3826B9098200C1BCE3 /* MessageInvalidator.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 6d8b152ed..67039536c 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -368,9 +368,9 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat shouldScrollToBottom = self.isCloseToBottom } case .update: - // FIXME: This is called many times when a message is inserted, leading to bad performance + shouldScrollToBottom = self.isCloseToBottom // Check this * before * reloading the row + print("[Test] UPDATE") self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .none) - shouldScrollToBottom = self.isCloseToBottom default: preconditionFailure() } } diff --git a/Session/Conversations/ConversationViewModel.m b/Session/Conversations/ConversationViewModel.m index 55e1baa18..588711011 100644 --- a/Session/Conversations/ConversationViewModel.m +++ b/Session/Conversations/ConversationViewModel.m @@ -822,9 +822,13 @@ NS_ASSUME_NONNULL_BEGIN OWSFailDebug(@"Can't find holdover view item."); return [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; } - 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]; + } } } @@ -864,6 +868,10 @@ NS_ASSUME_NONNULL_BEGIN oldViewItemCount:oldItemIdList.count updatedNeighborItemSet:updatedNeighborItemSet]; + for (NSString *itemID in updatedItemSet) { + [MessageInvalidator markAsUpdated:itemID]; + } + return [self.delegate conversationViewModelDidUpdate:[ConversationUpdate diffUpdateWithUpdateItems:updateItems shouldAnimateUpdates:shouldAnimateUpdates]]; diff --git a/Session/Conversations/Settings/OWSConversationSettingsViewController.m b/Session/Conversations/Settings/OWSConversationSettingsViewController.m index 3d303ca9d..82b8166b5 100644 --- a/Session/Conversations/Settings/OWSConversationSettingsViewController.m +++ b/Session/Conversations/Settings/OWSConversationSettingsViewController.m @@ -1002,7 +1002,7 @@ CGFloat kIconViewLength = 24; UISwitch *uiSwitch = (UISwitch *)sender; BOOL isEnabled = uiSwitch.isOn; [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - [(TSGroupThread *)self.thread setisOnlyNotifyingForMentions:isEnabled withTransaction:transaction]; + [(TSGroupThread *)self.thread setIsOnlyNotifyingForMentions:isEnabled withTransaction:transaction]; }]; } diff --git a/Session/Conversations/Views & Modals/DownloadAttachmentModal.swift b/Session/Conversations/Views & Modals/DownloadAttachmentModal.swift index 402c32032..1c8c88842 100644 --- a/Session/Conversations/Views & Modals/DownloadAttachmentModal.swift +++ b/Session/Conversations/Views & Modals/DownloadAttachmentModal.swift @@ -70,7 +70,7 @@ final class DownloadAttachmentModal : Modal { contact.isTrusted = true Storage.write(with: { transaction in Storage.shared.setContact(contact, using: transaction) - message.touch(with: transaction) + MessageInvalidator.invalidate(message, with: transaction) }, completion: { Storage.shared.resumeAttachmentDownloadJobsIfNeeded(for: message.uniqueThreadId) }) diff --git a/SessionMessagingKit/Database/Storage+Messaging.swift b/SessionMessagingKit/Database/Storage+Messaging.swift index 21e8d40e5..0a6a84f99 100644 --- a/SessionMessagingKit/Database/Storage+Messaging.swift +++ b/SessionMessagingKit/Database/Storage+Messaging.swift @@ -67,7 +67,7 @@ extension Storage { pointer.state = state pointer.save(with: transaction) guard let tsMessage = TSMessage.fetch(uniqueId: tsMessageID, transaction: transaction) else { return } - tsMessage.touch(with: transaction) + MessageInvalidator.invalidate(tsMessage, with: transaction) } /// Also touches the associated message. @@ -75,7 +75,7 @@ extension Storage { let transaction = transaction as! YapDatabaseReadWriteTransaction stream.save(with: transaction) guard let tsMessage = TSMessage.fetch(uniqueId: tsMessageID, transaction: transaction) else { return } - tsMessage.touch(with: transaction) + MessageInvalidator.invalidate(tsMessage, with: transaction) } private static let receivedMessageTimestampsCollection = "ReceivedMessageTimestampsCollection" diff --git a/SessionMessagingKit/Jobs/AttachmentUploadJob.swift b/SessionMessagingKit/Jobs/AttachmentUploadJob.swift index e3f9a1df6..401824b69 100644 --- a/SessionMessagingKit/Jobs/AttachmentUploadJob.swift +++ b/SessionMessagingKit/Jobs/AttachmentUploadJob.swift @@ -118,12 +118,14 @@ public final class AttachmentUploadJob : NSObject, Job, NSCoding { // NSObject/N delegate?.handleJobSucceeded(self) SNMessagingKitConfiguration.shared.storage.resumeMessageSendJobIfNeeded(messageSendJobID) Storage.shared.write(with: { transaction in - var interaction: TSInteraction? + var message: TSMessage? let transaction = transaction as! YapDatabaseReadWriteTransaction TSDatabaseSecondaryIndexes.enumerateMessages(withTimestamp: self.message.sentTimestamp!, with: { _, key, _ in - interaction = TSInteraction.fetch(uniqueId: key, transaction: transaction) + message = TSMessage.fetch(uniqueId: key, transaction: transaction) }, using: transaction) - interaction?.touch(with: transaction) // To refresh the associated message cell and hide the loader + if let message = message { + MessageInvalidator.invalidate(message, with: transaction) + } }, completion: { }) } diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 456ba6e23..8b4cfdff0 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -340,6 +340,7 @@ public final class MessageSender : NSObject { recipients.forEach { recipient in tsMessage.update(withSentRecipient: recipient, wasSentByUD: true, transaction: transaction) } + MessageInvalidator.invalidate(tsMessage, with: transaction) // Start the disappearing messages timer if needed OWSDisappearingMessagesJob.shared().startAnyExpiration(for: tsMessage, expirationStartedAt: NSDate.millisecondTimestamp(), transaction: transaction) } diff --git a/SessionMessagingKit/Threads/TSGroupThread.h b/SessionMessagingKit/Threads/TSGroupThread.h index 0599d0461..09f551854 100644 --- a/SessionMessagingKit/Threads/TSGroupThread.h +++ b/SessionMessagingKit/Threads/TSGroupThread.h @@ -45,7 +45,7 @@ extern NSString *const TSGroupThread_NotificationKey_UniqueId; transaction:(YapDatabaseReadWriteTransaction *)transaction; - (void)setGroupModel:(TSGroupModel *)newGroupModel withTransaction:(YapDatabaseReadWriteTransaction *)transaction; -- (void)setisOnlyNotifyingForMentions:(BOOL)isOnlyNotifyingForMentions withTransaction:(YapDatabaseReadWriteTransaction *)transaction; +- (void)setIsOnlyNotifyingForMentions:(BOOL)isOnlyNotifyingForMentions withTransaction:(YapDatabaseReadWriteTransaction *)transaction; - (void)leaveGroupWithSneakyTransaction; - (void)leaveGroupWithTransaction:(YapDatabaseReadWriteTransaction *)transaction; diff --git a/SessionMessagingKit/Threads/TSGroupThread.m b/SessionMessagingKit/Threads/TSGroupThread.m index f05d42732..382f6ed5e 100644 --- a/SessionMessagingKit/Threads/TSGroupThread.m +++ b/SessionMessagingKit/Threads/TSGroupThread.m @@ -208,7 +208,7 @@ NSString *const TSGroupThread_NotificationKey_UniqueId = @"TSGroupThread_Notific }]; } -- (void)setisOnlyNotifyingForMentions:(BOOL)isOnlyNotifyingForMentions withTransaction:(YapDatabaseReadWriteTransaction *)transaction +- (void)setIsOnlyNotifyingForMentions:(BOOL)isOnlyNotifyingForMentions withTransaction:(YapDatabaseReadWriteTransaction *)transaction { self.isOnlyNotifyingForMentions = isOnlyNotifyingForMentions; diff --git a/SessionMessagingKit/Utilities/MessageInvalidator.swift b/SessionMessagingKit/Utilities/MessageInvalidator.swift new file mode 100644 index 000000000..83619e091 --- /dev/null +++ b/SessionMessagingKit/Utilities/MessageInvalidator.swift @@ -0,0 +1,27 @@ + +/// A message is invalidated when it needs to be re-rendered in the UI. Examples of when this happens include: +/// +/// • When the sent or read status of a message is updated. +/// • When an attachment is uploaded or downloaded. +@objc public final class MessageInvalidator : NSObject { + private static var invalidatedMessages: Set = [] + + @objc public static let shared = MessageInvalidator() + + private override init() { } + + @objc public static func invalidate(_ message: TSMessage, with transaction: YapDatabaseReadWriteTransaction) { + guard let id = message.uniqueId else { return } + invalidatedMessages.insert(id) + message.touch(with: transaction) + } + + @objc public static func isInvalidated(_ message: TSMessage) -> Bool { + guard let id = message.uniqueId else { return false } + return invalidatedMessages.contains(id) + } + + @objc public static func markAsUpdated(_ id: String) { + invalidatedMessages.remove(id) + } +} From ec41a9e08e7ac0575f816aa60e62c9b4e720d56a Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 3 Aug 2021 15:39:00 +1000 Subject: [PATCH 03/10] Remove hack --- Session/Conversations/ConversationVC.swift | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 67039536c..496f1807d 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -320,12 +320,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat self.messagesTableView.keyboardHeight = newHeight } let margin = (self.lastPageTop - self.messagesTableView.contentOffset.y) - // HACK: If the keyboard is coming up and we're very close to the bottom, scroll to the - // bottom. This "fixes" an issue where the conversation would randomly scroll up sometimes - // when bringing up the keyboard. - if newHeight > 200 && margin <= 2 { - scrollToBottom(isAnimated: false) - } scrollButtonConstraint?.constant = -(newHeight + 16) let newContentOffsetY = max(self.messagesTableView.contentOffset.y + min(lastPageTop, 0) + newHeight - self.messagesTableView.keyboardHeight, 0.0) self.messagesTableView.contentOffset.y = newContentOffsetY From 7d56e51690cdfeecbc02098843627cdee7455268 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 3 Aug 2021 15:43:53 +1000 Subject: [PATCH 04/10] Simplify conversation screen updating logic --- Session/Conversations/ConversationVC.swift | 36 +++------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 496f1807d..8913200b8 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -347,7 +347,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat return messagesTableView.reloadData() } var shouldScrollToBottom = false - let shouldAnimate = conversationUpdate.shouldAnimateUpdates let batchUpdates: () -> Void = { for update in conversationUpdate.updateItems! { switch update.updateItemType { @@ -362,47 +361,20 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat shouldScrollToBottom = self.isCloseToBottom } case .update: - shouldScrollToBottom = self.isCloseToBottom // Check this * before * reloading the row print("[Test] UPDATE") - self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .none) + self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .fade) default: preconditionFailure() } } } - let batchUpdatesCompletion: (Bool) -> Void = { isFinished in + messagesTableView.performBatchUpdates(batchUpdates) { _ in if shouldScrollToBottom { self.scrollToBottom(isAnimated: true) - } else { - // This is a workaround for an issue where after an attachment is sent without the keyboard showing before, - // once the keyboard shows, the table view's content offset can be wrong and the last message won't completely show. - // This is caused by the main run loop calling some table view update method that sets the content offset back to - // the previous value when the keyboard is shown. - self.messagesTableView.reloadData() } self.markAllAsRead() } - if shouldAnimate { - messagesTableView.performBatchUpdates(batchUpdates, completion: batchUpdatesCompletion) - } else { - // HACK: We use `UIView.animateWithDuration:0` rather than `UIView.performWithAnimation` to work around a - // UIKit Crash like: - // - // *** Assertion failure in -[ConversationViewLayout prepareForCollectionViewUpdates:], - // /BuildRoot/Library/Caches/com.apple.xbs/Sources/UIKit_Sim/UIKit-3600.7.47/UICollectionViewLayout.m:760 - // *** Terminating app due to uncaught exception 'NSInternalInconsistencyException', reason: 'While - // preparing update a visible view at {length = 2, path = 0 - 142} - // wasn't found in the current data model and was not in an update animation. This is an internal - // error.' - // - // I'm unclear if this is a bug in UIKit, or if we're doing something crazy in - // ConversationViewLayout#prepareLayout. To reproduce, rapidily insert and delete items into the - // conversation. - UIView.animate(withDuration: 0) { - self.messagesTableView.performBatchUpdates(batchUpdates, completion: batchUpdatesCompletion) - if shouldScrollToBottom { - self.scrollToBottom(isAnimated: false) - } - } + if shouldScrollToBottom { + self.scrollToBottom(isAnimated: false) } } From 1b0a12d7c0d3a2258495a39eb862b693be762724 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 3 Aug 2021 16:21:30 +1000 Subject: [PATCH 05/10] Don't unnecessarily unsubscribe from closed group PNs We don't need to do this anymore as we now have the ability to ignore PNs in the notification service extension --- .../Settings/OWSConversationSettingsViewController.m | 11 ----------- .../Notifications/PushNotificationAPI.swift | 8 +------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Session/Conversations/Settings/OWSConversationSettingsViewController.m b/Session/Conversations/Settings/OWSConversationSettingsViewController.m index 7d3135714..b703a58ff 100644 --- a/Session/Conversations/Settings/OWSConversationSettingsViewController.m +++ b/Session/Conversations/Settings/OWSConversationSettingsViewController.m @@ -861,17 +861,6 @@ CGFloat kIconViewLength = 24; [self.thread updateWithMutedUntilDate:nil transaction:transaction]; }]; } - if (self.isClosedGroup) { - NSString *groupPublicKey = [LKGroupUtilities getDecodedGroupID:((TSGroupThread *)self.thread).groupModel.groupId]; - NSString *userPublicKey = [SNGeneralUtilities getUserPublicKey]; - if (uiSwitch.isOn) { - [[LKPushNotificationAPI performOperation:ClosedGroupOperationUnsubscribe - forClosedGroupWithPublicKey:groupPublicKey userPublicKey:userPublicKey] retainUntilComplete]; - } else { - [[LKPushNotificationAPI performOperation:ClosedGroupOperationSubscribe - forClosedGroupWithPublicKey:groupPublicKey userPublicKey:userPublicKey] retainUntilComplete]; - } - } } - (void)blockConversationSwitchDidChange:(id)sender diff --git a/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift b/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift index b725e1527..8fccb96ec 100644 --- a/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift +++ b/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift @@ -88,13 +88,7 @@ public final class PushNotificationAPI : NSObject { } // Subscribe to all closed groups Storage.shared.getUserClosedGroupPublicKeys().forEach { closedGroupPublicKey in - let groupID = LKGroupUtilities.getEncodedClosedGroupIDAsData(closedGroupPublicKey) - let threadOrNil = TSGroupThread.fetch(uniqueId: TSGroupThread.threadId(fromGroupId: groupID)) - if threadOrNil?.isMuted == true { - // Do nothing - } else { - performOperation(.subscribe, for: closedGroupPublicKey, publicKey: publicKey) - } + performOperation(.subscribe, for: closedGroupPublicKey, publicKey: publicKey) } return promise } From 3db8231bde4eb6102640ef7b4792d5e325fa4123 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 5 Aug 2021 09:51:12 +1000 Subject: [PATCH 06/10] Fix glitch --- Session/Conversations/ConversationVC.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 8913200b8..a48223371 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -362,7 +362,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat } case .update: print("[Test] UPDATE") - self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .fade) + self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .none) default: preconditionFailure() } } From b8c4e6aa93e26a917342dc9a88ffc85369679607 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 5 Aug 2021 10:02:52 +1000 Subject: [PATCH 07/10] Avoid unnecessary conversation screen updates --- Session/Conversations/ConversationVC.swift | 1 + .../Sending & Receiving/MessageSender.swift | 12 ++++++++---- .../Utilities/MessageInvalidator.swift | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index a48223371..35f5e1dde 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -353,6 +353,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat case .delete: self.messagesTableView.deleteRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .fade) case .insert: + print("[Test] INSERT") // Perform inserts before updates self.messagesTableView.insertRows(at: [ IndexPath(row: Int(update.newIndex), section: 0) ], with: .fade) if update.viewItem?.interaction is TSOutgoingMessage { diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 8b4cfdff0..4994a13a1 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -337,10 +337,12 @@ public final class MessageSender : NSObject { let thread = TSGroupThread.fetch(uniqueId: threadID, transaction: transaction), thread.isClosedGroup { recipients = thread.groupModel.groupMemberIds } - recipients.forEach { recipient in - tsMessage.update(withSentRecipient: recipient, wasSentByUD: true, transaction: transaction) + if !tsMessage.wasSentToAnyRecipient { + recipients.forEach { recipient in + tsMessage.update(withSentRecipient: recipient, wasSentByUD: true, transaction: transaction) + } + MessageInvalidator.invalidate(tsMessage, with: transaction) } - MessageInvalidator.invalidate(tsMessage, with: transaction) // Start the disappearing messages timer if needed OWSDisappearingMessagesJob.shared().startAnyExpiration(for: tsMessage, expirationStartedAt: NSDate.millisecondTimestamp(), transaction: transaction) } @@ -359,6 +361,8 @@ public final class MessageSender : NSObject { public static func handleFailedMessageSend(_ message: Message, with error: Swift.Error, using transaction: Any) { guard let tsMessage = TSOutgoingMessage.find(withTimestamp: message.sentTimestamp!) else { return } - tsMessage.update(sendingError: error, transaction: transaction as! YapDatabaseReadWriteTransaction) + let transaction = transaction as! YapDatabaseReadWriteTransaction + tsMessage.update(sendingError: error, transaction: transaction) + MessageInvalidator.invalidate(tsMessage, with: transaction) } } diff --git a/SessionMessagingKit/Utilities/MessageInvalidator.swift b/SessionMessagingKit/Utilities/MessageInvalidator.swift index 83619e091..2d87e5c38 100644 --- a/SessionMessagingKit/Utilities/MessageInvalidator.swift +++ b/SessionMessagingKit/Utilities/MessageInvalidator.swift @@ -11,7 +11,7 @@ private override init() { } @objc public static func invalidate(_ message: TSMessage, with transaction: YapDatabaseReadWriteTransaction) { - guard let id = message.uniqueId else { return } + guard let id = message.uniqueId, !isInvalidated(message) else { return } invalidatedMessages.insert(id) message.touch(with: transaction) } From 50d17be43b534d95834ad2402d10284d4d01268e Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 5 Aug 2021 10:11:20 +1000 Subject: [PATCH 08/10] Fix animation glitch --- Session/Conversations/ConversationVC.swift | 18 ++++++++++-------- .../Sending & Receiving/MessageSender.swift | 9 +++------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 35f5e1dde..cec77ffda 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -351,11 +351,11 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat for update in conversationUpdate.updateItems! { switch update.updateItemType { case .delete: - self.messagesTableView.deleteRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .fade) + self.messagesTableView.deleteRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .none) case .insert: print("[Test] INSERT") // Perform inserts before updates - self.messagesTableView.insertRows(at: [ IndexPath(row: Int(update.newIndex), section: 0) ], with: .fade) + self.messagesTableView.insertRows(at: [ IndexPath(row: Int(update.newIndex), section: 0) ], with: .none) if update.viewItem?.interaction is TSOutgoingMessage { shouldScrollToBottom = true } else { @@ -368,14 +368,16 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat } } } - messagesTableView.performBatchUpdates(batchUpdates) { _ in + UIView.performWithoutAnimation { + messagesTableView.performBatchUpdates(batchUpdates) { _ in + if shouldScrollToBottom { + self.scrollToBottom(isAnimated: false) + } + self.markAllAsRead() + } if shouldScrollToBottom { - self.scrollToBottom(isAnimated: true) + self.scrollToBottom(isAnimated: false) } - self.markAllAsRead() - } - if shouldScrollToBottom { - self.scrollToBottom(isAnimated: false) } } diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 4994a13a1..b9ef948c7 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -330,19 +330,16 @@ public final class MessageSender : NSObject { if let tsMessage = TSOutgoingMessage.find(withTimestamp: message.sentTimestamp!) { // Track the open group server message ID tsMessage.openGroupServerMessageID = message.openGroupServerMessageID ?? 0 - tsMessage.save(with: transaction) // Mark the message as sent var recipients = [ message.recipient! ] if case .closedGroup(_) = destination, let threadID = message.threadID, // threadID should always be set at this point let thread = TSGroupThread.fetch(uniqueId: threadID, transaction: transaction), thread.isClosedGroup { recipients = thread.groupModel.groupMemberIds } - if !tsMessage.wasSentToAnyRecipient { - recipients.forEach { recipient in - tsMessage.update(withSentRecipient: recipient, wasSentByUD: true, transaction: transaction) - } - MessageInvalidator.invalidate(tsMessage, with: transaction) + recipients.forEach { recipient in + tsMessage.update(withSentRecipient: recipient, wasSentByUD: true, transaction: transaction) } + tsMessage.save(with: transaction) // Start the disappearing messages timer if needed OWSDisappearingMessagesJob.shared().startAnyExpiration(for: tsMessage, expirationStartedAt: NSDate.millisecondTimestamp(), transaction: transaction) } From e311d2878f513d407dfb073881e65c78c8b54c8c Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 5 Aug 2021 10:47:15 +1000 Subject: [PATCH 09/10] Fix message status indicator bug --- Session/Conversations/ConversationVC.swift | 22 ++++++++++++++++--- .../Message Cells/VisibleMessageCell.swift | 2 +- .../Sending & Receiving/MessageSender.swift | 1 + .../Threads/Notification+Thread.swift | 2 ++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index cec77ffda..6077d5f68 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -205,6 +205,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat notificationCenter.addObserver(self, selector: #selector(addOrRemoveBlockedBanner), name: NSNotification.Name(rawValue: kNSNotificationName_BlockListDidChange), object: nil) notificationCenter.addObserver(self, selector: #selector(handleGroupUpdatedNotification), name: .groupThreadUpdated, object: nil) notificationCenter.addObserver(self, selector: #selector(sendScreenshotNotificationIfNeeded), name: UIApplication.userDidTakeScreenshotNotification, object: nil) + notificationCenter.addObserver(self, selector: #selector(handleMessageSentStatusChanged), name: .messageSentStatusDidChange, object: nil) // Mentions MentionsManager.populateUserPublicKeyCacheIfNeeded(for: thread.uniqueId!) // Draft @@ -319,7 +320,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat baselineKeyboardHeight = newHeight self.messagesTableView.keyboardHeight = newHeight } - let margin = (self.lastPageTop - self.messagesTableView.contentOffset.y) scrollButtonConstraint?.constant = -(newHeight + 16) let newContentOffsetY = max(self.messagesTableView.contentOffset.y + min(lastPageTop, 0) + newHeight - self.messagesTableView.keyboardHeight, 0.0) self.messagesTableView.contentOffset.y = newContentOffsetY @@ -353,7 +353,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat case .delete: self.messagesTableView.deleteRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .none) case .insert: - print("[Test] INSERT") // Perform inserts before updates self.messagesTableView.insertRows(at: [ IndexPath(row: Int(update.newIndex), section: 0) ], with: .none) if update.viewItem?.interaction is TSOutgoingMessage { @@ -362,7 +361,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat shouldScrollToBottom = self.isCloseToBottom } case .update: - print("[Test] UPDATE") self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .none) default: preconditionFailure() } @@ -411,6 +409,24 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat reloadInputViews() } + @objc private func handleMessageSentStatusChanged() { + DispatchQueue.main.async { + guard let indexPaths = self.messagesTableView.indexPathsForVisibleRows else { return } + var indexPathsToReload: [IndexPath] = [] + for indexPath in indexPaths { + guard let cell = self.messagesTableView.cellForRow(at: indexPath) as? VisibleMessageCell else { continue } + let isLast = (indexPath.item == (self.messagesTableView.numberOfRows(inSection: 0) - 1)) + guard !isLast else { continue } + if !cell.messageStatusImageView.isHidden { + indexPathsToReload.append(indexPath) + } + } + UIView.performWithoutAnimation { + self.messagesTableView.reloadRows(at: indexPathsToReload, with: .none) + } + } + } + // MARK: General @objc func addOrRemoveBlockedBanner() { func detach() { diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index 7b0725944..30cf15727 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -81,7 +81,7 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate { private lazy var snContentView = UIView() - private lazy var messageStatusImageView: UIImageView = { + internal lazy var messageStatusImageView: UIImageView = { let result = UIImageView() result.contentMode = .scaleAspectFit result.layer.cornerRadius = VisibleMessageCell.messageStatusImageViewSize / 2 diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index b9ef948c7..c001faaf1 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -340,6 +340,7 @@ public final class MessageSender : NSObject { tsMessage.update(withSentRecipient: recipient, wasSentByUD: true, transaction: transaction) } tsMessage.save(with: transaction) + NotificationCenter.default.post(name: .messageSentStatusDidChange, object: nil, userInfo: nil) // Start the disappearing messages timer if needed OWSDisappearingMessagesJob.shared().startAnyExpiration(for: tsMessage, expirationStartedAt: NSDate.millisecondTimestamp(), transaction: transaction) } diff --git a/SessionMessagingKit/Threads/Notification+Thread.swift b/SessionMessagingKit/Threads/Notification+Thread.swift index 77b74d0ef..4b61f8f1b 100644 --- a/SessionMessagingKit/Threads/Notification+Thread.swift +++ b/SessionMessagingKit/Threads/Notification+Thread.swift @@ -3,10 +3,12 @@ public extension Notification.Name { static let groupThreadUpdated = Notification.Name("groupThreadUpdated") static let muteSettingUpdated = Notification.Name("muteSettingUpdated") + static let messageSentStatusDidChange = Notification.Name("messageSentStatusDidChange") } @objc public extension NSNotification { @objc static let groupThreadUpdated = Notification.Name.groupThreadUpdated.rawValue as NSString @objc static let muteSettingUpdated = Notification.Name.muteSettingUpdated.rawValue as NSString + @objc static let messageSentStatusDidChange = Notification.Name.messageSentStatusDidChange.rawValue as NSString } From 29acca574c765083baaf6a55c85f60cfd5891668 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 5 Aug 2021 10:48:24 +1000 Subject: [PATCH 10/10] Update build number --- Session.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 9c812f91f..e5c66860d 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -5067,7 +5067,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 286; + CURRENT_PROJECT_VERSION = 287; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -5136,7 +5136,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 286; + CURRENT_PROJECT_VERSION = 287; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -5197,7 +5197,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 286; + CURRENT_PROJECT_VERSION = 287; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -5267,7 +5267,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 286; + CURRENT_PROJECT_VERSION = 287; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -6152,7 +6152,7 @@ CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 286; + CURRENT_PROJECT_VERSION = 287; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -6220,7 +6220,7 @@ CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 286; + CURRENT_PROJECT_VERSION = 287; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)",