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

Fix context menu npe

Browse source
This commit is contained in:
Alexey Kulish 2017-10-23 13:55:16 +03:00
parent 7277f72b7a
commit 0294dd8c45
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -574,7 +574,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
} }
private void restoreCustomMapRatio() { private void restoreCustomMapRatio() {
if (map.hasCustomMapRatio()) { if (map != null && map.hasCustomMapRatio()) {
map.restoreMapRatio(); map.restoreMapRatio();
} }
} }
@ -881,16 +881,18 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
public void onPause() { public void onPause() {
restoreCustomMapRatio(); restoreCustomMapRatio();
ViewParent parent = view.getParent(); if (view != null) {
if (parent != null && containerLayoutListener != null) { ViewParent parent = view.getParent();
((View) parent).removeOnLayoutChangeListener(containerLayoutListener); if (parent != null && containerLayoutListener != null) {
((View) parent).removeOnLayoutChangeListener(containerLayoutListener);
}
getMapActivity().getMapViewTrackingUtilities().setContextMenu(null);
getMapActivity().getMapViewTrackingUtilities().setMapLinkedToLocation(false);
if (!wasDrawerDisabled) {
getMapActivity().enableDrawer();
}
menu.updateControlsVisibility(false);
} }
getMapActivity().getMapViewTrackingUtilities().setContextMenu(null);
getMapActivity().getMapViewTrackingUtilities().setMapLinkedToLocation(false);
if (!wasDrawerDisabled) {
getMapActivity().enableDrawer();
}
menu.updateControlsVisibility(false);
super.onPause(); super.onPause();
} }