karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

TrackRecordingService: on recording end, we have a race condition while shutting down.

Browse Source
This commit is contained in:
Dennis Guse
2021-07-05 16:50:33 +02:00
parent 02b273c102
commit f2d276c246
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+15 -7
View File
@@ -95,7 +95,13 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
@Override @Override
public void run() { public void run() {
updateRecordingDataWhileRecording(); updateRecordingDataWhileRecording();
handler.postDelayed(this, RECORDING_DATA_UPDATE_INTERVAL.toMillis()); 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());
} }
}; };
@@ -745,16 +751,18 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
BluetoothRemoteSensorManager localRemoteSensorManager = this.remoteSensorManager; BluetoothRemoteSensorManager localRemoteSensorManager = this.remoteSensorManager;
AltitudeSumManager localAltitudeSumManager = this.altitudeSumManager; AltitudeSumManager localAltitudeSumManager = this.altitudeSumManager;
if (localAltitudeSumManager != null && localRemoteSensorManager != null) { if (localAltitudeSumManager == null || localRemoteSensorManager == null) {
// onEndRecording the managers might already be set to null. // when this happens, no recording is running and we should not send any notifications.
localAltitudeSumManager.fill(tmpLastTrackPoint); //TODO This implementation is not a good idea; rather solve the issue for this properly
localRemoteSensorManager.fill(tmpLastTrackPoint); return;
} }
localAltitudeSumManager.fill(tmpLastTrackPoint);
SensorDataSet sensorDataSet = localRemoteSensorManager.getSensorDataSet();
sensorDataSet.fillTrackPoint(tmpLastTrackPoint);
tmpTrackStatisticsUpdater.addTrackPoint(tmpLastTrackPoint, recordingDistanceInterval); tmpTrackStatisticsUpdater.addTrackPoint(tmpLastTrackPoint, recordingDistanceInterval);
track.setTrackStatistics(tmpTrackStatisticsUpdater.getTrackStatistics()); track.setTrackStatistics(tmpTrackStatisticsUpdater.getTrackStatistics());
recordingDataObservable.postValue(new RecordingData(track, tmpLastTrackPoint, remoteSensorManager.getSensorDataSet())); recordingDataObservable.postValue(new RecordingData(track, tmpLastTrackPoint, sensorDataSet));
} }
public LiveData<RecordingStatus> getRecordingStatusObservable() { public LiveData<RecordingStatus> getRecordingStatusObservable() {