From 4a6360689368c363f1a396a1747a3625c3c0b4bb Mon Sep 17 00:00:00 2001
From: max-klaus <alex.morozov.osm@gmail.com>
Date: Thu, 4 Feb 2021 12:49:52 +0300
Subject: [PATCH] Fix npe in NavigationService

---
 OsmAnd/src/net/osmand/plus/NavigationService.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/NavigationService.java b/OsmAnd/src/net/osmand/plus/NavigationService.java
index 16f1afddcc..8e525c0f91 100644
--- a/OsmAnd/src/net/osmand/plus/NavigationService.java
+++ b/OsmAnd/src/net/osmand/plus/NavigationService.java
@@ -4,16 +4,13 @@ import android.app.Notification;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.location.LocationManager;
 import android.os.Binder;
 import android.os.IBinder;
-import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 
 import net.osmand.Location;
-import net.osmand.PlatformUtil;
 import net.osmand.plus.helpers.LocationServiceHelper;
 import net.osmand.plus.helpers.LocationServiceHelper.LocationCallback;
 import net.osmand.plus.notifications.OsmandNotification;
@@ -137,10 +134,12 @@ public class NavigationService extends Service {
 		app.setNavigationService(null);
 		usedBy = 0;
 		// remove updates
-		try {
-			locationServiceHelper.removeLocationUpdates();
-		} catch (SecurityException e) {
-			// Location service permission not granted
+		if (locationServiceHelper != null) {
+			try {
+				locationServiceHelper.removeLocationUpdates();
+			} catch (SecurityException e) {
+				// Location service permission not granted
+			}
 		}
 		// remove notification
 		stopForeground(Boolean.TRUE);