From abe77ce8ae8ff48822b12fdbef9fa650a7e67a33 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Mon, 19 Dec 2022 21:59:41 +0100
Subject: [PATCH] Improved isSearchAllowed calls.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .../app/organicmaps/bookmarks/BookmarksListFragment.java    | 6 +++---
 iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h      | 1 -
 iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm     | 4 ----
 map/bookmark_manager.cpp                                    | 2 ++
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java
index 158bf9f642..ab8bc3a7f7 100644
--- a/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -306,7 +306,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
 
   private void updateSearchVisibility()
   {
-    if (!isSearchAllowed() || isEmpty())
+    if (isEmpty() || !isSearchAllowed())
     {
       UiUtils.hide(mSearchContainer);
     }
@@ -645,7 +645,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     inflater.inflate(R.menu.option_menu_bookmarks, menu);
 
     MenuItem itemSearch = menu.findItem(R.id.bookmarks_search);
-    itemSearch.setVisible(isSearchAllowed() && !isEmpty());
+    itemSearch.setVisible(!isEmpty() && isSearchAllowed());
   }
 
   @Override
@@ -655,7 +655,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
 
     boolean visible = !mSearchMode && !isEmpty();
     MenuItem itemSearch = menu.findItem(R.id.bookmarks_search);
-    itemSearch.setVisible(isSearchAllowed() && visible);
+    itemSearch.setVisible(visible && isSearchAllowed());
 
     MenuItem itemMore = menu.findItem(R.id.bookmarks_more);
     if (mLastSortTimestamp != 0)
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
index e987ebc671..5afef3cc85 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
@@ -35,7 +35,6 @@ NS_SWIFT_NAME(BookmarksManager)
 - (void)loadBookmarks;
 
 - (BOOL)isCategoryNotEmpty:(MWMMarkGroupID)groupId;
-- (BOOL)isSearchAllowed:(MWMMarkGroupID)groupId;
 - (void)prepareForSearch:(MWMMarkGroupID)groupId;
 - (NSString *)getCategoryName:(MWMMarkGroupID)groupId;
 - (uint64_t)getCategoryMarksCount:(MWMMarkGroupID)groupId;
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
index e20d6a114d..f784405dc8 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
@@ -195,10 +195,6 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting
          (self.bm.GetUserMarkIds(groupId).size() + self.bm.GetTrackIds(groupId).size());
 }
 
-- (BOOL)isSearchAllowed:(MWMMarkGroupID)groupId {
-  return self.bm.IsSearchAllowed(groupId);
-}
-
 - (void)prepareForSearch:(MWMMarkGroupID)groupId {
   self.bm.PrepareForSearch(groupId);
 }
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 71e758c27e..1b3a5a650b 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -1518,6 +1518,8 @@ bool BookmarkManager::IsSearchAllowed(kml::MarkGroupId groupId) const
       indexedBookmarksCount += it->second->GetUserMarks().size();
   }
 
+  /// @todo This function is actually called on Android only. Probably, there was some problems
+  /// with indexing large sets of bookmarks, but iOS works good at the same time?
   auto const bookmarksCount = GetUserMarkIds(groupId).size();
   auto const maxCount = searchAPI.GetMaximumPossibleNumberOfBookmarksToIndex();
   return indexedBookmarksCount + bookmarksCount <= maxCount;