TrackRecordingService: generate timestamps for TrackPoints in HandlerServer.

Part of #822.

src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java

@@ -3,10 +3,15 @@ package de.dennisguse.opentracks.services.handlers;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
+import android.util.Pair;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
+import java.time.Clock;
+import java.time.Instant;
+
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
@@ -23,6 +28,9 @@ public class HandlerServer {
 // Disabled to simplify testing and implementation of #822
 //    private ExecutorService serviceExecutor;
 
+    @VisibleForTesting
+    private Clock clock;
+
     private final LocationHandler locationHandler;
     private final EGM2008CorrectionManager egm2008CorrectionManager = new EGM2008CorrectionManager();
     private BluetoothRemoteSensorManager remoteSensorManager;
@@ -115,6 +123,41 @@ public class HandlerServer {
         service.newTrackPoint(trackPoint, recordingGpsAccuracy);
     }
 
+    public TrackPoint createSegmentStartManual() {
+        return TrackPoint.createSegmentStartManualWithTime(createNow());
+    }
+
+    public TrackPoint createSegmentEnd() {
+        TrackPoint segmentEnd = TrackPoint.createSegmentEndWithTime(createNow());
+        fillAndReset(segmentEnd);
+        return segmentEnd;
+    }
+
+    //TODO get lastTrackPoint from LocationHandler
+    public Pair<TrackPoint, SensorDataSet> createCurrentTrackPoint(@Nullable TrackPoint lastTrackPoint) {
+        TrackPoint currentTrackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, createNow());
+
+        if (lastTrackPoint != null && lastTrackPoint.hasLocation()) {
+            //TODO Should happen in TrackPoint? via constructor
+            currentTrackPoint.setSpeed(lastTrackPoint.getSpeed());
+            currentTrackPoint.setAltitude(lastTrackPoint.getAltitude());
+            currentTrackPoint.setLongitude(lastTrackPoint.getLongitude());
+            currentTrackPoint.setLatitude(lastTrackPoint.getLatitude());
+        }
+        SensorDataSet sensorDataSet = fill(currentTrackPoint);
+
+        return new Pair<>(currentTrackPoint, sensorDataSet);
+    }
+
+    //TODO Limit visibility
+    public Instant createNow() {
+        if (clock != null) {
+            return Instant.now(clock);
+        } else {
+            return Instant.now();
+        }
+    }
+
     @Deprecated
     @VisibleForTesting
     public void setAltitudeSumManager(AltitudeSumManager altitudeSumManager) {