From 3d1b930e069aa0092cf805e44111813903c41293 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 29 Jan 2019 13:39:15 -0500 Subject: [PATCH] Fix navigation to quoted replies outside load window. --- .../ConversationView/ConversationViewModel.h | 1 + .../ConversationView/ConversationViewModel.m | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index 0a6729e46..c4d781b3a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -106,6 +106,7 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { - (BOOL)canLoadMoreItems; - (nullable NSIndexPath *)ensureLoadWindowContainsQuotedReply:(OWSQuotedReplyModel *)quotedReply; + - (void)appendUnsavedOutgoingTextMessage:(TSOutgoingMessage *)outgoingMessage; @end diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 8356e391d..a5e589734 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -1582,6 +1582,17 @@ static const int kYapDatabaseRangeMaxLength = 25000; transaction:transaction]; }]; + self.collapseCutoffDate = [NSDate new]; + + [self ensureDynamicInteractions]; + + if (![self reloadViewItems]) { + OWSFailDebug(@"failed to reload view items in resetMapping."); + } + + [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; + [self.delegate conversationViewModelRangeDidChange]; + return indexPath; }