Reload all ContentSuggestions on notification

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.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.
 
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/time/time.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
@@ skipping 69 matching lines @@
 
 @interface ContentSuggestionsCollectionUpdater ()<
     ContentSuggestionsArticleItemDelegate,
     ContentSuggestionsDataSink>
 
 @property(nonatomic, weak) id<ContentSuggestionsDataSource> dataSource;
 @property(nonatomic, strong)
     NSMutableDictionary<NSNumber*, ContentSuggestionsSectionInformation*>*
         sectionInfoBySectionIdentifier;
 
-// Reloads all the data from the data source, deleting all the current items.
-- (void)reloadData;
 // Adds a new section if needed and returns the section identifier.
 - (NSInteger)addSectionIfNeeded:
     (ContentSuggestionsSectionInformation*)sectionInformation;
 // Resets the models, removing the current CollectionViewItem and the
 // SectionInfo.
 - (void)resetModels;
 
 @end
 
 @implementation ContentSuggestionsCollectionUpdater
@@ skipping 11 matching lines @@
   }
   return self;
 }
 
 #pragma mark - Properties
 
 - (void)setCollectionViewController:
     (ContentSuggestionsViewController*)collectionViewController {
   _collectionViewController = collectionViewController;
 
-  [self reloadData];
+  [self reloadAllData];
 }
 
 #pragma mark - ContentSuggestionsDataSink
 
 - (void)dataAvailable {
-  [self reloadData];
+  [self reloadAllData];
 }
 
 - (void)clearSuggestion:(ContentSuggestionIdentifier*)suggestionIdentifier {
   SectionIdentifier sectionIdentifier =
       SectionIdentifierForInfo(suggestionIdentifier.sectionInfo);
   if (![self.collectionViewController.collectionViewModel
           hasSectionForSectionIdentifier:sectionIdentifier]) {
     return;
   }
 
@@ skipping 12 matching lines @@
 
   if (!correspondingItem)
     return;
 
   NSIndexPath* indexPath = [self.collectionViewController.collectionViewModel
              indexPathForItem:correspondingItem
       inSectionWithIdentifier:sectionIdentifier];
   [self.collectionViewController dismissEntryAtIndexPath:indexPath];
 }
 
+- (void)reloadAllData {

[stkhapugin, 2017/03/09 14:12:05]

This was just renamed and moved up, right?

[gambard, 2017/03/09 14:12:52]

Yes!

+  [self resetModels];
+  CollectionViewModel* model =
+      self.collectionViewController.collectionViewModel;
+
+  NSArray<ContentSuggestion*>* suggestions = [self.dataSource allSuggestions];
+
+  for (ContentSuggestion* suggestion in suggestions) {
+    NSInteger sectionIdentifier =
+        [self addSectionIfNeeded:suggestion.suggestionIdentifier.sectionInfo];
+    ContentSuggestionsArticleItem* articleItem =
+        [[ContentSuggestionsArticleItem alloc]
+            initWithType:ItemTypeForContentSuggestionType(suggestion.type)
+                   title:suggestion.title
+                subtitle:suggestion.text
+                delegate:self
+                     url:suggestion.url];
+
+    articleItem.publisher = suggestion.publisher;
+    articleItem.publishDate = suggestion.publishDate;
+
+    articleItem.suggestionIdentifier = suggestion.suggestionIdentifier;
+
+    [model addItem:articleItem toSectionWithIdentifier:sectionIdentifier];
+  }
+
+  if ([self.collectionViewController isViewLoaded]) {
+    [self.collectionViewController.collectionView reloadData];
+  }
+}
+
 #pragma mark - Public methods
 
 - (BOOL)shouldUseCustomStyleForSection:(NSInteger)section {
   NSNumber* identifier = @([self.collectionViewController.collectionViewModel
       sectionIdentifierForSection:section]);
   ContentSuggestionsSectionInformation* sectionInformation =
       self.sectionInfoBySectionIdentifier[identifier];
   return sectionInformation.layout == ContentSuggestionsSectionLayoutCustom;
 }
 
@@ skipping 27 matching lines @@
          inSectionWithIdentifier:sectionIdentifier];
   };
 
   [self.dataSource.imageFetcher
       fetchImageForSuggestion:articleItem.suggestionIdentifier
                      callback:imageFetchedCallback];
 }
 
 #pragma mark - Private methods
 
-- (void)reloadData {
-  [self resetModels];
-  CollectionViewModel* model =
-      self.collectionViewController.collectionViewModel;
-
-  NSArray<ContentSuggestion*>* suggestions = [self.dataSource allSuggestions];
-
-  for (ContentSuggestion* suggestion in suggestions) {
-    NSInteger sectionIdentifier =
-        [self addSectionIfNeeded:suggestion.suggestionIdentifier.sectionInfo];
-    ContentSuggestionsArticleItem* articleItem =
-        [[ContentSuggestionsArticleItem alloc]
-            initWithType:ItemTypeForContentSuggestionType(suggestion.type)
-                   title:suggestion.title
-                subtitle:suggestion.text
-                delegate:self
-                     url:suggestion.url];
-
-    articleItem.publisher = suggestion.publisher;
-    articleItem.publishDate = suggestion.publishDate;
-
-    articleItem.suggestionIdentifier = suggestion.suggestionIdentifier;
-
-    [model addItem:articleItem toSectionWithIdentifier:sectionIdentifier];
-  }
-
-  if ([self.collectionViewController isViewLoaded]) {
-    [self.collectionViewController.collectionView reloadData];
-  }
-}
-
 - (NSInteger)addSectionIfNeeded:
     (ContentSuggestionsSectionInformation*)sectionInformation {
   NSInteger sectionIdentifier = SectionIdentifierForInfo(sectionInformation);
 
   CollectionViewModel* model =
       self.collectionViewController.collectionViewModel;
   if (![model hasSectionForSectionIdentifier:sectionIdentifier]) {
     [model addSectionWithIdentifier:sectionIdentifier];
     self.sectionInfoBySectionIdentifier[@(sectionIdentifier)] =
         sectionInformation;
     [self.sectionInfoBySectionIdentifier setObject:sectionInformation
                                             forKey:@(sectionIdentifier)];
   }
   return sectionIdentifier;
 }
 
 - (void)resetModels {
   [self.collectionViewController loadModel];
   self.sectionInfoBySectionIdentifier = [[NSMutableDictionary alloc] init];
 }
 
 @end