From c6b3fa05673e4ad4249dd66cc7153d58aa48d7b6 Mon Sep 17 00:00:00 2001
From: velichkomarija <velichkomarija4@gmail.com>
Date: Wed, 25 Nov 2020 15:01:22 +0300
Subject: [PATCH] [android] Fixed update collection and categories when hide
 all/show all button was pressed.

---
 .../bookmarks/BookmarkCollectionAdapter.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
index f329450876..67ad6153b7 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
@@ -66,9 +66,15 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
       BookmarkManager.INSTANCE.toggleCompilationVisibility(category, type);
 
       if (type == BookmarkManager.COLLECTION)
+      {
         notifyItemChanged(0);
+        mItemsCollection = BookmarkManager.INSTANCE.getChildrenCollections(mBookmarkCategory.getId());
+      }
       else if (mItemsCollection.size() > 0)
+      {
         notifyItemChanged(mItemsCollection.size() + 1);
+        mItemsCategory = BookmarkManager.INSTANCE.getChildrenCategories(mBookmarkCategory.getId());
+      }
       else
         notifyItemChanged(0);
     }
@@ -262,12 +268,10 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
     return itemCount;
   }
 
-  private void updateItemsByType(@BookmarkManager.CompilationType int compilationType)
+  private void updateAllItems()
   {
-    if (compilationType == BookmarkManager.COLLECTION)
-      mItemsCollection = BookmarkManager.INSTANCE.getChildrenCollections(mBookmarkCategory.getId());
-    else
-      mItemsCategory = BookmarkManager.INSTANCE.getChildrenCategories(mBookmarkCategory.getId());
+    mItemsCollection = BookmarkManager.INSTANCE.getChildrenCollections(mBookmarkCategory.getId());
+    mItemsCategory = BookmarkManager.INSTANCE.getChildrenCategories(mBookmarkCategory.getId());
   }
 
   void show(boolean visible)
@@ -283,7 +287,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
     {
       BookmarkManager.INSTANCE.setChildCategoriesVisibility(mBookmarkCategory.getId(),
                                                             compilationType, false);
-      updateItemsByType(compilationType);
+      updateAllItems();
       notifyDataSetChanged();
     }
 
@@ -292,7 +296,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
     {
       BookmarkManager.INSTANCE.setChildCategoriesVisibility(mBookmarkCategory.getId(),
                                                             compilationType, true);
-      updateItemsByType(compilationType);
+      updateAllItems();
       notifyDataSetChanged();
     }
   }