TrackPoint has Location as delegate instead of inheritance.

src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java

@@ -412,7 +412,7 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
                     samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
                 }
 
-                if (!LocationUtils.isValidLocation(trackPoint)) { //This can be split markers (not anymore supported feature)
+                if (!LocationUtils.isValidLocation(trackPoint.getLocation())) { //This can be split markers (not anymore supported feature)
                     includeNextPoint = true;
                 } else {
                     // Also include the last point if the selected track is not recording.

src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java

@@ -18,6 +18,8 @@ package de.dennisguse.opentracks.content.data;
 import android.location.Location;
 import android.location.LocationManager;
 
+import androidx.annotation.NonNull;
+
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 
 /**
@@ -25,34 +27,71 @@ import de.dennisguse.opentracks.content.sensor.SensorDataSet;
  *
  * @author Sandor Dornbush
  */
-//TODO Check if we can drop inheritance from Location and use attributes instead.
-public class TrackPoint extends Location {
+public class TrackPoint {
 
-    public static TrackPoint createPause() {
-        TrackPoint pause = new TrackPoint(LocationManager.GPS_PROVIDER);
-        pause.setLongitude(0);
-        pause.setLatitude(TrackPointsColumns.PAUSE_LATITUDE);
-        pause.setTime(System.currentTimeMillis());
-        return pause;
+    private Location location;
+
+    public TrackPoint() {
+        this.location = new Location("");
     }
 
-    public static TrackPoint createResume() {
-        TrackPoint resume = new TrackPoint(LocationManager.GPS_PROVIDER);
-        resume.setLongitude(0);
-        resume.setLatitude(TrackPointsColumns.RESUME_LATITUDE);
-        resume.setTime(System.currentTimeMillis());
-        return resume;
+    public TrackPoint(@NonNull Location location) {
+        this.location = location;
+    }
+
+    public TrackPoint(@NonNull Location location, SensorDataSet sensorDataSet) {
+        this.location = location;
+        this.sensorDataSet = sensorDataSet;
+    }
+
+    public TrackPoint(@NonNull TrackPoint trackPoint, SensorDataSet sensorDataSet) {
+        this.location = trackPoint.getLocation();
+        this.sensorDataSet = sensorDataSet;
     }
 
     private SensorDataSet sensorDataSet = null;
 
-    public TrackPoint(Location location, SensorDataSet sensorDataSet) {
-        super(location);
-        this.sensorDataSet = sensorDataSet;
+    public TrackPoint(double latitude, double longitude, Double altitude, long time) {
+        location = new Location(LocationManager.GPS_PROVIDER);
+        location.setLatitude(latitude);
+        location.setLongitude(longitude);
+        if (altitude != null) {
+            location.setAltitude(altitude);
+        }
+        location.setTime(time);
     }
 
-    public TrackPoint(String provider) {
-        super(provider);
+    public static TrackPoint createPause() {
+        return createPauseWithTime(System.currentTimeMillis());
+    }
+
+    public static TrackPoint createPauseWithTime(long time) {
+        Location pause = new Location(LocationManager.GPS_PROVIDER);
+        pause.setLongitude(0);
+        pause.setLatitude(TrackPointsColumns.PAUSE_LATITUDE);
+        pause.setTime(time);
+        return new TrackPoint(pause);
+    }
+
+    public static TrackPoint createResume() {
+        return createResumeWithTime(System.currentTimeMillis());
+    }
+
+    public static TrackPoint createResumeWithTime(long time) {
+        Location resume = new Location(LocationManager.GPS_PROVIDER);
+        resume.setLongitude(0);
+        resume.setLatitude(TrackPointsColumns.RESUME_LATITUDE);
+        resume.setTime(time);
+        return new TrackPoint(resume);
+    }
+
+    public @NonNull
+    Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(@NonNull Location location) {
+        this.location = location;
     }
 
     public SensorDataSet getSensorDataSet() {
@@ -63,8 +102,92 @@ public class TrackPoint extends Location {
         this.sensorDataSet = sensorDataSet;
     }
 
+    public double getLatitude() {
+        return location.getLatitude();
+    }
+
+    public void setLatitude(double latitude) {
+        location.setLatitude(latitude);
+    }
+
+    public double getLongitude() {
+        return location.getLongitude();
+    }
+
+    public void setLongitude(double longitude) {
+        location.setLongitude(longitude);
+    }
+
+    public long getTime() {
+        return location.getTime();
+    }
+
+    public void setTime(long time) {
+        location.setTime(time);
+    }
+
+    public boolean hasAltitude() {
+        return location.hasAltitude();
+    }
+
+    public double getAltitude() {
+        return location.getAltitude();
+    }
+
+    public void setAltitude(double altitude) {
+        location.setAltitude(altitude);
+    }
+
+    public boolean hasSpeed() {
+        return location.hasSpeed();
+    }
+
+    public float getSpeed() {
+        return location.getSpeed();
+    }
+
+    public void setSpeed(float speed) {
+        location.setSpeed(speed);
+    }
+
+    public boolean hasBearing() {
+        return location.hasBearing();
+    }
+
+    public float getBearing() {
+        return location.getBearing();
+    }
+
+    public void setBearing(float bearing) {
+        location.setBearing(bearing);
+    }
+
+    public boolean hasAccuracy() {
+        return location.hasAccuracy();
+    }
+
+    public float getAccuracy() {
+        return location.getAccuracy();
+    }
+
+    public void setAccuracy(float horizontalAccuracy) {
+        location.setAccuracy(horizontalAccuracy);
+    }
+
+    public float distanceTo(@NonNull TrackPoint dest) {
+        return location.distanceTo(dest.getLocation());
+    }
+
+    public float bearingTo(@NonNull TrackPoint dest) {
+        return location.bearingTo(dest.getLocation());
+    }
+
+    public float bearingTo(@NonNull Location dest) {
+        return location.bearingTo(dest);
+    }
+
     public void reset() {
-        super.reset();
+        location.reset();
         sensorDataSet = null;
     }
 }

src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java

@@ -19,6 +19,8 @@ package de.dennisguse.opentracks.content.data;
 import android.location.Location;
 import android.net.Uri;
 
+import androidx.annotation.NonNull;
+
 /**
  * A waypoint.
  *
@@ -117,11 +119,12 @@ public final class Waypoint {
         this.duration = duration;
     }
 
-    public Location getLocation() {
+    public @NonNull
+    Location getLocation() {
         return location;
     }
 
-    public void setLocation(Location location) {
+    public void setLocation(@NonNull Location location) {
         this.location = location;
     }
 

src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java

@@ -755,7 +755,7 @@ public class ContentProviderUtils {
      * @param cursor the cursor pointing to the location
      */
     public TrackPoint createTrackPoint(Cursor cursor) {
-        TrackPoint location = new TrackPoint("");
+        TrackPoint location = new TrackPoint();
         fillTrackPoint(cursor, new CachedTrackPointsIndexes(cursor), location);
         return location;
     }

src/main/java/de/dennisguse/opentracks/content/provider/TrackPointFactory.java

@@ -1,5 +1,6 @@
 package de.dennisguse.opentracks.content.provider;
 
+import android.location.Location;
 import android.location.LocationManager;
 
 import de.dennisguse.opentracks.content.data.TrackPoint;
@@ -16,6 +17,6 @@ public class TrackPointFactory {
     public static final TrackPointFactory DEFAULT_LOCATION_FACTORY = new TrackPointFactory();
 
     public TrackPoint create() {
-        return new TrackPoint(LocationManager.GPS_PROVIDER);
+        return new TrackPoint(new Location(LocationManager.GPS_PROVIDER));
     }
 }

src/main/java/de/dennisguse/opentracks/content/provider/TrackPointIterator.java

@@ -18,7 +18,7 @@ public class TrackPointIterator implements Iterator<TrackPoint>, AutoCloseable {
     private final ContentProviderUtils contentProviderUtils;
     private final long trackId;
     private final boolean descending;
-    private final TrackPointFactory trackPointFactory;
+    private final TrackPointFactory trackPointFactory; //TODO Remove; seems to be an old performance optimization.
     private final CachedTrackPointsIndexes indexes;
     private long lastTrackPointId = -1L;
     private Cursor cursor;