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

TrackRecordingService: cleanup.

Browse Source 
if+return rather than if+else.
This commit is contained in:
Dennis Guse
2020-04-12 21:18:36 +02:00
parent 95feae846a
commit 9b97cdfcd1
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+24 -5
View File
@@ -588,6 +588,7 @@ public class TrackRecordingService extends Service {
if (TrackPointUtils.after(trackPoint, lastValidTrackPoint)) { if (TrackPointUtils.after(trackPoint, lastValidTrackPoint)) {
idleTime = trackPoint.getTime() - lastValidTrackPoint.getLocation().getTime(); idleTime = trackPoint.getTime() - lastValidTrackPoint.getLocation().getTime();
} }
locationListenerPolicy.updateIdleTime(idleTime); locationListenerPolicy.updateIdleTime(idleTime);
if (currentRecordingInterval != locationListenerPolicy.getDesiredPollingInterval()) { if (currentRecordingInterval != locationListenerPolicy.getDesiredPollingInterval()) {
registerLocationListener(); registerLocationListener();
@@ -615,21 +616,39 @@ public class TrackRecordingService extends Service {
insertTrackPoint(track, trackPoint, null); insertTrackPoint(track, trackPoint, null);
isIdle = false; isIdle = false;
} else if (trackPoint.getSensorDataSet() != null || distanceToLastTrackLocation >= recordingDistanceInterval) {
lastTrackPoint = trackPoint;
return;
}
if (trackPoint.getSensorDataSet() != null || distanceToLastTrackLocation >= recordingDistanceInterval) {
insertTrackPoint(track, lastTrackPoint, lastValidTrackPoint); insertTrackPoint(track, lastTrackPoint, lastValidTrackPoint);
insertTrackPoint(track, trackPoint, null); insertTrackPoint(track, trackPoint, null);
isIdle = false; isIdle = false;
} else if (!isIdle && !TrackPointUtils.isMoving(trackPoint)) {
lastTrackPoint = trackPoint;
return;
}
if (!isIdle && !TrackPointUtils.isMoving(trackPoint)) {
insertTrackPoint(track, lastTrackPoint, lastValidTrackPoint); insertTrackPoint(track, lastTrackPoint, lastValidTrackPoint);
insertTrackPoint(track, trackPoint, null); insertTrackPoint(track, trackPoint, null);
isIdle = true; isIdle = true;
} else if (isIdle && TrackPointUtils.isMoving(trackPoint)) {
lastTrackPoint = trackPoint;
return;
}
if (isIdle && TrackPointUtils.isMoving(trackPoint)) {
insertTrackPoint(track, lastTrackPoint, lastValidTrackPoint); insertTrackPoint(track, lastTrackPoint, lastValidTrackPoint);
insertTrackPoint(track, trackPoint, null); insertTrackPoint(track, trackPoint, null);
isIdle = false; isIdle = false;
} else {
Log.d(TAG, "Not recording TrackPoint, idle"); lastTrackPoint = trackPoint;
return;
} }
Log.d(TAG, "Not recording TrackPoint, idle");
lastTrackPoint = trackPoint; lastTrackPoint = trackPoint;
} }