[ios] Inserts and deletes history items in the same BatchUpdates block

ios/chrome/browser/ui/history/history_collection_view_controller.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/chrome/browser/ui/history/history_collection_view_controller.h"
 
 #import <MobileCoreServices/MobileCoreServices.h>
 
 #include <memory>
 
@@ skipping 90 matching lines @@
 @property(nonatomic, assign, getter=isLoading) BOOL loading;
 // YES if there are no more history entries to load.
 @property(nonatomic, assign, getter=hasFinishedLoading) BOOL finishedLoading;
 // YES if the collection should be filtered by the next received query result.
 @property(nonatomic, assign) BOOL filterQueryResult;
 
 // Fetches history prior to |time| for search text |query|. If |query| is nil or
 // the empty string, all history is fetched.
 - (void)fetchHistoryForQuery:(NSString*)query
                  priorToTime:(const base::Time&)time;
+// Updates various elements after history items have been deleted from the
+// CollectionView.
+- (void)updateCollectionViewAfterDeletingEntries;
 // Updates header section to provide relevant information about the currently
 // displayed history entries.
 - (void)updateEntriesStatusMessage;
 // Removes selected items from the visible collection, but does not delete them
 // from browser history.
 - (void)removeSelectedItemsFromCollection;
-// Removes all items in the collection that are not included in entries.
+// Selects all items in the collection that are not included in entries.
 - (void)filterForHistoryEntries:(NSArray*)entries;
+// Deletes all items in the collection which indexes are included in indexArray,
+// needs to be run inside a performBatchUpdates block.
+- (void)deleteItemsFromCollectionViewModelWithIndex:(NSArray*)indexArray;
 // Adds loading indicator to the top of the history collection, if one is not
 // already present.
 - (void)addLoadingIndicator;
 // Displays context menu on cell pressed with gestureRecognizer.
 - (void)displayContextMenuInvokedByGestureRecognizer:
     (UILongPressGestureRecognizer*)gestureRecognizer;
 // Opens URL in the current tab and dismisses the history view.
 - (void)openURL:(const GURL&)URL;
 // Opens URL in a new non-incognito tab and dismisses the history view.
 - (void)openURLInNewTab:(const GURL&)URL;
@@ skipping 234 matching lines @@
           [[HistoryEntryItem alloc] initWithType:ItemTypeHistoryEntry
                                     historyEntry:entry
                                     browserState:_browserState
                                         delegate:self];
       [self.entryInserter insertHistoryEntryItem:item];
       if ([self isSearching] || self.filterQueryResult) {
         [filterResults addObject:item];
       }
     }
     [self.delegate historyCollectionViewControllerDidChangeEntries:self];
+    if (([self isSearching] && [searchQuery length] > 0 &&
+         [self.currentQuery isEqualToString:searchQuery]) ||
+        self.filterQueryResult) {
+      // If in search mode, filter out entries that are not
+      // part of the search result.
+      [self filterForHistoryEntries:filterResults];
+      NSArray* deletedIndexPaths =
+          self.collectionView.indexPathsForSelectedItems;
+      [self deleteItemsFromCollectionViewModelWithIndex:deletedIndexPaths];
+      self.filterQueryResult = NO;
+    }
   }
       completion:^(BOOL) {
-        if (([self isSearching] && [searchQuery length] > 0 &&
-             [self.currentQuery isEqualToString:searchQuery]) ||
-            self.filterQueryResult) {
-          // If in search mode, filter out entries that are not
-          // part of the search result.
-          [self filterForHistoryEntries:filterResults];
-          self.filterQueryResult = NO;
-        }
+        [self updateCollectionViewAfterDeletingEntries];
       }];
 }
 
 - (void)historyServiceFacade:(HistoryServiceFacade*)facade
     shouldShowNoticeAboutOtherFormsOfBrowsingHistory:(BOOL)shouldShowNotice {
   self.shouldShowNoticeAboutOtherFormsOfBrowsingHistory = shouldShowNotice;
   // Update the history entries status message if there is no query in progress.
   if (!self.isLoading) {
     [self updateEntriesStatusMessage];
   }
@@ skipping 164 matching lines @@
                       : history::QueryOptions::REMOVE_ALL_DUPLICATES;
   options.max_count = kMaxFetchCount;
   options.matching_algorithm =
       query_parser::MatchingAlgorithm::ALWAYS_PREFIX_SEARCH;
   _historyServiceFacade->QueryHistory(queryString, options);
   // Also determine whether notice regarding other forms of browsing history
   // should be shown.
   _historyServiceFacade->QueryOtherFormsOfBrowsingHistory();
 }
 
+- (void)updateCollectionViewAfterDeletingEntries {
+  // If only the header section remains, there are no history entries.
+  if ([self.collectionViewModel numberOfSections] == 1) {
+    self.entriesType = NO_ENTRIES;
+  }
+  [self updateEntriesStatusMessage];
+  [self.delegate historyCollectionViewControllerDidChangeEntries:self];
+}
+
 - (void)updateEntriesStatusMessage {
   CollectionViewItem* entriesStatusItem = nil;
   if (!self.hasHistoryEntries) {
     CollectionViewTextItem* noResultsItem =
         [[CollectionViewTextItem alloc] initWithType:ItemTypeEntriesStatus];
     noResultsItem.text =
         self.isSearching ? l10n_util::GetNSString(IDS_HISTORY_NO_SEARCH_RESULTS)
                          : l10n_util::GetNSString(IDS_HISTORY_NO_RESULTS);
     entriesStatusItem = noResultsItem;
   } else {
@@ skipping 34 matching lines @@
     [self.collectionViewModel addItem:entriesStatusItem
               toSectionWithIdentifier:kEntriesStatusSectionIdentifier];
     [self.collectionView insertItemsAtIndexPaths:@[ indexPath ]];
   }
                                 completion:nil];
 }
 
 - (void)removeSelectedItemsFromCollection {
   NSArray* deletedIndexPaths = self.collectionView.indexPathsForSelectedItems;
   [self.collectionView performBatchUpdates:^{
-    [self collectionView:self.collectionView
-        willDeleteItemsAtIndexPaths:deletedIndexPaths];
-    [self.collectionView deleteItemsAtIndexPaths:deletedIndexPaths];
+    [self deleteItemsFromCollectionViewModelWithIndex:deletedIndexPaths];
+  }
+      completion:^(BOOL) {
+        [self updateCollectionViewAfterDeletingEntries];
+      }];
+}
 
-    // Remove any empty sections, except the header section.
-    for (int section = self.collectionView.numberOfSections - 1; section > 0;
-         --section) {
-      if (![self.collectionViewModel numberOfItemsInSection:section]) {
-        [self.entryInserter removeSection:section];
-      }
+- (void)deleteItemsFromCollectionViewModelWithIndex:(NSArray*)indexArray {
+  [self collectionView:self.collectionView
+      willDeleteItemsAtIndexPaths:indexArray];
+  [self.collectionView deleteItemsAtIndexPaths:indexArray];
+
+  // Remove any empty sections, except the header section.
+  for (int section = self.collectionView.numberOfSections - 1; section > 0;
+       --section) {
+    if (![self.collectionViewModel numberOfItemsInSection:section]) {
+      [self.entryInserter removeSection:section];
     }
   }
-      completion:^(BOOL) {
-        // If only the header section remains, there are no history entries.
-        if ([self.collectionViewModel numberOfSections] == 1) {
-          self.entriesType = NO_ENTRIES;
-        }
-        [self updateEntriesStatusMessage];
-        [self.delegate historyCollectionViewControllerDidChangeEntries:self];
-      }];
 }
 
 - (void)filterForHistoryEntries:(NSArray*)entries {
   self.collectionView.allowsMultipleSelection = YES;
   for (int section = 1; section < [self.collectionViewModel numberOfSections];
        ++section) {
     NSInteger sectionIdentifier =
         [self.collectionViewModel sectionIdentifierForSection:section];
     if ([self.collectionViewModel
             hasSectionForSectionIdentifier:sectionIdentifier]) {
       NSArray* items = [self.collectionViewModel
           itemsInSectionWithIdentifier:sectionIdentifier];
       for (id item in items) {
         HistoryEntryItem* historyItem =
             base::mac::ObjCCastStrict<HistoryEntryItem>(item);
         if (![entries containsObject:historyItem]) {
           NSIndexPath* indexPath =
               [self.collectionViewModel indexPathForItem:historyItem
                                  inSectionWithIdentifier:sectionIdentifier];
           [self.collectionView
               selectItemAtIndexPath:indexPath
                            animated:NO
                      scrollPosition:UICollectionViewScrollPositionNone];
         }
       }
     }
   }
-  [self removeSelectedItemsFromCollection];
 }
 
 - (void)addLoadingIndicator {
   NSIndexPath* indexPath = [NSIndexPath indexPathForItem:0 inSection:0];
   if ([self.collectionViewModel hasItemAtIndexPath:indexPath] &&
       [self.collectionViewModel itemTypeForIndexPath:indexPath] ==
           ItemTypeActivityIndicator) {
     // Do not add indicator a second time.
     return;
   }
@@ skipping 118 matching lines @@
                        shouldCloseWithCompletion:^{
                          [self.URLLoader webPageOrderedOpen:copiedURL
                                                    referrer:web::Referrer()
                                                 inIncognito:YES
                                                inBackground:NO
                                                    appendTo:kLastTab];
                        }];
 }
 
 @end