Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ContextMenuAdapter crash

Browse source
This commit is contained in:
Alexey Kulish 2016-07-02 22:15:13 +03:00
parent 1e23752217
commit 194ed37f51
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -186,8 +186,12 @@ public class ContextMenuAdapter {
} else { } else {
if (item.getIcon() != ContextMenuItem.INVALID_ID) { if (item.getIcon() != ContextMenuItem.INVALID_ID) {
int colorRes = item.getColorRes(); int colorRes = item.getColorRes();
if (colorRes == ContextMenuItem.INVALID_ID && !item.shouldSkipPainting()) { if (colorRes == ContextMenuItem.INVALID_ID) {
colorRes = lightTheme ? R.color.icon_color : R.color.color_white; if (!item.shouldSkipPainting()) {
colorRes = lightTheme ? R.color.icon_color : R.color.color_white;
} else {
colorRes = 0;
}
} }
final Drawable drawable = mIconsCache.getIcon(item.getIcon(), colorRes); final Drawable drawable = mIconsCache.getIcon(item.getIcon(), colorRes);
((AppCompatImageView) convertView.findViewById(R.id.icon)).setImageDrawable(drawable); ((AppCompatImageView) convertView.findViewById(R.id.icon)).setImageDrawable(drawable);