📰 Handle optional item in group dismissal

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
index f8beb606cff61e98dafe3547d31aaeea6ebcdb2f..c085f9fd6fd1b3e2a968e66de51b06a48087d12d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
@@ -25,6 +25,7 @@
 import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegate;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -38,11 +39,7 @@
 public class SuggestionsSection extends InnerNode {
     private static final String TAG = "NtpCards";
 
-    private static final Set<Integer> SECTION_DISMISSAL_GROUP = new HashSet<>(2);
-    {

[dgn, 2017/01/31 17:17:55]

replaced this by Arrays.asList because that's an initialisation block that runs
for every SuggestionsSection instantiation. So not what we want, even though
because it's a set it didn't cause bugs.

[Bernhard Bauer, 2017/01/31 17:21:27]

Oh, duh. I guess I should have made it a static initialization block, but this
works as well.

-        SECTION_DISMISSAL_GROUP.add(1);
-        SECTION_DISMISSAL_GROUP.add(2);
-    }
+    private static final Set<Integer> SECTION_DISMISSAL_GROUP = new HashSet<>(Arrays.asList(1, 2));
 
     private final Delegate mDelegate;
     private final SuggestionsCategoryInfo mCategoryInfo;
@@ -475,6 +472,11 @@ public int getCategory() {
             return Collections.emptySet();
         }
 
+        if (!mMoreButton.isVisible()) {
+            assert getStartingOffsetForChild(mStatus) == 1;
+            return Collections.singleton(1);
+        }
+
         assert SECTION_DISMISSAL_GROUP.contains(getStartingOffsetForChild(mStatus));
         assert SECTION_DISMISSAL_GROUP.contains(getStartingOffsetForChild(mMoreButton));
         return SECTION_DISMISSAL_GROUP;