From 0f6480197b986ad2c69cccab85995f37e7431389 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 15 Jul 2021 18:20:33 +0200
Subject: [PATCH] Cleanup.

---
 .../services/handlers/LocationHandler.java    | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
index 4388f5e99..0e88218aa 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
@@ -42,8 +42,11 @@ class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener {
     }
 
     public void onStop() {
-        unregisterLocationListener();
-        locationManager = null;
+        if (locationManager != null) {
+            locationManager.removeUpdates(this);
+            locationManager = null;
+        }
+
         if (gpsStatus != null) {
             gpsStatus.stop();
             gpsStatus = null;
@@ -63,9 +66,7 @@ class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener {
                 locationListenerPolicy = new AbsoluteLocationListenerPolicy(Duration.ofSeconds(minRecordingInterval));
             }
 
-            if (locationManager != null) {
-                registerLocationListener();
-            }
+            registerLocationListener();
         }
         if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
             recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(sharedPreferences, context);
@@ -153,15 +154,6 @@ class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener {
         }
     }
 
-    private void unregisterLocationListener() {
-        if (locationManager == null) {
-            Log.e(TAG, "locationManager is null.");
-            return;
-        }
-        locationManager.removeUpdates(this);
-        locationManager = null;
-    }
-
     /**
      * Called from {@link GpsStatus} to inform that GPS status has changed from prevStatus to currentStatus.
      *