Release: v3.24.1

Track name: use a short version of ISO8601.
Fixes #1093.
2026-10-25 10:44:44 +01:00 · 2022-01-23 21:17:57 +01:00 · 2022-01-23 21:04:08 +01:00 · 2022-01-23 20:13:00 +01:00 · 2022-01-23 20:03:55 +01:00 · 2022-01-22 12:41:41 +01:00
256 changed files with 6130 additions and 3816 deletions
@@ -23,4 +23,5 @@ If applicable:
 **Technical information**
 - Device: [e.g. Nexus 7 (2013)]
 - OS: [e.g. LineageOS 15.1]
- - Version [e.g. v3.2.4]
+ - OpenTracks version: [e.g. v3.2.4]
+ - OpenTracks commit id (only for nightly builds): [e.g. 4b333bb]
@@ -20,7 +20,7 @@ jobs:
          java-version: '11'

      - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2.21.0
+        uses: reactivecircus/android-emulator-runner@v2.22.0
        with:
          api-level: ${{ matrix.api-level }}
          target: ${{ matrix.target }}
@@ -69,6 +69,7 @@ captures/
 .idea/jarRepositories.xml
 .idea/markdown-navigator-enh.xml
 .idea/markdown-navigator.xml
+.idea/deploymentTargetDropDown.xml

 # Keystore files
 *.jks
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="src/main/res/menu/aggregated_statistics.xml" value="0.10208333333333333" />
+        <entry key="src/main/res/xml/settings_gps.xml" value="0.22604166666666667" />
+        <entry key="src/main/res/xml/settings_sensors.xml" value="0.2101851851851852" />
+      </map>
+    </option>
+  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
    <option name="id" value="Android" />
  </component>
-</project>
+</project>
@@ -6,7 +6,8 @@ _OpenTracks_ is a sport tracking application that completely respects your priva

 <table>
    <tr>
-        <th>Free</th>
+        <th>Free (F-Droid)</th>
+        <th>Free (Nightly for F-Droid)</th>
        <th>Donations</th>
        <th>Translations</th>
    </tr>
@@ -16,6 +17,11 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
                <img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle">
            </a>
        </td>
+        <td align="center">
+            <a href="https://fdroid.storchp.de/fdroid/repo?fingerprint=99985A7E73DCB0B16C9BDDCE7A0B4996F88068AE7C771ED53E217E69CD1FF196">
+                <img alt="Nightly builds (for F-Droid client)" src="https://opentracksapp.com/static/img/fdroid.storchp.de.png" height="90" align="middle">
+            </a>
+        </td>
        <td align="center">
            <a href="https://liberapay.com/OpenTracks/donate">
                <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45" align="middle">
@@ -31,14 +37,16 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
        <td align="center">
            <img alt="OpenTracks version published on F-Droid" src="https://img.shields.io/f-droid/v/de.dennisguse.opentracks.svg" align="middle" >
        </td>
+        <td></td>
        <td align="center">
            <a href="bitcoin:bc1qckpls3lpjlcpyxzm66hcy65hnesas9zgacy6yc">
                <img alt="bitcoin:bc1qckpls3lpjlcpyxzm66hcy65hnesas9zgacy6yc" src="promotion/donations-bitcoin.png" height="90" align="middle">
            </a>
-        </td align="center">
+        </td>
        <td></td>
    </tr>
    <tr>
+        <td></td>
        <td></td>
        <td align="center">
            <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">
@@ -48,6 +56,7 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
        <td></td>
    </tr>
    <tr>
+        <td></td>
        <td></td>
        <td align="center">
            <a href="https://www.amazon.de/dp/B09K2KNQ7X/">
@@ -78,7 +87,7 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
 * __Photos and Markers:__ mark interesting locations while tracking
 * __Export:__
  * export tracks either as KMZ (incl. photos), KML, or GPX
-  * export automatically after each recording (e.g., to sync)
+  * export automatically after each recording (e.g., to sync via [Nextcloud](https://nextcloud.com/))
  * avoid duplication: each exported file contain a random unique identifier (i.e., `opentracks:trackid`)
 * __Altitude:__
  * gain/loss via barometric sensor (if present)
@@ -89,6 +98,8 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
  * cycling: cadence
  * cycling: power meter
  * running: speed and cadence
+  * support for BLE sensor training only (i.e., without GPS) for indoor training
+
  An overview of tested sensors: [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md)

 ### Gadgetbridge integration
@@ -106,7 +117,19 @@ OpenTracks can be used with [Gadgetbridge](https://www.gadgetbridge.org/):
 __Only required permission:__
 * _ACCESS_FINE_LOCATION_: required to use the GPS.

-An overview of Bluetooth LE sensors that are known to work with OpenTracks is in [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md).
+### API
+The following functionalities by sending from an external application (e.g., [Automate](https://llamalab.com/automate/), [Tasker](https://tasker.joaoapps.com), or [Easer](https://github.com/renyuneyun/Easer)).
+The API can be invoked by sending an Intent to start an activity.
+Package  (depends on the variant installed):
+* F-Droid: `de.dennisguse.opentracks`
+* GooglePlay: `de.dennisguse.opentracks.playStore`
+* Debug: `de.dennisguse.opentracks.debug`
+* Nightly: `de.dennisguse.opentracks.nightly`
+
+Activity:
+* **Start a recording:**  `de.dennisguse.opentracks.publicapi.StartRecording`
+
+* For testing via adb: `adb shell am start -n "package/activity"`

 ## Custom Dashboards (incl. map)
 As of v3.3.1, OpenTracks supports custom dashboards.
@@ -18,23 +18,21 @@
 Please note that the according to the specification these sensors _may_ provide speed as well as cadence.
 However, often only one value is provided.

-### Speed
+### Speed & Cadence
+
+* Wahoo Blue SC
+
+### Speed only

 * Garmin Speed Sensor 2
  * Has updatable firmware that requires an account for garmin.com
-  * This sensor reports speed data as cadence.
-    A workaround is in place.
-
 * Wahoo Speed (Model: WFRPMSPD)
-
 * CooSpo cadence and speed sensor (model: BK467)

-### Cadence
+### Cadence only

 * Garmin Cadence Sensor 2
 * Wahoo Cadence (Model: WFPODCAD2)
-  This sensor reports cadence data as speed.
-  A workaround is in place.

 ## 0x1818: Power Measurement

@@ -63,8 +63,8 @@ android {

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 4580
-        versionName "v3.23.0"
+        versionCode 4692
+        versionName "v3.24.1"

        buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""

@@ -123,10 +123,10 @@ android {
 dependencies {
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

-    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
    implementation 'androidx.preference:preference:1.1.1'
    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
    implementation 'com.android.support.constraint:constraint-layout:2.0.4'

    androidTestImplementation 'androidx.test:core:1.4.0'
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 24 24"
+   id="vector"
+   version="1.1"
+   sodipodi:docname="ic_clear_filter.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="16.541667"
+     inkscape:cx="12.392292"
+     inkscape:cy="24.710689"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="vector" />
+  <path
+     id="path"
+     style="fill:#707070;fill-opacity:1"
+     d="M 5.0390625 4 C 4.2090625 4 3.74 4.949375 4.25 5.609375 C 6.0862696 7.9637998 8.9006606 11.587089 9.4765625 12.328125 L 17.804688 4 L 5.0390625 4 z M 14 13.958984 L 10 17.958984 L 10 19 C 10 19.55 10.45 20 11 20 L 13 20 C 13.55 20 14 19.55 14 19 L 14 13.958984 z " />
+  <rect
+     style="fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.118;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833"
+     width="21.37405"
+     height="1.7606405"
+     x="-10.108474"
+     y="16.886091"
+     ry="0.88032025"
+     transform="rotate(-45)" />
+</svg>
@@ -0,0 +1,17 @@
+v3.24.0: OpenTracks
+
+Changes:
+- GPS is optional (also for indoor use): if using a BLE sensors that provide distance are used
+- Settings: option to disable BLE filtering of devices
+- Charts: altitude starts at minimal value instead of 0m.
+- UI supports showing stored timezone information
+
+Bugfix:
+- Re-added workaround for crash due to clock traveling back in time (workaround was removed in v3.23.0)
+- Removed unecessary workaround for BLE cycling sensor (RTFM)
+- GPX importer did not handle missing data properly
+
+Developer:
+- BLE sensors report data event-driven than pull-based
+- Reworked and added integration tests for recording
+
@@ -0,0 +1,16 @@
+v3.24.1: OpenTracks
+
+Changes:
+- Added API for starting recordings from other applications (disabled by default)
+- Shortened ISO8601 track names
+- BLE distance sensors: store GPS-locations based upon previous GPS-locations
+
+Bugfix:
+- While recording: fixed crash when opening charts
+- TrackDataHub should end processing after stop()
+- Prevent rare crash while deleting tracks
+
+Developer:
+- Refactored package structure
+- Monotonic clock
+- Value objects for heartrate, cadence, and power
@@ -0,0 +1,8 @@
+v3.19.1: OpenTracks
+
+Cambios:
+- Traducciones actualizadas.
+
+Corrección de errores:
+- Corregido el error de exportar todas las pistas.
+- Corregido el error de reanudar la pista.
@@ -0,0 +1,7 @@
+v3.20.0: OpenTracks
+
+Cambios:
+- Durante la grabación: la interfaz de usuario de las estadísticas es ahora configurable
+
+Corrección de errores:
+- Se ignoraba el cambio de nombre de pista/categoría durante la grabación (introducido en la v3.19.0)
@@ -0,0 +1,6 @@
+v3.20.1: OpenTracks
+
+Cambios:
+- Los anuncios ahora se pueden utilizar tanto por distancia como por tiempo
+- Los anuncios emiten un pitido si no se ha instalado un software de texto a voz
+- Se ha eliminado la frecuencia de localización GPS adaptativa
@@ -0,0 +1,10 @@
+v3.23.0: OpenTracks
+
+Cambios:
+- Añadido perfiles UI
+- Estadísticas agregadas para las pistas seleccionadas
+- Reimplementación de TrackPoints inactivos/no inactivos ya que el tiempo de movimiento dejó de funcionar (introducido en la v3.22.0)
+
+Corrección de errores:
+- Sensores BLE: borrado de datos al desconectarse
+- La exportación automática necesita persistir el permiso
@@ -1,6 +1,19 @@
 package de.dennisguse.opentracks;


+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.scrollTo;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.anything;
+
 import android.app.ActivityManager;
 import android.app.Instrumentation;
 import android.content.Context;
@@ -35,19 +48,6 @@ import org.junit.runner.RunWith;

 import de.dennisguse.opentracks.services.TrackDeleteService;

-import static androidx.test.espresso.Espresso.onData;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.Espresso.pressBack;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.scrollTo;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anything;
-
@LargeTest
@RunWith(AndroidJUnit4.class)
 public class EspressoDeleteTrackTest {
@@ -236,7 +236,6 @@ public class EspressoDeleteTrackTest {

            @Override
            public void describeTo(Description description) {
-
            }
        }));

@@ -29,10 +29,10 @@ import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.action.MotionEvents;
 import androidx.test.espresso.util.HumanReadables;
 import androidx.test.espresso.util.TreeIterables;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.rule.GrantPermissionRule;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.GrantPermissionRule;

 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -49,13 +49,10 @@ import java.util.concurrent.TimeoutException;
 public class EspressoEditTrackRecordingTest {

    @Rule
-    public ActivityTestRule<TrackListActivity> mActivityTestRule = new ActivityTestRule<>(TrackListActivity.class);
+    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);

    @Rule
-    public GrantPermissionRule mGrantPermissionRule =
-            GrantPermissionRule.grant(
-                    "android.permission.ACCESS_FINE_LOCATION",
-                    "android.permission.ACCESS_COARSE_LOCATION");
+    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);

    @LargeTest
    @Test
@@ -1,9 +1,5 @@
 package de.dennisguse.opentracks;

-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
@@ -11,11 +7,9 @@ import org.junit.runners.model.Statement;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

 public class PreferenceMetricUnitRule implements TestRule {
-    private final Context context;
    private final boolean metricUnits;

-    public PreferenceMetricUnitRule(@NonNull Context context, boolean metricUnits) {
-        this.context = context;
+    public PreferenceMetricUnitRule(boolean metricUnits) {
        this.metricUnits = metricUnits;
    }

@@ -1,5 +1,8 @@
 package de.dennisguse.opentracks.chart;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.junit.Test;
@@ -7,15 +10,12 @@ import org.junit.runner.RunWith;

 import java.time.Duration;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.fragments.TrackStubUtils;
+import de.dennisguse.opentracks.data.models.Altitude;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.stats.TrackStatistics;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
@RunWith(AndroidJUnit4.class)
 public class ChartPointTest {

@@ -26,7 +26,7 @@ public class ChartPointTest {
        statistics.setTotalTime(Duration.ofSeconds(1000));

        // when
-        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), 0, false, false);
+        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), Altitude.EGM2008.of(0), false, false);

        // then
        assertEquals(1000000, (long) point.getTimeOrDistance());
@@ -39,7 +39,7 @@ public class ChartPointTest {
        statistics.setTotalDistance(Distance.of(1000));

        // when
-        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), 0, true, true);
+        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), Altitude.EGM2008.of(0), true, true);

        // then
        assertEquals(1, (long) point.getTimeOrDistance());
@@ -51,7 +51,7 @@ public class ChartPointTest {
        TrackStatistics statistics = new TrackStatistics();

        // when
-        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(10), 50, false, true);
+        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(10), Altitude.EGM2008.of(50), false, true);

        // then
        assertEquals(50, point.getAltitude(), 0.01);
@@ -65,7 +65,7 @@ public class ChartPointTest {
        TrackStatistics statistics = new TrackStatistics();

        // when
-        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(10), 50, false, true);
+        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(10), Altitude.EGM2008.of(50), false, true);

        // then
        assertNull(point.getHeartRate());
@@ -77,14 +77,14 @@ public class ChartPointTest {
    public void create_sensorAvailable() {
        // given
        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint.setHeartRate_bpm(100f);
-        trackPoint.setCadence_rpm(101f);
+        trackPoint.setHeartRate(100f);
+        trackPoint.setCadence(101f);
        trackPoint.setPower(102f);

        TrackStatistics statistics = new TrackStatistics();

        // when
-        ChartPoint point = new ChartPoint(statistics, trackPoint, Speed.of(10), 50, false, true);
+        ChartPoint point = new ChartPoint(statistics, trackPoint, Speed.of(10), Altitude.EGM2008.of(50), false, true);

        // then
        assertEquals(100.0, point.getHeartRate(), 0.01);
@@ -14,20 +14,20 @@
 * the License.
 */

-package de.dennisguse.opentracks.fragments;
+package de.dennisguse.opentracks.chart;

 import java.time.Instant;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.TrackPoint;

 /**
 * Commons utilities for creating stubs of track, location.
 *
 * @author Youtao Liu
 */
-public class TrackStubUtils {
+class TrackStubUtils {

    public static final double INITIAL_ALTITUDE = 22;
    public static final long INITIAL_TIME = 1000L;
@@ -11,10 +11,16 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;

-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackPointIterator;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
+import de.dennisguse.opentracks.ui.markers.MarkerUtils;
 import de.dennisguse.opentracks.util.FileUtils;

 public class TestDataUtil {
@@ -119,8 +125,8 @@ public class TestDataUtil {
        trackPoint.setAltitude(i * ALTITUDE_INTERVAL);
        trackPoint.setSpeed(Speed.of(5f + (i / 10f)));

-        trackPoint.setHeartRate_bpm(100f + i);
-        trackPoint.setCadence_rpm(300f + i);
+        trackPoint.setHeartRate(100f + i);
+        trackPoint.setCadence(300f + i);
        trackPoint.setPower(400f + i);
        trackPoint.setAltitudeGain(ALTITUDE_GAIN);
        trackPoint.setAltitudeLoss(ALTITUDE_LOSS);
@@ -145,7 +151,7 @@ public class TestDataUtil {
    }

    public static Marker createMarkerWithPhoto(Context context, Track.Id trackId, TrackPoint trackPoint) throws IOException {
-        File dstFile = new File(FileUtils.getImageUrl(context, trackId));
+        File dstFile = new File(MarkerUtils.getImageUrl(context, trackId));
        dstFile.createNewFile();
        Uri photoUri = FileUtils.getUriForFile(context, dstFile);
        String photoUrl = photoUri.toString();
@@ -177,7 +183,7 @@ public class TestDataUtil {
        for (int i = 0; i < numberOfPoints; i++) {
            TrackPoint tp = TestDataUtil.createTrackPoint(i);
            contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId());
-            trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0));
+            trackStatisticsUpdater.addTrackPoint(tp);
        }
        dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
        contentProviderUtils.updateTrack(dummyTrack);
@@ -5,6 +5,10 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;

+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+
 public class TestSensorDataUtil {

    private final List<TrackPoint> trackPointList = new ArrayList<>();
@@ -16,9 +20,15 @@ public class TestSensorDataUtil {
        int i = trackPointList.size() + 1;
        tp.setLatitude(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0);
        tp.setLongitude(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0);
-        tp.setHeartRate_bpm(hr);
-        tp.setCadence_rpm(cadence);
-        tp.setPower(power);
+        if (hr != null) {
+            tp.setHeartRate(hr);
+        }
+        if (cadence != null) {
+            tp.setCadence(cadence);
+        }
+        if (power != null) {
+            tp.setPower(power);
+        }
        tp.setHorizontalAccuracy(Distance.of(1f));
        tp.setAltitude(1f);
        tp.setSpeed(Speed.of(5f + (i / 10f)));
@@ -14,7 +14,10 @@
 * the License.
 */

-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;

 import android.content.ContentUris;
 import android.content.Context;
@@ -25,12 +28,9 @@ import androidx.test.core.app.ApplicationProvider;
 import org.junit.Before;
 import org.junit.Test;

-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;

 /**
 * Tests {@link CustomContentProvider}.
@@ -13,7 +13,14 @@
 * License for the specific language governing permissions and limitations under
 * the License.
 */
-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;

 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -42,27 +49,20 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.stream.Collectors;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.TestSensorDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.HeartRate;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.UUIDUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;

 /**
 * A unit test for {@link ContentProviderUtils}.
@@ -192,6 +192,19 @@ public class CustomContentProviderUtilsTest {
        assertEquals(name, track.getName());
    }

+    private void assertCount(int trackCount, int trackPointCount, int markerCount) {
+        ContentResolver contentResolver = context.getContentResolver();
+        try (Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID)) {
+            assertEquals(trackCount, tracksCursor.getCount());
+        }
+        try (Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID)) {
+            assertEquals(trackPointCount, tracksPointsCursor.getCount());
+        }
+        try (Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID)) {
+            assertEquals(markerCount, markerCursor.getCount());
+        }
+    }
+
    /**
     * Tests the method {@link ContentProviderUtils#deleteAllTracks(Context)}
     */
@@ -204,22 +217,13 @@ public class CustomContentProviderUtilsTest {
        Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
        contentProviderUtils.insertMarker(marker);

-        ContentResolver contentResolver = context.getContentResolver();
-        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(1, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(10, tracksPointsCursor.getCount());
-        Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(1, markerCursor.getCount());
-        // Delete all.
+        assertCount(1, 10, 1);
+
+        // when
        contentProviderUtils.deleteAllTracks(context);
-        // Check whether all have been deleted.
-        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(0, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(0, tracksPointsCursor.getCount());
-        markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(0, markerCursor.getCount());
+
+        // then
+        assertCount(0, 0, 0);
    }

    /**
@@ -235,28 +239,18 @@ public class CustomContentProviderUtilsTest {
        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
        contentProviderUtils.insertMarker(marker);

-        ContentResolver contentResolver = context.getContentResolver();
-        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(1, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(10, tracksPointsCursor.getCount());
-        Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(1, markerCursor.getCount());
-        // Check marker has photo and it's in the external storage.
+        assertCount(1, 10, 1);
        assertTrue(marker.hasPhoto());
        File dir = FileUtils.getPhotoDir(context, trackId);
        assertTrue(dir.isDirectory());
        assertEquals(1, dir.list().length);
        assertTrue(dir.exists());
-        // Delete all.
+
+        // when
        contentProviderUtils.deleteAllTracks(context);
-        // Check whether all have been deleted.
-        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(0, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(0, tracksPointsCursor.getCount());
-        markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(0, markerCursor.getCount());
+
+        // then
+        assertCount(0, 0, 0);
        assertFalse(dir.exists());
    }

@@ -279,22 +273,13 @@ public class CustomContentProviderUtilsTest {
        Marker marker = new Marker(trackId1, contentProviderUtils.getLastValidTrackPoint(trackId2));
        contentProviderUtils.insertMarker(marker);

-        ContentResolver contentResolver = context.getContentResolver();
-        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(3, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(30, tracksPointsCursor.getCount());
-        Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(1, markerCursor.getCount());
-        // Delete one track.
+        assertCount(3, 30, 1);
+
+        // when
        contentProviderUtils.deleteTrack(context, trackId1);
-        // Check whether all data of a track has been deleted.
-        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(2, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(20, tracksPointsCursor.getCount());
-        markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(0, markerCursor.getCount());
+
+        // then
+        assertCount(2, 20, 0);
    }

    /**
@@ -324,13 +309,7 @@ public class CustomContentProviderUtilsTest {
        File dir2 = FileUtils.getPhotoDir(context, trackId2);

        // Check.
-        ContentResolver contentResolver = context.getContentResolver();
-        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(3, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(30, tracksPointsCursor.getCount());
-        Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(2, markerCursor.getCount());
+        assertCount(3, 30, 2);
        assertTrue(marker1.hasPhoto());
        assertTrue(dir1.isDirectory());
        assertEquals(1, dir1.list().length);
@@ -338,15 +317,12 @@ public class CustomContentProviderUtilsTest {
        assertTrue(dir2.isDirectory());
        assertEquals(1, dir2.list().length);
        assertTrue(dir2.exists());
-        // Delete one track.
+
+        // when
        contentProviderUtils.deleteTrack(context, trackId1);
-        // Check whether all data of a track has been deleted.
-        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        assertEquals(2, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        assertEquals(20, tracksPointsCursor.getCount());
-        markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(1, markerCursor.getCount());
+
+        // then
+        assertCount(2, 20, 1);
        assertFalse(dir1.exists());
        assertTrue(dir2.exists());
    }
@@ -763,11 +739,19 @@ public class CustomContentProviderUtilsTest {
        Pair<Track, List<TrackPoint>> track = TestDataUtil.createTrack(trackId, 10);
        TestDataUtil.insertTrackWithLocations(contentProviderUtils, track.first, track.second);

-        // when / then
+        // when
        contentProviderUtils.bulkInsertTrackPoint(track.second, trackId);
-        assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
+        try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, null)) {
+            // then
+            assertEquals(20, cursor.getCount());
+        }
+
+        // when
        contentProviderUtils.bulkInsertTrackPoint(track.second.subList(0, 8), trackId);
-        assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
+        try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, null)) {
+            // then
+            assertEquals(28, cursor.getCount());
+        }
    }

    /**
@@ -801,6 +785,7 @@ public class CustomContentProviderUtilsTest {

        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_HEARTRATE)).thenReturn(6);
        when(cursorMock.isNull(6)).thenReturn(false);
+        when(cursorMock.getFloat(6)).thenReturn(75f);

        // when
        TrackPoint trackPoint = contentProviderUtils.createTrackPoint(cursorMock);
@@ -810,7 +795,7 @@ public class CustomContentProviderUtilsTest {
        assertEquals(latitude, trackPoint.getLatitude(), 0.01);
        assertEquals(time, trackPoint.getTime().toEpochMilli());
        assertEquals(speed, trackPoint.getSpeed().toMPS(), 0.01);
-        assertFalse(trackPoint.hasHeartRate());
+        assertEquals(HeartRate.of(75f), trackPoint.getHeartRate());
    }

    /**
@@ -824,7 +809,11 @@ public class CustomContentProviderUtilsTest {
        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        contentProviderUtils.insertTrackPoint(TestDataUtil.createTrackPoint(22), trackId);
-        assertEquals(11, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
+        // when
+        try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, null)) {
+            // then
+            assertEquals(11, cursor.getCount());
+        }
    }

    @Test
@@ -834,8 +823,8 @@ public class CustomContentProviderUtilsTest {
        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        TrackPoint trackPoint = TestDataUtil.createTrackPoint(5);
-        trackPoint.setHeartRate_bpm(1F);
-        trackPoint.setCadence_rpm(2F);
+        trackPoint.setHeartRate(1F);
+        trackPoint.setCadence(2F);
        trackPoint.setPower(3F);

        // when
@@ -844,9 +833,9 @@ public class CustomContentProviderUtilsTest {
        // then
        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
        assertTrue(trackPoints.get(10).hasHeartRate());
-        assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01);
-        assertEquals(trackPoint.getCadence_rpm(), trackPoints.get(10).getCadence_rpm(), 0.01);
-        assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01);
+        assertEquals(trackPoint.getHeartRate(), trackPoints.get(10).getHeartRate());
+        assertEquals(trackPoint.getCadence(), trackPoints.get(10).getCadence());
+        assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower());
    }

    /**
@@ -874,10 +863,10 @@ public class CustomContentProviderUtilsTest {
                .map(TrackPoint.Id::new).collect(Collectors.toList());

        // when
-        Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds.get(8));
-
-        // then
-        assertEquals(2, cursor.getCount());
+        try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds.get(8))) {
+            // then
+            assertEquals(2, cursor.getCount());
+        }
    }

    @Test
@@ -934,8 +923,8 @@ public class CustomContentProviderUtilsTest {
        TrackPoint trackPoint = TestDataUtil.createTrackPoint(1);
        trackPoint.setType(TrackPoint.Type.TRACKPOINT);
        trackPoint.setPower(null);
-        trackPoint.setCadence_rpm(null);
-        trackPoint.setHeartRate_bpm(null);
+        trackPoint.setCadence(null);
+        trackPoint.setHeartRate(null);
        trackPointList.add(trackPoint);
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        Track track = TestDataUtil.createTrack(trackId);
@@ -997,13 +986,13 @@ public class CustomContentProviderUtilsTest {

        // then
        assertTrue(sensorStatistics.hasHeartRate());
-        assertEquals(sensorStatistics.getAvgHeartRate(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
        assertTrue(sensorStatistics.hasCadence());
-        assertEquals(sensorStatistics.getAvgCadence(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
        assertTrue(sensorStatistics.hasPower());
-        assertEquals(sensorStatistics.getAvgPower(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1029,8 +1018,8 @@ public class CustomContentProviderUtilsTest {

        // then
        assertTrue(sensorStatistics.hasHeartRate());
-        assertEquals(sensorStatistics.getAvgHeartRate(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
        assertFalse(sensorStatistics.hasCadence());
        assertFalse(sensorStatistics.hasPower());
    }
@@ -1059,8 +1048,8 @@ public class CustomContentProviderUtilsTest {
        // then
        assertFalse(sensorStatistics.hasHeartRate());
        assertTrue(sensorStatistics.hasCadence());
-        assertEquals(sensorStatistics.getAvgCadence(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
        assertFalse(sensorStatistics.hasPower());
    }

@@ -1089,7 +1078,7 @@ public class CustomContentProviderUtilsTest {
        assertFalse(sensorStatistics.hasHeartRate());
        assertFalse(sensorStatistics.hasCadence());
        assertTrue(sensorStatistics.hasPower());
-        assertEquals(sensorStatistics.getAvgPower(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1122,11 +1111,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate(), stats.maxHr, 0f);
-        assertEquals(sensorStatistics.getAvgCadence(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence(), stats.maxCadence, 0f);
-        assertEquals(sensorStatistics.getAvgPower(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1167,11 +1156,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate(), stats.maxHr, 0f);
-        assertEquals(sensorStatistics.getAvgCadence(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence(), stats.maxCadence, 0f);
-        assertEquals(sensorStatistics.getAvgPower(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1212,11 +1201,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate(), stats.maxHr, 0f);
-        assertEquals(sensorStatistics.getAvgCadence(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence(), stats.maxCadence, 0f);
-        assertEquals(sensorStatistics.getAvgPower(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
    }

    private void testGetSensorStats_randomData(int totalPoints, boolean withStartSegments) {
@@ -1243,11 +1232,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate(), stats.avgHr, 0.01f);
-        assertEquals(sensorStatistics.getMaxHeartRate(), stats.maxHr, 0.01f);
-        assertEquals(sensorStatistics.getAvgCadence(), stats.avgCadence, 0.01f);
-        assertEquals(sensorStatistics.getMaxCadence(), stats.maxCadence, 0.01f);
-        assertEquals(sensorStatistics.getAvgPower(), stats.avgPower, 0.01f);
+        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0.01f);
+        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0.01f);
+        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0.01f);
+        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0.01f);
+        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0.01f);
    }

    @Test
@@ -1,4 +1,8 @@
-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;

 import android.content.Context;
 import android.database.Cursor;
@@ -20,13 +24,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;

@RunWith(AndroidJUnit4.class)
 public class CustomSQLiteOpenHelperTest {
@@ -1,4 +1,6 @@
-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;
+
+import static org.junit.Assert.assertEquals;

 import android.net.Uri;
 import android.util.Pair;
@@ -8,11 +10,9 @@ import org.junit.Test;
 import java.util.HashSet;
 import java.util.Set;

-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;

-import static org.junit.Assert.assertEquals;
-
 public class ShareContentProviderTest {

    @Test
@@ -0,0 +1,205 @@
+package de.dennisguse.opentracks.data;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import junit.framework.TestCase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Instant;
+
+import de.dennisguse.opentracks.data.models.Track;
+
+@RunWith(AndroidJUnit4.class)
+public class TrackSelectionTest extends TestCase {
+    @Test
+    public void testFilterBuildSelection_empty() {
+        // given
+        TrackSelection filter = new TrackSelection();
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertNull(selection.getSelection());
+        assertNull(selection.getSelectionArgs());
+    }
+
+    @Test
+    public void testFilterBuildSelection_onlyOneTrackId() {
+        // given
+        Track.Id trackId = new Track.Id(1);
+        TrackSelection filter = new TrackSelection().addTrackId(trackId);
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertEquals(selection.getSelection(), "_id IN (?)");
+        assertEquals(selection.getSelectionArgs().length, 1);
+        assertEquals(selection.getSelectionArgs()[0], "1");
+    }
+
+    @Test
+    public void testFilterBuildSelection_severalTracksId() {
+        // given
+        Track.Id trackId1 = new Track.Id(1);
+        Track.Id trackId2 = new Track.Id(2);
+        Track.Id trackId3 = new Track.Id(3);
+        TrackSelection filter = new TrackSelection()
+                .addTrackId(trackId1)
+                .addTrackId(trackId2)
+                .addTrackId(trackId3);
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertEquals(selection.getSelection(), "_id IN (?,?,?)");
+        assertEquals(selection.getSelectionArgs().length, 3);
+        assertEquals(selection.getSelectionArgs()[0], "1");
+        assertEquals(selection.getSelectionArgs()[1], "2");
+        assertEquals(selection.getSelectionArgs()[2], "3");
+    }
+
+    @Test
+    public void testFilterBuildSelection_onlyOneCategory() {
+        // given
+        TrackSelection filter = new TrackSelection().addCategory("running");
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertEquals(selection.getSelection(), "category IN (?)");
+        assertEquals(selection.getSelectionArgs().length, 1);
+        assertEquals(selection.getSelectionArgs()[0], "running");
+    }
+
+    @Test
+    public void testFilterBuildSelection_severalCategories() {
+        // given
+        TrackSelection filter = new TrackSelection()
+                .addCategory("running")
+                .addCategory("road biking")
+                .addCategory("mountain biking")
+                .addCategory("trail walking");
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertEquals(selection.getSelection(), "category IN (?,?,?,?)");
+        assertEquals(selection.getSelectionArgs().length, 4);
+        assertEquals(selection.getSelectionArgs()[0], "running");
+        assertEquals(selection.getSelectionArgs()[1], "road biking");
+        assertEquals(selection.getSelectionArgs()[2], "mountain biking");
+        assertEquals(selection.getSelectionArgs()[3], "trail walking");
+    }
+
+    @Test
+    public void testFilterBuildSelection_onlyDateRange() {
+        // given
+        Instant instant = Instant.now();
+        long oneDay = 24 * 60 * 60 * 1000;
+        TrackSelection filterWrong1 = new TrackSelection().addDateRange(instant, null);
+        TrackSelection filterWrong2 = new TrackSelection().addDateRange(null, instant);
+        TrackSelection filterOk = new TrackSelection().addDateRange(instant, instant.plusMillis(oneDay));
+
+        // when
+        SelectionData selectionWrong1 = filterWrong1.buildSelection();
+        SelectionData selectionWrong2 = filterWrong2.buildSelection();
+        SelectionData selectionOk = filterOk.buildSelection();
+
+        // Then
+        assertNull(selectionWrong1.getSelection());
+        assertNull(selectionWrong1.getSelectionArgs());
+
+        assertNull(selectionWrong2.getSelection());
+        assertNull(selectionWrong2.getSelectionArgs());
+
+        assertEquals(selectionOk.getSelection(), "starttime BETWEEN ? AND ?");
+        assertEquals(selectionOk.getSelectionArgs().length, 2);
+        assertEquals(selectionOk.getSelectionArgs()[0], Long.toString(instant.toEpochMilli()));
+        assertEquals(selectionOk.getSelectionArgs()[1], Long.toString(instant.toEpochMilli() + oneDay));
+    }
+
+    @Test
+    public void testFilterBuildSelection_tracksId_and_categories() {
+        // given
+        Track.Id trackId1 = new Track.Id(1);
+        Track.Id trackId2 = new Track.Id(2);
+        Track.Id trackId3 = new Track.Id(3);
+        TrackSelection filter = new TrackSelection()
+                .addTrackId(trackId1)
+                .addTrackId(trackId2)
+                .addTrackId(trackId3)
+                .addCategory("running")
+                .addCategory("road biking");
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertEquals(selection.getSelection(), "_id IN (?,?,?) AND category IN (?,?)");
+        assertEquals(selection.getSelectionArgs().length, 5);
+        assertEquals(selection.getSelectionArgs()[0], "1");
+        assertEquals(selection.getSelectionArgs()[1], "2");
+        assertEquals(selection.getSelectionArgs()[2], "3");
+        assertEquals(selection.getSelectionArgs()[3], "running");
+        assertEquals(selection.getSelectionArgs()[4], "road biking");
+    }
+
+    @Test
+    public void testFilterBuildSelection_tracksId_and_dateRange() {
+        // given
+        Instant instant = Instant.now();
+        long oneDay = 24 * 60 * 60 * 1000;
+
+        Track.Id trackId1 = new Track.Id(1);
+        Track.Id trackId2 = new Track.Id(2);
+        Track.Id trackId3 = new Track.Id(3);
+
+        TrackSelection filter = new TrackSelection()
+                .addTrackId(trackId1)
+                .addTrackId(trackId2)
+                .addTrackId(trackId3)
+                .addDateRange(instant, instant.plusMillis(oneDay));
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertEquals(selection.getSelection(), "_id IN (?,?,?) AND starttime BETWEEN ? AND ?");
+        assertEquals(selection.getSelectionArgs().length, 5);
+        assertEquals(selection.getSelectionArgs()[0], "1");
+        assertEquals(selection.getSelectionArgs()[1], "2");
+        assertEquals(selection.getSelectionArgs()[2], "3");
+        assertEquals(selection.getSelectionArgs()[3], Long.toString(instant.toEpochMilli()));
+        assertEquals(selection.getSelectionArgs()[4], Long.toString(instant.toEpochMilli() + oneDay));
+    }
+
+    @Test
+    public void testFilterBuildSelection_categories_and_dateRange() {
+        // given
+        Instant instant = Instant.now();
+        long oneDay = 24 * 60 * 60 * 1000;
+
+        TrackSelection filter = new TrackSelection()
+                .addCategory("running")
+                .addCategory("road biking")
+                .addDateRange(instant, instant.plusMillis(oneDay));
+
+        // when
+        SelectionData selection = filter.buildSelection();
+
+        // Then
+        assertEquals(selection.getSelection(), "category IN (?,?) AND starttime BETWEEN ? AND ?");
+        assertEquals(selection.getSelectionArgs().length, 4);
+        assertEquals(selection.getSelectionArgs()[0], "running");
+        assertEquals(selection.getSelectionArgs()[1], "road biking");
+        assertEquals(selection.getSelectionArgs()[2], Long.toString(instant.toEpochMilli()));
+        assertEquals(selection.getSelectionArgs()[3], Long.toString(instant.toEpochMilli() + oneDay));
+    }
+}
@@ -1,4 +1,6 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.data;
+
+import static org.junit.Assert.assertEquals;

 import androidx.test.ext.junit.runners.AndroidJUnit4;

@@ -7,8 +9,6 @@ import org.junit.runner.RunWith;

 import java.util.UUID;

-import static org.junit.Assert.assertEquals;
-
@RunWith(AndroidJUnit4.class)
 public class UUIDUtilsTest {

@@ -1,13 +1,16 @@
-package de.dennisguse.opentracks.content.data;
+package de.dennisguse.opentracks.data.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;

 import org.junit.Test;

 import java.time.Instant;
 import java.time.temporal.ChronoUnit;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.TrackPoint;

 public class TrackPointTest {

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.io.file.exporter;

+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;

 import androidx.test.core.app.ApplicationProvider;
@@ -10,12 +12,11 @@ import org.junit.runners.JUnit4;

 import java.io.ByteArrayOutputStream;
 import java.time.Instant;
+import java.time.ZoneOffset;

-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;

-import static org.junit.Assert.assertEquals;
-
@RunWith(JUnit4.class)
 public class KmlTrackExporterTest {

@@ -27,6 +28,8 @@ public class KmlTrackExporterTest {
    @Test
    public void writeCloseSegment_only_write_sensordata_if_present() {
        String expected = "<when>1970-01-01T00:00:00Z</when>\n" +
+                "<gx:coord/>\n" +
+                "<when>1970-01-01T01:00:00+01:00</when>\n" +
                "<gx:coord/>\n" +
                "<ExtendedData>\n" +
                "<SchemaData schemaUrl=\"#schema\">\n" +
@@ -41,7 +44,8 @@ public class KmlTrackExporterTest {
        KMLTrackExporter kmlTrackWriter = (KMLTrackExporter) TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
        kmlTrackWriter.prepare(outputStream);

-        kmlTrackWriter.writeTrackPoint(trackPoint);
+        kmlTrackWriter.writeTrackPoint(ZoneOffset.UTC, trackPoint);
+        kmlTrackWriter.writeTrackPoint(ZoneOffset.ofTotalSeconds(3600), trackPoint);

        // when
        kmlTrackWriter.writeCloseSegment();
@@ -30,34 +30,35 @@ import org.mockito.Mockito;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
-import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower;
-import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Cadence;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.HeartRate;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Power;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
+import de.dennisguse.opentracks.sensors.AltitudeSumManager;
+import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingServiceTestUtils;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
-import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.stats.TrackStatistics;

 /**
@@ -98,55 +99,68 @@ public class ExportImportTest {
    private TrackImporter trackImporter;

    @Before
-    public void fileSetup() throws IOException {
+    public void fileSetup() throws IOException, TimeoutException {
+        TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
+
        tmpFile = File.createTempFile("test", "test", context.getFilesDir());
        tmpFileUri = Uri.fromFile(tmpFile);

        trackImporter = new TrackImporter(context, contentProviderUtils, Distance.of(10), Distance.of(200), true);
+
+        TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
    }

    @After
-    public void FileTearDown() throws TimeoutException {
+    public void tearDown() throws TimeoutException {
        tmpFile.deleteOnExit();
        tmpFileUri = null;

-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
-                .getService();
-        service.getTrackPointCreator().setClock(Clock.systemUTC());
+        // Ensure that the database is empty after every test
+        contentProviderUtils.deleteAllTracks(context);
+
+        TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
    }

-    public void setUp(boolean hasSensorDistance) throws TimeoutException {
+    public void setUp() throws TimeoutException {
        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
                .getService();

        TrackPointCreator trackPointCreator = service.getTrackPointCreator();

-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock("2020-02-02T02:02:02Z");
        trackId = service.startNewTrack();

-        Distance sensorDistance = hasSensorDistance ? Distance.of(10) : null; // recording distance interval
+        Distance sensorDistance = Distance.of(10); // recording distance interval

-        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:03Z"), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, "2020-02-02T02:02:03Z", 3, 14, 10, 15, 10, 1);
        service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null);
-        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:04Z"), 3, 14.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
-        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:05Z"), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+
+        // A sensor-only TrackPoint
+        trackPointCreator.setClock("2020-02-02T02:02:04Z");
+        mockAltitudeChange(trackPointCreator, 1);
+        mockBLESensorData(trackPointCreator, 15f, sensorDistance, 66f, 3f, 50f);
+
+        trackPointCreator.setClock("2020-02-02T02:02:05Z");
+        mockBLESensorData(trackPointCreator, 5f, Distance.of(2), 66f, 3f, 50f); // Distance will be added to next TrackPoint
+
+        sendLocation(trackPointCreator, "2020-02-02T02:02:05Z", 3, 14.001, 10, 15, 10, 0);
        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);

-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET")));
-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
+        trackPointCreator.setClock("2020-02-02T02:02:06Z");
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, trackPointCreator));
        service.pauseCurrentTrack();

-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:20Z"), ZoneId.of("CET")));
+        trackPointCreator.setClock("2020-02-02T02:02:20Z");
        service.resumeCurrentTrack();

-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:21Z"), ZoneId.of("CET")));
-        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:21Z"), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, "2020-02-02T02:02:21Z", 3, 14.002, 10, 15, 10, 0);

-        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:22Z"), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
-        sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:23Z"), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
+        sendLocation(trackPointCreator, "2020-02-02T02:02:22Z", 3, 16, 10, 15, 10, 0);

-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:24Z"), ZoneId.of("CET")));
-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
+        sendLocation(trackPointCreator, "2020-02-02T02:02:23Z", 3, 16.001, 10, 15, 10, 0);
+
+        trackPointCreator.setClock("2020-02-02T02:02:24Z");
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, trackPointCreator));
        service.endCurrentTrack();

        Track track = contentProviderUtils.getTrack(trackId);
@@ -158,25 +172,15 @@ public class ExportImportTest {
        track = contentProviderUtils.getTrack(trackId);
        trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
        markers = contentProviderUtils.getMarkers(trackId);
-        assertEquals(10, trackPoints.size());
+        assertEquals(11, trackPoints.size());
        assertEquals(2, markers.size());
    }

-    @After
-    public void tearDown() {
-        if (trackId != null) {
-            contentProviderUtils.deleteTrack(context, trackId);
-        }
-        if (importTrackId != null) {
-            contentProviderUtils.deleteTrack(context, importTrackId);
-        }
-    }
-
    //TODO Does not test images
    @LargeTest
    @Test
    public void kmz_with_trackdetail_and_sensordata() throws TimeoutException, IOException {
-        setUp(true);
+        setUp();

        // given
        Track track = contentProviderUtils.getTrack(trackId);
@@ -204,32 +208,51 @@ public class ExportImportTest {
        // 2. trackpoints
        TrackPointAssert a = new TrackPointAssert()
                .noAccuracy();
-        a.assertEquals(trackPoints, TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId));
+        List<TrackPoint> actual = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);
+        a.assertEquals(trackPoints, actual);

        // 3. trackstatistics
        TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics();

        // Time
+        assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset());
        assertEquals(Instant.parse("2020-02-02T02:02:02Z"), importedTrackStatistics.getStartTime());
        assertEquals(Instant.parse("2020-02-02T02:02:24Z"), importedTrackStatistics.getStopTime());

-        assertEquals(track.getTrackStatistics().getTotalTime(), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(8), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(4), importedTrackStatistics.getMovingTime());
+        TrackStatistics originalTrackStatistics = track.getTrackStatistics();
+
+        assertEquals(originalTrackStatistics.getTotalTime(), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(7), importedTrackStatistics.getTotalTime());
+
+        assertEquals(originalTrackStatistics.getMovingTime(), importedTrackStatistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(3), importedTrackStatistics.getMovingTime());

        // Distance
-        assertEquals(Distance.of(60), importedTrackStatistics.getTotalDistance());
+        assertEquals(originalTrackStatistics.getTotalDistance(), importedTrackStatistics.getTotalDistance());
+        assertEquals(123.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);

        // Speed
-        assertEquals(Speed.of(15), importedTrackStatistics.getMaxSpeed());
-        assertEquals(Speed.of(7.5), importedTrackStatistics.getAverageSpeed());
-        assertEquals(Speed.of(15), importedTrackStatistics.getAverageMovingSpeed());
+        assertEquals(originalTrackStatistics.getMaxSpeed(), importedTrackStatistics.getMaxSpeed());
+        assertEquals(41.05, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+
+        assertEquals(originalTrackStatistics.getAverageSpeed(), importedTrackStatistics.getAverageSpeed());
+        assertEquals(17.59, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
+
+        assertEquals(originalTrackStatistics.getAverageMovingSpeed(), importedTrackStatistics.getAverageMovingSpeed());
+        assertEquals(41.05, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);

        // Altitude
+        assertEquals(originalTrackStatistics.getMinAltitude(), importedTrackStatistics.getMinAltitude(), 0.01);
        assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);
+
+        assertEquals(originalTrackStatistics.getMaxAltitude(), importedTrackStatistics.getMaxAltitude(), 0.01);
        assertEquals(10, importedTrackStatistics.getMaxAltitude(), 0.01);
-        assertEquals(1, importedTrackStatistics.getTotalAltitudeGain(), 0.01);
-        assertEquals(1, importedTrackStatistics.getTotalAltitudeLoss(), 0.01);
+
+        assertEquals(originalTrackStatistics.getTotalAltitudeGain(), importedTrackStatistics.getTotalAltitudeGain(), 0.01);
+        assertEquals(2, importedTrackStatistics.getTotalAltitudeGain(), 0.01);
+
+        assertEquals(originalTrackStatistics.getTotalAltitudeLoss(), importedTrackStatistics.getTotalAltitudeLoss(), 0.01);
+        assertEquals(2, importedTrackStatistics.getTotalAltitudeLoss(), 0.01);

        // 4. markers
        assertMarkers();
@@ -238,7 +261,7 @@ public class ExportImportTest {
    @LargeTest
    @Test(expected = ImportAlreadyExistsException.class)
    public void kml_with_trackdetail_and_sensordata_duplicate_trackUUID() throws TimeoutException, IOException {
-        setUp(false);
+        setUp();

        // given
        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
@@ -264,7 +287,7 @@ public class ExportImportTest {
    @LargeTest
    @Test
    public void gpx() throws TimeoutException, IOException {
-        setUp(true);
+        setUp();

        // given
        Track track = contentProviderUtils.getTrack(trackId);
@@ -295,39 +318,78 @@ public class ExportImportTest {
        // 2. trackpoints
        // The GPX exporter does not support exporting TrackPoints without lat/lng.
        // Therefore, the track segmentation is changes.
-        List<TrackPoint> trackPointsWithCoordinates = trackPoints.stream().filter(it -> TrackPoint.Type.SEGMENT_START_AUTOMATIC.equals(it.getType()) || TrackPoint.Type.TRACKPOINT.equals(it.getType())).collect(Collectors.toList());
-        trackPointsWithCoordinates.get(0).setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
-        trackPointsWithCoordinates.get(3).setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);

        TrackPointAssert a = new TrackPointAssert()
                .setDelta(0.05)
                .noAccuracy(); // speed is not fully
-        a.assertEquals(trackPointsWithCoordinates, TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId));
+        List<TrackPoint> actual = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);
+        a.assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setLatitude(3)
+                        .setLongitude(14)
+                        .setAltitude(10)
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeLoss(1f)
+                        .setAltitudeGain(1f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z"))
+                        .setLatitude(3)
+                        .setLongitude(14.001)
+                        .setAltitude(10)
+                        .setSpeed(Speed.of(5))
+                        .setAltitudeLoss(1f)
+                        .setAltitudeGain(1f)
+                        .setSensorDistance(Distance.of(12))
+                        .setHeartRate(66f)
+                        .setPower(50f)
+                        .setCadence(3f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:02:21Z"))
+                        .setLatitude(3)
+                        .setLongitude(14.002)
+                        .setAltitude(10)
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f)
+                        .setSpeed(Speed.of(15)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:02:22Z"))
+                        .setLatitude(3)
+                        .setLongitude(16)
+                        .setAltitude(10)
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f)
+                        .setSpeed(Speed.of(15)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:23Z"))
+                        .setLatitude(3)
+                        .setLongitude(16.001)
+                        .setAltitude(10)
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f)
+                        .setSpeed(Speed.of(15))
+        ), actual);

        // 3. trackstatistics
        TrackStatistics trackStatistics = track.getTrackStatistics();
        TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics();

        // Time
+        assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset());
        assertEquals(Instant.parse("2020-02-02T02:02:03Z"), importedTrackStatistics.getStartTime());
        assertEquals(Instant.parse("2020-02-02T02:02:23Z"), importedTrackStatistics.getStopTime());

-        assertEquals(Duration.ofSeconds(4), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(4), importedTrackStatistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(3), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(3), importedTrackStatistics.getMovingTime());

        // Distance
-        assertEquals(Distance.of(60), importedTrackStatistics.getTotalDistance());
+        assertEquals(123.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);

        // Speed
-        assertEquals(Speed.of(15), importedTrackStatistics.getMaxSpeed());
-        assertEquals(Speed.of(15), importedTrackStatistics.getAverageSpeed());
-        assertEquals(Speed.of(15), importedTrackStatistics.getAverageMovingSpeed());
+        assertEquals(41.05, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(41.05, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(41.05, importedTrackStatistics.getAverageMovingSpeed().toMPS(), 0.01);

        // Altitude
        assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);
        assertEquals(10, importedTrackStatistics.getMaxAltitude(), 0.01);
-        assertEquals(1, importedTrackStatistics.getTotalAltitudeGain(), 0.01);
-        assertEquals(1, importedTrackStatistics.getTotalAltitudeLoss(), 0.01);
+        assertEquals(2, importedTrackStatistics.getTotalAltitudeGain(), 0.01);
+        assertEquals(2, importedTrackStatistics.getTotalAltitudeLoss(), 0.01);

        // 4. markers
        assertMarkers();
@@ -336,7 +398,7 @@ public class ExportImportTest {
    @LargeTest
    @Test(expected = ImportAlreadyExistsException.class)
    public void gpx_duplicate_trackUUID() throws TimeoutException, IOException {
-        setUp(false);
+        setUp();

        // given
        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
@@ -380,7 +442,43 @@ public class ExportImportTest {
        }
    }

-    private void sendLocation(TrackPointCreator trackPointCreator, Instant time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) {
+    private void mockBLESensorData(TrackPointCreator trackPointCreator, Float speed, Distance distance, float heartRate, float cadence, Float power) {
+        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, trackPointCreator) {
+            @Override
+            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
+                SensorDataSet sensorDataSet = new SensorDataSet();
+                sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
+                sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));
+
+                SensorDataCycling.CyclingCadence cyclingCadence = Mockito.mock(SensorDataCycling.CyclingCadence.class);
+                Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
+                Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
+                sensorDataSet.set(cyclingCadence);
+
+                if (distance != null && speed != null) {
+                    SensorDataCycling.DistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCycling.DistanceSpeed.Data.class);
+                    Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
+                    Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
+                    SensorDataCycling.DistanceSpeed distanceSpeed = Mockito.mock(SensorDataCycling.DistanceSpeed.class);
+                    Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
+                    Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
+                    sensorDataSet.set(distanceSpeed);
+                }
+
+                sensorDataSet.fillTrackPoint(trackPoint);
+                return sensorDataSet;
+            }
+        });
+        trackPointCreator.onChange(null);
+    }
+
+    private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
+        AltitudeSumManager altitudeSumManager = trackPointCreator.getAltitudeSumManager();
+        altitudeSumManager.setAltitudeGain_m(altitudeGain);
+        altitudeSumManager.setAltitudeLoss_m(altitudeGain);
+    }
+
+    private void sendLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain) {
        Location location = new Location("mock");
        location.setLatitude(latitude);
        location.setLongitude(longitude);
@@ -388,41 +486,9 @@ public class ExportImportTest {
        location.setSpeed(speed);
        location.setAltitude(altitude);

-        trackPointCreator.setAltitudeSumManager(new AltitudeSumManager() {
-            @Override
-            public void fill(@NonNull TrackPoint trackPoint) {
-                trackPoint.setAltitudeGain(altitudeGain);
-                trackPoint.setAltitudeLoss(altitudeGain);
-            }
-        });
+        mockAltitudeChange(trackPointCreator, altitudeGain);

-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
-            @Override
-            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
-                SensorDataSet sensorDataSet = new SensorDataSet();
-                sensorDataSet.set(new SensorDataCyclingPower("power", "power", power));
-                sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", heartRate));
-
-                SensorDataCycling.Cadence cadence = Mockito.mock(SensorDataCycling.Cadence.class);
-                Mockito.when(cadence.hasValue()).thenReturn(true);
-                Mockito.when(cadence.getValue()).thenReturn(cyclingCadence);
-                sensorDataSet.set(cadence);
-
-                SensorDataCycling.DistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCycling.DistanceSpeed.Data.class);
-                Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
-                Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
-                SensorDataCycling.DistanceSpeed distanceSpeed = Mockito.mock(SensorDataCycling.DistanceSpeed.class);
-                Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
-                Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
-
-                sensorDataSet.set(distanceSpeed);
-
-                sensorDataSet.fillTrackPoint(trackPoint);
-                return sensorDataSet;
-            }
-        });
-
-        trackPointCreator.setClock(Clock.fixed(time, ZoneId.of("CET")));
-        trackPointCreator.getLocationHandler().onLocationChanged(location);
+        trackPointCreator.setClock(time);
+        trackPointCreator.getGpsHandler().onLocationChanged(location);
    }
 }
@@ -1,5 +1,8 @@
 package de.dennisguse.opentracks.io.file.importer;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import android.content.Context;

 import androidx.test.core.app.ApplicationProvider;
@@ -18,17 +21,14 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.List;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.stats.TrackStatistics;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 /**
 * Test that legacy KML/GPX formats can still be imported.
 */
@@ -1,5 +1,8 @@
 package de.dennisguse.opentracks.io.file.importer;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import android.content.Context;

 import androidx.test.core.app.ApplicationProvider;
@@ -17,15 +20,12 @@ import java.io.InputStream;
 import java.time.Instant;
 import java.util.List;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;

 /**
 * Test that legacy KML/GPX formats can still be imported.
@@ -4,11 +4,10 @@ import org.junit.Assert;

 import java.util.List;

-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;

 public class TrackPointAssert {

-    private boolean assertTime = true;
    private boolean assertAccuracy = true;

    private double delta = 0.001;
@@ -17,10 +16,7 @@ public class TrackPointAssert {
    }

    public void assertEquals(TrackPoint expected, TrackPoint actual) {
-        Assert.assertNotNull(actual.getTime());
-        if (assertTime) {
-            Assert.assertEquals(expected.getTime(), actual.getTime());
-        }
+        Assert.assertEquals(expected.getTime(), actual.getTime());

        Assert.assertEquals(expected.getType(), actual.getType());

@@ -65,17 +61,17 @@ public class TrackPointAssert {

        Assert.assertEquals(expected.hasHeartRate(), actual.hasHeartRate());
        if (expected.hasHeartRate()) {
-            Assert.assertEquals(expected.getHeartRate_bpm(), actual.getHeartRate_bpm(), delta);
+            Assert.assertEquals(expected.getHeartRate(), actual.getHeartRate());
        }

        Assert.assertEquals(expected.hasPower(), actual.hasPower());
        if (expected.hasPower()) {
-            Assert.assertEquals(expected.getPower(), actual.getPower(), delta);
+            Assert.assertEquals(expected.getPower(), actual.getPower());
        }

        Assert.assertEquals(expected.hasCadence(), actual.hasCadence());
        if (expected.hasCadence()) {
-            Assert.assertEquals(expected.getCadence_rpm(), actual.getCadence_rpm(), delta);
+            Assert.assertEquals(expected.getCadence(), actual.getCadence());
        }
    }

@@ -100,11 +96,6 @@ public class TrackPointAssert {
        }
    }

-    public TrackPointAssert ignoreTime() {
-        this.assertTime = false;
-        return this;
-    }
-
    public TrackPointAssert noAccuracy() {
        this.assertAccuracy = false;
        return this;
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.sensors;
+package de.dennisguse.opentracks.sensors;

 import org.junit.Assert;
 import org.junit.Before;
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.sensors;

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -7,10 +7,11 @@ import android.bluetooth.BluetoothGattCharacteristic;

 import org.junit.Test;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
-import de.dennisguse.opentracks.content.sensor.SensorDataRunning;
+import de.dennisguse.opentracks.data.models.Cadence;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;

 public class BluetoothUtilsTest {

@@ -101,7 +102,7 @@ public class BluetoothUtilsTest {

        // then
        assertEquals(Speed.of(5), sensor.getSpeed());
-        assertEquals(80, sensor.getCadence(), 0.01);
+        assertEquals(Cadence.of(80), sensor.getCadence());
        assertEquals(Distance.of(6553.5 + 1677721.6), sensor.getTotalDistance());
    }
 }
@@ -1,10 +1,10 @@
-package de.dennisguse.opentracks.util;
-
-import org.junit.Test;
+package de.dennisguse.opentracks.sensors;

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;

+import org.junit.Test;
+
 public class PressureSensorUtilsTest {

    // real data at 500Hz stationary
@@ -1,9 +1,9 @@
-package de.dennisguse.opentracks.util;
-
-import org.junit.Test;
+package de.dennisguse.opentracks.sensors;

 import static org.junit.Assert.assertEquals;

+import org.junit.Test;
+
 public class UintUtilsTest {

    @Test
@@ -1,4 +1,9 @@
-package de.dennisguse.opentracks.content.sensor;
+package de.dennisguse.opentracks.sensors.sensorData;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;

 import androidx.test.ext.junit.runners.AndroidJUnit4;

@@ -6,13 +11,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.util.UintUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
+import de.dennisguse.opentracks.data.models.Cadence;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.sensors.UintUtils;

@RunWith(AndroidJUnit4.class)
 public class SensorDataCyclingTest {
@@ -20,48 +21,48 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_1() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 1, 1024); // 1s
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 2, 2048); // 2s
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 1024); // 1s
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 2048); // 2s

        // when
        current.compute(previous);

        // then
-        assertEquals(60, current.getValue(), 0.01);
+        assertEquals(60, current.getValue().getRPM(), 0.01);
    }

    @Test
    public void compute_cadence_2() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 1, 6184);
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 2, 8016);
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 6184);
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 8016);

        // when
        current.compute(previous);

        // then
-        assertEquals(33.53, current.getValue(), 0.01);
+        assertEquals(33.53, current.getValue().getRPM(), 0.01);
    }

    @Test
    public void compute_cadence_sameCount() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 1, 1024);
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 1, 2048);
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 1024);
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 2048);

        // when
        current.compute(previous);

        // then
-        assertEquals(0, current.getValue(), 0.01);
+        assertEquals(Cadence.of(0), current.getValue());
    }


    @Test
    public void compute_cadence_sameTime() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 1, 1024);
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 2, 1024);
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, 1024);
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 1024);

        // when
        current.compute(previous);
@@ -73,14 +74,14 @@ public class SensorDataCyclingTest {
    @Test
    public void compute_cadence_rollOverTime() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 1, UintUtils.UINT16_MAX - 1024);
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 2, 0);
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 1, UintUtils.UINT16_MAX - 1024);
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 2, 0);

        // when
        current.compute(previous);

        // then
-        assertEquals(60, current.getValue(), 0.01);
+        assertEquals(60, current.getValue().getRPM(), 0.01);
    }

    @Ignore("Disabled from #953")
@@ -88,21 +89,21 @@ public class SensorDataCyclingTest {
    @Deprecated
    public void compute_cadence_rollOverCount() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 0, 2048);

        // when
        current.compute(previous);

        // then
-        assertEquals(60, current.getValue(), 0.01);
+        assertEquals(60, current.getValue().getRPM(), 0.01);
    }

    @Test
    public void compute_cadence_overflow() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", UintUtils.UINT32_MAX - 1, 1024);
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 0, 2048);

        // when
        current.compute(previous);
@@ -171,8 +172,8 @@ public class SensorDataCyclingTest {
    @Test
    public void equals_cadence_with_no_data() {
        // given
-        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress");
-        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCycling.CyclingCadence previous = new SensorDataCycling.CyclingCadence("sensorAddress");
+        SensorDataCycling.CyclingCadence current = new SensorDataCycling.CyclingCadence("sensorAddress", "sensorName", 0, 2048);

        // when
        previous.toString();
@@ -1,5 +1,10 @@
 package de.dennisguse.opentracks.services;

+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.NotificationManager;
 import android.content.Context;

@@ -11,16 +16,11 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.stats.TrackStatistics;

-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(MockitoJUnitRunner.class)
 public class TrackRecordingServiceNotificationManagerTest {

@@ -1,464 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks.services;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import android.content.ContentProvider;
-import android.content.Context;
-import android.content.Intent;
-import android.os.IBinder;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.MediumTest;
-import androidx.test.filters.SmallTest;
-import androidx.test.rule.GrantPermissionRule;
-import androidx.test.rule.ServiceTestRule;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.time.Clock;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.CustomContentProvider;
-import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
-import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
-import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-
-/**
- * Tests for the track recording service.
- *
- * @author Bartlomiej Niechwiej
- */
-@RunWith(AndroidJUnit4.class)
-public class TrackRecordingServiceTest {
-
-    @Rule
-    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
-
-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
-    @BeforeClass
-    public static void preSetUp() {
-        // Prepare looper for Android's message queue
-        if (Looper.myLooper() == null) Looper.prepare();
-    }
-
-    @AfterClass
-    public static void finalTearDown() {
-        if (Looper.myLooper() != null) Looper.myLooper().quit();
-    }
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-    private ContentProviderUtils contentProviderUtils;
-
-    private final Track.Id trackId = new Track.Id(Math.abs(new Random().nextLong()));
-
-    static Intent createStartIntent(Context context) {
-        return new Intent(context, TrackRecordingService.class);
-    }
-
-    private final AltitudeSumManager altitudeSumManager = new AltitudeSumManager() {
-        @Override
-        public void fill(@NonNull TrackPoint trackPoint) {
-            trackPoint.setAltitudeGain(0f);
-            trackPoint.setAltitudeLoss(0f);
-        }
-    };
-
-    @Before
-    public void setUp() {
-        // Set up the mock content resolver
-        ContentProvider customContentProvider = new CustomContentProvider() {
-        };
-        customContentProvider.attachInfo(context, null);
-
-        contentProviderUtils = new ContentProviderUtils(context);
-
-        // Let's use default values.
-        PreferencesUtils.clear();
-
-        // Ensure that the database is empty before every test
-        contentProviderUtils.deleteAllTracks(context);
-    }
-
-    @After
-    public void tearDown() throws TimeoutException {
-        // Reset service (if some previous test failed)
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        if (service.isRecording() || service.isPaused()) {
-            service.endCurrentTrack();
-        }
-        service.getTrackPointCreator().setClock(Clock.systemUTC());
-
-        // Ensure that the database is empty after every test
-        contentProviderUtils.deleteAllTracks(context);
-    }
-
-    @SmallTest
-    @Test
-    public void testStartable() throws TimeoutException {
-        mServiceRule.startService(createStartIntent(context));
-        assertNotNull(mServiceRule.bindService(createStartIntent(context)));
-    }
-
-    @MediumTest
-    @Test
-    public void testBindable() throws TimeoutException {
-        IBinder service = mServiceRule.bindService(createStartIntent(context));
-        assertNotNull(service);
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_noTracks() throws TimeoutException {
-        // given
-        List<Track> tracks = contentProviderUtils.getTracks();
-        assertTrue(tracks.isEmpty());
-
-        // when
-        Intent startIntent = createStartIntent(context);
-        mServiceRule.startService(startIntent);
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(startIntent))
-                .getService();
-
-        // then
-        // Test if we start in no-recording mode by default.
-        assertFalse(service.isRecording());
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_oldTracks() throws TimeoutException {
-        // given
-        createDummyTrack(trackId);
-
-        // when
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        // then
-        assertFalse(service.isRecording());
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_serviceRestart_whileRecording() throws TimeoutException {
-        // given
-        createDummyTrack(trackId);
-
-        //when
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        service.resumeTrack(trackId);
-
-        // then
-        assertTrue(service.isRecording());
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_stop() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
-        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
-        service.endCurrentTrack();
-
-        // then
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-
-        TrackPointAssert a = new TrackPointAssert();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_pauseAndResume() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
-        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
-        service.pauseCurrentTrack();
-
-        // then
-        assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
-
-        //when
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
-        service.resumeTrack(trackId);
-
-        // then
-        assertTrue(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:04Z"))
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_resumeStoppedTrack() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
-        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
-        service.endCurrentTrack();
-
-        // when
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
-        service.resumeTrack(trackId);
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-
-        trackPointCreator.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z")), Distance.of(50));
-
-        // then
-        assertTrue(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:04Z")),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z"))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_stopPausedTrack() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
-        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
-        service.pauseCurrentTrack();
-
-        // when
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:03Z"))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testStartNewTrack_alreadyRecording() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        Track.Id trackId = service.startNewTrack();
-        assertTrue(service.isRecording());
-
-        // when
-        Track.Id newTrackId = service.startNewTrack();
-
-        // then
-        assertNotNull(trackId);
-        assertNull(newTrackId);
-    }
-
-    @MediumTest
-    @Test
-    public void testEndCurrentTrack_noRecording() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        assertFalse(service.isRecording());
-
-        // when
-        // Ending the current track when there is no recording should not result in any error.
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-    }
-
-    @MediumTest
-    @Test
-    public void testInsertWaypointMarker_noRecordingTrack() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        assertFalse(service.isRecording());
-
-        // when
-        Marker.Id markerId = service.insertMarker(null, null, null, null);
-
-        // then
-        assertNull(markerId);
-    }
-
-    @MediumTest
-    @Test
-    public void testInsertWaypointMarker_validWaypoint() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-        trackPointCreator.stopGPS();
-
-        trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
-        Track.Id trackId = service.startNewTrack();
-
-        assertTrue(service.isRecording());
-        trackPointCreator.onNewTrackPoint(
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
-                        .setLatitude(10)
-                        .setLongitude(10)
-                , Distance.of(50));
-
-        // when
-        Marker.Id markerId = service.insertMarker(null, null, null, null);
-
-        // then
-        assertNotEquals(new Marker.Id(-1L), markerId);
-        Marker wpt = contentProviderUtils.getMarker(markerId);
-        assertEquals(context.getString(R.string.marker_icon_url), wpt.getIcon());
-        assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName());
-        assertEquals(trackId, wpt.getTrackId());
-        assertEquals(0.0, wpt.getLength().toM(), 0.01);
-        assertNotNull(wpt.getLocation());
-
-        service.endCurrentTrack();
-    }
-
-    private void addTrack(Track track) {
-        assertNotNull(track.getId());
-        contentProviderUtils.insertTrack(track);
-        assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId());
-    }
-
-    // NOTE: Do not use to create a track that is currently recording.
-    private void createDummyTrack(Track.Id id) {
-        Track dummyTrack = new Track();
-        dummyTrack.setId(id);
-        dummyTrack.setName("Dummy Track");
-        TrackStatistics trackStatistics = new TrackStatistics();
-        Instant now = Instant.now();
-        trackStatistics.setStartTime(now.minusSeconds(5L));
-        trackStatistics.setStopTime(now.minusSeconds(1L));
-        dummyTrack.setTrackStatistics(trackStatistics);
-        addTrack(dummyTrack);
-    }
-
-    static void newTrackPoint(TrackRecordingService trackRecordingService, double latitude, double longitude, float accuracy, long speed) {
-        newTrackPoint(trackRecordingService, latitude, longitude, accuracy, speed, System.currentTimeMillis());
-    }
-
-    static void newTrackPoint(TrackRecordingService trackRecordingService, double latitude, double longitude, float accuracy, long speed, long time) {
-        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(time))
-                .setLongitude(longitude)
-                .setLatitude(latitude)
-                .setHorizontalAccuracy(Distance.of(accuracy))
-                .setSpeed(Speed.of(speed))
-                .setBearing(3.0f);
-
-        trackRecordingService.getTrackPointCreator().onNewTrackPoint(trackPoint, Distance.of(50));
-    }
-}
@@ -1,539 +0,0 @@
-package de.dennisguse.opentracks.services;
-
-import static org.junit.Assert.assertFalse;
-
-import android.content.ContentProvider;
-import android.content.Context;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.MediumTest;
-import androidx.test.rule.GrantPermissionRule;
-import androidx.test.rule.ServiceTestRule;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.CustomContentProvider;
-import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
-import de.dennisguse.opentracks.content.sensor.SensorDataRunning;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
-import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
-import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-
-/**
- * Tests insert location.
- */
-@RunWith(AndroidJUnit4.class)
-//TODO Implement as mock test; no need to store data in database
-public class TrackRecordingServiceTestLocation {
-
-    @Rule
-    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
-
-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-    private ContentProviderUtils contentProviderUtils;
-
-    private TrackRecordingService service;
-
-    private final AltitudeSumManager altitudeSumManager = new AltitudeSumManager() {
-        @Override
-        public void fill(@NonNull TrackPoint trackPoint) {
-            trackPoint.setAltitudeGain(0f);
-            trackPoint.setAltitudeLoss(0f);
-        }
-    };
-
-    @BeforeClass
-    public static void preSetUp() {
-        // Prepare looper for Android's message queue
-        if (Looper.myLooper() == null) Looper.prepare();
-    }
-
-    @AfterClass
-    public static void finalTearDown() {
-        if (Looper.myLooper() != null) Looper.myLooper().quit();
-    }
-
-    @Before
-    public void setUp() throws TimeoutException {
-        // Set up the mock content resolver
-        ContentProvider customContentProvider = new CustomContentProvider() {
-        };
-        customContentProvider.attachInfo(context, null);
-
-        contentProviderUtils = new ContentProviderUtils(context);
-        tearDown();
-
-        // Let's use default values.
-        PreferencesUtils.clear();
-
-        service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
-                .getService();
-        service.getTrackPointCreator().stopGPS();
-    }
-
-    @After
-    public void tearDown() {
-        // Ensure that the database is empty after every test
-        contentProviderUtils.deleteAllTracks(context);
-    }
-
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_movingAccurate() {
-        // given
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0001, 35.0, 2, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0002, 35.0, 3, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0003, 35.0, 4, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0005, 35.0, 6, 15);
-
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert()
-                .ignoreTime();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.0001)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(2))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.0001)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(3))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.0002)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(4))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.0003)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(5))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.0004)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(6))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_slowMovingAccurate() {
-        // given
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000001, 35.0, 2, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000002, 35.0, 3, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000003, 35.0, 4, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000004, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000005, 35.0, 6, 15);
-
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert()
-                .ignoreTime();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.0005)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(6))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_idle() {
-        // given
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 6, 0);
-
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert()
-                .ignoreTime();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(6))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_idle_withMovement() {
-        // given
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-        service.getTrackPointCreator().stopGPS();
-
-        // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 0); // will be ignored
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 0); // will be ignored
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 6, 15);
-
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert()
-                .ignoreTime();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(2))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(5))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(6))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_idle_withSensorData() {
-        // given
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-        service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
-
-            @Override
-            public boolean isEnabled() {
-                return true;
-            }
-
-            @Override
-            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
-                SensorDataSet sensorDataSet = new SensorDataSet();
-                sensorDataSet.set(new SensorDataHeartRate("sensorName", "sensorAddress", 5f));
-                sensorDataSet.fillTrackPoint(trackPoint);
-                return sensorDataSet;
-            }
-        });
-
-        // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 6, 0);
-
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert()
-                .ignoreTime();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(6))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-                        .setHeartRate_bpm(5f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-                        .setHeartRate_bpm(5f)
-        ), trackPoints);
-    }
-
-    @Deprecated // Will be superseded when fixing #500
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_idle_withSensorDistance() {
-        BluetoothRemoteSensorManager remoteSensorManager = new BluetoothRemoteSensorManager(context) {
-
-            @Override
-            public boolean isEnabled() {
-                return true;
-            }
-        };
-
-        AltitudeSumManager altitudeSumManager = new AltitudeSumManager();
-
-        // given
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setRemoteSensorManager(remoteSensorManager);
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-        altitudeSumManager.stop(service);
-        altitudeSumManager.setConnected(true);
-
-        // when
-        altitudeSumManager.addAltitudeGain_m(6f);
-        altitudeSumManager.addAltitudeLoss_m(6f);
-        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(0)));
-        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(2)));
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
-
-        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(12)));
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 15);
-
-        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(13)));
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 15);
-        altitudeSumManager.addAltitudeGain_m(6f);
-        altitudeSumManager.addAltitudeLoss_m(6f);
-        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(14)));
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 15);
-
-        altitudeSumManager.addAltitudeGain_m(6f);
-        altitudeSumManager.addAltitudeLoss_m(6f);
-        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(16)));
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        TrackPointAssert a = new TrackPointAssert()
-                .ignoreTime();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(5))
-                        .setAltitudeGain(6f)
-                        .setAltitudeLoss(6f)
-                        .setSensorDistance(Distance.of(2)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(2))
-                        .setSpeed(Speed.of(5))
-                        .setSensorDistance(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(4))
-                        .setSpeed(Speed.of(5))
-                        .setAltitudeGain(6f)
-                        .setAltitudeLoss(6f)
-                        .setSensorDistance(Distance.of(2)),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
-                        .setSensorDistance(Distance.of(11))
-                        .setSpeed(Speed.of(5))
-                        .setAltitudeGain(6f)
-                        .setAltitudeLoss(6f)
-                        .setSensorDistance(Distance.of(2))
-        ), trackPoints);
-    }
-
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_segment() {
-        // given
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.1, 35.0, 2, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.1, 35.0, 3, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.2, 35.0, 4, 0);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.2, 35.0, 5, 0);
-
-        service.endCurrentTrack();
-
-        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-
-        TrackPointAssert a = new TrackPointAssert()
-                .ignoreTime();
-        a.assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, null),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, null)
-                        .setLatitude(45.1)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(2))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.1)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(3))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, null)
-                        .setLatitude(45.2)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(4))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.2)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(5))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), trackPoints);
-    }
-}
@@ -1,233 +0,0 @@
-package de.dennisguse.opentracks.services;
-
-import android.content.ContentProvider;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Looper;
-
-import androidx.preference.PreferenceManager;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.MediumTest;
-import androidx.test.rule.ServiceTestRule;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.CustomContentProvider;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Tests for the track recording service, which require a {@link Looper}.
- *
- * @author Bartlomiej Niechwiej
- */
-@RunWith(AndroidJUnit4.class)
-public class TrackRecordingServiceTestLooper {
-
-    @Rule
-    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-
-    private ContentProviderUtils contentProviderUtils;
-
-    @BeforeClass
-    public static void preSetUp() {
-        // Prepare looper for Android's message queue
-        if (Looper.myLooper() == null) Looper.prepare();
-    }
-
-    @AfterClass
-    public static void finalTearDown() {
-        if (Looper.myLooper() != null) Looper.myLooper().quit();
-    }
-
-    @Before
-    public void setUp() {
-        // Set up the mock content resolver
-        ContentProvider customContentProvider = new CustomContentProvider() {
-        };
-        customContentProvider.attachInfo(context, null);
-
-        contentProviderUtils = new ContentProviderUtils(context);
-
-        // Let's use default values.
-        PreferencesUtils.clear();
-
-        // Ensure that the database is empty before every test
-        contentProviderUtils.deleteAllTracks(context);
-    }
-
-    @After
-    public void tearDown() throws TimeoutException {
-        // Reset service (if some previous test failed)
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
-                .getService();
-        if (service.isRecording() || service.isPaused()) {
-            service.endCurrentTrack();
-        }
-
-        // Ensure that the database is empty after every test
-        contentProviderUtils.deleteAllTracks(context);
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_minRequiredAccuracy() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_gps_accuracy_key), 500);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_maxRecordingDistanceDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.max_recording_distance_key), Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default)));
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_maxRecordingDistance() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.max_recording_distance_key), 50);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_minRecordingDistanceDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_distance_interval_key), Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)));
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_minRecordingDistance() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_distance_interval_key), 2);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_metricUnitsDefault() throws TimeoutException {
-        PreferencesUtils.setString(R.string.stats_units_key, context.getString(R.string.stats_units_default));
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_metricUnitsDisabled() throws TimeoutException {
-        PreferencesUtils.setString(R.string.stats_units_key, context.getString(R.string.stats_units_imperial));
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_minRecordingIntervalDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.min_recording_interval_key), Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)));
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_minRecordingInterval() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.min_recording_interval_key), 2);
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_minRequiredAccuracyDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_gps_accuracy_key), Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default)));
-        editor.commit();
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testIntegration_completeRecordingSession() throws TimeoutException {
-        List<Track> tracks = contentProviderUtils.getTracks();
-        assertTrue(tracks.isEmpty());
-        fullRecordingSession();
-    }
-
-    private void fullRecordingSession() throws TimeoutException {
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
-                .getService();
-        assertFalse(service.isRecording());
-
-        // Start a track.
-        Track.Id trackId = service.startNewTrack();
-        assertNotNull(trackId);
-        assertTrue(service.isRecording());
-        Track track = contentProviderUtils.getTrack(trackId);
-        assertNotNull(track);
-        assertEquals(trackId, track.getId());
-
-        // Insert a few points, markers and statistics.
-        for (int i = 0; i < 30; i++) {
-            //TODO Should send locations to LocationHandler instead of TrackPoints to TrackPointCreator?
-            TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getTrackPointCreator().createNow())
-                    .setLongitude(35.0f + i / 10.0f)
-                    .setLatitude(45.0f - i / 5.0f)
-                    .setHorizontalAccuracy(Distance.of(5))
-                    .setSpeed(Speed.of(10))
-                    .setBearing(3.0f);
-
-            Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy();
-            service.getTrackPointCreator().onNewTrackPoint(trackPoint, prefAccuracy);
-
-            if (i % 7 == 0) {
-                service.insertMarker(null, null, null, null);
-            }
-        }
-
-        // Stop the track. Validate if it has correct data.
-        service.endCurrentTrack();
-        assertFalse(service.isRecording());
-        track = contentProviderUtils.getTrack(trackId);
-        assertNotNull(track);
-        assertEquals(trackId, track.getId());
-        TrackStatistics trackStatistics = track.getTrackStatistics();
-        assertNotNull(trackStatistics);
-        assertTrue(trackStatistics.getStartTime().isAfter(Instant.ofEpochMilli(0)));
-        assertTrue(trackStatistics.getStopTime().isAfter(trackStatistics.getStartTime()));
-    }
-}
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package de.dennisguse.opentracks.services;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Looper;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.rule.ServiceTestRule;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
+
+@RunWith(AndroidJUnit4.class)
+public class TrackRecordingServiceTestMarker {
+
+    @Rule
+    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
+
+    @Rule
+    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+    private ContentProviderUtils contentProviderUtils;
+
+    private TrackRecordingService service;
+
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
+    @AfterClass
+    public static void finalTearDown() {
+        if (Looper.myLooper() != null) Looper.myLooper().quit();
+    }
+
+    private TrackRecordingService startService() throws TimeoutException {
+        Intent startIntent = new Intent(context, TrackRecordingService.class);
+        return ((TrackRecordingService.Binder) mServiceRule.bindService(startIntent))
+                .getService();
+    }
+
+    @Before
+    public void setUp() throws TimeoutException {
+        contentProviderUtils = new ContentProviderUtils(context);
+        service = startService();
+        tearDown();
+    }
+
+    @After
+    public void tearDown() throws TimeoutException {
+        TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
+
+        // Ensure that the database is empty after every test
+        contentProviderUtils.deleteAllTracks(context);
+    }
+
+    @MediumTest
+    @Test
+    public void notRecording_testInsertMarker() {
+        // given
+        assertFalse(service.isRecording());
+
+        // when
+        Marker.Id markerId = service.insertMarker(null, null, null, null);
+
+        // then
+        assertNull(markerId);
+    }
+
+    @MediumTest
+    @Test
+    public void recording_noGPSfix_cannotCreateMarker() {
+        // given
+        service.startNewTrack();
+
+        // when
+        Marker.Id markerId = service.insertMarker(null, null, null, null);
+
+        // then
+        assertNull(markerId);
+    }
+
+    @MediumTest
+    @Test
+    public void recording_GPSfix_createsMarker() {
+        // given
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.stopGPS();
+
+        trackPointCreator.setClock("2020-02-02T02:02:02Z");
+        Track.Id trackId = service.startNewTrack();
+        service.stopUpdateRecordingData();
+
+        assertTrue(service.isRecording());
+        trackPointCreator.onNewTrackPoint(
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setLatitude(10)
+                        .setLongitude(10)
+        );
+
+        // when
+        Marker.Id markerId = service.insertMarker(null, null, null, null);
+
+        // then
+        assertNotEquals(new Marker.Id(-1L), markerId);
+        Marker wpt = contentProviderUtils.getMarker(markerId);
+        assertEquals(context.getString(R.string.marker_icon_url), wpt.getIcon());
+        assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName());
+        assertEquals(trackId, wpt.getTrackId());
+        assertEquals(0.0, wpt.getLength().toM(), 0.01);
+        assertNotNull(wpt.getLocation());
+
+        service.endCurrentTrack();
+    }
+}
@@ -0,0 +1,820 @@
+package de.dennisguse.opentracks.services;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.rule.ServiceTestRule;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.TestDataUtil;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
+import de.dennisguse.opentracks.sensors.AltitudeSumManager;
+import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+
+/**
+ * Tests insert location.
+ */
+@RunWith(AndroidJUnit4.class)
+public class TrackRecordingServiceTestRecording {
+
+    @Rule
+    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
+
+    @Rule
+    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+    private ContentProviderUtils contentProviderUtils;
+
+    private TrackRecordingService service;
+
+    private final AltitudeSumManager altitudeSumManager = new AltitudeSumManager() {
+        @Override
+        public void fill(@NonNull TrackPoint trackPoint) {
+            trackPoint.setAltitudeGain(0f);
+            trackPoint.setAltitudeLoss(0f);
+        }
+    };
+
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
+    @AfterClass
+    public static void finalTearDown() {
+        if (Looper.myLooper() != null) Looper.myLooper().quit();
+    }
+
+    private TrackRecordingService startService() throws TimeoutException {
+        Intent startIntent = new Intent(context, TrackRecordingService.class);
+        return ((TrackRecordingService.Binder) mServiceRule.bindService(startIntent))
+                .getService();
+    }
+
+    @Before
+    public void setUp() throws TimeoutException {
+        contentProviderUtils = new ContentProviderUtils(context);
+        tearDown();
+
+        PreferencesUtils.setString(R.string.recording_distance_interval_key, R.string.recording_distance_interval_default);
+        PreferencesUtils.setString(R.string.idle_speed_key, R.string.idle_speed_default);
+
+        service = startService();
+        service.getTrackPointCreator().stopGPS();
+    }
+
+    @After
+    public void tearDown() throws TimeoutException {
+        TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
+        // Ensure that the database is empty after every test
+        contentProviderUtils.deleteAllTracks(context);
+    }
+
+    @MediumTest
+    @Test
+    public void recording_startStop() {
+
+        // given
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+
+        // when
+        String startTime = "2020-02-02T02:02:02Z";
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime))
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+
+
+        // when
+        String stopTime = "2020-02-02T02:02:03Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 1, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_startPauseResume() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // when
+        String pauseTime = "2020-02-02T02:02:03Z";
+        trackPointCreator.setClock(pauseTime);
+        service.pauseCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, pauseTime, 0, 1, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(pauseTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+
+        //when
+        String resumeTime = "2020-02-02T02:02:04Z";
+        trackPointCreator.setClock(resumeTime);
+        service.resumeTrack(trackId);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, resumeTime, 0, 1, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(pauseTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(resumeTime))
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+
+    @MediumTest
+    @Test
+    public void testRecording_startPauseStop() {
+        // given
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        String starTime = "2020-02-02T02:02:02Z";
+        trackPointCreator.setClock(starTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        String pauseTime = "2020-02-02T02:02:03Z";
+        trackPointCreator.setClock(pauseTime);
+        service.pauseCurrentTrack();
+
+        // when
+        trackPointCreator.setClock("2020-02-02T02:02:04Z");
+        service.endCurrentTrack();
+
+        // then
+        assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
+        TrackPointAssert a = new TrackPointAssert();
+        a.assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(starTime)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(pauseTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), trackPoints);
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_startStopResumeStop() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        String stopTime = "2020-02-02T02:02:03Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // when
+        String resumeTime = "2020-02-02T02:02:04Z";
+        trackPointCreator.setClock(resumeTime);
+        service.resumeTrack(trackId);
+        trackPointCreator.stopGPS();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // then
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(resumeTime))
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_gpsOnly_recordingDistance_above() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+
+        // when
+        String gps1 = "2020-02-02T02:02:03Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps2 = "2020-02-02T02:02:06Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0001, 35.0, 1, 15);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, gps2, 11.113178253173828f, 4, 3, 15, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps3 = "2020-02-02T02:02:08Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0002, 35.0, 1, 15);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, gps3, 22.226356506347656, 6, 5, 15, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // when
+        String stopTime = "2020-02-02T02:02:12Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 22.226356506347656, 10, 5, 15, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps2))
+                        .setLatitude(45.0001)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
+                        .setLatitude(45.0001)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_gpsOnly_recordingDistance_above_speed_0() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // when
+        String gps1 = "2020-02-02T02:02:03Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 0);
+
+        // then
+        TrackStatistics gps1statistics = new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f);
+        assertEquals(gps1statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps2 = "2020-02-02T02:02:06Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0001, 35.0, 1, 0);
+
+        // then
+        assertEquals(gps1statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps3 = "2020-02-02T02:02:08Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0002, 35.0, 1, 0);
+
+
+        // then
+        assertEquals(gps1statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String stopTime = "2020-02-02T02:02:12Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(0))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
+                        .setLatitude(45.0001)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(0))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_gpsOnly_recordingDistance_below() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // when
+        String gps1 = "2020-02-02T02:02:03Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);
+
+        // then
+        TrackStatistics gps1Statistics = new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f);
+        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps2 = "2020-02-02T02:02:06Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.00001, 35.0, 1, 15);
+
+        // then
+        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps3 = "2020-02-02T02:02:08Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.00002, 35.0, 1, 15);
+
+        // then
+        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // when
+        String stopTime = "2020-02-02T02:02:12Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 2.222635507583618, 10, 5, 15, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
+                        .setLatitude(45.00002)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_gpsOnly_recordingDistance_idle() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // when
+        String gps1 = "2020-02-02T02:02:03Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 0);
+
+        // then
+        TrackStatistics gps1Statistics = new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f);
+        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps2 = "2020-02-02T02:02:06Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0, 35.0, 1, 0);
+
+        // then
+        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps3 = "2020-02-02T02:02:08Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0, 35.0, 1, 0);
+
+        // then
+        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // when
+        String stopTime = "2020-02-02T02:02:12Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(0))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
+                        .setLatitude(45.00002)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(0))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_gpsOnly_recordingDistance_idle_movement() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // when
+        String gps1 = "2020-02-02T02:02:03Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps2 = "2020-02-02T02:02:06Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0, 35.0, 1, 0);
+
+        // then
+        final TrackStatistics gps2statistics = new TrackStatistics(startTime, gps2, 0, 4, 0, 0, 0f, 0f);
+        assertEquals(gps2statistics
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps3 = "2020-02-02T02:02:08Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0, 35.0, 1, 0);
+
+        // then
+        assertEquals(gps2statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // when
+        String gps4 = "2020-02-02T02:02:10Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps4, 45.0, 35.0, 1, 15);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, gps4, 0, 8, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String stopTime = "2020-02-02T02:02:12Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps2))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(0))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(0))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps4))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+
+    @MediumTest
+    @Test
+    public void testRecording_gpsOnly_ignore_inaccurate() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // when
+        String gps1 = "2020-02-02T02:02:03Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 100, 15);
+
+        // then
+        TrackStatistics startStatistics = new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null);
+        assertEquals(startStatistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // when
+        String gps2 = "2020-02-02T02:02:06Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.1, 35.0, 100, 15);
+
+        // then
+        assertEquals(startStatistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // when
+        String stopTime = "2020-02-02T02:02:12Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // then
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_gpsOnly_segment() {
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+
+        // when
+        String gps1 = "2020-02-02T02:02:03Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f), contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+        // when
+        String gps2 = "2020-02-02T02:02:06Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.1, 35.0, 1, 15);
+
+        // then
+        assertEquals(new TrackStatistics(startTime, gps2, 0, 1, 0, 0, 0f, 0f), contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // when
+        String stopTime = "2020-02-02T02:02:12Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 7, 0, 0, 0f, 0f)
+                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+
+
+        // then
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse(gps2))
+                        .setLatitude(45.1)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setAltitudeGain(0f)
+                        .setAltitudeLoss(0f)
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+
+    /**
+     * Make sure that GPS-based TrackPoints are stored, if the distance to the previous GPS-based TrackPoint is greater than recordingDistanceInterval.
+     */
+    @MediumTest
+    @Test
+    public void testRecording_gpsAndSensor_gpsIdleMoving_sensorMoving() {
+        // TODO Check TrackStatistics
+        AltitudeSumManager altitudeSumManager = new AltitudeSumManager();
+
+        // given
+        String startTime = "2020-02-02T02:02:02Z";
+        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
+        trackPointCreator.setClock(startTime);
+        Track.Id trackId = service.startNewTrack();
+        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
+
+        // when
+        String sensor1 = "2020-02-02T02:02:03Z";
+        trackPointCreator.setClock(sensor1);
+        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(0))); //Should be ignored
+
+        // when
+        String sensor2 = "2020-02-02T02:02:04Z";
+        trackPointCreator.setClock(sensor2);
+        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(2)));
+
+        // when
+        String gps1 = "2020-02-02T02:02:05Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);
+
+        // when
+        String sensor3 = "2020-02-02T02:02:06Z";
+        trackPointCreator.setClock(sensor3);
+        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(12)));
+
+        // when
+        String sensor4 = "2020-02-02T02:02:07Z";
+        trackPointCreator.setClock(sensor4);
+        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(14))); //Should be ignored
+
+        // when
+        String gps2 = "2020-02-02T02:02:08Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0, 35.0, 4, 15); //Should be ignored
+
+        // when
+        String sensor5 = "2020-02-02T02:02:10Z";
+        trackPointCreator.setClock(sensor5);
+        remoteSensorManager.onChanged(new SensorDataRunning("", "", Speed.of(5), null, Distance.of(16))); //Should be ignored
+
+        // when
+        String gps3 = "2020-02-02T02:02:12Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.001, 35.0, 1, 15);
+
+        // when
+        String gps4 = "2020-02-02T02:02:14Z";
+        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps4, 45.001, 35.0, 1, 15);
+
+
+        // when
+        String stopTime = "2020-02-02T02:02:16Z";
+        trackPointCreator.setClock(stopTime);
+        service.endCurrentTrack();
+
+        // then
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
+                new TrackPoint(TrackPoint.Type.SENSORPOINT, Instant.parse(sensor2)) //First moving TrackPoint: store as the time might be interesting.
+                        .setSpeed(Speed.of(5))
+                        .setSensorDistance(Distance.of(2)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
+                        .setLatitude(45)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(5))
+                        .setSensorDistance(Distance.of(0)),
+                new TrackPoint(TrackPoint.Type.SENSORPOINT, Instant.parse(sensor3))
+                        .setSpeed(Speed.of(5))
+                        .setSensorDistance(Distance.of(10)),
+                new TrackPoint(TrackPoint.Type.SENSORPOINT, Instant.parse(sensor5)) //TODO No need to store this TrackPoint, data could be merged into the next one
+                        .setSpeed(Speed.of(5))
+                        .setSensorDistance(Distance.of(4)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
+                        .setLatitude(45.001)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(5))
+                        .setSensorDistance(Distance.of(0)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps4))
+                        .setLatitude(45.001)
+                        .setLongitude(35)
+                        .setHorizontalAccuracy(Distance.of(1))
+                        .setSpeed(Speed.of(5))
+                        .setSensorDistance(Distance.of(0)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
+                        .setSensorDistance(Distance.of(11))
+                        .setSpeed(Speed.of(5))
+                        .setSensorDistance(Distance.of(0))
+        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
+    }
+}
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package de.dennisguse.opentracks.services;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Looper;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.rule.ServiceTestRule;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
+
+/**
+ * Testing the states of TrackRecordingService.
+ * As states are checked against MutableLiveData that are updated via `postValue()` (is asynchronous to be inform other Threads), Thread.sleep() is required.
+ */
+@RunWith(AndroidJUnit4.class)
+public class TrackRecordingServiceTestStateMachine {
+
+    @Rule
+    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
+
+    @Rule
+    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+    private ContentProviderUtils contentProviderUtils;
+
+    private TrackRecordingService service;
+
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
+    @AfterClass
+    public static void finalTearDown() {
+        if (Looper.myLooper() != null) Looper.myLooper().quit();
+    }
+
+
+    private TrackRecordingService startService() throws TimeoutException {
+        Intent startIntent = new Intent(context, TrackRecordingService.class);
+        return ((TrackRecordingService.Binder) mServiceRule.bindService(startIntent))
+                .getService();
+    }
+
+    @Before
+    public void setUp() throws TimeoutException {
+        contentProviderUtils = new ContentProviderUtils(context);
+        service = startService();
+        tearDown();
+    }
+
+    @After
+    public void tearDown() throws TimeoutException {
+        TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
+        // Ensure that the database is empty after every test
+        contentProviderUtils.deleteAllTracks(context);
+    }
+
+    @MediumTest
+    @Test
+    public void initialState() {
+        // given
+        List<Track> tracks = contentProviderUtils.getTracks();
+        assertTrue(tracks.isEmpty());
+
+        // when
+        // noop
+
+        // then
+        assertFalse(service.isRecording());
+        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
+        assertEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue());
+    }
+
+    @MediumTest
+    @Test
+    public void gps_startStop() throws InterruptedException {
+        // given
+        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue());
+
+        // when
+        service.tryStartGps();
+        Thread.sleep(1000);
+
+        // then
+        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
+        assertEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
+
+        // when
+        service.stopGps(true);
+        Thread.sleep(1000);
+
+        // then
+        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
+        assertEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+//        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue()); TODO BUG: GPS can only be stopped if a service is recording.
+    }
+
+    @MediumTest
+    @Test
+    public void recording_startPauseStopResume_no_data() throws InterruptedException {
+        // given
+        assertFalse(service.isRecording());
+
+        // when
+        Track.Id trackId = service.startNewTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertTrue(service.isRecording());
+        assertEquals(new TrackRecordingService.RecordingStatus(trackId, false), service.getRecordingStatusObservable().getValue());
+        assertNotEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
+
+
+        // when
+        service.pauseCurrentTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertTrue(service.isRecording());
+        assertTrue(service.isPaused());
+        assertEquals(new TrackRecordingService.RecordingStatus(trackId, true), service.getRecordingStatusObservable().getValue());
+        assertNotEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue()); //TODO The GPS is kept in pause, right? Might be a bug.
+
+
+        // when
+        service.resumeCurrentTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertTrue(service.isRecording());
+        assertFalse(service.isPaused());
+        assertEquals(new TrackRecordingService.RecordingStatus(trackId, false), service.getRecordingStatusObservable().getValue());
+        assertNotEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
+
+
+        // when
+        service.endCurrentTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertFalse(service.isRecording());
+        assertFalse(service.isPaused());
+        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
+        assertEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue());
+
+
+        // when
+        service.resumeTrack(trackId);
+        Thread.sleep(1000);
+
+        // then
+        assertTrue(service.isRecording());
+        assertFalse(service.isPaused());
+        assertEquals(new TrackRecordingService.RecordingStatus(trackId, false), service.getRecordingStatusObservable().getValue());
+        Thread.sleep(1000); //TODO Figure out why we need to wait here until the update is happening
+        assertNotEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
+    }
+
+    @MediumTest
+    @Test
+    public void invalidStateChanges() throws InterruptedException {
+        // given
+        assertFalse(service.isRecording());
+
+        // when
+        service.pauseCurrentTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
+        assertEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue());
+
+
+        // when
+        service.resumeCurrentTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
+        assertEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue());
+
+
+        // when
+        service.endCurrentTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
+        assertEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_NONE, service.getGpsStatusObservable().getValue());
+    }
+
+    @Ignore("TODO Bug: GPS can be stopped although the current track is recording")
+    @MediumTest
+    @Test
+    public void recording_stopGPS_noop() throws InterruptedException {
+        // given
+        Track.Id trackId = service.startNewTrack();
+        assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
+
+        // when
+        service.stopGps(false); //TODO Should be ignored as service is recording
+        Thread.sleep(1000);
+
+        // then
+        assertTrue(service.isRecording());
+        assertFalse(service.isPaused());
+        assertEquals(new TrackRecordingService.RecordingStatus(trackId, false), service.getRecordingStatusObservable().getValue());
+        Thread.sleep(1000); //TODO Figure out why we need to wait here until the update is happening
+        assertNotEquals(TrackRecordingService.NOT_RECORDING, service.getRecordingDataObservable().getValue());
+        assertEquals(GpsStatusValue.GPS_ENABLED, service.getGpsStatusObservable().getValue());
+    }
+
+    @MediumTest
+    @Test
+    public void recording_startRecording_alreadyRecording() throws InterruptedException {
+        // given
+        Track.Id trackId = service.startNewTrack();
+        assertTrue(service.isRecording());
+
+        // when
+        Track.Id newTrackId = service.startNewTrack();
+        Thread.sleep(1000);
+
+        // then
+        assertNotNull(trackId);
+        assertNull(newTrackId);
+    }
+}
@@ -1,198 +0,0 @@
-package de.dennisguse.opentracks.services;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import android.content.ContentProvider;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.MediumTest;
-import androidx.test.rule.GrantPermissionRule;
-import androidx.test.rule.ServiceTestRule;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Function;
-
-import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.CustomContentProvider;
-import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-
-/**
- * Tests resulting TrackStatistics.
- */
-@RunWith(AndroidJUnit4.class)
-public class TrackRecordingServiceTestStatistics {
-
-    @Rule
-    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
-
-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-    private ContentProviderUtils contentProviderUtils;
-
-    private TrackRecordingService service;
-
-    private final AltitudeSumManager altitudeSumManager = new AltitudeSumManager() {
-        @Override
-        public void fill(@NonNull TrackPoint trackPoint) {
-            trackPoint.setAltitudeGain(0f);
-            trackPoint.setAltitudeLoss(0f);
-        }
-    };
-
-    @BeforeClass
-    public static void preSetUp() {
-        // Prepare looper for Android's message queue
-        if (Looper.myLooper() == null) Looper.prepare();
-    }
-
-    @AfterClass
-    public static void finalTearDown() {
-        if (Looper.myLooper() != null) Looper.myLooper().quit();
-    }
-
-    @Before
-    public void setUp() throws TimeoutException {
-        // Set up the mock content resolver
-        ContentProvider customContentProvider = new CustomContentProvider() {
-        };
-        customContentProvider.attachInfo(context, null);
-
-        contentProviderUtils = new ContentProviderUtils(context);
-        tearDown();
-
-        // Let's use default values.
-        PreferencesUtils.clear();
-
-        service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
-                .getService();
-        service.getTrackPointCreator().stopGPS();
-    }
-
-    @After
-    public void tearDown() throws TimeoutException {
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
-                .getService();
-        service.getTrackPointCreator().setClock(Clock.systemUTC());
-    }
-
-    /**
-     * Moving time should increase if the previous and current TrackPoint have speed > threshold by the timeDiff(previousTrackPoint, currentTrackPoint).
-     */
-    @MediumTest
-    @Test
-    public void movingtime_with_pauses() {
-        Assume.assumeTrue(
-                "Test fails on API23; reproducible on CI and some machines.",
-                Build.VERSION.SDK_INT > 23
-        );
-
-        // given
-        service.getTrackPointCreator().setClock(Clock.fixed(Instant.ofEpochMilli(0), ZoneId.systemDefault()));
-        Track.Id trackId = service.startNewTrack();
-        service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
-
-        Function<Integer, Void> assertMovingTime = expected -> {
-            Duration actual = contentProviderUtils.getTrack(trackId).getTrackStatistics().getMovingTime();
-            assertEquals(Duration.ofSeconds(expected), actual);
-            return null;
-        };
-
-        Function<Integer, Void> assertTotalTime = expected -> {
-            Duration actual = contentProviderUtils.getTrack(trackId).getTrackStatistics().getTotalTime();
-            assertEquals(Duration.ofSeconds(expected), actual);
-            return null;
-        };
-
-        // when / then
-        int movingtime_s = 0;
-
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15, 5 * 60000);
-        assertMovingTime.apply(movingtime_s);
-
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0001, 35.0, 2, 15, 6 * 60000);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0002, 35.0, 2, 15, (long) (6.5 * 60000));
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0003, 35.0, 2, 15, 7 * 60000);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 2, 15, 8 * 60000);
-        movingtime_s += 3 * 60;
-        assertMovingTime.apply(movingtime_s);
-
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 2, 0, 9 * 60000); //will be ignored
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 2, 0, 10 * 60000); //will be ignored
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 2, 0, 11 * 60000);
-        assertMovingTime.apply(movingtime_s);
-
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 2, 15, 13 * 60000);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 2, 15, (long) (13.5 * 60000)); //will be ignored
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0005, 35.0, 2, 15, 14 * 60000);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0006, 35.0, 2, 15, 15 * 60000);
-        movingtime_s += 2 * 60;
-        assertMovingTime.apply(movingtime_s);
-        assertTotalTime.apply(15 * 60);
-
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0006, 35.0, 2, 0, 16 * 60000); //will be ignored
-        assertMovingTime.apply(movingtime_s);
-
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0015, 35.0, 2, 0, 17 * 60000);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0016, 35.0, 2, 15, 18 * 60000);
-        assertMovingTime.apply(movingtime_s);
-
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0016, 35.0, 2, 0, 19 * 60000); //TODO we could ignore this TrackPoint
-        assertMovingTime.apply(movingtime_s);
-        assertTotalTime.apply(19 * 60);
-
-        service.getTrackPointCreator().setClock(Clock.fixed(Instant.ofEpochSecond(40 * 60), ZoneId.systemDefault()));
-        assertMovingTime.apply(movingtime_s);
-        service.pauseCurrentTrack();
-        assertTotalTime.apply(40 * 60);
-
-        service.getTrackPointCreator().setClock(Clock.fixed(Instant.ofEpochSecond(41 * 60), ZoneId.systemDefault()));
-        service.resumeCurrentTrack();
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0016, 35.0, 2, 15, 42 * 60000);
-        assertMovingTime.apply(movingtime_s);
-        assertTotalTime.apply(41 * 60);
-
-        service.getTrackPointCreator().setClock(Clock.fixed(Instant.ofEpochSecond(50 * 60), ZoneId.systemDefault()));
-        service.endCurrentTrack();
-        assertMovingTime.apply(movingtime_s);
-        assertTotalTime.apply(49 * 60);
-
-        // then
-        assertFalse(service.isRecording());
-
-        TrackStatistics trackStatistics = contentProviderUtils.getTrack(trackId).getTrackStatistics();
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        assertEquals(20, trackPoints.size());
-
-        assertEquals(Duration.ofMinutes(49), trackStatistics.getTotalTime());
-    }
-}
@@ -0,0 +1,47 @@
+package de.dennisguse.opentracks.services;
+
+import android.content.Context;
+import android.content.Intent;
+import android.location.Location;
+
+import androidx.test.rule.ServiceTestRule;
+
+import java.time.Clock;
+import java.util.concurrent.TimeoutException;
+
+import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
+
+public class TrackRecordingServiceTestUtils {
+
+
+    //TODO Workaround as service is not stopped on API23; thus sharedpreferences are not reset between tests.
+    //TODO Anyhow, the service should re-create all it's resources if a recording starts and makes sure that there is no leftovers from previous recordings.
+    @Deprecated
+    public static void resetService(ServiceTestRule mServiceRule, Context context) throws TimeoutException {
+        // Let's use default values.
+        PreferencesUtils.clear();
+
+        // Reset service (if some previous test failed)
+        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
+                .getService();
+
+        service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context, service.getTrackPointCreator()));
+        service.getTrackPointCreator().setClock(Clock.systemUTC());
+        service.endCurrentTrack();
+        service.sharedPreferenceChangeListener.onSharedPreferenceChanged(null, null);
+    }
+
+    static void sendGPSLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, long speed) {
+        Location location = new Location("mock");
+        location.setTime(1L); // Should be ignored anyhow.
+        location.setLatitude(latitude);
+        location.setLongitude(longitude);
+        location.setAccuracy(accuracy);
+        location.setSpeed(speed);
+
+        trackPointCreator.setClock(time);
+        trackPointCreator.getGpsHandler().onLocationChanged(location);
+    }
+}
@@ -1,4 +1,6 @@
-package de.dennisguse.opentracks.services.tasks;
+package de.dennisguse.opentracks.services.announcement;
+
+import static org.junit.Assert.assertEquals;

 import android.content.Context;
 import android.content.Intent;
@@ -19,12 +21,10 @@ import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.stats.TrackStatistics;

-import static org.junit.Assert.assertEquals;
-
@RunWith(AndroidJUnit4.class)
 public class VoiceAnnouncementManagerTest {

@@ -1,4 +1,6 @@
-package de.dennisguse.opentracks.services.tasks;
+package de.dennisguse.opentracks.services.announcement;
+
+import static org.junit.Assert.assertEquals;

 import android.content.Context;
 import android.util.Pair;
@@ -13,21 +15,18 @@ import org.junit.runner.RunWith;

 import java.time.Duration;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
-import de.dennisguse.opentracks.services.tasks.AnnouncementUtils;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackPointIterator;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.ui.intervals.IntervalStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
-
-import static org.junit.Assert.assertEquals;

@RunWith(AndroidJUnit4.class)
-public class AnnouncementUtilsTest {
+public class VoiceAnnouncementUtilsTest {

    private final Context context = ApplicationProvider.getApplicationContext();
    private ContentProviderUtils contentProviderUtils;
@@ -47,7 +46,7 @@ public class AnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, true, null);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, true, null);

        // then
        assertEquals("total distance 20.00 kilometers in 1 hour 5 minutes 10 seconds at 18.4 kilometers per hour", announcement);
@@ -68,7 +67,7 @@ public class AnnouncementUtilsTest {
        }

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, true, lastInterval);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, true, lastInterval);

        // then
        Assert.assertEquals(
@@ -92,7 +91,7 @@ public class AnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, false, null);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, false, null);

        // then
        assertEquals("total distance 20.00 kilometers in 1 hour 5 minutes 10 seconds at 3 minutes 15 seconds per kilometer", announcement);
@@ -113,7 +112,7 @@ public class AnnouncementUtilsTest {
        }

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, false, lastInterval);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, false, lastInterval);

        // then
        assertEquals(
@@ -137,7 +136,7 @@ public class AnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, true, null);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, true, null);

        // then
        assertEquals("total distance 12.43 miles in 1 hour 5 minutes 10 seconds at 11.4 miles per hour", announcement);
@@ -158,7 +157,7 @@ public class AnnouncementUtilsTest {
        }

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, true, lastInterval);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, true, lastInterval);

        // then
        assertEquals(
@@ -182,7 +181,7 @@ public class AnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, false, null);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, false, null);

        // then
        assertEquals("total distance 12.43 miles in 1 hour 5 minutes 10 seconds at 5 minutes 15 seconds per mile", announcement);
@@ -203,7 +202,7 @@ public class AnnouncementUtilsTest {
        }

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, false, lastInterval);
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, false, lastInterval);

        // then
        //assertEquals("total distance 12.43 miles in 1 hour 5 minutes 10 seconds at 5 minutes 15 seconds per mile Lap time of 1 minute 53 seconds per mile", announcement);
@@ -21,12 +21,12 @@ import org.mockito.junit.MockitoJUnitRunner;

 import java.time.Instant;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

@RunWith(MockitoJUnitRunner.class)
-public class LocationHandlerTest {
+public class GPSHandlerTest {

    private final Context context = ApplicationProvider.getApplicationContext();

@@ -34,7 +34,7 @@ public class LocationHandlerTest {
    private TrackPointCreator trackPointCreator;

    @InjectMocks
-    private LocationHandler locationHandler;
+    private GPSHandler locationHandler;

    @BeforeClass
    public static void preSetUp() {
@@ -62,7 +62,7 @@ public class LocationHandlerTest {
        locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis()));

        // then
-        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class));
    }

    /**
@@ -78,7 +78,7 @@ public class LocationHandlerTest {
        locationHandler.onLocationChanged(createLocation(latitude, 35f, 3, 5, System.currentTimeMillis()));

        // then
-        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class));
    }

    /**
@@ -94,7 +94,7 @@ public class LocationHandlerTest {

        // then
        // no newTrackPoint called
-        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class));
    }

    @Test
@@ -107,7 +107,7 @@ public class LocationHandlerTest {
        locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));

        // then
-        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
+        verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class));
    }

    /**
@@ -3,7 +3,6 @@ package de.dennisguse.opentracks.services.handlers;
 import static org.mockito.Mockito.verify;

 import android.content.Context;
-import android.content.SharedPreferences;

 import org.junit.After;
 import org.junit.Before;
@@ -13,8 +12,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.TrackPoint;

@RunWith(MockitoJUnitRunner.class)
 public class TrackPointCreatorTest {
@@ -26,10 +25,7 @@ public class TrackPointCreatorTest {
    private TrackPointCreator.Callback server;

    @Mock
-    private LocationHandler locationHandler;
-
-    @Mock
-    private SharedPreferences sharedPreferences;
+    private GPSHandler locationHandler;

    private TrackPointCreator subject;

@@ -52,7 +48,7 @@ public class TrackPointCreatorTest {
        Distance horizontalAccuracyThreshold = Distance.of(50);

        // when
-        subject.onNewTrackPoint(trackPoint, horizontalAccuracyThreshold);
+        subject.onNewTrackPoint(trackPoint);

        // then
        Thread.sleep(10); // Wait for executor service
@@ -17,7 +17,7 @@ import org.junit.runner.RunWith;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;

@RunWith(AndroidJUnit4.class)
 public class PreferencesOpenHelperTest {
@@ -1,4 +1,9 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.settings;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;

 import android.content.Context;
 import android.content.SharedPreferences;
@@ -11,20 +16,14 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.DataField;
-import de.dennisguse.opentracks.content.data.Layout;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.List;

+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+
@RunWith(AndroidJUnit4.class)
 public class PreferencesUtilsTest {

@@ -14,7 +14,9 @@
 * the License.
 */

-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.share;
+
+import static org.junit.Assert.assertEquals;

 import android.content.Context;

@@ -27,16 +29,16 @@ import org.junit.runner.RunWith;

 import java.time.Duration;
 import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;

-import static org.junit.Assert.assertEquals;
-
 /**
 * Tests for {@link DescriptionGenerator}.
 *
@@ -80,18 +82,18 @@ public class DescriptionGeneratorTest {
                        + "Description: -<br>"
                        + "Total distance: 20.00 km (12.4 mi)<br>"
                        + "Total time: 10:00<br>"
-                + "Moving time: 05:00<br>"
-                + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
-                + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
-                + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
-                + "Average pace: 0:30 min/km (0:48 min/mi)<br>"
-                + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
-                + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
-                + "Max elevation: 550 m (1804 ft)<br>"
-                + "Min elevation: -500 m (-1640 ft)<br>"
-                + "Elevation gain: 6000 m (19685 ft)<br>"
-                + "Elevation loss: 6000 m (19685 ft)<br>"
-                + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
+                        + "Moving time: 05:00<br>"
+                        + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
+                        + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
+                        + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
+                        + "Average pace: 0:30 min/km (0:48 min/mi)<br>"
+                        + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
+                        + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
+                        + "Max elevation: 550 m (1804 ft)<br>"
+                        + "Min elevation: -500 m (-1640 ft)<br>"
+                        + "Elevation gain: 6000 m (19685 ft)<br>"
+                        + "Elevation loss: 6000 m (19685 ft)<br>"
+                        + "Recorded: " + StringUtils.formatDateTime(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";

        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
    }
@@ -127,7 +129,7 @@ public class DescriptionGeneratorTest {
                        + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
                        + "Elevation gain: 6000 m (19685 ft)<br>"
                        + "Elevation loss: 6000 m (19685 ft)<br>"
-                        + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
+                        + "Recorded: " + StringUtils.formatDateTime(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";

        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
    }
@@ -15,6 +15,9 @@
 */
 package de.dennisguse.opentracks.stats;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.junit.Before;
@@ -24,11 +27,8 @@ import org.junit.runner.RunWith;
 import java.time.Duration;
 import java.time.Instant;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;

 /**
 * Tests for {@link TrackStatistics}.
@@ -12,12 +12,12 @@ import org.junit.runner.RunWith;
 import java.time.Duration;
 import java.time.Instant;

-import de.dennisguse.opentracks.content.data.Altitude;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Altitude;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;

@RunWith(AndroidJUnit4.class)
 public class TrackStatisticsUpdaterTest {
@@ -53,7 +53,7 @@ public class TrackStatisticsUpdaterTest {
        // when
        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();

-        subject.addTrackPoint(tp, GPS_DISTANCE);
+        subject.addTrackPoint(tp);

        // then
        TrackStatistics statistics = subject.getTrackStatistics();
@@ -77,7 +77,7 @@ public class TrackStatisticsUpdaterTest {

        // when
        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-        data.trackPoints.forEach(it -> subject.addTrackPoint(it, GPS_DISTANCE));
+        data.trackPoints.forEach(it -> subject.addTrackPoint(it));

        // then
        TrackStatistics statistics = subject.getTrackStatistics();
@@ -105,9 +105,9 @@ public class TrackStatisticsUpdaterTest {
        TrackPoint tp3 = new TrackPoint(0.00001, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(3000));

        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
+        subject.addTrackPoint(tp1);
+        subject.addTrackPoint(tp2);
+        subject.addTrackPoint(tp3);

        // then
        assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -124,9 +124,9 @@ public class TrackStatisticsUpdaterTest {
        tp3.setSpeed(Speed.of(5f));

        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
+        subject.addTrackPoint(tp1);
+        subject.addTrackPoint(tp2);
+        subject.addTrackPoint(tp3);

        // then
        assertEquals(1.10, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -149,16 +149,16 @@ public class TrackStatisticsUpdaterTest {
        tp5.setSensorDistance(Distance.of(10f));

        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
+        subject.addTrackPoint(tp1);
+        subject.addTrackPoint(tp2);
+        subject.addTrackPoint(tp3);

        // then
        assertEquals(110.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);

        // when
-        subject.addTrackPoint(tp4, GPS_DISTANCE);
-        subject.addTrackPoint(tp5, GPS_DISTANCE);
+        subject.addTrackPoint(tp4);
+        subject.addTrackPoint(tp5);

        // then
        assertEquals(125.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -178,16 +178,16 @@ public class TrackStatisticsUpdaterTest {
        tp5.setSensorDistance(Distance.of(10f));

        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
+        subject.addTrackPoint(tp1);
+        subject.addTrackPoint(tp2);
+        subject.addTrackPoint(tp3);

        // then
        assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);

        // when
-        subject.addTrackPoint(tp4, GPS_DISTANCE);
-        subject.addTrackPoint(tp5, GPS_DISTANCE);
+        subject.addTrackPoint(tp4);
+        subject.addTrackPoint(tp5);

        // then
        assertEquals(15, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -209,16 +209,16 @@ public class TrackStatisticsUpdaterTest {
        TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000));

        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
+        subject.addTrackPoint(tp1);
+        subject.addTrackPoint(tp2);
+        subject.addTrackPoint(tp3);

        // then
        assertEquals(5, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);

        // when
-        subject.addTrackPoint(tp4, GPS_DISTANCE);
-        subject.addTrackPoint(tp5, GPS_DISTANCE);
+        subject.addTrackPoint(tp4);
+        subject.addTrackPoint(tp5);

        // then
        assertEquals(59.18, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -258,15 +258,15 @@ public class TrackStatisticsUpdaterTest {
        tp4.setSpeed(Speed.of(5f));
        TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000));

-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
-        subject.addTrackPoint(tp4, GPS_DISTANCE);
+        subject.addTrackPoint(tp1);
+        subject.addTrackPoint(tp2);
+        subject.addTrackPoint(tp3);
+        subject.addTrackPoint(tp4);

        // when
        TrackStatisticsUpdater copy = new TrackStatisticsUpdater(subject);
-        subject.addTrackPoint(tp5, GPS_DISTANCE);
-        copy.addTrackPoint(tp5, GPS_DISTANCE);
+        subject.addTrackPoint(tp5);
+        copy.addTrackPoint(tp5);


        // then
@@ -1,4 +1,7 @@
-package de.dennisguse.opentracks.viewmodels;
+package de.dennisguse.opentracks.ui.aggregatedStatistics;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;

 import android.content.Context;

@@ -13,15 +16,12 @@ import java.time.Instant;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.TrackIconUtils;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
@RunWith(JUnit4.class)
 public class AggregatedStatisticsTest {

@@ -0,0 +1,84 @@
+package de.dennisguse.opentracks.ui.aggregatedStatistics;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+
+import android.util.Pair;
+import android.view.View;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.GrantPermissionRule;
+
+import org.hamcrest.core.IsInstanceOf;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.TrackListActivity;
+import de.dennisguse.opentracks.content.data.TestDataUtil;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class EspressoAggregatedFilterTest {
+
+    private final String CATEGORY = "category";
+
+    @Rule
+    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
+
+    @Rule
+    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
+
+    @Before
+    public void setUp() {
+        Pair<Track, List<TrackPoint>> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 20);
+        pair.first.setCategory(CATEGORY);
+        TestDataUtil.insertTrackWithLocations(new ContentProviderUtils(ApplicationProvider.getApplicationContext()), pair.first, pair.second);
+    }
+
+    @Test
+    public void espressoAggregatedFilterTest() {
+        // open AggregatedStatisticsActivity through toolbar's menu item
+        onView(ViewMatchers.withId(R.id.toolbar)).check(matches(isDisplayed()));
+        onView(withId(R.id.toolbar)).check(matches(hasDescendant(withId(R.id.track_list_aggregated_stats))));
+        onView(withId(R.id.track_list_aggregated_stats)).perform(click());
+
+        // open FilterDialogFragment through toolbar's menu item
+        onView(withId(R.id.toolbar)).check(matches(isDisplayed()));
+        onView(withId(R.id.toolbar)).check(matches(hasDescendant(withId(R.id.aggregated_statistics_filter))));
+        onView(withId(R.id.aggregated_statistics_filter)).perform(click());
+
+        // check there's a checkbox with CATEGORY text
+        ViewInteraction checkBox = onView(
+                allOf(withId(R.id.filter_dialog_check_button), withText(CATEGORY),
+                        withParent(allOf(withId(R.id.filter_items),
+                                withParent(IsInstanceOf.<View>instanceOf(android.view.ViewGroup.class)))),
+                        isDisplayed()));
+        checkBox.check(matches(isDisplayed()));
+
+        // check there's an edit text for "from date"
+        onView(withId(R.id.filter_date_edit_text_from)).check(matches(isDisplayed()));
+
+        // check there's an edit text for "to date"
+        onView(withId(R.id.filter_date_edit_text_to)).check(matches(isDisplayed()));
+    }
+}
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 import androidx.test.ext.junit.runners.AndroidJUnit4;

@@ -1,33 +1,31 @@
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.ui.customRecordingLayout;


+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static org.hamcrest.CoreMatchers.is;
+
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewAssertion;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.action.MotionEvents;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.GrantPermissionRule;

-import android.content.Context;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.*;
-import static androidx.test.espresso.matcher.ViewMatchers.*;
-
-import de.dennisguse.opentracks.content.data.DataField;
-import de.dennisguse.opentracks.content.data.Layout;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -35,26 +33,24 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import static org.hamcrest.CoreMatchers.is;
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.TrackListActivity;
+import de.dennisguse.opentracks.settings.PreferencesUtils;

@LargeTest
@RunWith(AndroidJUnit4.class)
 public class EspressoCustomLayoutTest {

-    private final Context context = ApplicationProvider.getApplicationContext();
+    @Rule
+    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);

    @Rule
-    public ActivityTestRule<TrackListActivity> mActivityTestRule = new ActivityTestRule<>(TrackListActivity.class);
-
-    @Rule
-    public GrantPermissionRule mGrantPermissionRule =
-            GrantPermissionRule.grant(
-                    "android.permission.ACCESS_FINE_LOCATION");
+    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);

    @Test
    public void customLayoutTest() {
        // TrackListActivity: start recording
-        ViewInteraction trackControllerRecordButton = onView(withId(R.id.controller_record));
+        ViewInteraction trackControllerRecordButton = onView(ViewMatchers.withId(R.id.controller_record));
        trackControllerRecordButton.perform(click());

        // Get custom layout preferences and check all data fields are showed.
@@ -89,7 +85,7 @@ public class EspressoCustomLayoutTest {
    private static Matcher<View> childAtPosition(
            final Matcher<View> parentMatcher, final int position) {

-        return new TypeSafeMatcher<View>() {
+        return new TypeSafeMatcher<>() {
            @Override
            public void describeTo(Description description) {
                description.appendText("Child at position " + position + " in parent ");
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.data;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 import android.content.Context;
 import android.content.res.Resources;
@@ -1,4 +1,7 @@
-package de.dennisguse.opentracks.viewmodels;
+package de.dennisguse.opentracks.ui.intervals;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;

 import android.content.Context;
 import android.util.Pair;
@@ -12,18 +15,15 @@ import org.junit.runners.JUnit4;

 import java.util.List;

-import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackPointIterator;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.data.models.UnitConversions;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
-import de.dennisguse.opentracks.util.UnitConversions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;

@RunWith(JUnit4.class)
 public class IntervalStatisticsTest {
@@ -41,7 +41,7 @@ public class IntervalStatisticsTest {
    private TrackStatistics buildTrackStatistics(List<TrackPoint> trackPoints) {
        TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater();
        for (TrackPoint tp : trackPoints) {
-            trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0));
+            trackStatisticsUpdater.addTrackPoint(tp);
        }
        return trackStatisticsUpdater.getTrackStatistics();
    }
@@ -132,7 +132,7 @@ public class IntervalStatisticsTest {
            TrackPoint tp = TestDataUtil.createTrackPoint(i);
            tp.setAltitudeLoss(null);
            contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId());
-            trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0));
+            trackStatisticsUpdater.addTrackPoint(tp);
        }
        dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
        contentProviderUtils.updateTrack(dummyTrack);
@@ -1,5 +1,8 @@
 package de.dennisguse.opentracks.util;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 import android.content.Context;

 import androidx.test.core.app.ApplicationProvider;
@@ -16,10 +19,7 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;

-import de.dennisguse.opentracks.content.data.TrackPoint;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import de.dennisguse.opentracks.data.models.TrackPoint;

@RunWith(JUnit4.class)
 public class EGM2008UtilsTest {
@@ -11,8 +11,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.DataField;
-import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;

@RunWith(AndroidJUnit4.class)
 public class StatisticsUtilsTest extends TestCase {
@@ -16,6 +16,9 @@

 package de.dennisguse.opentracks.util;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import android.content.Context;

 import androidx.test.core.app.ApplicationProvider;
@@ -24,15 +27,26 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+import java.time.DayOfWeek;
 import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.TextStyle;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 import java.util.TimeZone;
+import java.util.stream.Collectors;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;

 /**
 * Tests for {@link StringUtils}.
@@ -141,7 +155,7 @@ public class StringUtilsTest {

        // This comparision tends to be flaky (difference of 1ms)
        // Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime));
-        assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime).toEpochMilli()) <= 1);
+        assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime).toInstant().toEpochMilli()) <= 1);
    }

    @Test
@@ -184,4 +198,43 @@ public class StringUtilsTest {
        assertEquals("12.0 km/h", StringUtils.formatSpeed(context, Speed.of(3.34), true, true));
        assertEquals("7.5 mph", StringUtils.formatSpeed(context, Speed.of(3.34), false, true));
    }
+
+    @Test
+    public void testFormatDateTodayRelative() {
+        // given
+        ArrayList<String> shortDays = Arrays.stream(DayOfWeek.values()).map(d -> d.getDisplayName(TextStyle.FULL, Locale.getDefault())).collect(Collectors.toCollection(ArrayList::new));
+        ArrayList<String> shortMonths = Arrays.stream(Month.values()).map(m -> m.getDisplayName(TextStyle.SHORT, Locale.getDefault())).collect(Collectors.toCollection(ArrayList::new));
+
+        LocalDate today = LocalDateTime.ofInstant(Instant.now(), ZoneId.systemDefault()).toLocalDate();
+        LocalDate yesterday = today.minus(1, ChronoUnit.DAYS);
+        LocalDate dayName = today.minus(2, ChronoUnit.DAYS);
+        LocalDate thisYear = today.minus(15, ChronoUnit.DAYS);
+        LocalDate aYearAgo = today.minus(400, ChronoUnit.DAYS);
+
+        int offsetFromLocale = OffsetDateTime.now().getOffset().getTotalSeconds() - 28800; // -08:00
+
+        OffsetDateTime todayRecordedOdt = OffsetDateTime.of(LocalDateTime.of(today.getYear(), today.getMonth(), today.getDayOfMonth(), 20, 0, 0), ZoneOffset.ofTotalSeconds(offsetFromLocale));
+        OffsetDateTime yesterdayRecordedOdt = OffsetDateTime.of(LocalDateTime.of(yesterday.getYear(), yesterday.getMonth(), yesterday.getDayOfMonth(), 1, 0, 0), ZoneOffset.ofTotalSeconds(offsetFromLocale));
+        OffsetDateTime dayNameRecordedOdt = OffsetDateTime.of(LocalDateTime.of(dayName.getYear(), dayName.getMonth(), dayName.getDayOfMonth(), 7, 0, 0), ZoneOffset.ofTotalSeconds(offsetFromLocale));
+        OffsetDateTime thisYearRecordedOdt = OffsetDateTime.of(LocalDateTime.of(thisYear.getYear(), thisYear.getMonth(), thisYear.getDayOfMonth(), 12, 0, 0), ZoneOffset.ofTotalSeconds(offsetFromLocale));
+        OffsetDateTime aYearAgoRecordedOdt = OffsetDateTime.of(LocalDateTime.of(aYearAgo.getYear(), aYearAgo.getMonth(), aYearAgo.getDayOfMonth(), 17, 0, 0), ZoneOffset.ofTotalSeconds(offsetFromLocale));
+
+        // when
+        String formatToday = StringUtils.formatDateTodayRelative(context, todayRecordedOdt);
+        String formatYesterday = StringUtils.formatDateTodayRelative(context, yesterdayRecordedOdt);
+        String formatDayName = StringUtils.formatDateTodayRelative(context, dayNameRecordedOdt);
+        String formatThisYear = StringUtils.formatDateTodayRelative(context, thisYearRecordedOdt);
+        String formatAYearAgo = StringUtils.formatDateTodayRelative(context, aYearAgoRecordedOdt);
+
+        // then
+        assertEquals("Today", formatToday);
+        assertEquals("Yesterday", formatYesterday);
+        assertTrue(shortDays.contains(formatDayName)); // Something like Friday
+        if (today.getYear() != thisYear.getYear()) {
+            assertTrue(shortMonths.stream().anyMatch(fty -> formatThisYear.matches("\\d+ " + fty + " \\d{4}"))); // Something like 14 Dec 2021
+        } else {
+            assertTrue(shortMonths.stream().anyMatch(fty -> formatThisYear.matches("\\d+ " + fty))); // Something like 14 Dec
+        }
+        assertTrue(shortMonths.stream().anyMatch(fty -> formatAYearAgo.matches("\\d+ " + fty + " \\d{4}"))); // Something like 14 Dec 2021
+    }
 }
@@ -16,6 +16,8 @@

 package de.dennisguse.opentracks.util;

+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;

 import androidx.test.core.app.ApplicationProvider;
@@ -24,16 +26,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.Locale;
+import java.time.OffsetDateTime;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

-import static org.junit.Assert.assertEquals;
-
 /**
 * Tests {@link TrackNameUtils}.
 *
@@ -43,7 +41,7 @@ import static org.junit.Assert.assertEquals;
 public class TrackNameUtilsTest {

    private static final Track.Id TRACK_ID = new Track.Id(1L);
-    private static final Instant START_TIME = Instant.ofEpochMilli(1288213406000L);
+    private static final OffsetDateTime START_TIME = OffsetDateTime.parse("2022-01-02T10:15:30.1234+01:00");

    private static final Context CONTEXT = ApplicationProvider.getApplicationContext();

@@ -53,7 +51,7 @@ public class TrackNameUtilsTest {
    @Test
    public void testTrackName_date_local() {
        PreferencesUtils.setString(R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_local_value));
-        assertEquals(StringUtils.formatDateTime(CONTEXT, START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals(StringUtils.formatDateTimeWithOffset(START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
    }

    /**
@@ -62,8 +60,7 @@ public class TrackNameUtilsTest {
    @Test
    public void testTrackName_date_iso_8601() {
        PreferencesUtils.setString(R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value));
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(TrackNameUtils.ISO_8601_FORMAT, Locale.US);
-        assertEquals(simpleDateFormat.format(START_TIME.toEpochMilli()), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals("2022-01-02T10:15+01", TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
    }

    /**
@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.viewmodels;

+import static org.mockito.Mockito.when;
+
 import android.content.Context;

 import androidx.test.core.app.ApplicationProvider;
@@ -15,14 +17,15 @@ import java.time.Duration;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Layout;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Cadence;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.HeartRate;
+import de.dennisguse.opentracks.data.models.Power;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
-
-import static org.mockito.Mockito.when;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;

@RunWith(MockitoJUnitRunner.class)
 public class StatisticDataBuilderTest extends TestCase {
@@ -124,8 +127,8 @@ public class StatisticDataBuilderTest extends TestCase {
    @Test
    public void testFromSensorStatistics_onlyHeartRate() {
        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
-        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(200f);
-        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(150f);
+        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(HeartRate.of(200f));
+        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(HeartRate.of(150f));
        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
        when(sensorStatisticsMock.hasPower()).thenReturn(false);

@@ -142,8 +145,8 @@ public class StatisticDataBuilderTest extends TestCase {
    public void testFromSensorStatistics_onlyCadence() {
        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgCadence()).thenReturn(90f);
-        when(sensorStatisticsMock.getMaxCadence()).thenReturn(110f);
+        when(sensorStatisticsMock.getAvgCadence()).thenReturn(Cadence.of(90f));
+        when(sensorStatisticsMock.getMaxCadence()).thenReturn(Cadence.of(110f));
        when(sensorStatisticsMock.hasPower()).thenReturn(false);

        // when
@@ -160,7 +163,7 @@ public class StatisticDataBuilderTest extends TestCase {
        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
        when(sensorStatisticsMock.hasPower()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgPower()).thenReturn(300f);
+        when(sensorStatisticsMock.getAvgPower()).thenReturn(Power.of(300f));

        // when
        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
@@ -173,13 +176,13 @@ public class StatisticDataBuilderTest extends TestCase {
    @Test
    public void testFromSensorStatistics() {
        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
-        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(200f);
-        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(150f);
+        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(HeartRate.of(200f));
+        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(HeartRate.of(150f));
        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgCadence()).thenReturn(90f);
-        when(sensorStatisticsMock.getMaxCadence()).thenReturn(110f);
+        when(sensorStatisticsMock.getAvgCadence()).thenReturn(Cadence.of(90f));
+        when(sensorStatisticsMock.getMaxCadence()).thenReturn(Cadence.of(110f));
        when(sensorStatisticsMock.hasPower()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgPower()).thenReturn(300f);
+        when(sensorStatisticsMock.getAvgPower()).thenReturn(Power.of(300f));

        // when
        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
@@ -69,6 +69,23 @@ limitations under the License.
        android:supportsRtl="true"
        android:theme="@style/ThemeCustom">

+        <activity
+            android:name=".publicapi.StartRecording"
+            android:exported="true"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <!--        <activity-->
+        <!--            android:name=".publicapi.StopRecording"-->
+        <!--            android:exported="true"-->
+        <!--            android:theme="@style/SplashTheme">-->
+        <!--            <intent-filter>-->
+        <!--                <category android:name="android.intent.category.DEFAULT" />-->
+        <!--            </intent-filter>-->
+        <!--        </activity>-->
+
        <activity android:name=".AboutActivity" />

        <activity
@@ -267,7 +284,7 @@ limitations under the License.
        </activity>

        <activity
-            android:name=".MarkerDetailActivity"
+            android:name=".ui.markers.MarkerDetailActivity"
            android:exported="true">
            <intent-filter>
                <action android:name="de.dennisguse.opentracks.MarkerDetails" />
@@ -275,10 +292,10 @@ limitations under the License.
            </intent-filter>
        </activity>

-        <activity android:name=".MarkerEditActivity" />
+        <activity android:name=".ui.markers.MarkerEditActivity" />

        <activity
-            android:name=".MarkerListActivity"
+            android:name=".ui.markers.MarkerListActivity"
            android:exported="true"
            android:label="@string/menu_markers"
            android:launchMode="singleTop">
@@ -308,7 +325,9 @@ limitations under the License.

        <activity android:name=".TrackRecordedActivity" />

-        <activity android:name=".TrackRecordingActivity" android:parentActivityName=".TrackListActivity">
+        <activity
+            android:name=".TrackRecordingActivity"
+            android:parentActivityName=".TrackListActivity">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value=".TrackListActivity" />
@@ -316,7 +335,7 @@ limitations under the License.

        <activity android:name=".TrackEditActivity" />

-        <activity android:name=".AggregatedStatisticsActivity" />
+        <activity android:name=".ui.aggregatedStatistics.AggregatedStatisticsActivity" />

        <activity android:name=".io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity" />
        <activity android:name=".io.file.importer.DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity" />
@@ -328,7 +347,7 @@ limitations under the License.
        <activity android:name=".settings.SettingsCustomLayoutEditActivity" />

        <activity
-            android:name=".ShowOnMapProxyActivity$KML"
+            android:name=".share.ShowOnMapProxyActivity$KML"
            android:exported="true">
            <intent-filter android:label="@string/open_track_as_KML">
                <action android:name="Intent.OpenTracks-Dashboard" />
@@ -336,7 +355,7 @@ limitations under the License.
            </intent-filter>
        </activity>
        <activity
-            android:name=".ShowOnMapProxyActivity$GPX"
+            android:name=".share.ShowOnMapProxyActivity$GPX"
            android:exported="true">
            <intent-filter android:label="@string/open_track_as_GPX">
                <action android:name="Intent.OpenTracks-Dashboard" />
@@ -345,7 +364,7 @@ limitations under the License.
        </activity>

        <provider
-            android:name=".content.provider.ShareContentProvider"
+            android:name=".data.ShareContentProvider"
            android:authorities="${applicationId}.content"
            android:exported="false"
            android:grantUriPermissions="true" />
@@ -6,8 +6,8 @@ import android.view.View;
 import androidx.annotation.Nullable;

 import de.dennisguse.opentracks.databinding.AboutBinding;
+import de.dennisguse.opentracks.ui.util.ViewUtils;
 import de.dennisguse.opentracks.util.SystemUtils;
-import de.dennisguse.opentracks.util.ViewUtils;

 public class AboutActivity extends AbstractActivity {

@@ -22,7 +22,8 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import de.dennisguse.opentracks.services.tasks.VoiceAnnouncement;
+
+import de.dennisguse.opentracks.services.announcement.VoiceAnnouncement;

 /**
 * @author Jimmy Shih
@@ -22,11 +22,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.stream.Collectors;

-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
-import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment.ConfirmDeleteCaller;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.services.TrackDeleteService;
 import de.dennisguse.opentracks.services.TrackDeleteServiceConnection;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment.ConfirmDeleteCaller;

 /**
 * An abstract class for the following common tasks across
@@ -96,11 +96,7 @@ public abstract class AbstractTrackDeleteActivity extends AbstractActivity imple
    protected abstract Track.Id getRecordingTrackId();

    @Override
-    public void connected() {
-        TrackDeleteService service = trackDeleteServiceConnection.getServiceIfBound();
-        if (service == null) {
-            return;
-        }
+    public void connected(TrackDeleteService service) {
        service.getDeletingStatusObservable().observe(AbstractTrackDeleteActivity.this, this::onTrackDeleteStatus);
    }
 }
@@ -1,46 +0,0 @@
-package de.dennisguse.opentracks;
-
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.lifecycle.ViewModelProvider;
-
-import java.util.List;
-
-import de.dennisguse.opentracks.adapters.AggregatedStatisticsAdapter;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.databinding.AggregatedStatsBinding;
-import de.dennisguse.opentracks.viewmodels.AggregatedStatisticsModel;
-
-public class AggregatedStatisticsActivity extends AbstractActivity {
-
-    public static final String EXTRA_TRACK_IDS = "track_ids";
-
-    private AggregatedStatsBinding viewBinding;
-
-    private AggregatedStatisticsAdapter adapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        viewBinding.aggregatedStatsList.setEmptyView(viewBinding.aggregatedStatsEmptyView);
-
-        List<Track.Id> trackIds = getIntent().getParcelableArrayListExtra(EXTRA_TRACK_IDS);
-
-        final AggregatedStatisticsModel viewModel = new ViewModelProvider(this).get(AggregatedStatisticsModel.class);
-        viewModel.getAggregatedStats(trackIds).observe(this, aggregatedStatistics -> {
-            if (aggregatedStatistics != null) {
-                adapter = new AggregatedStatisticsAdapter(this, aggregatedStatistics);
-                viewBinding.aggregatedStatsList.setAdapter(adapter);
-            }
-            adapter.notifyDataSetChanged();
-        });
-    }
-
-    @Override
-    protected View getRootView() {
-        viewBinding = AggregatedStatsBinding.inflate(getLayoutInflater());
-        return viewBinding.getRoot();
-    }
-}
@@ -1,46 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks;
-
-import android.view.Menu;
-
-/**
- * Callback when items in the contextual action mode are selected.
- *
- * @author Jimmy Shih
- */
-public interface ContextualActionModeCallback {
-
-    /**
-     * Invoked to prepare the menu for the selected items.
-     *
-     * @param menu          the menu
-     * @param positions     the selected items' positions
-     * @param ids           the selected items' ids, if available
-     * @param showSelectAll true to show select all
-     */
-    void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll);
-
-    /**
-     * Invoked when items are selected.
-     *
-     * @param itemId    the context menu item id
-     * @param positions the selected items' positions
-     * @param ids       the selected items' ids, if available
-     */
-    boolean onClick(int itemId, int[] positions, long[] ids);
-}
@@ -35,7 +35,7 @@ import androidx.fragment.app.Fragment;
 import de.dennisguse.opentracks.databinding.ControllerFragmentBinding;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.util.ActivityUtils;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
 import de.dennisguse.opentracks.util.StringUtils;

 /**
@@ -60,21 +60,11 @@ public class ControllerFragment extends Fragment implements View.OnTouchListener
    private TrackRecordingService.RecordingStatus recordingStatus;
    private TrackRecordingService.RecordingData recordingData;

-    private final Runnable bindChangedCallback = new Runnable() {
-        @Override
-        public void run() {
-            TrackRecordingService service = trackRecordingServiceConnection.getServiceIfBound();
-            if (service == null) {
-                Log.w(TAG, "could not get TrackRecordingService");
-                return;
-            }
-
-            service.getRecordingStatusObservable()
-                    .observe(ControllerFragment.this, status -> onRecordingStatusChanged(status));
-
-            service.getRecordingDataObservable()
-                    .observe(ControllerFragment.this, recordingData -> onTotalTimeChanged(recordingData));
-        }
+    private final TrackRecordingServiceConnection.Callback bindChangedCallback = service -> {
+        service.getRecordingStatusObservable()
+                .observe(ControllerFragment.this, this::onRecordingStatusChanged);
+        service.getRecordingDataObservable()
+                .observe(ControllerFragment.this, this::onTotalTimeChanged);
    };

    @Override
@@ -6,7 +6,7 @@ import android.view.View;
 import androidx.annotation.Nullable;

 import de.dennisguse.opentracks.databinding.HelpBinding;
-import de.dennisguse.opentracks.util.ViewUtils;
+import de.dennisguse.opentracks.ui.util.ViewUtils;

 public class HelpActivity extends AbstractActivity {

@@ -1,10 +0,0 @@
-package de.dennisguse.opentracks;
-
-import de.dennisguse.opentracks.content.TrackDataHub;
-
-/**
- * Interface for communication between activities that use {@link de.dennisguse.opentracks.content.TrackDataHub} and their fragments that need thi data hub.
- */
-public interface TrackActivityDataHubInterface {
-    TrackDataHub getTrackDataHub();
-}
@@ -23,8 +23,8 @@ import android.widget.ArrayAdapter;

 import androidx.annotation.NonNull;

-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackEditBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -28,7 +28,6 @@ import android.graphics.drawable.AnimatedVectorDrawable;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Log;
 import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -49,25 +48,29 @@ import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;

 import java.time.Duration;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.databinding.TrackListBinding;
-import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
-import de.dennisguse.opentracks.util.ActivityUtils;
+import de.dennisguse.opentracks.share.ShareUtils;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsActivity;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
+import de.dennisguse.opentracks.ui.util.ListItemUtils;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;

@@ -95,7 +98,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    private TrackRecordingService.RecordingStatus recordingStatus = TrackRecordingService.STATUS_DEFAULT;

    // Callback when an item is selected in the contextual action mode
-    private final ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
+    private final ActivityUtils.ContextualActionModeCallback contextualActionModeCallback = new ActivityUtils.ContextualActionModeCallback() {

        @Override
        public void onPrepare(Menu menu, int[] positions, long[] trackIds, boolean showSelectAll) {
@@ -127,32 +130,21 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    private MenuItem searchMenuItem;
    private MenuItem startGpsMenuItem;

-    // Callback when the trackRecordingServiceConnection binding changes.
-    private final Runnable bindChangedCallback = new Runnable() {
-        @Override
-        public void run() {
-            TrackRecordingService service = trackRecordingServiceConnection.getServiceIfBound();
-            if (service == null) {
-                Log.e(TAG, "service not available to start gps or a new recording");
-                return;
-            }
+    private final TrackRecordingServiceConnection.Callback bindChangedCallback = service -> {
+        service.getRecordingStatusObservable()
+                .observe(TrackListActivity.this, this::onRecordingStatusChanged);

-            service.getRecordingStatusObservable()
-                    .observe(TrackListActivity.this, status -> onRecordingStatusChanged(status));
+        service.getGpsStatusObservable()
+                .observe(TrackListActivity.this, this::onGpsStatusChanged);

-            // Get GPS status and listen GPS status changes.
-            service.getGpsStatusObservable()
-                    .observe(TrackListActivity.this, status -> onGpsStatusChanged(status));
+        updateGpsMenuItem(true, recordingStatus.isRecording());

-            updateGpsMenuItem(true, recordingStatus.isRecording());
-
-            if (service.getGpsStatusObservable().getValue().isGpsStarted()) {
-                return;
-            }
-
-            //TODO Not cool to do this in a callback that might be called more than once!
-            service.tryStartGps();
+        if (service.getGpsStatusObservable().getValue().isGpsStarted()) {
+            return;
        }
+
+        //TODO Not cool to do this in a callback that might be called more than once!
+        service.tryStartGps();
    };

    @Override
@@ -192,6 +184,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                int totalTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALTIME);
                int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
                int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
+                int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
                int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
                int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
                int markerCountIndex = cursor.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT);
@@ -205,12 +198,14 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                String totalDistance = StringUtils.formatDistance(TrackListActivity.this, Distance.of(cursor.getDouble(totalDistanceIndex)), metricUnits);
                int markerCount = cursor.getInt(markerCountIndex);
                long startTime = cursor.getLong(startTimeIndex);
+                int startTimeOffset = cursor.getInt(startTimeOffsetIndex);
                String category = icon != null && !icon.equals("") ? null : cursor.getString(categoryIndex);
                String description = cursor.getString(descriptionIndex);

                ListItemUtils.setListItem(TrackListActivity.this, view, isRecording, recordingStatus.isPaused(),
                        iconId, R.string.image_track, name, totalTime, totalDistance, markerCount,
-                        startTime, true, category, description, false);
+                        OffsetDateTime.ofInstant(Instant.ofEpochMilli(startTime), ZoneOffset.ofTotalSeconds(startTimeOffset)),
+                        category, description, false);
            }
        };
        viewBinding.trackList.setAdapter(resourceCursorAdapter);
@@ -301,12 +296,11 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
            } else {
                // Invoke trackRecordingService
                if (!gpsStatusValue.isGpsStarted()) {
-                    trackRecordingServiceConnection.startAndBind(this);
-                    bindChangedCallback.run();
+                    trackRecordingServiceConnection.startAndBindWithCallback(this);
                } else {
                    TrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
                    if (trackRecordingService != null) {
-                        trackRecordingService.stopGpsAndShutdown();
+                        trackRecordingService.stopGpsAndShutdown(); //TODO Handle this in TrackRecordingServiceConnection
                    }
                    trackRecordingServiceConnection.unbindAndStop(this);
                }
@@ -456,7 +450,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        }

        if (itemId == R.id.list_context_menu_share) {
-            Intent intent = IntentUtils.newShareFileIntent(this, trackIds);
+            Intent intent = ShareUtils.newShareFileIntent(this, trackIds);
            intent = Intent.createChooser(intent, null);
            startActivity(intent);
            return true;
@@ -517,7 +511,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        @Override
        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
            final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
-                    TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME,
+                    TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
                    TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT};

            final String sortOrder = TracksColumns.STARTTIME + " DESC";
@@ -33,21 +33,24 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;

 import com.google.android.material.tabs.TabLayoutMediator;

-import de.dennisguse.opentracks.content.TrackDataHub;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.chart.ChartFragment;
+import de.dennisguse.opentracks.chart.TrackDataHubInterface;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackDataHub;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackRecordedBinding;
-import de.dennisguse.opentracks.fragments.ChartFragment;
-import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
-import de.dennisguse.opentracks.fragments.IntervalsFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment;
 import de.dennisguse.opentracks.services.TrackDeleteService;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.share.ShareUtils;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.ui.intervals.IntervalsFragment;
+import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.settings.PreferencesUtils;

 /**
 * An activity to show the track detail, record a new track or resumes an existing one.
@@ -56,7 +59,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
 * @author Rodrigo Damazio
 */
 //TODO Should not use TrackRecordingServiceConnection; only used to determine if there is NO current recording, to enable resume functionality.
-public class TrackRecordedActivity extends AbstractTrackDeleteActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackActivityDataHubInterface {
+public class TrackRecordedActivity extends AbstractTrackDeleteActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackDataHubInterface {

    private static final String TAG = TrackRecordedActivity.class.getSimpleName();

@@ -77,20 +80,8 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement

    private TrackRecordingServiceConnection trackRecordingServiceConnection;

-    private final Runnable bindCallback = new Runnable() {
-        @Override
-        public void run() {
-            TrackRecordingService service = trackRecordingServiceConnection.getServiceIfBound();
-            if (service == null) {
-                Log.w(TAG, "could not get TrackRecordingService");
-                return;
-            }
-
-            service.getRecordingStatusObservable()
-                    .observe(TrackRecordedActivity.this, status -> onRecordingStatusChanged(status));
-
-        }
-    };
+    private final TrackRecordingServiceConnection.Callback bindCallback = service -> service.getRecordingStatusObservable()
+            .observe(TrackRecordedActivity.this, this::onRecordingStatusChanged);

    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
        @Override
@@ -192,7 +183,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == R.id.track_detail_share) {
-            Intent intent = Intent.createChooser(IntentUtils.newShareFileIntent(this, trackId), null);
+            Intent intent = Intent.createChooser(ShareUtils.newShareFileIntent(this, trackId), null);
            startActivity(intent);
            return true;
        }
@@ -21,18 +21,21 @@ import com.google.android.material.tabs.TabLayoutMediator;

 import java.util.List;

-import de.dennisguse.opentracks.content.TrackDataHub;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.chart.ChartFragment;
+import de.dennisguse.opentracks.chart.TrackDataHubInterface;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackDataHub;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
-import de.dennisguse.opentracks.fragments.ChartFragment;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
-import de.dennisguse.opentracks.fragments.IntervalsFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.ui.intervals.IntervalsFragment;
+import de.dennisguse.opentracks.ui.markers.MarkerEditActivity;
+import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -46,7 +49,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
 */
 //NOTE: This activity does NOT react to preference changes of R.string.recording_track_id_key.
 //This mode of communication should be removed anyhow.
-public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface, ControllerFragment.Callback {
+public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackDataHubInterface, ControllerFragment.Callback {

    public static final String EXTRA_TRACK_ID = "track_id";

@@ -67,14 +70,9 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc

    private TrackRecordingService.RecordingStatus recordingStatus = TrackRecordingService.STATUS_DEFAULT;

-    private final Runnable bindChangedCallback = new Runnable() {
+    private final TrackRecordingServiceConnection.Callback bindChangedCallback = new TrackRecordingServiceConnection.Callback() {
        @Override
-        public void run() {
-            TrackRecordingService service = trackRecordingServiceConnection.getServiceIfBound();
-            if (service == null) {
-                Log.w(TAG, "could not get TrackRecordingService");
-                return;
-            }
+        public void onConnected(TrackRecordingService service) {

            service.getRecordingStatusObservable()
                    .observe(TrackRecordingActivity.this, status -> onRecordingStatusChanged(status));
@@ -211,13 +209,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
            trackDataHub.setRecordingStatus(recordingStatus);
        }

-        /*
-         * If the binding has happened, then invoke the callback to start a new recording.
-         * If the binding hasn't happened, then invoking the callback will have no effect.
-         * But when the binding occurs, the callback will get invoked.
-         */
-        trackRecordingServiceConnection.startAndBind(this);
-        bindChangedCallback.run();
+        trackRecordingServiceConnection.startAndBindWithCallback(this);
    }

    @Override
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.CustomLayoutFieldType;
+import de.dennisguse.opentracks.ui.customRecordingLayout.CustomLayoutFieldType;
 import de.dennisguse.opentracks.viewmodels.StatisticData;

 public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -14,7 +14,7 @@
 * the License.
 */

-package de.dennisguse.opentracks.fragments;
+package de.dennisguse.opentracks.chart;

 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -31,18 +31,16 @@ import java.util.Collections;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TrackActivityDataHubInterface;
-import de.dennisguse.opentracks.chart.ChartPoint;
-import de.dennisguse.opentracks.content.TrackDataHub;
-import de.dennisguse.opentracks.content.TrackDataListener;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.TrackDataHub;
+import de.dennisguse.opentracks.data.models.Altitude;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.databinding.ChartBinding;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
-import de.dennisguse.opentracks.settings.PreferencesUtils;

 /**
 * A fragment to display track chart to the user.
@@ -51,7 +49,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
 * @author Sandor Dornbush
 * @author Rodrigo Damazio
 */
-public class ChartFragment extends Fragment implements TrackDataListener {
+public class ChartFragment extends Fragment implements TrackDataHub.Listener {

    private static final String KEY_CHART_VIEW_BY_DISTANCE_KEY = "chartViewByDistance";

@@ -189,9 +187,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
        }
    }

-    public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed, double smoothedAltitude_m) {
+    public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed, Altitude smoothedAltitude) {
        if (isResumed()) {
-            ChartPoint point = new ChartPoint(trackStatistics, trackPoint, smoothedSpeed, smoothedAltitude_m, chartByDistance, viewBinding.chartView.getMetricUnits());
+            ChartPoint point = new ChartPoint(trackStatistics, trackPoint, smoothedSpeed, smoothedAltitude, chartByDistance, viewBinding.chartView.getMetricUnits());
            pendingPoints.add(point);
        }
    }
@@ -242,7 +240,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
     */
    private synchronized void resumeTrackDataHub() {
-        trackDataHub = ((TrackActivityDataHubInterface) getActivity()).getTrackDataHub();
+        trackDataHub = ((TrackDataHubInterface) getActivity()).getTrackDataHub();
        trackDataHub.registerTrackDataListener(this);
    }

@@ -3,18 +3,19 @@ package de.dennisguse.opentracks.chart;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Altitude;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.data.models.UnitConversions;
 import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.util.UnitConversions;

 public class ChartPoint {
    //X-axis
    private double timeOrDistance;

    //Y-axis
-    private final double altitude;
+    private Double altitude;
    private Double speed;
    private Double pace;
    private Double heartRate;
@@ -27,25 +28,29 @@ public class ChartPoint {
        this.altitude = altitude;
    }

-    public ChartPoint(@NonNull TrackStatistics trackStatistics, @NonNull TrackPoint trackPoint, Speed smoothedSpeed, double smoothedAltitude_m, boolean chartByDistance, boolean metricUnits) {
+    public ChartPoint(@NonNull TrackStatistics trackStatistics, @NonNull TrackPoint trackPoint, Speed smoothedSpeed, Altitude smoothedAltitude, boolean chartByDistance, boolean metricUnits) {
        if (chartByDistance) {
            timeOrDistance = trackStatistics.getTotalDistance().toKM_Miles(metricUnits);
        } else {
            timeOrDistance = trackStatistics.getTotalTime().toMillis();
        }

-        altitude = Distance.of(smoothedAltitude_m).toM_FT(metricUnits);
+        if (smoothedAltitude != null) {
+            altitude = Distance.of(smoothedAltitude.toM()).toM_FT(metricUnits);
+        }

-        speed = smoothedSpeed.to(metricUnits);
-        pace = smoothedSpeed.toPace(metricUnits).toMillis() * UnitConversions.MS_TO_S * UnitConversions.S_TO_MIN;
+        if (smoothedSpeed != null) {
+            speed = smoothedSpeed.to(metricUnits);
+            pace = smoothedSpeed.toPace(metricUnits).toMillis() * UnitConversions.MS_TO_S * UnitConversions.S_TO_MIN;
+        }
        if (trackPoint.hasHeartRate()) {
-            heartRate = (double) trackPoint.getHeartRate_bpm();
+            heartRate = (double) trackPoint.getHeartRate().getBPM();
        }
        if (trackPoint.hasCadence()) {
-            cadence = (double) trackPoint.getCadence_rpm();
+            cadence = (double) trackPoint.getCadence().getRPM();
        }
        if (trackPoint.hasPower()) {
-            power = (double) trackPoint.getPower();
+            power = (double) trackPoint.getPower().getW();
        }
    }

@@ -41,17 +41,17 @@ import androidx.core.view.GestureDetectorCompat;
 import java.text.NumberFormat;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;

-import de.dennisguse.opentracks.MarkerDetailActivity;
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.stats.ExtremityMonitor;
+import de.dennisguse.opentracks.ui.markers.MarkerDetailActivity;
+import de.dennisguse.opentracks.ui.markers.MarkerUtils;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.ThemeUtils;

 /**
 * Visualization of the chart.
@@ -83,12 +83,12 @@ public class ChartView extends View {
        X_FRACTION_FORMAT.setMinimumFractionDigits(1);
    }

-    private final List<ChartValueSeries> seriesList = new ArrayList<>();
+    private final List<ChartValueSeries> seriesList = new LinkedList<>();
    private final ChartValueSeries speedSeries;
    private final ChartValueSeries paceSeries;

-    private final List<ChartPoint> chartPoints = new ArrayList<>();
-    private final List<Marker> markers = new ArrayList<>();
+    private final LinkedList<ChartPoint> chartPoints = new LinkedList<>();
+    private final List<Marker> markers = new LinkedList<>();
    private final ExtremityMonitor xExtremityMonitor = new ExtremityMonitor();
    private final int backgroundColor;
    private final Paint axisPaint;
@@ -213,7 +213,7 @@ public class ChartView extends View {

            @Override
            protected boolean drawIfChartPointHasNoData() {
-                return true;
+                return false;
            }
        });

@@ -835,22 +835,22 @@ public class ChartView extends View {
        return paint.measureText(marker);
    }

-    /**
-     * Draws the current pointer.
-     *
-     * @param canvas the canvas
-     */
    private void drawPointer(Canvas canvas) {
+        if (chartPoints.isEmpty()) {
+            return;
+        }
+        ChartPoint last = chartPoints.getLast();
+
        ChartValueSeries firstChartValueSeries = null;
        for (ChartValueSeries chartValueSeries : seriesList) {
-            if (chartValueSeries.isEnabled() && chartValueSeries.hasData()) {
+            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() && chartValueSeries.isChartPointValid(last)) {
                firstChartValueSeries = chartValueSeries;
                break;
            }
        }
        if (firstChartValueSeries != null && chartPoints.size() > 0) {
            int dx = getX(maxX) - pointer.getIntrinsicWidth() / 2;
-            double value = firstChartValueSeries.extractDataFromChartPoint(chartPoints.get(chartPoints.size() - 1));
+            double value = firstChartValueSeries.extractDataFromChartPoint(last);
            int dy = getY(firstChartValueSeries, value) - pointer.getIntrinsicHeight();
            canvas.translate(dx, dy);
            pointer.draw(canvas);
@@ -873,9 +873,9 @@ public class ChartView extends View {
        boolean drawFirstPoint = false;
        path.rewind();

-        Iterator<ChartPoint> iterator = chartPoints.iterator();
-        while (iterator.hasNext()) {
-            ChartPoint point = iterator.next();
+        Integer finalX = null;
+
+        for (ChartPoint point : chartPoints) {
            if (!series.isChartPointValid(point)) {
                continue;
            }
@@ -893,10 +893,12 @@ public class ChartView extends View {
            // draw graph
            path.lineTo(x, y);

-            // last point: move to lower right
-            if (!iterator.hasNext()) {
-                path.lineTo(x, yCorner);
-            }
+            finalX = x;
+        }
+
+        // last point: move to lower right
+        if (finalX != null) {
+            path.lineTo(finalX, yCorner);
        }

        // back to lower left corner
@@ -0,0 +1,10 @@
+package de.dennisguse.opentracks.chart;
+
+import de.dennisguse.opentracks.data.TrackDataHub;
+
+/**
+ * Interface for communication between activities that use {@link TrackDataHub} and their fragments that need thi data hub.
+ */
+public interface TrackDataHubInterface {
+    TrackDataHub getTrackDataHub();
+}
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.content;
-
-import androidx.annotation.NonNull;
-
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-
-/**
- * Listener for track data changes.
- *
- * @author Rodrigo Damazio
- */
-public interface TrackDataListener {
-
-    /**
-     * Called when the track or its statistics has been updated.
-     *
-     * @param track the track
-     */
-    //TODO Could be @NonNull
-    void onTrackUpdated(Track track);
-
-    /**
-     * Called to clear previously-sent track points.
-     */
-    void clearTrackPoints();
-
-    /**
-     * Called when a sampled in track point is read.
-     *
-     * @param trackPoint the trackPoint
-     */
-    default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed, double smoothedAltitude_m) {
-    }
-
-    /**
-     * Called when a sampled out track point is read.
-     *
-     * @param trackPoint the trackPoint
-     */
-    default void onSampledOutTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) {
-    }
-
-    /**
-     * Called when finish sending new track points.
-     */
-    default void onNewTrackPointsDone() {
-    }
-
-    /**
-     * Called to clear previously sent markers.
-     */
-    default void clearMarkers() {
-    }
-
-    /**
-     * Called when a new marker is read.
-     *
-     * @param marker the marker
-     */
-    default void onNewMarker(@NonNull Marker marker) {
-    }
-
-    /**
-     * Called when finish sending new markers.
-     * This gets called after every batch of calls to {@link #clearMarkers()} and {@link #onNewMarker(Marker)}.
-     */
-    default void onNewMarkersDone() {
-    }
-}
@@ -1,27 +0,0 @@
-package de.dennisguse.opentracks.content.sensor;
-
-import androidx.annotation.NonNull;
-
-public class SensorDataCyclingPower extends SensorData<Float> {
-
-    public SensorDataCyclingPower(String address) {
-        super(address);
-    }
-
-    public SensorDataCyclingPower(String name, String address, float power_w) {
-        super(name, address);
-        this.value = power_w;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return super.toString() + " power=" + value;
-    }
-
-    @NonNull
-    @Override
-    protected Float getNoneValue() {
-        return 0f;
-    }
-}
@@ -1,27 +0,0 @@
-package de.dennisguse.opentracks.content.sensor;
-
-import androidx.annotation.NonNull;
-
-public class SensorDataHeartRate extends SensorData<Float> {
-
-    public SensorDataHeartRate(String address) {
-        super(address);
-    }
-
-    public SensorDataHeartRate(String name, String address, float heartRate_bpm) {
-        super(name, address);
-        this.value = heartRate_bpm;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return super.toString() + " heart=" + value;
-    }
-
-    @NonNull
-    @Override
-    protected Float getNoneValue() {
-        return 0f;
-    }
-}
@@ -1,8 +1,8 @@
-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;

 import android.database.Cursor;

-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;

 /**
 * A cache of track points indexes.
@@ -14,7 +14,7 @@
 * the License.
 */

-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;

 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -32,6 +32,7 @@ import androidx.annotation.VisibleForTesting;
 import java.io.File;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -39,19 +40,22 @@ import java.util.List;
 import java.util.UUID;

 import de.dennisguse.opentracks.BuildConfig;
-import de.dennisguse.opentracks.content.data.Altitude;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.models.Altitude;
+import de.dennisguse.opentracks.data.models.Cadence;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.HeartRate;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Power;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.ui.markers.MarkerUtils;
 import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.UUIDUtils;

 /**
 * {@link ContentProviderUtils} implementation.
@@ -73,6 +77,10 @@ public class ContentProviderUtils {

    private final ContentResolver contentResolver;

+    public interface ContentProviderSelectionInterface {
+        SelectionData buildSelection();
+    }
+
    public ContentProviderUtils(Context context) {
        contentResolver = context.getContentResolver();
    }
@@ -94,6 +102,7 @@ public class ContentProviderUtils {
        int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
        int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
        int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
+        int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
        int stopTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STOPTIME);
        int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
        int totalTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALTIME);
@@ -105,7 +114,7 @@ public class ContentProviderUtils {
        int altitudeLossIndex = cursor.getColumnIndexOrThrow(TracksColumns.ALTITUDE_LOSS);
        int iconIndex = cursor.getColumnIndexOrThrow(TracksColumns.ICON);

-        Track track = new Track();
+        Track track = new Track(ZoneOffset.ofTotalSeconds(cursor.getInt(startTimeOffsetIndex)));
        TrackStatistics trackStatistics = track.getTrackStatistics();
        if (!cursor.isNull(idIndex)) {
            track.setId(new Track.Id(cursor.getLong(idIndex)));
@@ -122,6 +131,7 @@ public class ContentProviderUtils {
        if (!cursor.isNull(categoryIndex)) {
            track.setCategory(cursor.getString(categoryIndex));
        }
+
        if (!cursor.isNull(startTimeIndex)) {
            trackStatistics.setStartTime(Instant.ofEpochMilli(cursor.getLong(startTimeIndex)));
        }
@@ -205,15 +215,10 @@ public class ContentProviderUtils {
        return tracks;
    }

-    public List<Track> getTracks(List<Track.Id> trackIds) {
-        if (trackIds == null || trackIds.isEmpty()) {
-            return getTracks();
-        }
-
-        String selection = String.format(TracksColumns._ID + " IN (%s)", TextUtils.join(",", Collections.nCopies(trackIds.size(), "?")));
-        String[] selectionArgs = trackIds.stream().map(id -> Long.toString(id.getId())).toArray(String[]::new);
+    public List<Track> getTracks(ContentProviderSelectionInterface selection) {
+        SelectionData selectionData = selection.buildSelection();
        ArrayList<Track> tracks = new ArrayList<>();
-        try (Cursor cursor = getTrackCursor(selection, selectionArgs, TracksColumns._ID)) {
+        try (Cursor cursor = getTrackCursor(selectionData.getSelection(), selectionData.getSelectionArgs(), TracksColumns._ID)) {
            if (cursor != null && cursor.moveToFirst()) {
                tracks.ensureCapacity(cursor.getCount());
                do {
@@ -289,6 +294,7 @@ public class ContentProviderUtils {
        values.put(TracksColumns.NAME, track.getName());
        values.put(TracksColumns.DESCRIPTION, track.getDescription());
        values.put(TracksColumns.CATEGORY, track.getCategory());
+        values.put(TracksColumns.STARTTIME_OFFSET, track.getZoneOffset().getTotalSeconds());
        if (trackStatistics.getStartTime() != null) {
            values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime().toEpochMilli());
        }
@@ -472,7 +478,7 @@ public class ContentProviderUtils {
    private void deleteMarkerPhoto(Context context, Marker marker) {
        if (marker != null && marker.hasPhoto()) {
            Uri uri = marker.getPhotoURI();
-            File file = FileUtils.buildInternalPhotoFile(context, marker.getTrackId(), uri);
+            File file = MarkerUtils.buildInternalPhotoFile(context, marker.getTrackId(), uri);
            if (file.exists()) {
                File parent = file.getParentFile();
                file.delete();
@@ -575,10 +581,10 @@ public class ContentProviderUtils {
        }

        if (!cursor.isNull(indexes.sensorHeartRateIndex)) {
-            trackPoint.setHeartRate_bpm(cursor.getFloat(indexes.sensorHeartRateIndex));
+            trackPoint.setHeartRate(cursor.getFloat(indexes.sensorHeartRateIndex));
        }
        if (!cursor.isNull(indexes.sensorCadenceIndex)) {
-            trackPoint.setCadence_rpm(cursor.getFloat(indexes.sensorCadenceIndex));
+            trackPoint.setCadence(cursor.getFloat(indexes.sensorCadenceIndex));
        }
        if (!cursor.isNull(indexes.sensorDistanceIndex)) {
            trackPoint.setSensorDistance(Distance.of(cursor.getFloat(indexes.sensorDistanceIndex)));
@@ -737,16 +743,16 @@ public class ContentProviderUtils {
        }

        if (trackPoint.hasHeartRate()) {
-            values.put(TrackPointsColumns.SENSOR_HEARTRATE, trackPoint.getHeartRate_bpm());
+            values.put(TrackPointsColumns.SENSOR_HEARTRATE, trackPoint.getHeartRate().getBPM());
        }
        if (trackPoint.hasCadence()) {
-            values.put(TrackPointsColumns.SENSOR_CADENCE, trackPoint.getCadence_rpm());
+            values.put(TrackPointsColumns.SENSOR_CADENCE, trackPoint.getCadence().getRPM());
        }
        if (trackPoint.hasSensorDistance()) {
            values.put(TrackPointsColumns.SENSOR_DISTANCE, trackPoint.getSensorDistance().toM());
        }
        if (trackPoint.hasPower()) {
-            values.put(TrackPointsColumns.SENSOR_POWER, trackPoint.getPower());
+            values.put(TrackPointsColumns.SENSOR_POWER, trackPoint.getPower().getW());
        }

        if (trackPoint.hasAltitudeGain()) {
@@ -829,12 +835,17 @@ public class ContentProviderUtils {
        SensorStatistics sensorStatistics = null;
        try (Cursor cursor = contentResolver.query(ContentUris.withAppendedId(TracksColumns.CONTENT_URI_SENSOR_STATS, trackId.getId()), null, null, null, null)) {
            if (cursor != null && cursor.moveToFirst()) {
+                final int MAX_HR_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_MAX_HR);
+                final int AVG_HR_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_HR);
+                final int MAX_CADENCE_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_MAX_CADENCE);
+                final int AVG_CADENCE_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_CADENCE);
+                final int AVG_POWER_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_POWER);
                sensorStatistics = new SensorStatistics(
-                        !cursor.isNull(cursor.getColumnIndexOrThrow("max_hr")) ? cursor.getFloat(cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_MAX_HR)) : null,
-                        !cursor.isNull(cursor.getColumnIndexOrThrow("avg_hr")) ? cursor.getFloat(cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_HR)) : null,
-                        !cursor.isNull(cursor.getColumnIndexOrThrow("max_cadence")) ? cursor.getFloat(cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_MAX_CADENCE)) : null,
-                        !cursor.isNull(cursor.getColumnIndexOrThrow("avg_cadence")) ? cursor.getFloat(cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_CADENCE)) : null,
-                        !cursor.isNull(cursor.getColumnIndexOrThrow("avg_power")) ? cursor.getFloat(cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_POWER)) : null
+                        !cursor.isNull(MAX_HR_INDEX) ? HeartRate.of(cursor.getFloat(MAX_HR_INDEX)) : null,
+                        !cursor.isNull(AVG_HR_INDEX) ? HeartRate.of(cursor.getFloat(AVG_HR_INDEX)) : null,
+                        !cursor.isNull(MAX_CADENCE_INDEX) ? Cadence.of(cursor.getFloat(MAX_CADENCE_INDEX)) : null,
+                        !cursor.isNull(AVG_CADENCE_INDEX) ? Cadence.of(cursor.getFloat(AVG_CADENCE_INDEX)) : null,
+                        !cursor.isNull(AVG_POWER_INDEX) ? Power.of(cursor.getFloat(AVG_POWER_INDEX)) : null
                );
            }

@@ -14,7 +14,7 @@
 * the License.
 */

-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;

 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -35,10 +35,10 @@ import androidx.annotation.VisibleForTesting;

 import java.util.Arrays;

-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;

 /**
 * A {@link ContentProvider} that handles access to track points, tracks, and markers tables.
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;

 import android.content.ContentValues;
 import android.content.Context;
@@ -9,14 +9,16 @@ import android.util.Log;

 import androidx.annotation.VisibleForTesting;

+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.zone.ZoneRules;
 import java.util.UUID;

 import de.dennisguse.opentracks.Startup;
-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.util.UUIDUtils;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;

 /**
 * Database helper for creating and upgrading the database.
@@ -26,7 +28,7 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {

    private static final String TAG = CustomSQLiteOpenHelper.class.getSimpleName();

-    private static final int DATABASE_VERSION = 31;
+    private static final int DATABASE_VERSION = 33;

    public CustomSQLiteOpenHelper(Context context) {
        this(context, ((Startup) context.getApplicationContext()).getDatabaseName());
@@ -83,6 +85,12 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                case 31:
                    upgradeFrom30to31(db);
                    break;
+                case 32:
+                    upgradeFrom31to32(db);
+                    break;
+                case 33:
+                    upgradeFrom32to33(db);
+                    break;

                default:
                    throw new RuntimeException("Not implemented: upgrade to " + toVersion);
@@ -119,6 +127,12 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                case 30:
                    downgradeFrom31to30(db);
                    break;
+                case 31:
+                    downgradeFrom32to31(db);
+                    break;
+                case 32:
+                    downgradeFrom33to32(db);
+                    break;
                default:
                    throw new RuntimeException("Not implemented: downgrade to " + toVersion);
            }
@@ -422,6 +436,83 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {

        db.execSQL("CREATE INDEX trackpoints_trackid_index ON trackpoints(trackid)");

+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    /**
+     * Add TrackPoint type SENSORPOINT (2).
+     */
+    private void upgradeFrom31to32(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE trackpoints RENAME TO trackpoints_old");
+        db.execSQL("CREATE TABLE trackpoints (_id INTEGER PRIMARY KEY AUTOINCREMENT, trackid INTEGER NOT NULL, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, speed FLOAT, bearing FLOAT, sensor_heartrate FLOAT, sensor_cadence FLOAT, sensor_power FLOAT, elevation_gain FLOAT, elevation_loss FLOAT, type TEXT CHECK(type IN (-2, -1, 0, 1, 2)), sensor_distance FLOAT, FOREIGN KEY (trackid) REFERENCES tracks(_id) ON UPDATE CASCADE ON DELETE CASCADE)");
+        db.execSQL("INSERT INTO trackpoints SELECT _id, trackid, longitude, latitude, time, elevation, accuracy, speed, bearing, sensor_heartrate, sensor_cadence, sensor_power, elevation_gain, elevation_gain, type, sensor_distance FROM trackpoints_old");
+        db.execSQL("DROP TABLE trackpoints_old");
+
+        db.execSQL("CREATE INDEX trackpoints_trackid_index ON trackpoints(trackid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom32to31(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE trackpoints RENAME TO trackpoints_old");
+        db.execSQL("CREATE TABLE trackpoints (_id INTEGER PRIMARY KEY AUTOINCREMENT, trackid INTEGER NOT NULL, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, speed FLOAT, bearing FLOAT, sensor_heartrate FLOAT, sensor_cadence FLOAT, sensor_power FLOAT, elevation_gain FLOAT, elevation_loss FLOAT, type TEXT CHECK(type IN (-2, -1, 0, 1)), sensor_distance FLOAT, FOREIGN KEY (trackid) REFERENCES tracks(_id) ON UPDATE CASCADE ON DELETE CASCADE)");
+        db.execSQL("INSERT INTO trackpoints SELECT _id, trackid, longitude, latitude, time, elevation, accuracy, speed, bearing, sensor_heartrate, sensor_cadence, sensor_power, elevation_gain, elevation_gain, type, sensor_distance FROM trackpoints_old");
+        db.execSQL("DROP TABLE trackpoints_old");
+
+        db.execSQL("CREATE INDEX trackpoints_trackid_index ON trackpoints(trackid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    /**
+     * Add timezone to Track.
+     */
+    private void upgradeFrom32to33(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE tracks ADD COLUMN starttime_offset INTEGER");
+
+        ZoneRules zoneRules = ZoneOffset.systemDefault().getRules();
+
+        try (Cursor cursor = db.query("tracks", new String[]{"_id", "starttime"}, null, null, null, null, null)) {
+            if (cursor.moveToFirst()) {
+                int trackIdIndex = cursor.getColumnIndexOrThrow("_id");
+                int startTimeIndex = cursor.getColumnIndexOrThrow("starttime");
+                do {
+                    Track.Id trackId = new Track.Id(cursor.getLong(trackIdIndex));
+                    long startTime = cursor.getLong(startTimeIndex);
+
+                    ContentValues cv = new ContentValues();
+                    cv.put("starttime_offset", zoneRules.getOffset(Instant.ofEpochMilli(startTime)).getTotalSeconds());
+                    db.update("tracks", cv, "_id = ?", new String[]{String.valueOf(trackId.getId())});
+                } while (cursor.moveToNext());
+            }
+        }
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom33to32(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("DROP INDEX tracks_uuid_index");
+
+        db.execSQL("ALTER TABLE tracks RENAME TO tracks_old");
+        db.execSQL("CREATE TABLE tracks (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, starttime INTEGER, stoptime INTEGER, numpoints INTEGER, totaldistance FLOAT, totaltime INTEGER, movingtime INTEGER, avgspeed FLOAT, avgmovingspeed FLOAT, maxspeed FLOAT, minelevation FLOAT, maxelevation FLOAT, elevationgain FLOAT, icon TEXT, uuid BLOB, elevationloss FLOAT)");
+        db.execSQL("INSERT INTO tracks SELECT _id, name, description, category, starttime, stoptime, numpoints, totaldistance, totaltime, movingtime, avgspeed, avgmovingspeed, maxspeed, minelevation, maxelevation, elevationgain, icon, uuid, elevationloss FROM tracks_old");
+        db.execSQL("DROP TABLE tracks_old");
+
+        db.execSQL("CREATE UNIQUE INDEX tracks_uuid_index ON tracks(uuid)");
+
+
        db.setTransactionSuccessful();
        db.endTransaction();
    }
@@ -0,0 +1,24 @@
+package de.dennisguse.opentracks.data;
+
+public class SelectionData {
+    private final String selection;
+    private final String[] selectionArgs;
+
+    public SelectionData() {
+        selection = null;
+        selectionArgs = null;
+    }
+
+    public SelectionData(String selection, String[] selectionArgs) {
+        this.selection = selection;
+        this.selectionArgs = selectionArgs;
+    }
+
+    public String getSelection() {
+        return selection;
+    }
+
+    public String[] getSelectionArgs() {
+        return selectionArgs;
+    }
+}
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;

 import android.content.Context;
 import android.content.UriMatcher;
@@ -25,11 +25,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
-import de.dennisguse.opentracks.util.FileUtils;

 /**
 * A content provider that mimics the behavior of {@link androidx.core.content.FileProvider}, which shares virtual (non-existing) KML-files.
@@ -14,7 +14,7 @@
 * the License.
 */

-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.data;

 import android.content.ContentResolver;
 import android.content.Context;
@@ -25,28 +25,30 @@ import android.os.HandlerThread;
 import android.util.Log;

 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;

 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+import de.dennisguse.opentracks.data.models.Altitude;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;

 /**
 * Track data hub.
- * Receives data from {@link de.dennisguse.opentracks.content.provider.CustomContentProvider} and distributes it to {@link TrackDataListener} after some processing.
+ * Receives data from {@link CustomContentProvider} and distributes it to {@link Listener} after some processing.
 * <p>
 * {@link TrackPoint}s are filtered/downsampled with a dynamic sampling frequency.
 *
@@ -70,7 +72,7 @@ public class TrackDataHub {
    private static final String TAG = TrackDataHub.class.getSimpleName();

    private final Context context;
-    private final Set<TrackDataListener> listeners;
+    private final Set<Listener> listeners;
    private final ContentProviderUtils contentProviderUtils;
    private final int targetNumPoints;

@@ -178,11 +180,11 @@ public class TrackDataHub {
    }

    /**
-     * Registers a {@link TrackDataListener}.
+     * Registers a {@link Listener}.
     *
     * @param trackDataListener the track data listener
     */
-    public void registerTrackDataListener(final TrackDataListener trackDataListener) {
+    public void registerTrackDataListener(final Listener trackDataListener) {
        handler.post(() -> {
            listeners.add(trackDataListener);
            if (isStarted()) {
@@ -192,11 +194,11 @@ public class TrackDataHub {
    }

    /**
-     * Unregisters a {@link TrackDataListener}.
+     * Unregisters a {@link Listener}.
     *
     * @param trackDataListener the track data listener
     */
-    public void unregisterTrackDataListener(final TrackDataListener trackDataListener) {
+    public void unregisterTrackDataListener(final Listener trackDataListener) {
        handler.post(() -> listeners.remove(trackDataListener));
    }

@@ -218,7 +220,7 @@ public class TrackDataHub {

        notifyTracksTableUpdate(listeners);

-        for (TrackDataListener listener : listeners) {
+        for (Listener listener : listeners) {
            listener.clearTrackPoints();
        }
        notifyTrackPointsTableUpdate(true, listeners);
@@ -230,8 +232,8 @@ public class TrackDataHub {
     *
     * @param trackDataListener the track data listener.
     */
-    private void loadDataForListener(TrackDataListener trackDataListener) {
-        Set<TrackDataListener> trackDataListeners = Collections.singleton(trackDataListener);
+    private void loadDataForListener(Listener trackDataListener) {
+        Set<Listener> trackDataListeners = Collections.singleton(trackDataListener);

        //Track
        notifyTracksTableUpdate(trackDataListeners);
@@ -253,12 +255,12 @@ public class TrackDataHub {
     *
     * @param trackDataListeners the track data listeners to notify
     */
-    private void notifyTracksTableUpdate(Set<TrackDataListener> trackDataListeners) {
+    private void notifyTracksTableUpdate(Set<Listener> trackDataListeners) {
        if (trackDataListeners.isEmpty()) {
            return;
        }
        Track track = contentProviderUtils.getTrack(selectedTrackId);
-        for (TrackDataListener trackDataListener : trackDataListeners) {
+        for (Listener trackDataListener : trackDataListeners) {
            trackDataListener.onTrackUpdated(track);
        }
    }
@@ -269,12 +271,12 @@ public class TrackDataHub {
     *
     * @param trackDataListeners the track data listeners to notify
     */
-    private void notifyMarkersTableUpdate(Set<TrackDataListener> trackDataListeners) {
+    private void notifyMarkersTableUpdate(Set<Listener> trackDataListeners) {
        if (trackDataListeners.isEmpty()) {
            return;
        }

-        for (TrackDataListener trackDataListener : trackDataListeners) {
+        for (Listener trackDataListener : trackDataListeners) {
            trackDataListener.clearMarkers();
        }

@@ -282,14 +284,14 @@ public class TrackDataHub {
            if (cursor != null && cursor.moveToFirst()) {
                do {
                    Marker marker = contentProviderUtils.createMarker(cursor);
-                    for (TrackDataListener trackDataListener : trackDataListeners) {
+                    for (Listener trackDataListener : trackDataListeners) {
                        trackDataListener.onNewMarker(marker);
                    }
                } while (cursor.moveToNext());
            }
        }

-        for (TrackDataListener trackDataListener : trackDataListeners) {
+        for (Listener trackDataListener : trackDataListeners) {
            trackDataListener.onNewMarkersDone();
        }
    }
@@ -299,7 +301,7 @@ public class TrackDataHub {
     *
     * @param updateSamplingState true to update the sampling state
     */
-    private void notifyTrackPointsTableUpdate(boolean updateSamplingState, Set<TrackDataListener> listeners) {
+    private void notifyTrackPointsTableUpdate(boolean updateSamplingState, Set<Listener> listeners) {
        if (listeners.isEmpty()) {
            return;
        }
@@ -308,7 +310,7 @@ public class TrackDataHub {
            // Reload and resample the track at a lower frequency.
            Log.i(TAG, "Resampling track after " + numLoadedPoints + " points.");
            resetSamplingState();
-            for (TrackDataListener listener : listeners) {
+            for (Listener listener : listeners) {
                listener.clearTrackPoints();
            }
        }
@@ -336,13 +338,13 @@ public class TrackDataHub {
        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, next)) {

            while (trackPointIterator.hasNext()) {
-                if (!isStarted()) {
-                    break;
-                }
-
                //Prevents a NPE if stop() is happening while notifyTrackPointsTableUpdate()
                TrackStatisticsUpdater currentUpdater = trackStatisticsUpdater;

+                if (!isStarted()) {
+                    return;
+                }
+
                trackPoint = trackPointIterator.next();
                TrackPoint.Id trackPointId = trackPoint.getId();

@@ -362,15 +364,15 @@ public class TrackDataHub {
                    samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
                }

-                currentUpdater.addTrackPoint(trackPoint, recordingDistanceInterval);
+                currentUpdater.addTrackPoint(trackPoint);

                // Also include the last point if the selected track is not recording.
                if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) {
-                    for (TrackDataListener trackDataListener : listeners) {
+                    for (Listener trackDataListener : listeners) {
                        trackDataListener.onSampledInTrackPoint(trackPoint, currentUpdater.getTrackStatistics(), currentUpdater.getSmoothedSpeed(), currentUpdater.getSmoothedAltitude());
                    }
                } else {
-                    for (TrackDataListener trackDataListener : listeners) {
+                    for (Listener trackDataListener : listeners) {
                        trackDataListener.onSampledOutTrackPoint(trackPoint, currentUpdater.getTrackStatistics());
                    }
                }
@@ -389,7 +391,7 @@ public class TrackDataHub {
            lastSeenTrackPointId = localLastSeenTrackPointIdId;
        }

-        listeners.stream().forEach(TrackDataListener::onNewTrackPointsDone);
+        listeners.stream().forEach(Listener::onNewTrackPointsDone);
    }


@@ -415,4 +417,63 @@ public class TrackDataHub {
    public void setRecordingDistanceInterval(Distance recordingDistanceInterval) {
        this.recordingDistanceInterval = recordingDistanceInterval;
    }
+
+    public interface Listener {
+
+        /**
+         * Called when the track or its statistics has been updated.
+         *
+         * @param track the track
+         */
+        //TODO Could be @NonNull
+        void onTrackUpdated(Track track);
+
+        /**
+         * Called to clear previously-sent track points.
+         */
+        void clearTrackPoints();
+
+        /**
+         * Called when a sampled in track point is read.
+         *
+         * @param trackPoint the trackPoint
+         */
+        default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed, @Nullable Altitude smoothedAltitude_m) {
+        }
+
+        /**
+         * Called when a sampled out track point is read.
+         *
+         * @param trackPoint the trackPoint
+         */
+        default void onSampledOutTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) {
+        }
+
+        /**
+         * Called when finish sending new track points.
+         */
+        default void onNewTrackPointsDone() {
+        }
+
+        /**
+         * Called to clear previously sent markers.
+         */
+        default void clearMarkers() {
+        }
+
+        /**
+         * Called when a new marker is read.
+         *
+         * @param marker the marker
+         */
+        default void onNewMarker(@NonNull Marker marker) {
+        }
+
+        /**
+         * Called when finish sending new markers.
+         * This gets called after every batch of calls to {@link #clearMarkers()} and {@link #onNewMarker(Marker)}.
+         */
+        default void onNewMarkersDone() {
+        }
+    }
 }
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.provider;
+package de.dennisguse.opentracks.data;

 import android.database.Cursor;

@@ -8,8 +8,8 @@ import androidx.annotation.VisibleForTesting;
 import java.util.Iterator;
 import java.util.NoSuchElementException;

-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;

 /**
 * A lightweight wrapper around the original {@link Cursor}.
@@ -0,0 +1,77 @@
+package de.dennisguse.opentracks.data;
+
+import android.text.TextUtils;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
+
+public class TrackSelection implements ContentProviderUtils.ContentProviderSelectionInterface {
+    private final List<Track.Id> trackIds = new ArrayList<>();
+    private final List<String> categories = new ArrayList<>();
+    private Instant from;
+    private Instant to;
+
+    public TrackSelection addDateRange(Instant from, Instant to) {
+        this.from = from;
+        this.to = to;
+        return this;
+    }
+
+    public TrackSelection addTrackId(Track.Id trackId) {
+        if (!this.trackIds.contains(trackId)) {
+            this.trackIds.add(trackId);
+        }
+        return this;
+    }
+
+    public TrackSelection addCategory(String category) {
+        if (!this.categories.contains(category)) {
+            this.categories.add(category);
+        }
+        return this;
+    }
+
+    public boolean isEmpty() {
+        return trackIds.isEmpty() && categories.isEmpty() && from == null && to == null;
+    }
+
+    @Override
+    public SelectionData buildSelection() {
+        String selection = "";
+        String[] selectionArgs;
+        ArrayList<String> fromToArgs = new ArrayList<>();
+
+        // Builds selection.
+        if (!trackIds.isEmpty()) {
+            selection = String.format(TracksColumns._ID + " IN (%s)", TextUtils.join(",", Collections.nCopies(trackIds.size(), "?")));
+        }
+        if (!categories.isEmpty()) {
+            selection += selection.isEmpty() ? "" : " AND ";
+            selection += String.format(TracksColumns.CATEGORY + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?")));
+        }
+        if (from != null && to != null) {
+            selection += selection.isEmpty() ? "" : " AND ";
+            selection += TracksColumns.STARTTIME + " BETWEEN ? AND ?";
+            fromToArgs.add(Long.toString(from.toEpochMilli()));
+            fromToArgs.add(Long.toString(to.toEpochMilli()));
+        }
+
+        if (selection.isEmpty()) {
+            return new SelectionData();
+        }
+
+        // Builds selection arguments.
+        ArrayList<String> args = trackIds.stream().map(id -> Long.toString(id.getId())).collect(Collectors.toCollection(ArrayList::new));
+        args.addAll(categories);
+        args.addAll(fromToArgs);
+        selectionArgs = args.stream().toArray(String[]::new);
+
+        return new SelectionData(selection, selectionArgs);
+    }
+}
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.data;

 import androidx.annotation.NonNull;

@@ -1,4 +1,6 @@
-package de.dennisguse.opentracks.content.data;
+package de.dennisguse.opentracks.data.models;
+
+import androidx.annotation.NonNull;

 import de.dennisguse.opentracks.R;

@@ -14,6 +16,8 @@ public abstract class Altitude {
        return altitude_m;
    }

+    public abstract Altitude replace(double altitude_m);
+
    public abstract int getLabelId();

    public static class WGS84 extends Altitude {
@@ -30,6 +34,11 @@ public abstract class Altitude {
        public static Altitude of(double altitude_m) {
            return new WGS84(altitude_m);
        }
+
+        @Override
+        public Altitude replace(double altitude_m) {
+            return new WGS84(altitude_m);
+        }
    }

    public static class EGM2008 extends Altitude {
@@ -46,6 +55,19 @@ public abstract class Altitude {
        public static Altitude of(double altitude_m) {
            return new EGM2008(altitude_m);
        }
+
+        @Override
+        public Altitude replace(double altitude_m) {
+            return new EGM2008(altitude_m);
+        }
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "Altitude{" +
+                "altitude_m=" + altitude_m + this.getClass().getSimpleName() +
+                '}';
    }
 }

@@ -0,0 +1,43 @@
+package de.dennisguse.opentracks.data.models;
+
+import androidx.annotation.NonNull;
+
+import java.util.Objects;
+
+public class Cadence {
+
+    public static Cadence of(float value) {
+        return new Cadence(value);
+    }
+
+    private final float value;
+
+    private Cadence(float value) {
+        this.value = value;
+    }
+
+    public float getRPM() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Cadence cadence = (Cadence) o;
+        return Float.compare(cadence.value, value) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "Cadence{" +
+                "value=" + value + " rpm" +
+                '}';
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dennis Guse	f578c6bc19	Release: v3.24.1	2022-01-23 21:17:57 +01:00
Dennis Guse	a97bf6b883	Track name: use a short version of ISO8601. Fixes #1093.	2022-01-23 21:04:08 +01:00
Dennis Guse	838f3dc622	Public API: enable other applications to start recordings. Fixes #671.	2022-01-23 20:13:00 +01:00
Dennis Guse	8ae4d75708	Merge remote-tracking branch 'weblate/main'	2022-01-23 20:03:55 +01:00
mondstern	0c6813aca1	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (477 of 477 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2022-01-22 12:41:41 +01:00
Dennis Guse	05bd2e6a71	Voice announcement: fix French seconds. Fixes #1101.	2022-01-21 19:56:53 +01:00
mondstern	8cad813d56	Translated using Weblate (Ukrainian) Currently translated at 98.3% (468 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/uk/	2022-01-20 12:28:29 +01:00
mondstern	52626d5886	Translated using Weblate (Finnish) Currently translated at 85.9% (409 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/fi/	2022-01-20 12:28:29 +01:00
mondstern	c238aa7c6d	Translated using Weblate (Basque) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/eu/	2022-01-20 12:28:29 +01:00
mondstern	019568144a	Translated using Weblate (Danish) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/da/	2022-01-20 12:28:29 +01:00
Dennis Guse	9abe3cf05b	PTets: close cursors.	2022-01-20 12:28:23 +01:00
Peter Storch	1099102e29	Change handling of Uri and DocumentFile handling for #1080 The Uris from Intent.getData() and DocumentFile.getUri() seems to be different. I think PreferencesUtils should only work with the original Uri as well as the permission handling logic. IntentUtils.toDocumentFile can be used to convert it to a DocumentFile later on to actually work with. Adds "No file manager found" message if no activity with OPEN_DOCUMENT_TREE is found. #1095 Removed deprecation of `startActivityForResult`.	2022-01-19 22:26:52 +01:00
Dennis Guse	f64c1feb1a	Bugfix: prevent rare crash due to Actvity lifecycle events in AbstractTrackDeleteActivity.	2022-01-19 20:53:30 +01:00
Dennis Guse	e1d3b04dd0	Bugfix: MediaPlayer creation might fail for ttsFallback. Seen on a Fairphone 4. Part of #963.	2022-01-16 21:39:16 +01:00
Dennis Guse	619b82a23e	Package structure: moved functionality from FileUtils to MarkerUtils. Part of #963.	2022-01-16 21:39:16 +01:00
Dennis Guse	d18c67a648	Cleanup: MarkerEditActivity now uses ActivityResultLauncher and implemented onDestroy().	2022-01-16 21:39:16 +01:00
Dennis Guse	0eda1eed1d	Introduced value objects for heartrate, cadence, and power. Fixes #896.	2022-01-16 15:30:08 +01:00
Dennis Guse	1df1fe699a	Cleanup: removed unused parameter.	2022-01-16 15:30:08 +01:00
Dennis Guse	9a7183738f	Update .gitignore	2022-01-16 15:20:17 +01:00
Dennis Guse	864bc8fad9	Cleanup.	2022-01-15 23:16:53 +01:00
Dennis Guse	5ea651d340	Merge pull request #1096 from OpenTracksApp/refactor#800 Refactoring package structure.	2022-01-15 22:59:19 +01:00
Dennis Guse	7484ab03ce	Package structure: moved UI utils Part of #963.	2022-01-15 22:40:03 +01:00
Dennis Guse	7caf33fb66	Package structure: moved share functionality. Part of #963.	2022-01-15 22:28:47 +01:00
Dennis Guse	88c4e1a109	Package structure: moved sensors. Part of #963.	2022-01-15 22:24:59 +01:00
Dennis Guse	0645628d7e	Package structure: moved models and database. Part of #963.	2022-01-15 22:24:59 +01:00
Dennis Guse	cf993b73d7	Package structure: moved custom recording layout. Part of #963.	2022-01-15 22:24:59 +01:00
Dennis Guse	d49386259a	Package structure: moved support files. Part of #963.	2022-01-15 22:08:30 +01:00
Dennis Guse	10f00c4c99	Package structure: moved UI utilities. Part of #963.	2022-01-15 22:08:30 +01:00
Dennis Guse	2ca69df447	Package structure: moved Marker UI code. Part of #963.	2022-01-15 22:08:21 +01:00
Dennis Guse	1a125ca60d	Package structure: moved aggregated statistics. Part of #963.	2022-01-15 22:08:06 +01:00
Dennis Guse	5053c41bec	Package structure: moved intervals. Part of #963.	2022-01-15 22:07:53 +01:00
Dennis Guse	46cf7f9acf	TrackRecordingServiceConnection: use a callback instead of a Runnable.	2022-01-15 20:53:46 +01:00
Dennis Guse	522d8b41d8	Bugfix: use monotonic clock. Fixes #800.	2022-01-15 19:52:27 +01:00
Dennis Guse	43e1c99642	Refactoring package structure. Part of #963.	2022-01-14 23:34:05 +01:00
mondstern	81d516d11a	Translated using Weblate (Slovak) Currently translated at 99.5% (474 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/sk/	2022-01-14 07:25:36 +01:00
mondstern	b8ce386556	Translated using Weblate (Slovak) Currently translated at 72.0% (343 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/sk/	2022-01-14 07:25:36 +01:00
mondstern	bda8a9ea83	Translated using Weblate (Slovak) Currently translated at 65.7% (313 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/sk/	2022-01-14 07:25:36 +01:00
dependabot[bot]	79b3e4ea5b	Bump material from 1.4.0 to 1.5.0 Bumps [material](https://github.com/material-components/material-components-android) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](https://github.com/material-components/material-components-android/compare/1.4.0...1.5.0) --- updated-dependencies: - dependency-name: com.google.android.material:material dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-14 07:25:17 +01:00
dependabot[bot]	1e15222e99	Bump appcompat from 1.4.0 to 1.4.1 Bumps appcompat from 1.4.0 to 1.4.1. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-13 08:00:42 +01:00
Dennis Guse	58b1396d64	Refactoring package structure. Part of #963.	2022-01-12 22:57:35 +01:00
Dennis Guse	a9f1381dae	Refactoring package structure. Part of #963.	2022-01-12 22:42:23 +01:00
Dennis Guse	e508c53ca9	TrackRecordingManager: store GPS-based TrackPoints based upon the distance to the previously stored GPS-based TrackPoint.	2022-01-12 18:07:48 +01:00
Dennis Guse	d691c958b9	Cleanup: TrackRecordingManager should use onNewTrackPoint().	2022-01-12 18:07:48 +01:00
Dennis Guse	bc1edec372	Bugfix: ChartView needs data. Fixes #1086.	2022-01-12 18:06:26 +01:00
Dennis Guse	11de7d5868	Cleanup.	2022-01-09 22:35:15 +01:00
Dennis Guse	44e8cd1491	Bugfix: TrackDataHub should abort processing if stopped.	2022-01-09 19:02:54 +01:00
Dennis Guse	9dac5d3e72	Release: v3.24.0	2022-01-09 18:39:08 +01:00
Dennis Guse	cd7bf36aa9	TrackRecordingService: add integration tests.	2022-01-09 18:28:35 +01:00
Dennis Guse	ab07d3b130	TrackRecordingService: re-worked TrackPoint recording tests for state changes.	2022-01-09 18:28:35 +01:00
Dennis Guse	8b5320e40e	TrackRecordingService: cleanup tests.	2022-01-09 18:28:35 +01:00
Dennis Guse	ef15632d7b	TrackRecordingService: refactored and unified tests.	2022-01-09 18:28:35 +01:00
Dennis Guse	f5ce76955b	TrackRecordingService: add tests for state changes.	2022-01-09 18:28:35 +01:00
mondstern	3701b61852	Translated using Weblate (Spanish) Currently translated at 91.0% (71 of 78 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/app-store-metadata-files/es/	2022-01-08 19:19:57 +01:00
mondstern	3b8a243f55	Translated using Weblate (Vietnamese) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/vi/	2022-01-08 19:19:57 +01:00
mondstern	e19f55a618	Translated using Weblate (Ukrainian) Currently translated at 97.4% (464 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/uk/	2022-01-08 19:19:57 +01:00
mondstern	9e6a787ed9	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/pt_BR/	2022-01-08 19:19:57 +01:00
mondstern	9626c5dd0b	Translated using Weblate (Polish) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/pl/	2022-01-08 19:19:57 +01:00
FTno	1e42ef5e6c	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2022-01-08 19:19:57 +01:00
mondstern	e5792336a8	Translated using Weblate (Italian) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/it/	2022-01-08 19:19:57 +01:00
Xosé M	9d4ec8ba2a	Translated using Weblate (Galician) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2022-01-08 19:19:56 +01:00
mondstern	e928adf3b5	Translated using Weblate (French) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/fr/	2022-01-08 19:19:56 +01:00
mondstern	f061243a7d	Translated using Weblate (Estonian) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/et/	2022-01-08 19:19:56 +01:00
mondstern	1d623a076f	Translated using Weblate (Spanish) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/es/	2022-01-08 19:19:56 +01:00
mondstern	13ed210933	Translated using Weblate (Czech) Currently translated at 100.0% (476 of 476 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/cs/	2022-01-08 19:19:56 +01:00
Román Ginés	eba4918b01	StringUtilsTest.testFormatDateTime removed. Fixes #1082 .	2022-01-08 19:19:45 +01:00
Dennis Guse	9bde8944b9	Workaround: Clock.systemUTC() seems to be not monotonic. Introduced in `25e590da02`	2022-01-06 22:12:53 +01:00
Dennis Guse	1163f74b98	SENSORPOINT and TRACKPOINT require a distance to be stored. TrackRecording and TrackStatisticsUpdater. Part of #500 Fixes #1074.	2022-01-06 22:12:53 +01:00
Dennis Guse	c4b8082efc	Bluetooth sensors: event-driven TrackPoint creation. Part of #500.	2022-01-06 22:12:53 +01:00
Dennis Guse	1fb8fc6a09	Bugfix: GpxTrackImporter needs to reset data when it encounters a new TrackPoint; affected only sensor data.	2022-01-06 22:12:53 +01:00
Dennis Guse	dbc29a88ce	Cleanup: removed useless tests.	2022-01-06 22:12:53 +01:00
mondstern	05af52a21b	Translated using Weblate (Ukrainian) Currently translated at 97.4% (460 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/uk/	2022-01-03 16:27:56 +01:00
mondstern	1a5de37f8a	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/pt_BR/	2022-01-03 16:27:56 +01:00
mondstern	015ddabf3a	Translated using Weblate (French) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/fr/	2022-01-03 16:27:56 +01:00
mondstern	12a008a99a	Translated using Weblate (Vietnamese) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/vi/	2022-01-03 16:27:56 +01:00
mondstern	99ccf65cc2	Translated using Weblate (Polish) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/pl/	2022-01-03 16:27:56 +01:00
FTno	a159d4c375	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2022-01-03 16:27:55 +01:00
mondstern	01ac31716a	Translated using Weblate (Italian) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/it/	2022-01-03 16:27:55 +01:00
mondstern	cfb2d0c2d3	Translated using Weblate (Estonian) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/et/	2022-01-03 16:27:55 +01:00
mondstern	c05fa638a0	Translated using Weblate (Czech) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/cs/	2022-01-03 16:27:55 +01:00
mondstern	519f2b016e	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2022-01-03 16:27:55 +01:00
Román Ginés	5cd6992c90	Proper handling of timezone data on UI. Fixes #301 . Details: - Date and time handled by OffsetDateTime Java class. - Track default name with offset (for date local and ISO 8601 options). - TrackListActivity: shows relative today's date (like Today, Yesterday, 22 Dec, 22 Dec 2021, etc). - StatisticsRecordedFragment: always shows the original date and time. For example, if you record an activity at 20h then it always will show 20h regardless the zone are where you are. - Added new tests.	2022-01-03 16:27:40 +01:00
Peter Storch	1631836327	Try to takkle down export dir issues	2022-01-02 21:19:43 +01:00
Dennis Guse	07074ad260	TrackStatistics and ChartView: handle altitude and speed as optional with null as default value. Then only the relevant part of the y-axis is shown. Fixes #795.	2022-01-02 18:17:20 +01:00
Dennis Guse	8c20d5583a	Charts: elevation is now optional. Part of #500.	2022-01-02 18:17:20 +01:00
Xosé M	39bce2a487	Translated using Weblate (Galician) Currently translated at 100.0% (472 of 472 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2021-12-30 12:16:45 +01:00
Dennis Guse	a221194ab1	Translated using Weblate (German) Currently translated at 89.5% (422 of 471 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/de/	2021-12-30 12:16:45 +01:00
Dennis Guse	55d3502ff9	Cleanup using AndroidStudio analyze.	2021-12-30 12:16:31 +01:00
Dennis Guse	0cd22a8ba0	README: add nightly repo.	2021-12-29 10:33:08 +01:00
Dennis Guse	aff4bce3fe	Cleanup: tests also should close cursors.	2021-12-28 23:17:52 +01:00
Dennis Guse	bb290e2ee4	Settings: add option to disable filter of BLE sensors. Fixes #1000.	2021-12-28 22:56:29 +01:00
Dennis Guse	6d04659370	Timezone support: store timezone offset per Track. When a recording is started the offset of the phone is used. Timezone is exported to KML and GPX. Fixes #301.	2021-12-28 15:42:38 +01:00
Dennis Guse	7193171a09	Merge pull request #1033 from OpenTracksApp/indoor#500 Storing data from sensors without GPS	2021-12-28 14:24:57 +01:00
Dennis Guse	7d0d87e962	Tests: ServiceTestRule does not (always) restart the service. Thus, resetting it's status is not happening and then leading to failures in subsequent tests. Fixes #1058.	2021-12-28 13:05:24 +01:00
Dennis Guse	d6cc7a0321	TrackPointCreator: only try fill TrackPoint with sensor data if started.	2021-12-28 13:05:24 +01:00
Dennis Guse	c7bbaddc06	Cleanup: fix various issues in tests.	2021-12-28 13:05:24 +01:00
Dennis Guse	9af213fd12	Bugfix: selected interval may be null.	2021-12-28 13:05:24 +01:00
Dennis Guse	77f56a5376	Test: disable automatic creation of TrackPoints for tests. Part of #500.	2021-12-28 13:05:24 +01:00
Dennis Guse	ea5ac186d0	README: add sensor-only feature. Part of #500.	2021-12-28 13:05:24 +01:00
Dennis Guse	84c51ba8bb	GPX: export cumulative sensor data from SENSORPOINTs. Part of #500.	2021-12-28 13:05:24 +01:00
Dennis Guse	89f9f25c55	GPX: export track statistics using TrackStatsExtensionv1. Fixes #652.	2021-12-28 13:05:24 +01:00
Dennis Guse	f8cc257895	KMZ/KML: Export/Import SENSORPOINTs. Part of #500.	2021-12-28 13:05:23 +01:00
Dennis Guse	ba66c45005	Recording data from BLE sensors alone (need to provide distance). GPS is optional in this case, but no coordinates will be available. Naive implementation tries to store data every second using the UI timer. Part of #500.	2021-12-28 13:05:23 +01:00
Dennis Guse	24b638aa30	Add TrackPoint type for BLE sensor only data (i.e., no GPS). Part of #500.	2021-12-28 13:05:23 +01:00
Dennis Guse	45125bcda3	Refactor: rename LocationHandler to GPSHandler.	2021-12-28 13:05:23 +01:00
Dennis Guse	3359a30907	TrackRecordingService: first process the TrackPoint, then update the notification.	2021-12-28 13:05:23 +01:00
dependabot[bot]	6f822afc71	Bump reactivecircus/android-emulator-runner from 2.21.0 to 2.22.0 Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.21.0 to 2.22.0. - [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases) - [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md) - [Commits](https://github.com/reactivecircus/android-emulator-runner/compare/v2.21.0...v2.22.0) --- updated-dependencies: - dependency-name: reactivecircus/android-emulator-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-12-27 06:44:32 +01:00
Dennis Guse	230e97147c	Update bug report template.	2021-12-25 19:54:59 +01:00
Román Ginés	b4ce99440a	AggregatedStatisticsActivity: added filter option (by category, start and/or end date). Fixes #1039.	2021-12-24 11:50:32 +01:00
Dennis Guse	4d333bbafa	Merge pull request #1056 from OpenTracksApp/whaoo#1050	2021-12-22 22:29:09 +01:00
Dennis Guse	0ee1c77680	Sensors: added Wahoo Blue SC.	2021-12-22 22:27:25 +01:00
Dennis Guse	6fe6cee475	BLE: CSC remove workarounds as those are not necessary. The implementation of OpenTracks for the CSC parsing was broken and fixed in `35de5b6b26` Fixes #1046.	2021-12-21 22:00:38 +01:00
Dennis Guse	52228d44a9	Cleanup.	2021-12-21 21:55:41 +01:00