From 94eaed002461f774feba49c0072719544d1054c5 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 1 Nov 2018 15:00:01 -0400
Subject: [PATCH] Fix rebase breakage.

---
 .../ConversationView/ConversationViewModel.m           | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
index 042cebc88..3910d2daa 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
@@ -585,7 +585,7 @@ static const int kYapDatabaseRangeMinLength = 0;
                updatedNeighborItemSet:updatedNeighborItemSet];
 }
 
-// A simpler version of the update logic we call when
+// A simpler version of the update logic we use when
 // only transient items have changed.
 - (void)updateForTransientItems
 {
@@ -598,7 +598,6 @@ static const int kYapDatabaseRangeMinLength = 0;
         [oldItemIdList addObject:viewItem.itemId];
     }
 
-    NSUInteger oldViewItemCount = self.viewItems.count;
     if (![self reloadViewItems]) {
         // These errors are rare.
         OWSFailDebug(@"could not reload view items; hard resetting message mappings.");
@@ -607,12 +606,9 @@ static const int kYapDatabaseRangeMinLength = 0;
         return;
     }
 
-    OWSLogVerbose(@"self.viewItems.count: %zd -> %zd", oldViewItemCount, self.viewItems.count);
+    OWSLogVerbose(@"self.viewItems.count: %zd -> %zd", oldItemIdList.count, self.viewItems.count);
 
-    [self updateViewWitholdItemIdList:oldItemIdList
-                       updatedItemSet:[NSSet set]
-                     oldViewItemCount:oldViewItemCount
-               updatedNeighborItemSet:nil];
+    [self updateViewWithOldItemIdList:oldItemIdList updatedItemSet:[NSSet set] updatedNeighborItemSet:nil];
 }
 
 - (void)updateViewWithOldItemIdList:(NSArray<NSString *> *)oldItemIdList