diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java index 7e2d1a9b1f..509f7c2518 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java @@ -146,9 +146,9 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment { - Intent intent = new Intent(getActivity(), BookmarkListActivity.class) + Intent intent = new Intent(getActivity(), BookmarkListActivity.class) .putExtra(BookmarksListFragment.EXTRA_CATEGORY, item); - startActivityForResult(intent, 101); + startActivity(intent); }); } diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java index 70a5fef6c1..0ff428719f 100644 --- a/android/src/com/mapswithme/maps/bookmarks/Holders.java +++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java @@ -143,8 +143,8 @@ public class Holders void setOnClickListener(@Nullable OnItemClickListener listener) { mView.setOnClickListener(v -> { - if (listener != null) - listener.onItemClick(v,mEntity); + if (listener != null && mEntity != null) + listener.onItemClick(v, mEntity); }); } diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java b/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java index 720794f128..08170376fd 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java @@ -31,8 +31,6 @@ public class CategoryDataSource extends RecyclerView.AdapterDataObserver impleme BookmarkManager.INSTANCE.getCategoriesSnapshot(mCategory.getType().getFilterStrategy()); int index = snapshot.indexOfOrInvalidIndex(mCategory); if (index >= 0) - { mCategory = snapshot.getItems().get(index); - } } }