From e9f24f6bae351e2efe9911ec15e61a2ae1be5daa Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 31 Jul 2023 19:00:11 +0200
Subject: [PATCH] TrackRecordingService: removed race conditions workarounds.

Part of #1187.
---
 .../services/TrackRecordingManager.java       |  5 +--
 .../services/TrackRecordingService.java       | 36 ++++---------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
index d660c7c21..50410889c 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
@@ -112,10 +112,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
         reset();
     }
 
-    Pair<Track, Pair<TrackPoint, SensorDataSet>> getDataForUI(TrackPointCreator trackPointCreator) {
-        if (trackPointCreator == null) {
-            return null;
-        }
+    Pair<Track, Pair<TrackPoint, SensorDataSet>> getDataForUI(@NonNull TrackPointCreator trackPointCreator) {
         TrackStatisticsUpdater tmpTrackStatisticsUpdater = new TrackStatisticsUpdater(trackStatisticsUpdater);
         Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastTrackPointUIWithSpeed, lastTrackPointUIWithAltitude, lastStoredTrackPointWithLocation);
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 978d1a409..948d7fe13 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -71,13 +71,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         public void run() {
             updateRecordingDataWhileRecording();
 
-            Handler localHandler = TrackRecordingService.this.handler;
-            if (localHandler == null) {
-                // when this happens, no recording is running and we should not send any notifications.
-                //TODO This implementation is not a good idea; rather solve the issue for this properly
-                return;
-            }
-            localHandler.postDelayed(this, RECORDING_DATA_UPDATE_INTERVAL.toMillis());
+            TrackRecordingService.this.handler.postDelayed(this, RECORDING_DATA_UPDATE_INTERVAL.toMillis());
         }
     };
 
@@ -137,11 +131,9 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         notificationManager = null;
 
         egm2008CorrectionManager = null;
-        try {
-            voiceAnnouncementManager.stop();
-        } finally {
-            voiceAnnouncementManager = null;
-        }
+
+        voiceAnnouncementManager.stop();
+        voiceAnnouncementManager = null;
 
         // This should be the next to last operation
         wakeLock = SystemUtils.releaseWakeLock(wakeLock);
@@ -272,13 +264,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
 
     @Override
     public void newGpsStatus(GpsStatusValue gpsStatusValue) {
-
-        //TODO This check should not be necessary, but prevents a crash; somehow the shutdown is not working correctly as we should not receive a notification then.
-        // It is likely a race condition as the LocationManager provides location updates without using the Handler.
-        if (gpsStatusObservable != null) {
-            notificationManager.updateContent(getString(gpsStatusValue.message));
-            gpsStatusObservable.postValue(gpsStatusValue);
-        }
+        notificationManager.updateContent(getString(gpsStatusValue.message));
+        gpsStatusObservable.postValue(gpsStatusValue);
     }
 
     public Marker.Id insertMarker(String name, String category, String description, String photoUrl) {
@@ -316,15 +303,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         }
 
         // Compute temporary track statistics using sensorData and update time.
-
-        TrackPointCreator localTrackPointCreator = this.trackPointCreator;
-        VoiceAnnouncementManager localVoiceAnnouncementManager = this.voiceAnnouncementManager;
-        if (localTrackPointCreator == null || localVoiceAnnouncementManager == null) {
-            // when this happens, no recording is running and we should not send any notifications.
-            //TODO This implementation is not a good idea; rather solve the issue for this properly
-            return;
-        }
-
         Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.getDataForUI(trackPointCreator);
         if (data == null) {
             Log.w(TAG, "Requesting data if not recording is taking place, should not be done.");
@@ -333,7 +311,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         TrackPoint trackPoint = data.second.first;
         egm2008CorrectionManager.correctAltitude(this, trackPoint);
 
-        localVoiceAnnouncementManager.update(this, data.first);
+        voiceAnnouncementManager.update(this, data.first);
 
         recordingDataObservable.postValue(new RecordingData(data.first, trackPoint, data.second.second));
     }