From a9f31ecd1e872a416a93917a7f2cd1b8381d4671 Mon Sep 17 00:00:00 2001
From: velichkomarija <velichkomarija4@gmail.com>
Date: Mon, 19 Oct 2020 23:16:33 +0300
Subject: [PATCH] [android] Fixes aster review.

---
 .../bookmarks/BookmarkCollectionAdapter.java   |  6 +++---
 .../maps/bookmarks/BookmarksListFragment.java  | 13 +------------
 .../com/mapswithme/maps/bookmarks/Holders.java |  4 +++-
 .../mapswithme/util/statistics/Statistics.java | 18 +++++++++++++++---
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
index ad6fae90b0..c37403725d 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
@@ -64,9 +64,9 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
       category.invertVisibility();
       notifyItemChanged(mHolder.getAdapterPosition());
       notifyItemChanged(SectionPosition.INVALID_POSITION);
-      
-      String compilationTypeString = BookmarkManager.INSTANCE.getCompilationType(category.getId()) ==
-                                     BookmarkManager.CATEGORY ?
+
+      int type = BookmarkManager.INSTANCE.getCompilationType(category.getId());
+      String compilationTypeString = type == BookmarkManager.CATEGORY ?
                                      Statistics.ParamValue.CATEGORY :
                                      Statistics.ParamValue.COLLECTION;
       Statistics.INSTANCE.trackGuideVisibilityChange(
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index 03129baa6b..003bd16556 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -622,18 +622,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
                new Factory.ShowBookmarkTask(bookmark.getCategoryId(), bookmark.getBookmarkId()));
 
     Statistics.INSTANCE.trackGuideBookmarkSelect(mCategoryDataSource.getData().getServerId(),
-                                                 getParamValueByType(bookmark.getCategoryId()));
-  }
-
-  @NonNull
-  private String getParamValueByType(long catId)
-  {
-    if (BookmarkManager.INSTANCE.isCompilation(catId))
-      return Statistics.ParamValue.MAIN;
-    else if (BookmarkManager.INSTANCE.getCompilationType(catId) == BookmarkManager.CATEGORY)
-      return Statistics.ParamValue.CATEGORY;
-    else
-      return Statistics.ParamValue.COLLECTION;
+                                                 bookmark.getCategoryId());
   }
 
   public void onItemMore(int position)
diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java
index 89d08f6ea7..d465710019 100644
--- a/android/src/com/mapswithme/maps/bookmarks/Holders.java
+++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java
@@ -93,7 +93,7 @@ public class Holders
 
     void setAction(@NonNull HeaderActionChildCategories action,
                    final boolean showAll,
-                   @BookmarkManager.CompilationType final int compilationType,
+                   @BookmarkManager.CompilationType int compilationType,
                    @NonNull String serverId)
     {
       mButton.setText(showAll
@@ -123,7 +123,9 @@ public class Holders
       private final boolean mShowAll;
       @BookmarkManager.CompilationType
       private final int mCompilationType;
+      @NonNull
       private final String mServerId;
+      @NonNull
       private final String mCompilationTypeString;
 
       ToggleShowAllChildCategoryClickListener(@NonNull HeaderActionChildCategories action,
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index dd88257859..c8de28c44a 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -1950,10 +1950,22 @@ public enum Statistics
     trackEvent(GUIDES_OPEN, params().add(SERVER_ID, serverId), STATISTICS_CHANNEL_REALTIME);
   }
 
-  public void trackGuideBookmarkSelect(@NonNull String serverId, @NonNull String from)
+  public void trackGuideBookmarkSelect(@NonNull String serverId, long catId)
   {
-    trackEvent(GUIDES_BOOKMARK_SELECT, params().add(SERVER_ID, serverId).add(FROM, from),
-               STATISTICS_CHANNEL_REALTIME);
+    trackEvent(GUIDES_BOOKMARK_SELECT, params()
+                   .add(SERVER_ID, serverId)
+                   .add(FROM, getCompilationTypeById(catId)), STATISTICS_CHANNEL_REALTIME);
+  }
+
+  @NonNull
+  private String getCompilationTypeById(long catId)
+  {
+    if (!BookmarkManager.INSTANCE.isCompilation(catId))
+      return Statistics.ParamValue.MAIN;
+    else if (BookmarkManager.INSTANCE.getCompilationType(catId) == BookmarkManager.CATEGORY)
+      return Statistics.ParamValue.CATEGORY;
+    else
+      return Statistics.ParamValue.COLLECTION;
   }
 
   public void trackCollectionOrCategorySelect(@NonNull String serverId, @NonNull String categoryName,