Removed an import for file deleted as part of the iOS 13 min version changes

Fixed a bug where opening a conversation by tapping a notification wouldn't mark the conversation messages as read
pull/612/head
Morgan Pretty 2 years ago
parent f9b0c0feed
commit f9f0662558

@ -424,7 +424,6 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
}
}
viewModel.markAllAsRead()
recoverInputView()
}
@ -580,8 +579,11 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
snInputView.text = draft
}
// Now we have done all the needed diffs, update the viewModel with the latest data
// Now we have done all the needed diffs, update the viewModel with the latest data and mark
// all messages as read (we do it in here as the 'threadData' actually contains the last
// 'interactionId' for the thread)
self.viewModel.updateThreadData(updatedThreadData)
self.viewModel.markAllAsRead()
/// **Note:** This needs to happen **after** we have update the viewModel's thread data
if initialLoad || viewModel.threadData.currentUserIsClosedGroupMember != updatedThreadData.currentUserIsClosedGroupMember {
@ -608,9 +610,8 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
return
}
// Mark received messages as read
// Store the 'sentMessageBeforeUpdate' state locally
let didSendMessageBeforeUpdate: Bool = self.viewModel.sentMessageBeforeUpdate
self.viewModel.markAllAsRead()
self.viewModel.sentMessageBeforeUpdate = false
// When sending a message we want to reload the UI instantly (with any form of animation the message

@ -17,7 +17,6 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[];
#import <SignalUtilitiesKit/OWSFormat.h>
#import <SignalUtilitiesKit/OWSNavigationController.h>
#import <SignalUtilitiesKit/OWSOperation.h>
#import <SignalUtilitiesKit/OWSQueues.h>
#import <SignalUtilitiesKit/OWSTableViewController.h>
#import <SignalUtilitiesKit/OWSTextField.h>
#import <SignalUtilitiesKit/OWSTextView.h>

Loading…
Cancel
Save