upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

TrackRecordingService: call stopSelf after triggering post-workout export.

Browse Source 
Might fix #1080.
This commit is contained in:
Dennis Guse
2022-01-28 21:06:20 +01:00
parent cc93384d1f
commit a7fd6b8dfa
2 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java
+2 -2
View File
@@ -132,7 +132,7 @@ public class TrackRecordingServiceTestStateMachine {
assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
// when
service.stopSensors(true);
service.stopSensorsAndShutdown();
Thread.sleep(1000);
// then
@@ -252,7 +252,7 @@ public class TrackRecordingServiceTestStateMachine {
assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
// when
service.stopSensors(false); //TODO Should be ignored as service is recording
service.stopSensors(); //TODO Should be ignored as service is recording
Thread.sleep(1000);
// then
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+27 -29
View File
@@ -161,24 +161,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
return binder;
}
@Deprecated //TODO Should be @VisibleForTesting
public boolean isRecording() {
return recordingStatus.isRecording();
}
@VisibleForTesting
public boolean isPaused() {
return recordingStatus.isPaused();
}
public Marker.Id insertMarker(String name, String category, String description, String photoUrl) {
if (!isRecording() || isPaused()) {
return null;
}
return trackRecordingManager.insertMarker(name, category, description, photoUrl);
}
public Track.Id startNewTrack() {
if (isRecording()) {
Log.w(TAG, "Ignore startNewTrack. Already recording.");
@@ -256,6 +238,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
endRecording(true);
ExportUtils.postWorkoutExport(this, trackId);
stopSelf();
}
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
@@ -275,11 +259,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
notificationManager.updateContent(getString(R.string.generic_paused));
}
/**
* Common code for ending a track or pausing a track.
*
* @param trackStopped true if track is stopped, false if track is paused
*/
private void endRecording(boolean trackStopped) {
stopUpdateRecordingData();
if (!trackStopped) {
@@ -293,22 +272,23 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
// Update instance variables
trackPointCreator.stop();
stopSensors(trackStopped);
stopSensors();
}
public void stopSensorsAndShutdown() {
stopSensors(true);
if (isRecording()) {
return;
}
stopSensors();
stopSelf();
}
void stopSensors(boolean shutdown) {
void stopSensors() {
if (!isRecording()) return;
trackPointCreator.stop();
showNotification(false);
wakeLock = SystemUtils.releaseWakeLock(wakeLock);
if (shutdown) {
stopSelf();
}
}
@Override
@@ -346,6 +326,14 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
}
}
public Marker.Id insertMarker(String name, String category, String description, String photoUrl) {
if (!isRecording() || isPaused()) {
return null;
}
return trackRecordingManager.insertMarker(name, category, description, photoUrl);
}
@Deprecated
@VisibleForTesting
public TrackPointCreator getTrackPointCreator() {
@@ -409,4 +397,14 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
recordingStatus = status;
recordingStatusObservable.postValue(recordingStatus);
}
@Deprecated //TODO Should be @VisibleForTesting
public boolean isRecording() {
return recordingStatus.isRecording();
}
@VisibleForTesting
public boolean isPaused() {
return recordingStatus.isPaused();
}
}