AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[bookmarks][android] Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2019-08-29 19:36:01 +03:00 • committed by Aleksey Belousov
parent 5255859892
commit 4d7e91fa3d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/menu/menu_bookmarks_list.xml
View file

@ -18,6 +18,6 @@
android:icon="@drawable/ic_24_px_settings"/>
<item android:id="@+id/delete_category"
android:title="@string/delete"
android:title="@string/delete_list"
android:icon="@drawable/ic_delete"/>
</menu>

8
android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
View file

@ -47,7 +47,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
private static final int MAX_CATEGORY_NAME_LENGTH = 60;
@NonNull
@Nullable
private BookmarkCategory mSelectedCategory;
@Nullable
private CategoryEditor mCategoryEditor;
@ -156,7 +156,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
processor
.mInternalProcessor
.process(this, mSelectedCategory);
.process(this, getSelectedCategory());
Statistics.INSTANCE.trackBookmarkListSettingsClick(processor.getAnalytics());
return true;
}
@ -309,7 +309,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == Activity.RESULT_OK && requestCode == REQ_CODE_DELETE_CATEGORY)
{
onDeleteActionSelected(mSelectedCategory);
onDeleteActionSelected(getSelectedCategory());
return;
}
onActivityResultInternal(requestCode, resultCode, data);
@ -347,6 +347,8 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
@NonNull
protected BookmarkCategory getSelectedCategory()
{
if (mSelectedCategory == null)
throw new AssertionError("Invalid attempt to use null selected category.");
return mSelectedCategory;
}