From 36d4f5d4ab1e0e0763636724ae81b8a296b596d1 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 1 Aug 2017 15:28:28 +0300
Subject: [PATCH] Fix possible NPE (2)

---
 .../MeasurementToolFragment.java              | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 2c816b87fb..ef3eb32057 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -19,8 +19,6 @@ public class MeasurementToolFragment extends Fragment {
 
 	public static final String TAG = "MeasurementToolFragment";
 
-	private MeasurementToolLayer measurementLayer;
-
 	private TextView distanceTv;
 	private TextView pointsTv;
 	private String pointsSt;
@@ -31,7 +29,7 @@ public class MeasurementToolFragment extends Fragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		MapActivity mapActivity = (MapActivity) getActivity();
-		measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
@@ -78,14 +76,26 @@ public class MeasurementToolFragment extends Fragment {
 		return (MapActivity) getActivity();
 	}
 
+	private MeasurementToolLayer getMeasurementLayer() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			return mapActivity.getMapLayers().getMeasurementToolLayer();
+		}
+		return null;
+	}
+
 	private void updateText() {
-		distanceTv.setText(measurementLayer.getDistanceSt() + ",");
-		pointsTv.setText(pointsSt + ": " + measurementLayer.getPointsCount());
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			distanceTv.setText(measurementLayer.getDistanceSt() + ",");
+			pointsTv.setText(pointsSt + ": " + measurementLayer.getPointsCount());
+		}
 	}
 
 	private void enterMeasurementMode() {
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (mapActivity != null && measurementLayer != null) {
 			measurementLayer.setInMeasurementMode(true);
 			mapActivity.refreshMap();
 			mapActivity.disableDrawer();
@@ -107,7 +117,8 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void exitMeasurementMode() {
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (mapActivity != null && measurementLayer != null) {
 			measurementLayer.setInMeasurementMode(false);
 			mapActivity.refreshMap();
 			mapActivity.enableDrawer();