Cleanup: GpsStatusManager only needs Position.

src/androidTest/java/de/dennisguse/opentracks/sensors/GpsStatusTest.java

@@ -28,7 +28,6 @@ import java.util.List;
 
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Position;
-import de.dennisguse.opentracks.data.models.TrackPoint;
 
 @RunWith(AndroidJUnit4.class)
 public class GpsStatusTest {
@@ -82,16 +81,16 @@ public class GpsStatusTest {
 
         // when / then
         subject.start();
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(badFix, Instant.now())));
+        subject.onNewTrackPoint(Position.of(badFix, Instant.now()));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD), statusList);
 
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(ok, Instant.now())));
+        subject.onNewTrackPoint(Position.of(ok, Instant.now()));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD, GPS_SIGNAL_FIX), statusList);
 
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(ok, Instant.now())));
+        subject.onNewTrackPoint(Position.of(ok, Instant.now()));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD, GPS_SIGNAL_FIX), statusList);
 
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(badFix, Instant.now())));
+        subject.onNewTrackPoint(Position.of(badFix, Instant.now()));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_BAD, GPS_SIGNAL_FIX, GPS_SIGNAL_BAD), statusList);
     }
 
@@ -106,13 +105,13 @@ public class GpsStatusTest {
 
         // when / then
         subject.start();
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(ok, Instant.now().minusMillis(1000))));
+        subject.onNewTrackPoint(Position.of(ok, Instant.now().minusMillis(1000)));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX), statusList);
 
         subject.determineGpsStatusByTime(Instant.now());
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST), statusList);
 
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(ok, Instant.now())));
+        subject.onNewTrackPoint(Position.of(ok, Instant.now()));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST, GPS_SIGNAL_FIX), statusList);
     }
 
@@ -133,13 +132,13 @@ public class GpsStatusTest {
         Thread.sleep(100);
         assertEquals(List.of(GPS_ENABLED), statusList);
 
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(ok, Instant.now())));
+        subject.onNewTrackPoint(Position.of(ok, Instant.now()));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX), statusList);
 
         Thread.sleep(100);
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST), statusList);
 
-        subject.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(badFix, Instant.now())));
+        subject.onNewTrackPoint(Position.of(badFix, Instant.now()));
         assertEquals(List.of(GPS_ENABLED, GPS_SIGNAL_FIX, GPS_SIGNAL_LOST, GPS_SIGNAL_BAD), statusList);
 
         Thread.sleep(100);

src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java

@@ -19,7 +19,6 @@ import java.time.Duration;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Position;
-import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorGPS;
 import de.dennisguse.opentracks.sensors.sensorData.Raw;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
@@ -125,7 +124,7 @@ public class GpsManager implements SensorConnector, LocationListenerCompat, GpsS
     public void onLocationChanged(@NonNull Location location) {
         // Send each update to the status; please note that this TrackPoint is not stored.
         Position position = Position.of(location, trackPointCreator.createNow());
-        gpsStatusManager.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, position));
+        gpsStatusManager.onNewTrackPoint(position);
 
         if (!position.hasValidLocation()) {
             Log.w(TAG, "Ignore newTrackPoint. Location is invalid.");

src/main/java/de/dennisguse/opentracks/sensors/GpsStatusManager.java

@@ -12,13 +12,12 @@ import java.time.Duration;
 import java.time.Instant;
 
 import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.data.models.Position;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 /**
  * This class handle GPS status according to received locations and some thresholds.
  */
-//TODO Use Position instead of TrackPoint.
 class GpsStatusManager {
 
     private static final String TAG = GpsStatusManager.class.getSimpleName();
@@ -36,7 +35,7 @@ class GpsStatusManager {
     private final Context context;
 
     @Nullable
-    private TrackPoint lastTrackPoint = null;
+    private Position lastPosition = null;
 
     private Handler handler;
 
@@ -82,26 +81,24 @@ class GpsStatusManager {
     }
 
     /**
-     * This method must be called from the client every time a new trackPoint is received.
+     * This method must be called every time a new {@link Position} is received.
-     * Receive new trackPoint and calculate the new status if needed.
+     * Receive new position and calculate the new status if needed.
      * It look for GPS changes in lastLocation if it's not null. If it's null then look for in lastValidLocation if any.
      */
-    public void onNewTrackPoint(@NonNull final TrackPoint trackPoint) {
+    public void onNewTrackPoint(@NonNull Position position) {
-        lastTrackPoint = trackPoint;
+        lastPosition = position;
 
-        determineGpsStatusOnTrackpoint(trackPoint);
+        determineGpsStatusOnTrackpoint(position);
     }
 
     /**
-     * Checks if lastLocation has new GPS status looking up time and accuracy.
+     * Checks if {@link Position} has new GPS status looking up time and accuracy.
      * It depends of signalLostThreshold and signalBadThreshold.
      * If there is any change then it does the change.
      * Also, it'll run the runnable if signal is bad or stop it if the signal is lost.
      */
-    //TODO use MonotonicClock instead of Instant.now()
+    private void determineGpsStatusOnTrackpoint(@NonNull Position position) {
-    @VisibleForTesting
+        if (position.fulfillsAccuracy(horizontalAccuracyThreshold)) {
-    void determineGpsStatusOnTrackpoint(@NonNull TrackPoint lastTrackPoint) {
-        if (lastTrackPoint.position().fulfillsAccuracy(horizontalAccuracyThreshold)) {
             if (gpsStatus != GpsStatusValue.GPS_SIGNAL_FIX) {
                 setGpsStatus(GpsStatusValue.GPS_SIGNAL_FIX);
                 scheduleTimer(); //TODO
@@ -116,10 +113,10 @@ class GpsStatusManager {
     }
 
     void determineGpsStatusByTime(Instant now) {
-        if (lastTrackPoint == null) {
+        if (lastPosition == null) {
             return;
         }
-        if (signalLostThreshold.minus(Duration.between(lastTrackPoint.getTime(), now)).isNegative()) {
+        if (signalLostThreshold.minus(Duration.between(lastPosition.time(), now)).isNegative()) {
             // Too much time without receiving signal -> signal lost.
             if (gpsStatus != GpsStatusValue.GPS_SIGNAL_LOST) {
                 setGpsStatus(GpsStatusValue.GPS_SIGNAL_LOST);
@@ -156,7 +153,7 @@ class GpsStatusManager {
         }
 
         setGpsStatus(GpsStatusValue.GPS_DISABLED);
-        lastTrackPoint = null;
+        lastPosition = null;
         stopTimer();
     }