Release v3.7.1

Found by Google Play Pre-Launch report.

.github/workflows/test.yml

@@ -0,0 +1,21 @@
+#https://github.com/marketplace/actions/android-emulator-runner
+name: Test
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [29]
+        target: [default]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ matrix.target }}
+          arch: x86_64
+          script: ./gradlew connectedCheck

.gitignore

@@ -45,19 +45,16 @@ captures/
 
 
 # IntelliJ IDEA
-*.iml
 *.iws
 /out/
 
 # User-specific configurations
 .idea/.name
-.idea/assetWizardSettings.xml
 .idea/caches/
 .idea/compiler.xml
 .idea/copyright/profiles_settings.xml
 .idea/dataSources.ids
 .idea/datasources.xml
-.idea/dictionaries
 .idea/dynamic.xml
 .idea/encodings.xml
 .idea/jsLibraryMappings.xml
@@ -67,10 +64,8 @@ captures/
 .idea/scopes/scope_settings.xml
 .idea/shelf/
 .idea/sqlDataSources.xml
-.idea/tasks.xml
 .idea/vcs.xml
 .idea/uiDesigner.xml
-.idea/workspace.xml
 
 # Keystore files
 *.jks

.travis.yml

@@ -1,46 +0,0 @@
-#See https://docs.travis-ci.com/user/languages/android/
-#See https://github.com/ankidroid/Anki-Android/blob/master/.travis.yml
-language: android
-
-env:
-  global:
-    - ADB_INSTALL_TIMEOUT=8
-    - ABI=armeabi-v7a
-    - EMU_FLAVOR=default
-    # PATH order is incredibly important. e.g. the 'emulator' script exists in more than one place!
-    - ANDROID_HOME=/usr/local/android-sdk
-    - TOOLS=${ANDROID_HOME}/tools
-    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
-  matrix:
-    - API=27 ABI=x86_64
-
-android:
-  components:
-    # installing tools to start, then use `sdkmanager` below to get the rest
-    - tools
-    - build-tools-28.0.3
-    - android-29
-
-# Emulator Management: Create, Start and Wait
-#install:
-#  - echo y | sdkmanager "platform-tools"
-#  - echo y | sdkmanager --channel=4 "emulator"
-#  - echo y | sdkmanager "system-images;android-$API;$EMU_FLAVOR;$ABI"
-#  - echo no | avdmanager create avd --force -n test -k "system-images;android-$API;$EMU_FLAVOR;$ABI" -c 10M
-#  - emulator -verbose -avd test -no-accel -no-snapshot -no-window -camera-back none -camera-front none -selinux permissive -qemu -m 2048 &
-#  - android-wait-for-emulator
-#  - adb shell input keyevent 82 &
-
-script:
-  - ./gradlew clean build
-#  - ./gradlew connectedCheck
-
-sbefore_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache

README.md

@@ -31,6 +31,7 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
 * __Tracking:__ track your sport and outdoor activities 
 * __Photos and Markers:__ mark interesting locations while tracking (also with photos)
 * __Heart rate:__ supports Bluetooth LE sensors
+* __Cycling (speed and cadence)__: supports Bluetooth LE sensors
 * __Export data:__ export tracks either as KMZ (incl. photos), KML or GPX
 * __No Internet access:__ Internet is not used
 * __Voice announcements__

README_DEVELOPER.md

@@ -14,15 +14,15 @@ For the time being, the OpenTracks Data API can be used to implement mainly cust
 
 ## Implementation
 OpenTracks by default does not expose any data to 3rd-party applications.
-On the request of the user (i.e., pressing a button), an Intent is created that exposes the `Track` data (it's summary) as well as the `TrackPoint`s.
+On the request of the user (i.e., pressing a button), an Intent is created that exposes the `Track` data (it's summary) as well as the `TrackPoint`s of one or more selected tracks.
 For each, one URI is provided.
 These URIs notify observers if on content changes (e.g., a new `TrackPoint` was added).
 
 Limitations:
-* only tracks selected by the user is exposed,
+* only tracks selected by the user are exposed,
 * `Waypoints` are not exposed,
 * access is only granted temporarily and automatically revoked (see `FLAG_GRANT_READ_URI_PERMISSION`),
-* no write access is impossible, and
+* no write access is possible, and
 * neither track recordings can be started, paused, or stopped.
 
 All required information can be found in `IntentDashboardUtils.java`. 

README_RELEASE.md

@@ -4,7 +4,7 @@
 
 1. Get next _version code_ (master branch): `git rev-list HEAD --count master`
 2. Decide on _version name_ (semantic versioning)
-3. Manually update _version code_ and _version name_ in `AndroidManifest.xml` (used by FDroid)
+3. Manually update _version code_ and _version name_ in `build.gradle`
 4. Create changelog (`_version code_.txt`)
 5. Create commit with all changes
 6. Tag newly create commit with _version name_ (e.g., v3.2.1)

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
     }
 }
 
@@ -59,11 +59,14 @@ android {
                 applicationName: "@string/app_name"
         ]
 
-        //Useful for debugging.
-        //versionCode getVersionCode()
+        versionCode 3372
+        //versionCode getVersionCode() //Useful for debugging.
+        versionName "v3.7.1"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
+
+
         minSdkVersion 21
         targetSdkVersion 29
 
@@ -98,6 +101,7 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
 
     androidTestImplementation 'androidx.test:core:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -109,5 +113,5 @@ dependencies {
 
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'org.mockito:mockito-core:3.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
 }

fastlane/metadata/android/de-DE/full_description.txt

@@ -4,6 +4,7 @@ Erfasst deine Kilometer, ohne dass es jemand anderes tut.
 Funktionen & Features:
 * zeichnet Sport und andere Outdooraktivitäten auf
 * unterstützt das Markieren interessanter Orte, inkl. Foto-Funktion
-* zeichnet deine Herzfrequenz auf (unterstützt Bluetooth-LE-Sensoren)
+* zeichnet deine Herzfrequenz auf (Bluetooth LE)
+* nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren (Bluetooth LE)
 * exportiert deine Daten als KML oder GPX
 * funktioniert ganz ohne Internet

fastlane/metadata/android/en-US/changelogs/3287.txt

@@ -0,0 +1,12 @@
+v3.4.0: OpenTracks
+
+Changes:
+- Dashboard API: multiple tracks
+- Updated help
+
+Bugfix:
+- Fixed crash on fragment re-creation
+- When paused: prevent stopping app
+
+Developer:
+- Enable testing via CI (Github Actions and TravisCI)

fastlane/metadata/android/en-US/changelogs/3305.txt

@@ -0,0 +1,14 @@
+v3.5.0: OpenTracks
+
+Changes:
+- Marker: select pictures from gallery
+- Marker: share picture
+- Use track name as filename when sharing
+- Removed elevation min/max (was imprecise)
+
+Bugfix:
+- Charts use preferred units and rate
+
+Developer:
+- Database: remove unused columns
+- Database: add indices

fastlane/metadata/android/en-US/changelogs/3330.txt

@@ -0,0 +1,10 @@
+v3.6.0: OpenTracks
+
+Changes:
+- Stopped tracks can now be resumed
+
+Bugfix:
+- Import of KMZ did not process the photo URL correctly
+
+Developer:
+- Simplified data processing

fastlane/metadata/android/en-US/changelogs/3333.txt

@@ -0,0 +1,4 @@
+v3.6.1: OpenTracks
+
+Bugfix:
+- KMZ import: store correct picture path

fastlane/metadata/android/en-US/changelogs/3335.txt

@@ -0,0 +1,4 @@
+v3.6.2: OpenTracks
+
+Bugfix:
+- Charts were not shown correctly (introduced in v3.6.0)

fastlane/metadata/android/en-US/changelogs/3369.txt

@@ -0,0 +1,13 @@
+v3.7.0: OpenTracks
+
+Changes:
+- Report speed/pace by activity type
+- Added workaround for GPS week rollover
+- (Experimental) Support for Bluetooth LE cycling sensors (cadence and speed)
+- KMZ/KML import enhanced
+
+Bugfix:
+- KMZ import: only import used images
+
+Developer:
+- Refactored TrackRecordingService

fastlane/metadata/android/en-US/changelogs/3372.txt

@@ -0,0 +1,7 @@
+v3.7.1: OpenTracks
+
+Workaround:
+- Hide start GPS button
+
+Bugfix:
+- Fixed null pointer

fastlane/metadata/android/en-US/full_description.txt

@@ -4,5 +4,6 @@ Features:
 * Sport tracking: track your sport and outdoor activities
 * Photos and markers: mark interesting locations while tracking
 * Heart rate: supports Bluetooth LE sensors
+* Cycling (speed and cadence): supports Bluetooth LE sensors
 * Export data: export tracks either as KML or GPX
 * No Internet access: Internet is not used

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sun Apr 12 18:41:12 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java

@@ -18,9 +18,7 @@ package de.dennisguse.opentracks;
 
 import android.location.Location;
 
-import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 
 /**
  * Commons utilities for creating stubs of track, location.
@@ -37,31 +35,14 @@ public class TrackStubUtils {
     private static final float INITIAL_ACCURACY = 5;
     private static final float INITIAL_SPEED = 10;
     private static final float INITIAL_BEARING = 3.0f;
-    // Used to change the value of latitude, longitude, and altitude.
-    private static final double DIFFERENCE = 0.01;
-
-    /**
-     * Gets a a {@link Track} stub with specified number of locations.
-     *
-     * @param numberOfLocations the number of locations for the track
-     * @return a track stub.
-     */
-    public static Track createTrack(int numberOfLocations) {
-        Track track = new Track();
-        for (int i = 0; i < numberOfLocations; i++) {
-            track.addLocation(createSensorDataSetLocation(INITIAL_LATITUDE + i * DIFFERENCE, INITIAL_LONGITUDE + i * DIFFERENCE, INITIAL_ALTITUDE + i * DIFFERENCE));
-        }
-
-        return track;
-    }
 
     /**
      * Create a MyTracks location with default values.
      *
      * @return a track stub.
      */
-    public static TrackPoint createSensorDataSetLocation() {
-        return createSensorDataSetLocation(INITIAL_LATITUDE, INITIAL_LONGITUDE, INITIAL_ALTITUDE);
+    public static TrackPoint createDefaultTrackPoint() {
+        return createDefaultTrackPoint(INITIAL_LATITUDE, INITIAL_LONGITUDE, INITIAL_ALTITUDE);
     }
 
     /**
@@ -69,18 +50,16 @@ public class TrackStubUtils {
      *
      * @return a SensorDataSetLocation stub.
      */
-    private static TrackPoint createSensorDataSetLocation(double latitude, double longitude, double altitude) {
-        // Initial Location
-        Location loc = new Location(LOCATION_PROVIDER);
-        loc.setLatitude(latitude);
-        loc.setLongitude(longitude);
-        loc.setAltitude(altitude);
-        loc.setAccuracy(INITIAL_ACCURACY);
-        loc.setSpeed(INITIAL_SPEED);
-        loc.setTime(INITIAL_TIME);
-        loc.setBearing(INITIAL_BEARING);
-        SensorDataSet sd = new SensorDataSet(Float.NaN, Float.NaN);
+    private static TrackPoint createDefaultTrackPoint(double latitude, double longitude, double altitude) {
+        Location location = new Location(LOCATION_PROVIDER);
+        location.setLatitude(latitude);
+        location.setLongitude(longitude);
+        location.setAltitude(altitude);
+        location.setAccuracy(INITIAL_ACCURACY);
+        location.setSpeed(INITIAL_SPEED);
+        location.setTime(INITIAL_TIME);
+        location.setBearing(INITIAL_BEARING);
 
-        return new TrackPoint(loc, sd);
+        return new TrackPoint(location);
     }
 }

src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java

@@ -15,6 +15,7 @@
  */
 package de.dennisguse.opentracks.chart;
 
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -44,7 +45,17 @@ public class ChartValueSeriesTest {
                 R.string.description_elevation_metric,
                 R.string.description_elevation_imperial,
                 R.color.chart_elevation_fill,
-                R.color.chart_elevation_border);
+                R.color.chart_elevation_border) {
+            @Override
+            double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getElevation();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return false;
+            }
+        };
     }
 
     @Test
@@ -63,8 +74,8 @@ public class ChartValueSeriesTest {
 
     @Test
     public void testSmallUpdates() {
-        series.update(0);
-        series.update(10);
+        series.update(new ChartPoint(0));
+        series.update(new ChartPoint(10));
         series.updateDimension();
         Assert.assertEquals(100, series.getInterval());
         Assert.assertEquals(0, series.getMinMarkerValue());
@@ -73,8 +84,8 @@ public class ChartValueSeriesTest {
 
     @Test
     public void testBigUpdates() {
-        series.update(0);
-        series.update(901);
+        series.update(new ChartPoint(0));
+        series.update(new ChartPoint(901));
         series.updateDimension();
         Assert.assertEquals(1000, series.getInterval());
         Assert.assertEquals(0, series.getMinMarkerValue());
@@ -83,8 +94,8 @@ public class ChartValueSeriesTest {
 
     @Test
     public void testNotZeroBasedUpdates() {
-        series.update(220);
-        series.update(250);
+        series.update(new ChartPoint(220));
+        series.update(new ChartPoint(250));
         series.updateDimension();
         Assert.assertEquals(100, series.getInterval());
         Assert.assertEquals(200, series.getMinMarkerValue());

src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java

@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 
 /**
@@ -42,7 +42,7 @@ public class DescriptionGeneratorTest {
     private static final long START_TIME = 1288721514000L;
     private DescriptionGenerator descriptionGenerator;
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @Before
     public void setUp() {
@@ -55,7 +55,7 @@ public class DescriptionGeneratorTest {
     @Test
     public void testGenerateTrackDescription() {
         Track track = new Track();
-        TripStatistics stats = new TripStatistics();
+        TrackStatistics stats = new TrackStatistics();
         stats.setTotalDistance(20000);
         stats.setTotalTime(600000);
         stats.setMovingTime(300000);
@@ -63,10 +63,8 @@ public class DescriptionGeneratorTest {
         stats.setMaxElevation(550);
         stats.setMinElevation(-500);
         stats.setTotalElevationGain(6000);
-        stats.setMaxGrade(0.42);
-        stats.setMinGrade(0.11);
-        stats.setStartTime(START_TIME);
-        track.setTripStatistics(stats);
+        stats.setStartTime_ms(START_TIME);
+        track.setTrackStatistics(stats);
         track.setCategory("hiking");
         String expected = //"Created by"
                 "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks</a><p>"
@@ -85,13 +83,45 @@ public class DescriptionGeneratorTest {
                 + "Max elevation: 550 m (1804 ft)<br>"
                 + "Min elevation: -500 m (-1640 ft)<br>"
                 + "Elevation gain: 6000 m (19685 ft)<br>"
-                + "Max grade: 42 %<br>"
-                + "Min grade: 11 %<br>"
                 + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
 
         Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
     }
 
+    @Test
+    public void testGenerateTrackDescriptionWithoutMaxMinElevation() {
+        Track track = new Track();
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setMaxElevation(Double.POSITIVE_INFINITY);
+        stats.setMinElevation(Double.NEGATIVE_INFINITY);
+        stats.setTotalElevationGain(6000);
+        stats.setStartTime_ms(START_TIME);
+        track.setTrackStatistics(stats);
+        track.setCategory("hiking");
+        String expected = //"Created by"
+                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks</a><p>"
+                        + "Name: -<br>"
+                        + "Activity type: hiking<br>"
+                        + "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>"
+                        + "Elevation gain: 6000 m (19685 ft)<br>"
+                        + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
+
+        Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
+    }
+
 
     /**
      * Tests {@link DescriptionGenerator#writeDistance(double, StringBuilder, int, String)}.
@@ -142,34 +172,4 @@ public class DescriptionGeneratorTest {
         descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n");
         Assert.assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString());
     }
-
-    /**
-     * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)}.
-     */
-    @Test
-    public void testWriteGrade() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeGrade(.042, builder, R.string.description_max_grade, "<br>");
-        Assert.assertEquals("Max grade: 4 %<br>", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)} with a NaN.
-     */
-    @Test
-    public void testWriteGrade_nan() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeGrade(Double.NaN, builder, R.string.description_max_grade, "<br>");
-        Assert.assertEquals("Max grade: 0 %<br>", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)} with an infinite number.
-     */
-    @Test
-    public void testWriteGrade_infinite() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeGrade(Double.POSITIVE_INFINITY, builder, R.string.description_max_grade, "<br>");
-        Assert.assertEquals("Max grade: 0 %<br>", builder.toString());
-    }
 }

src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java

@@ -39,7 +39,7 @@ import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 
 /**
  * Tests for {@link SearchEngine}.
@@ -56,7 +56,7 @@ public class SearchEngineTest {
     private ContentProviderUtils providerUtils;
     private SearchEngine engine;
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
 
     @Before
@@ -66,21 +66,21 @@ public class SearchEngineTest {
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         providerUtils.deleteAllTracks(context);
     }
 
-    private long insertTrack(String title, String description, String category, double distance, long hoursAgo) {
+    private long insertTrack(String title, String description, String category, long hoursAgo) {
         Track track = new Track();
         track.setName(title);
         track.setDescription(description);
         track.setCategory(category);
 
-        TripStatistics stats = track.getTripStatistics();
+        TrackStatistics stats = track.getTrackStatistics();
         if (hoursAgo > 0) {
             // Started twice hoursAgo, so the average time is hoursAgo.
-            stats.setStartTime(NOW - hoursAgo * 1000L * 60L * 60L * 2);
-            stats.setStopTime(NOW);
+            stats.setStartTime_ms(NOW - hoursAgo * 1000L * 60L * 60L * 2);
+            stats.setStopTime_ms(NOW);
         }
 
         Uri uri = providerUtils.insertTrack(track);
@@ -88,31 +88,25 @@ public class SearchEngineTest {
     }
 
     private long insertTrack(String title, String description, String category) {
-        return insertTrack(title, description, category, 0, -1);
-    }
-
-    private long insertTrack(String title, double distance) {
-        return insertTrack(title, "", "", distance, -1);
+        return insertTrack(title, description, category, -1);
     }
 
     private long insertTrack(String title, long hoursAgo) {
-        return insertTrack(title, "", "", 0.0, hoursAgo);
+        return insertTrack(title, "", "", hoursAgo);
     }
 
     private long insertWaypoint(String title, String description, String category, double distance, long hoursAgo, long trackId) {
-        Waypoint waypoint = new Waypoint();
-        waypoint.setName(title);
-        waypoint.setDescription(description);
-        waypoint.setCategory(category);
-        waypoint.setTrackId(trackId);
-
         Location location = new Location(HERE);
         location.setLatitude(location.getLatitude() + distance);
         location.setLongitude(location.getLongitude() + distance);
         if (hoursAgo >= 0) {
             location.setTime(NOW - hoursAgo * 1000L * 60L * 60L);
         }
-        waypoint.setLocation(location);
+        Waypoint waypoint = new Waypoint(location);
+        waypoint.setName(title);
+        waypoint.setDescription(description);
+        waypoint.setCategory(category);
+        waypoint.setTrackId(trackId);
 
         Uri uri = providerUtils.insertWaypoint(waypoint);
         return ContentUris.parseId(uri);
@@ -153,7 +147,7 @@ public class SearchEngineTest {
         long allMatchId = insertTrack("aa", "ba", "ca");
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Title > Description > Category.
         assertTrackResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
@@ -178,7 +172,7 @@ public class SearchEngineTest {
         long allMatchId = insertWaypoint("aa", "ba", "ca");
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Title > Description > Category.
         assertWaypointResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
@@ -199,7 +193,7 @@ public class SearchEngineTest {
         long trackId = insertTrack("aa", "bb", "cc");
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Title > Description > Category.
         Assert.assertEquals(results.toString(), 3, results.size());
@@ -216,7 +210,7 @@ public class SearchEngineTest {
         long farId = insertWaypoint("ac", 0.2);
 
         SearchQuery query = new SearchQuery("a", HERE, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Distance order.
         assertWaypointResults(results, nearId, farId, farFarAwayId);
@@ -229,7 +223,7 @@ public class SearchEngineTest {
         long oldId = insertTrack("ac", 2);
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Reverse time order.
         assertTrackResults(results, recentId, oldId, oldestId);
@@ -243,7 +237,7 @@ public class SearchEngineTest {
         long oldId = insertWaypoint("ac", 1);
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Reverse time order.
         assertWaypointResults(results, recentId, oldId, oldestId);
@@ -256,7 +250,7 @@ public class SearchEngineTest {
         long otherId = insertTrack("aa", 1);
 
         SearchQuery query = new SearchQuery("a", null, currentId, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Current track should be demoted.
         assertTrackResults(results, otherId, currentId);
@@ -269,7 +263,7 @@ public class SearchEngineTest {
         long currentId = insertWaypoint("ab", 1, 123);
 
         SearchQuery query = new SearchQuery("a", null, 123, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Waypoint in current track should be promoted.
         assertWaypointResults(results, currentId, otherId);

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -1,6 +1,15 @@
 package de.dennisguse.opentracks.content.data;
 
+import android.content.Context;
 import android.location.Location;
+import android.net.Uri;
+import android.util.Pair;
+
+import java.io.File;
+import java.io.IOException;
+
+import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.util.FileUtils;
 
 public class TestDataUtil {
 
@@ -8,22 +17,40 @@ public class TestDataUtil {
     public static final double INITIAL_LONGITUDE = -57.0;
     public static final double ALTITUDE_INTERVAL = 2.5;
 
+    /**
+     * Create a track without any trackPoints.
+     */
+    public static Track createTrack(long trackId) {
+        Track track = new Track();
+        track.setId(trackId);
+        track.setName("Test: " + trackId);
+
+        return track;
+    }
+
     /**
      * Simulates a track which is used for testing.
      *
-     * @param id        the id of the track
-     * @param numPoints the location number in the track
-     * @return the simulated track
+     * @param trackId   the trackId of the track
+     * @param numPoints the trackPoints number in the track
      */
-    public static Track getTrack(long id, int numPoints) {
-        Track track = new Track();
-        track.setId(id);
-        track.setName("Test: " + id);
-        track.setNumberOfPoints(numPoints);
+    public static Pair<Track, TrackPoint[]> createTrack(long trackId, int numPoints) {
+        Track track = createTrack(trackId);
+
+        TrackPoint[] trackPoints = new TrackPoint[numPoints];
         for (int i = 0; i < numPoints; i++) {
-            track.addLocation(createLocation(i));
+            trackPoints[i] = (createTrackPoint(i));
         }
-        return track;
+
+        return new Pair<>(track, trackPoints);
+    }
+
+    public static Track createTrackAndInsert(ContentProviderUtils contentProviderUtils, long trackId, int numPoints) {
+        Pair<Track, TrackPoint[]> pair = createTrack(trackId, numPoints);
+
+        insertTrackWithLocations(contentProviderUtils, pair.first, pair.second);
+
+        return pair.first;
     }
 
     /**
@@ -32,13 +59,42 @@ public class TestDataUtil {
      * @param i the index to set the value of location.
      * @return created location
      */
-    public static Location createLocation(int i) {
-        Location loc = new Location("test");
-        loc.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
-        loc.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
-        loc.setAccuracy((float) i / 100.0f);
-        loc.setAltitude(i * ALTITUDE_INTERVAL);
-        loc.setTime(i + 1);
-        return loc;
+    public static TrackPoint createTrackPoint(int i) {
+        Location location = new Location("test");
+        location.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
+        location.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
+        location.setAccuracy((float) i / 100.0f);
+        location.setAltitude(i * ALTITUDE_INTERVAL);
+        location.setTime(i + 1);
+        return new TrackPoint(location);
+    }
+
+    /**
+     * Inserts a track with locations into the database.
+     *
+     * @param track       track to be inserted
+     * @param trackPoints trackPoints to be inserted
+     */
+    public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, TrackPoint[] trackPoints) {
+        contentProviderUtils.insertTrack(track);
+        contentProviderUtils.bulkInsertTrackPoint(trackPoints, track.getId());
+    }
+
+    /**
+     * Creates a Waypoint with a photo.
+     *
+     * @param context  The context.
+     * @param trackId  The track id.
+     * @param location The location.
+     * @return the Waypoint created.
+     */
+    public static  Waypoint createWaypointWithPhoto(Context context, long trackId, Location location) throws IOException {
+        String photoUrl = "";
+        File dstFile = new File(FileUtils.getImageUrl(context, trackId));
+        dstFile.createNewFile();
+        Uri photoUri = FileUtils.getUriForFile(context, dstFile);
+        photoUrl = photoUri.toString();
+
+        return new Waypoint("Waypoint name", "Waypoint description", "Waypoint category", "", trackId, 0.0, 0, location, photoUrl);
     }
 }

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java

@@ -16,8 +16,8 @@
 
 package de.dennisguse.opentracks.content.provider;
 
+import android.content.ContentUris;
 import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -29,7 +29,6 @@ import org.junit.Test;
 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
-import de.dennisguse.opentracks.content.provider.CustomContentProvider.DatabaseHelper;
 
 /**
  * Tests {@link CustomContentProvider}.
@@ -38,30 +37,15 @@ import de.dennisguse.opentracks.content.provider.CustomContentProvider.DatabaseH
  */
 public class CustomContentProviderTest {
 
-    private static final String DATABASE_NAME = "test.db";
-
-    private SQLiteDatabase db;
     private CustomContentProvider customContentProvider;
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @Before
     public void setUp() {
-        context.deleteDatabase(DATABASE_NAME);
-        db = (new DatabaseHelper(context, DATABASE_NAME)).getWritableDatabase();
         customContentProvider = new CustomContentProvider() {
         };
     }
 
-    /**
-     * Tests {@link CustomContentProvider.DatabaseHelper#onCreate(SQLiteDatabase)}.
-     */
-    @Test
-    public void testDatabaseHelper_OnCreate() {
-        Assert.assertTrue(hasTable(TracksColumns.TABLE_NAME));
-        Assert.assertTrue(hasTable(TrackPointsColumns.TABLE_NAME));
-        Assert.assertTrue(hasTable(WaypointsColumns.TABLE_NAME));
-    }
-
     /**
      * Tests {@link CustomContentProvider#onCreate(android.content.Context)}.
      */
@@ -76,73 +60,12 @@ public class CustomContentProviderTest {
     @Test
     public void testGetType() {
         Assert.assertEquals(TracksColumns.CONTENT_TYPE, customContentProvider.getType(TracksColumns.CONTENT_URI));
-        Assert.assertEquals(TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI));
+        Assert.assertEquals(TracksColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(TracksColumns.CONTENT_URI.buildUpon(), 1).build()));
+
+        Assert.assertEquals(TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI_BY_ID));
+        Assert.assertEquals(TrackPointsColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(TrackPointsColumns.CONTENT_URI_BY_TRACKID.buildUpon(), 1).build()));
+
         Assert.assertEquals(WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
-    }
-
-    /**
-     * Creates a table, containing one column.
-     *
-     * @param table the table name
-     */
-    private void createTable(String table) {
-        db.execSQL("CREATE TABLE " + table + " (test INTEGER)");
-    }
-
-    /**
-     * Drops a table in database.
-     *
-     * @param table the table name
-     */
-    private void dropTable(String table) {
-        db.execSQL("Drop TABLE " + table);
-    }
-
-    /**
-     * Returns true if the table exists.
-     *
-     * @param table the table name
-     */
-    private boolean hasTable(String table) {
-        try {
-            db.rawQuery("select count(*) from " + table, null);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Returns true if the column in the table exists.
-     *
-     * @param table  the table name
-     * @param column the column name
-     */
-    private boolean hasColumn(String table, String column) {
-        try {
-            db.execSQL("SElECT count(*) from  " + table + " order by  " + column);
-        } catch (Exception e) {
-            if (e.getMessage().contains("no such column")) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Sets up upgrade.
-     *
-     * @param oldVersion thd old database version
-     */
-    private void setupUpgrade(int oldVersion) {
-        dropTable(TracksColumns.TABLE_NAME);
-        dropTable(TrackPointsColumns.TABLE_NAME);
-        dropTable(WaypointsColumns.TABLE_NAME);
-        createTable(TracksColumns.TABLE_NAME);
-        createTable(TrackPointsColumns.TABLE_NAME);
-        createTable(WaypointsColumns.TABLE_NAME);
-
-        DatabaseHelper databaseHelper = new DatabaseHelper(context);
-        databaseHelper.onUpgrade(db, oldVersion, CustomContentProvider.DATABASE_VERSION);
+        Assert.assertEquals(WaypointsColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(WaypointsColumns.CONTENT_URI.buildUpon(), 1).build()));
     }
 }

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java

@@ -21,6 +21,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.location.Location;
+import android.util.Pair;
 
 import androidx.test.core.app.ApplicationProvider;
 
@@ -31,9 +32,11 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
@@ -42,7 +45,8 @@ import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.util.FileUtils;
 
 import static org.mockito.Mockito.when;
 
@@ -59,7 +63,7 @@ public class CustomContentProviderUtilsTest {
     private static final String TEST_DESC = "Test Desc!";
     private static final String TEST_DESC_NEW = "Test Desc new!";
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
     private ContentProviderUtils contentProviderUtils;
 
     @Mock
@@ -76,70 +80,45 @@ public class CustomContentProviderUtilsTest {
 
     @Test
     public void testLocationIterator_noPoints() {
-        testIterator(1, 0, 1, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
-    }
-
-    @Test
-    public void testLocationIterator_customFactory() {
-        final TrackPoint location = new TrackPoint("test_location");
-        final AtomicInteger counter = new AtomicInteger();
-        testIterator(1, 15, 4, false, new TrackPointFactory() {
-            @Override
-            public TrackPoint createLocation() {
-                counter.incrementAndGet();
-                return location;
-            }
-        });
-        // Make sure we were called exactly as many times as we had track points.
-        Assert.assertEquals(15, counter.get());
-    }
-
-    @Test
-    public void testLocationIterator_nullFactory() {
-        try {
-            testIterator(1, 15, 4, false, null);
-            Assert.fail("Expecting IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
+        testIterator(1, 0, 1, false);
     }
 
     @Test
     public void testLocationIterator_noBatchAscending() {
-        testIterator(1, 50, 100, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 100, false);
+        testIterator(2, 50, 50, false);
     }
 
     @Test
     public void testLocationIterator_noBatchDescending() {
-        testIterator(1, 50, 100, true, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, true, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 100, true);
+        testIterator(2, 50, 50, true);
     }
 
     @Test
     public void testLocationIterator_batchAscending() {
-        testIterator(1, 50, 11, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 11, false);
+        testIterator(2, 50, 25, false);
     }
 
     @Test
     public void testLocationIterator_batchDescending() {
-        testIterator(1, 50, 11, true, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, true, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 11, true);
+        testIterator(2, 50, 25, true);
     }
 
     @Test
     public void testLocationIterator_largeTrack() {
-        testIterator(1, 20000, 2000, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 20000, 2000, false);
     }
 
-    private List<Location> testIterator(long trackId, int numPoints, int batchSize, boolean descending, TrackPointFactory trackPointFactory) {
+    private void testIterator(long trackId, int numPoints, int batchSize, boolean descending) {
         long lastPointId = initializeTrack(trackId, numPoints);
-        ((ContentProviderUtils) contentProviderUtils).setDefaultCursorBatchSize(batchSize);
-        List<Location> locations = new ArrayList<Location>(numPoints);
-        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(trackId, -1L, descending, trackPointFactory)) {
+        contentProviderUtils.setDefaultCursorBatchSize(batchSize);
+        List<TrackPoint> locations = new ArrayList<>(numPoints);
+        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(trackId, -1L, descending)) {
             while (it.hasNext()) {
-                Location loc = it.next();
+                TrackPoint loc = it.next();
                 Assert.assertNotNull(loc);
                 locations.add(loc);
                 // Make sure the IDs are returned in the right order.
@@ -148,33 +127,31 @@ public class CustomContentProviderUtilsTest {
             }
             Assert.assertEquals(numPoints, locations.size());
         }
-        return locations;
     }
 
     private long initializeTrack(long id, int numPoints) {
         Track track = new Track();
         track.setId(id);
         track.setName("Test: " + id);
-        track.setNumberOfPoints(numPoints);
         contentProviderUtils.insertTrack(track);
         track = contentProviderUtils.getTrack(id);
         Assert.assertNotNull(track);
 
-        Location[] locations = new Location[numPoints];
+        TrackPoint[] trackPoints = new TrackPoint[numPoints];
         for (int i = 0; i < numPoints; ++i) {
             Location loc = new Location("test");
             loc.setLatitude(37.0 + (double) i / 10000.0);
             loc.setLongitude(57.0 - (double) i / 10000.0);
             loc.setAccuracy((float) i / 100.0f);
             loc.setAltitude(i * 2.5);
-            locations[i] = loc;
+            trackPoints[i] = new TrackPoint(loc);
         }
-        contentProviderUtils.bulkInsertTrackPoint(locations, numPoints, id);
+        contentProviderUtils.bulkInsertTrackPoint(trackPoints, id);
 
-        // Load all inserted locations.
+        // Load all inserted trackPoints.
         long lastPointId = -1;
         int counter = 0;
-        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(id, -1L, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY)) {
+        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(id, -1L, false)) {
             while (it.hasNext()) {
                 it.next();
                 lastPointId = it.getTrackPointId();
@@ -183,7 +160,6 @@ public class CustomContentProviderUtilsTest {
         }
 
         Assert.assertTrue(numPoints == 0 || lastPointId > 0);
-        Assert.assertEquals(numPoints, track.getNumberOfPoints());
         Assert.assertEquals(numPoints, counter);
 
         return lastPointId;
@@ -223,14 +199,15 @@ public class CustomContentProviderUtilsTest {
     public void testDeleteAllTracks() {
         // Insert track, points and waypoint at first.
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        insertTrackWithLocations(track);
-        Waypoint waypoint = new Waypoint();
+        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
+        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         contentProviderUtils.insertWaypoint(waypoint);
+
         ContentResolver contentResolver = context.getContentResolver();
         Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
         Assert.assertEquals(1, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
+        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
         Assert.assertEquals(10, tracksPointsCursor.getCount());
         Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
         Assert.assertEquals(1, waypointCursor.getCount());
@@ -239,33 +216,71 @@ public class CustomContentProviderUtilsTest {
         // Check whether all have been deleted.
         tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
         Assert.assertEquals(0, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
+        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
         Assert.assertEquals(0, tracksPointsCursor.getCount());
         waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
         Assert.assertEquals(0, waypointCursor.getCount());
     }
 
+    /**
+     * Tests the method {@link ContentProviderUtils#deleteAllTracks(Context)}
+     */
+    @Test
+    public void testDeleteAllTracks_withWaypointAndPhoto() throws IOException {
+        // Insert track, points and waypoint with photo at first.
+        long trackId = System.currentTimeMillis();
+        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
+        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
+        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        contentProviderUtils.insertWaypoint(waypoint);
+
+        ContentResolver contentResolver = context.getContentResolver();
+        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
+        Assert.assertEquals(1, tracksCursor.getCount());
+        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
+        Assert.assertEquals(10, tracksPointsCursor.getCount());
+        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
+        Assert.assertEquals(1, waypointCursor.getCount());
+        // Check waypoint has photo and it's in the external storage.
+        Assert.assertTrue(waypoint.hasPhoto());
+        File dir = FileUtils.getPhotoDir(context, trackId);
+        Assert.assertTrue(dir.isDirectory());
+        Assert.assertEquals(1, dir.list().length);
+        Assert.assertTrue(dir.exists());
+        // Delete all.
+        contentProviderUtils.deleteAllTracks(context);
+        // Check whether all have been deleted.
+        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
+        Assert.assertEquals(0, tracksCursor.getCount());
+        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
+        Assert.assertEquals(0, tracksPointsCursor.getCount());
+        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
+        Assert.assertEquals(0, waypointCursor.getCount());
+        Assert.assertFalse(dir.exists());
+    }
+
     /**
      * Tests the method {@link ContentProviderUtils#deleteTrack(Context, long)}.
      */
     @Test
     public void testDeleteTrack() {
         // Insert three tracks, points of two tracks and way point of one track.
+
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 0);
 
-        contentProviderUtils.insertTrack(track);
-        insertTrackWithLocations(TestDataUtil.getTrack(trackId + 1, 10));
-        insertTrackWithLocations(TestDataUtil.getTrack(trackId + 2, 10));
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId + 1, 10);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId + 2, 10);
 
-        Waypoint waypoint = new Waypoint();
+        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId + 1));
         waypoint.setTrackId(trackId);
         contentProviderUtils.insertWaypoint(waypoint);
 
         ContentResolver contentResolver = context.getContentResolver();
         Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
         Assert.assertEquals(3, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
+        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
         Assert.assertEquals(20, tracksPointsCursor.getCount());
         Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
         Assert.assertEquals(1, waypointCursor.getCount());
@@ -274,21 +289,76 @@ public class CustomContentProviderUtilsTest {
         // Check whether all data of a track has been deleted.
         tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
         Assert.assertEquals(2, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
+        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
         Assert.assertEquals(20, tracksPointsCursor.getCount());
         waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
         Assert.assertEquals(0, waypointCursor.getCount());
     }
 
+    /**
+     * Tests the method {@link ContentProviderUtils#deleteTrack(Context, long)}.
+     */
+    @Test
+    public void testDeleteTrack_withWaypointPhoto() throws IOException {
+        // Insert three tracks.
+        long trackId = System.currentTimeMillis();
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId + 1, 10);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId + 2, 10);
+
+        // Insert a waypoint in tracks trackId and trackId + 1.
+        TrackPoint trackPoint1 = contentProviderUtils.getLastValidTrackPoint(trackId);
+        Waypoint waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint1.getLocation());
+        contentProviderUtils.insertWaypoint(waypoint1);
+        File dir1 = FileUtils.getPhotoDir(context, trackId);
+
+        TrackPoint trackPoint2 = contentProviderUtils.getLastValidTrackPoint(trackId + 1);
+        Waypoint waypoint2 = TestDataUtil.createWaypointWithPhoto(context, trackId + 1, trackPoint2.getLocation());
+        contentProviderUtils.insertWaypoint(waypoint2);
+        File dir2 = FileUtils.getPhotoDir(context, trackId + 1);
+
+        // Check.
+        ContentResolver contentResolver = context.getContentResolver();
+        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
+        Assert.assertEquals(3, tracksCursor.getCount());
+        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
+        Assert.assertEquals(30, tracksPointsCursor.getCount());
+        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
+        Assert.assertEquals(2, waypointCursor.getCount());
+        Assert.assertTrue(waypoint1.hasPhoto());
+        Assert.assertTrue(dir1.isDirectory());
+        Assert.assertEquals(1, dir1.list().length);
+        Assert.assertTrue(dir1.exists());
+        Assert.assertTrue(dir2.isDirectory());
+        Assert.assertEquals(1, dir2.list().length);
+        Assert.assertTrue(dir2.exists());
+        // Delete one track.
+        contentProviderUtils.deleteTrack(context, trackId);
+        // Check whether all data of a track has been deleted.
+        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
+        Assert.assertEquals(2, tracksCursor.getCount());
+        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
+        Assert.assertEquals(20, tracksPointsCursor.getCount());
+        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
+        Assert.assertEquals(1, waypointCursor.getCount());
+        Assert.assertFalse(dir1.exists());
+        Assert.assertTrue(dir2.exists());
+    }
+
     /**
      * Tests the method {@link ContentProviderUtils#getAllTracks()}
      */
     @Test
     public void testGetAllTracks() {
+        // given
         int initialTrackNumber = contentProviderUtils.getAllTracks().size();
         long trackId = System.currentTimeMillis();
-        contentProviderUtils.insertTrack(TestDataUtil.getTrack(trackId, 0));
+        contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId));
+
+        // when
         List<Track> allTracks = contentProviderUtils.getAllTracks();
+
+        // then
         Assert.assertEquals(initialTrackNumber + 1, allTracks.size());
         Assert.assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
     }
@@ -299,7 +369,7 @@ public class CustomContentProviderUtilsTest {
     @Test
     public void testGetLastTrack() {
         long trackId = System.currentTimeMillis();
-        contentProviderUtils.insertTrack(TestDataUtil.getTrack(trackId, 0));
+        contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId));
         Assert.assertEquals(trackId, contentProviderUtils.getLastTrack().getId());
     }
 
@@ -309,7 +379,7 @@ public class CustomContentProviderUtilsTest {
     @Test
     public void testGetTrack() {
         long trackId = System.currentTimeMillis();
-        contentProviderUtils.insertTrack(TestDataUtil.getTrack(trackId, 0));
+        contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId));
         Assert.assertNotNull(contentProviderUtils.getTrack(trackId));
     }
 
@@ -318,11 +388,14 @@ public class CustomContentProviderUtilsTest {
      */
     @Test
     public void testUpdateTrack() {
+        // given
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 0);
+        Track track = TestDataUtil.createTrack(trackId);
         String nameOld = "name1";
         String nameNew = "name2";
         track.setName(nameOld);
+
+        // when / then
         contentProviderUtils.insertTrack(track);
         Assert.assertEquals(nameOld, contentProviderUtils.getTrack(trackId).getName());
         track.setName(nameNew);
@@ -336,14 +409,14 @@ public class CustomContentProviderUtilsTest {
     @Test
     public void testCreateContentValues_waypoint() {
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
+        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+
         // Bottom
         long startTime = 1000L;
         // AverageSpeed
-        double minGrade = -20.11;
-        TripStatistics statistics = new TripStatistics();
-        statistics.setStartTime(startTime);
-        statistics.setStopTime(2500L);
+        TrackStatistics statistics = new TrackStatistics();
+        statistics.setStartTime_ms(startTime);
+        statistics.setStopTime_ms(2500L);
         statistics.setTotalTime(1500L);
         statistics.setMovingTime(700L);
         statistics.setTotalDistance(750.0);
@@ -351,22 +424,12 @@ public class CustomContentProviderUtilsTest {
         statistics.setMaxSpeed(60.0);
         statistics.setMaxElevation(1250.0);
         statistics.setMinElevation(1200.0);
-        statistics.setMaxGrade(15.0);
-        statistics.setMinGrade(minGrade);
 
-        track.setTripStatistics(statistics);
-        contentProviderUtils.insertTrack(track);
+        track.first.setTrackStatistics(statistics);
+        contentProviderUtils.insertTrack(track.first);
 
-        // Insert at first.
-        Waypoint waypoint = new Waypoint();
+        Waypoint waypoint = new Waypoint(track.second[0]);
         waypoint.setDescription(TEST_DESC);
-
-        Location location = new Location("test");
-        location.setLatitude(22);
-        location.setLongitude(22);
-        location.setAccuracy((float) 1 / 100.0f);
-        location.setAltitude(2.5);
-        waypoint.setLocation(location);
         contentProviderUtils.insertWaypoint(waypoint);
 
         ContentProviderUtils contentProviderUtils = new ContentProviderUtils(contentResolverMock);
@@ -375,7 +438,7 @@ public class CustomContentProviderUtilsTest {
         waypoint.setId(waypointId);
         ContentValues contentValues = contentProviderUtils.createContentValues(waypoint);
         Assert.assertEquals(waypointId, contentValues.get(WaypointsColumns._ID));
-        Assert.assertEquals(22 * 1000000, contentValues.get(WaypointsColumns.LONGITUDE));
+        Assert.assertEquals((int) (TestDataUtil.INITIAL_LONGITUDE * 1000000), contentValues.get(WaypointsColumns.LONGITUDE));
         Assert.assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION));
     }
 
@@ -415,68 +478,106 @@ public class CustomContentProviderUtilsTest {
 
     /**
      * Tests the method
-     * {@link ContentProviderUtils#deleteWaypoint(long)}
+     * {@link ContentProviderUtils#deleteWaypoint(Context, long)}
      * when there is only one waypoint in the track.
      */
     @Test
     public void testDeleteWaypoint_onlyOneWayPoint() {
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
         // Insert at first.
-        Waypoint waypoint1 = new Waypoint();
+        Waypoint waypoint1 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint1.setDescription(TEST_DESC);
         waypoint1.setTrackId(trackId);
         contentProviderUtils.insertWaypoint(waypoint1);
 
-        // Delete
-        contentProviderUtils.deleteWaypoint(1);
+        // Check insert was done.
+        Assert.assertEquals(contentProviderUtils.getWaypointCount(trackId), 1);
 
-        Assert.assertNull(contentProviderUtils.getWaypoint(1));
+        // Get waypoint id that needs to delete.
+        long waypoint1Id = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1));
+
+        // Delete
+        contentProviderUtils.deleteWaypoint(context, waypoint1Id);
+
+        Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id));
     }
 
     /**
      * Tests the method
-     * {@link ContentProviderUtils#deleteWaypoint(long)}
-     * when there is more than one waypoint in the track.
+     * {@link ContentProviderUtils#deleteWaypoint(Context, long)}
+     * when there is only one waypoint in the track.
+     */
+    @Test
+    public void testDeleteWaypoint_onlyOneWayPointWithPhotoUrl() throws IOException {
+        long trackId = System.currentTimeMillis();
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
+        // Insert at first.
+        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
+        Waypoint waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        contentProviderUtils.insertWaypoint(waypoint1);
+
+        // Check insert was done.
+        Assert.assertEquals(contentProviderUtils.getWaypointCount(trackId), 1);
+
+        // Get waypoint id that needs to delete.
+        long waypoint1Id = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1));
+
+        // Check waypoint has photo and it's in the external storage.
+        Assert.assertTrue(waypoint1.hasPhoto());
+        File dir = FileUtils.getPhotoDir(context, trackId);
+        Assert.assertTrue(dir.isDirectory());
+        Assert.assertEquals(1, dir.list().length);
+        Assert.assertTrue(dir.exists());
+
+        // Delete
+        contentProviderUtils.deleteWaypoint(context, waypoint1Id);
+
+        // Check waypoint doesn't exists and photo folder was deleted.
+        Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id));
+        Assert.assertFalse(dir.exists());
+    }
+
+    /**
+     * Tests the method {@link ContentProviderUtils#deleteWaypoint(Context, long)} when there is more than one waypoint in the track.
      */
     @Test
     public void testDeleteWaypoint_hasNextWayPoint() {
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-
-        TripStatistics statistics = new TripStatistics();
-        statistics.setStartTime(1000L);
-        statistics.setStopTime(2500L);
-        statistics.setTotalTime(1500L);
-        statistics.setMovingTime(700L);
-        statistics.setTotalDistance(750.0);
-        statistics.setTotalElevationGain(50.0);
-        statistics.setMaxSpeed(60.0);
-        statistics.setMaxElevation(1250.0);
-        statistics.setMinElevation(1200.0);
-        statistics.setMaxGrade(15.0);
-        statistics.setMinGrade(-25.0);
-
-        track.setTripStatistics(statistics);
-        contentProviderUtils.insertTrack(track);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
+//        Track track = TestDataUtil.createTrackAndInsert(trackId, 10);
+//
+//        TrackStatistics statistics = new TrackStatistics();
+//        statistics.setStartTime_ms(1000L);
+//        statistics.setStopTime_ms(2500L);
+//        statistics.setTotalTime(1500L);
+//        statistics.setMovingTime(700L);
+//        statistics.setTotalDistance(750.0);
+//        statistics.setTotalElevationGain(50.0);
+//        statistics.setMaxSpeed(60.0);
+//        statistics.setMaxElevation(1250.0);
+//        statistics.setMinElevation(1200.0);
+//
+//        track.setTrackStatistics(statistics);
+//        TestDataUtil.insertTrackWithLocations(contentProviderUtils, track);
 
         // Insert at first.
-        Waypoint waypoint1 = new Waypoint();
+        Waypoint waypoint1 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint1.setDescription(MOCK_DESC);
         waypoint1.setTrackId(trackId);
         long waypoint1Id = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1));
 
-        Waypoint waypoint2 = new Waypoint();
+        Waypoint waypoint2 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint2.setDescription(MOCK_DESC);
         waypoint2.setTrackId(trackId);
         long waypoint2Id = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint2));
 
         // Delete
         Assert.assertNotNull(contentProviderUtils.getWaypoint(waypoint1Id));
-        contentProviderUtils.deleteWaypoint(waypoint1Id);
+        contentProviderUtils.deleteWaypoint(context, waypoint1Id);
         Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id));
 
         Assert.assertEquals(MOCK_DESC, contentProviderUtils.getWaypoint(waypoint2Id).getDescription());
@@ -488,16 +589,15 @@ public class CustomContentProviderUtilsTest {
     @Test
     public void testGetNextWaypointNumber() {
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
-        Waypoint waypoint1 = new Waypoint();
+        Waypoint waypoint1 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint1.setTrackId(trackId);
-        Waypoint waypoint2 = new Waypoint();
+        Waypoint waypoint2 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint2.setTrackId(trackId);
-        Waypoint waypoint3 = new Waypoint();
+        Waypoint waypoint3 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint3.setTrackId(trackId);
-        Waypoint waypoint4 = new Waypoint();
+        Waypoint waypoint4 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint4.setTrackId(trackId);
         contentProviderUtils.insertWaypoint(waypoint1);
         contentProviderUtils.insertWaypoint(waypoint2);
@@ -514,10 +614,9 @@ public class CustomContentProviderUtilsTest {
     @Test
     public void testInsertAndGetWaypoint() {
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
-        Waypoint waypoint = new Waypoint();
+        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint.setDescription(TEST_DESC);
         waypoint.setTrackId(trackId);
         long waypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint));
@@ -531,10 +630,10 @@ public class CustomContentProviderUtilsTest {
     @Test
     public void testUpdateWaypoint() {
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
         // Insert at first.
-        Waypoint waypoint = new Waypoint();
+        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint.setDescription(TEST_DESC);
         waypoint.setTrackId(trackId);
         long waypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint));
@@ -548,93 +647,99 @@ public class CustomContentProviderUtilsTest {
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(Location[], int, long)}.
+     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(TrackPoint[], long)}.
      */
     @Test
     public void testBulkInsertTrackPoint() {
-        // Insert track, point at first.
+        // given
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        insertTrackWithLocations(track);
+        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        TestDataUtil.insertTrackWithLocations(contentProviderUtils, track.first, track.second);
 
-        contentProviderUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), -1, trackId);
+        // when / then
+        contentProviderUtils.bulkInsertTrackPoint(track.second, trackId);
         Assert.assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
-        contentProviderUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), 8, trackId);
+        contentProviderUtils.bulkInsertTrackPoint(Arrays.copyOfRange(track.second, 0, 8), trackId);
         Assert.assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
     }
 
     /**
      * Tests the method {@link ContentProviderUtils#createTrackPoint(Cursor)}.
      */
+    //TODO incomplete
     @Test
     public void testCreateTrackPoint() {
-        // Set index.
-        int index = 1;
-        // Id
-        when(cursorMock.getColumnIndex(TrackPointsColumns._ID)).thenReturn(index++);
-        // Longitude
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LONGITUDE)).thenReturn(index++);
-        // Latitude
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LATITUDE)).thenReturn(index++);
-        // Time
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.TIME))
-                .thenReturn(index++);
-        // Speed
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SPEED)).thenReturn(index++);
-        // Sensor
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_HEARTRATE)).thenReturn(index++);
+        // given
+        when(cursorMock.getColumnIndex(TrackPointsColumns._ID)).thenReturn(1);
 
-        // Set return value of isNull().
-        index = 2;
-        // Longitude
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Latitude
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Time
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Speed
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Sensor
-        when(cursorMock.isNull(index++)).thenReturn(false);
-
-        // Set return value of isNull().
-        index = 2;
-        // Longitude
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LONGITUDE)).thenReturn(2);
+        when(cursorMock.isNull(2)).thenReturn(false);
         int longitude = 11;
-        when(cursorMock.getInt(index++)).thenReturn(longitude * 1000000);
-        // Latitude.
-        int latitude = 22;
-        when(cursorMock.getInt(index++)).thenReturn(latitude * 1000000);
-        // Time
-        long time = System.currentTimeMillis();
-        when(cursorMock.getLong(index++)).thenReturn(time);
-        // Speed
-        float speed = 2.2f;
-        when(cursorMock.getFloat(index++)).thenReturn(speed);
-        // Sensor
-        byte[] sensor = "Sensor state".getBytes();
-        when(cursorMock.getBlob(index++)).thenReturn(sensor);
+        when(cursorMock.getInt(2)).thenReturn(longitude * 1000000);
 
-        Location location = contentProviderUtils.createTrackPoint(cursorMock);
-        Assert.assertEquals((double) longitude, location.getLongitude(), 0.01);
-        Assert.assertEquals((double) latitude, location.getLatitude(), 0.01);
-        Assert.assertEquals(time, location.getTime(), 0.01);
-        Assert.assertEquals(speed, location.getSpeed(), 0.01);
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LATITUDE)).thenReturn(3);
+        when(cursorMock.isNull(3)).thenReturn(false);
+        int latitude = 22;
+        when(cursorMock.getInt(3)).thenReturn(latitude * 1000000);
+
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.TIME)).thenReturn(4);
+        when(cursorMock.isNull(4)).thenReturn(false);
+        long time = System.currentTimeMillis();
+        when(cursorMock.getLong(4)).thenReturn(time);
+
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SPEED)).thenReturn(5);
+        when(cursorMock.isNull(5)).thenReturn(false);
+        float speed = 2.2f;
+        when(cursorMock.getFloat(5)).thenReturn(speed);
+
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_HEARTRATE)).thenReturn(6);
+        when(cursorMock.isNull(6)).thenReturn(false);
+
+        // when
+        TrackPoint trackPoint = contentProviderUtils.createTrackPoint(cursorMock);
+
+        // then
+        Assert.assertEquals(longitude, trackPoint.getLongitude(), 0.01);
+        Assert.assertEquals(latitude, trackPoint.getLatitude(), 0.01);
+        Assert.assertEquals(time, trackPoint.getTime(), 0.01);
+        Assert.assertEquals(speed, trackPoint.getSpeed(), 0.01);
+        Assert.assertFalse(trackPoint.hasHeartRate());
     }
 
     /**
      * Tests the method
-     * {@link ContentProviderUtils#insertTrackPoint(Location, long)}.
+     * {@link ContentProviderUtils#insertTrackPoint(TrackPoint, long)}.
      */
     @Test
     public void testInsertTrackPoint() {
         // Insert track, point at first.
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        insertTrackWithLocations(track);
+        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
-        contentProviderUtils.insertTrackPoint(TestDataUtil.createLocation(22), trackId);
-        Assert.assertEquals(11, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
+        contentProviderUtils.insertTrackPoint(TestDataUtil.createTrackPoint(22), trackId);
+        Assert.assertEquals(11, contentProviderUtils.getTrackPoints(trackId).size());
+    }
+
+    @Test
+    public void testInsertAndLoadTrackPoint() {
+        // given
+        long trackId = System.currentTimeMillis();
+        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
+        TrackPoint trackPoint = TestDataUtil.createTrackPoint(5);
+        trackPoint.setHeartRate_bpm(1F);
+        trackPoint.setCyclingCadence_rpm(2F);
+        trackPoint.setPower(3F);
+
+        // when
+        contentProviderUtils.insertTrackPoint(trackPoint, trackId);
+
+        // then
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertTrue(trackPoints.get(10).hasHeartRate());
+        Assert.assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01);
+        Assert.assertEquals(trackPoint.getCyclingCadence_rpm(), trackPoints.get(10).getCyclingCadence_rpm(), 0.01);
+        Assert.assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01);
     }
 
     /**
@@ -644,11 +749,10 @@ public class CustomContentProviderUtilsTest {
     public void testGetLastValidTrackPoint() {
         // Insert track, points at first.
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        insertTrackWithLocations(track);
+        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
-        Location lastLocation = contentProviderUtils.getLastValidTrackPoint(trackId);
-        checkLocation(9, lastLocation);
+        TrackPoint lastTrackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
+        checkLocation(9, lastTrackPoint.getLocation());
     }
 
     /**
@@ -656,17 +760,20 @@ public class CustomContentProviderUtilsTest {
      */
     @Test
     public void testGetTrackPointCursor_desc() {
-        // Insert track, points at first.
+        // given
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track.first);
 
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
+        long[] trackpointIds = new long[track.second.length];
         for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
         }
 
+        // when
         Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[1], 5, true);
+
+        // then
         Assert.assertEquals(2, cursor.getCount());
     }
 
@@ -675,79 +782,87 @@ public class CustomContentProviderUtilsTest {
      */
     @Test
     public void testGetTrackPointCursor_asc() {
-        // Insert track, points at first.
+        // given
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track.first);
 
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
+        long[] trackpointIds = new long[track.second.length];
         for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
         }
 
+        // when
         Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[8], 5, false);
+
+        // then
         Assert.assertEquals(2, cursor.getCount());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, TrackPointFactory)} in descending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean)} in descending.
      */
     @Test
     public void testGetTrackPointLocationIterator_desc() {
-        // Insert track, points at first.
+        // given
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track.first);
 
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
+        long[] trackpointIds = new long[track.second.length];
         for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
         }
 
         long startTrackPointId = trackpointIds[9];
+        // when
+        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true);
 
-        TrackPointIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
+        // then
         for (int i = 0; i < trackpointIds.length; i++) {
-            Assert.assertTrue(locationIterator.hasNext());
-            Location location = locationIterator.next();
-            Assert.assertEquals(startTrackPointId - i, locationIterator.getTrackPointId());
-            checkLocation((trackpointIds.length - 1) - i, location);
+            Assert.assertTrue(trackPointIterator.hasNext());
+            TrackPoint trackPoint = trackPointIterator.next();
+            Assert.assertEquals(startTrackPointId - i, trackPointIterator.getTrackPointId());
+            checkLocation((trackpointIds.length - 1) - i, trackPoint.getLocation());
         }
-        Assert.assertFalse(locationIterator.hasNext());
+        Assert.assertFalse(trackPointIterator.hasNext());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, TrackPointFactory)} in ascending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean)} in ascending.
      */
     @Test
     public void testGetTrackPointLocationIterator_asc() {
-        // Insert track, point at first.
+        // given
         long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track);
+        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track.first);
 
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
+        long[] trackpointIds = new long[track.second.length];
         for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
         }
 
         long startTrackPointId = trackpointIds[0];
 
-        TrackPointIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY);
-        for (int i = 0; i < trackpointIds.length; i++) {
-            Assert.assertTrue(locationIterator.hasNext());
-            Location location = locationIterator.next();
-            Assert.assertEquals(startTrackPointId + i, locationIterator.getTrackPointId());
+        // when
+        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false);
 
-            checkLocation(i, location);
+        // then
+        for (int i = 0; i < trackpointIds.length; i++) {
+            Assert.assertTrue(trackPointIterator.hasNext());
+            TrackPoint trackPoint = trackPointIterator.next();
+            Assert.assertEquals(startTrackPointId + i, trackPointIterator.getTrackPointId());
+
+            checkLocation(i, trackPoint.getLocation());
         }
-        Assert.assertFalse(locationIterator.hasNext());
+        Assert.assertFalse(trackPointIterator.hasNext());
     }
 
     /**
      * Checks the value of a location.
      *
-     * @param i        the index of this location which created in the method {@link TestDataUtil#getTrack(long, int)}
+     * @param i        the index of this location which created in the method {@link TestDataUtil#createTrack(long, int)}
      * @param location the location to be checked
      */
     private void checkLocation(int i, Location location) {
@@ -757,13 +872,12 @@ public class CustomContentProviderUtilsTest {
         Assert.assertEquals(i * TestDataUtil.ALTITUDE_INTERVAL, location.getAltitude(), 0.01);
     }
 
-    /**
-     * Inserts a track with locations into the database.
-     *
-     * @param track track to be inserted
-     */
-    private void insertTrackWithLocations(Track track) {
-        contentProviderUtils.insertTrack(track);
-        contentProviderUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track.getLocations().size(), track.getId());
+
+    @Test
+    public void testFormatIdListForUri() {
+        Assert.assertEquals("", ContentProviderUtils.formatIdListForUri(new long[]{}));
+        Assert.assertEquals("12", ContentProviderUtils.formatIdListForUri(new long[]{12}));
+        Assert.assertEquals("42,43,44", ContentProviderUtils.formatIdListForUri(new long[]{42, 43, 44}));
     }
+
 }

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java

@@ -0,0 +1,179 @@
+package de.dennisguse.opentracks.content.provider;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
+
+@RunWith(AndroidJUnit4.class)
+public class CustomSQLiteOpenHelperTest {
+
+    private static final String TRACKS_CREATE_TABLE_V23 = "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, mingrade FLOAT, maxgrade FLOAT, icon TEXT)";
+    private static final String TRACKPOINTS_CREATE_TABLE_V23 = "CREATE TABLE trackpoints (_id INTEGER PRIMARY KEY AUTOINCREMENT, trackid INTEGER, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, speed FLOAT, bearing FLOAT, sensor_heartrate FLOAT, sensor_cadence FLOAT, sensor_power FLOAT)";
+    private static final String WAYPOINTS_CREATE_TABLE_V23 = "CREATE TABLE waypoints (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, icon TEXT, trackid INTEGER, type INTEGER, length FLOAT, duration INTEGER, starttime INTEGER, startid INTEGER, stopid INTEGER, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, speed FLOAT, bearing FLOAT, totaldistance FLOAT, totaltime INTEGER, movingtime INTEGER, avgspeed FLOAT, avgmovingspeed FLOAT, maxspeed FLOAT, minelevation FLOAT, maxelevation FLOAT, elevationgain FLOAT, mingrade FLOAT, maxgrade FLOAT, photoUrl TEXT)";
+
+    private static final String DATABASE_NAME = "test.db";
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    /**
+     * Get the SQL create statements for all tables (ordered by name).
+     *
+     * @return Map(TableName, SQL)
+     */
+    private static Map<String, String> getTableSQL(SQLiteDatabase db) {
+        HashMap<String, String> tableSQL = new HashMap<>();
+        try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "name IN ('" + TracksColumns.TABLE_NAME + "', '" + TrackPointsColumns.TABLE_NAME + "', '" + WaypointsColumns.TABLE_NAME + "')", null, null, null, "name")) {
+            if (cursor != null) {
+                while (cursor.moveToNext()) {
+                    tableSQL.put(cursor.getString(0), cursor.getString(1));
+                }
+            }
+        }
+        return tableSQL;
+    }
+
+    /**
+     * Get the SQL create statements for all indices (ordered by name).
+     *
+     * @return Map(tableName, SQL)
+     */
+    public static Map<String, String> getIndexSQL(SQLiteDatabase db) {
+        HashMap<String, String> indexSQL = new HashMap<>();
+        try (Cursor cursor = db.rawQuery("SELECT tbl_name, SQL FROM sqlite_master WHERE type = 'index'", null)) {
+            if (cursor != null) {
+                while (cursor.moveToNext()) {
+                    indexSQL.put(cursor.getString(0), cursor.getString(1));
+                }
+            }
+        }
+        return indexSQL;
+    }
+
+    /**
+     * Returns true if a SQL create statement is in the schema.
+     *
+     * @param sqlCreate the table name
+     */
+    private static boolean hasSqlCreate(SQLiteDatabase db, String sqlCreate) {
+        try (Cursor cursor = db.rawQuery("SELECT SQL FROM sqlite_master", null)) {
+            if (cursor != null) {
+                while (cursor.moveToNext()) {
+                    String sql = cursor.getString(0);
+                    if (sqlCreate.equals(sql)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    @Before
+    public void setUp() {
+        context.deleteDatabase(DATABASE_NAME);
+    }
+
+    @Test
+    public void onCreate() {
+        try (SQLiteDatabase db = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getWritableDatabase()) {
+            Assert.assertTrue(hasSqlCreate(db, TracksColumns.CREATE_TABLE));
+
+            Assert.assertTrue(hasSqlCreate(db, TrackPointsColumns.CREATE_TABLE));
+            Assert.assertTrue(hasSqlCreate(db, TrackPointsColumns.CREATE_TABLE_INDEX));
+
+            Assert.assertTrue(hasSqlCreate(db, WaypointsColumns.CREATE_TABLE));
+            Assert.assertTrue(hasSqlCreate(db, WaypointsColumns.CREATE_TABLE_INDEX));
+        }
+    }
+
+    @Test
+    public void onUpgrade_FromVersion23() {
+        // Manually create database schema with version 23 (base version)
+        {
+            SQLiteDatabase dbBase = new SQLiteOpenHelper(context, DATABASE_NAME, null, 23) {
+                @Override
+                public void onCreate(SQLiteDatabase db) {
+                }
+
+                @Override
+                public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+                }
+            }.getWritableDatabase();
+
+            dbBase.execSQL(TRACKS_CREATE_TABLE_V23);
+            dbBase.execSQL(TRACKPOINTS_CREATE_TABLE_V23);
+            dbBase.execSQL(WAYPOINTS_CREATE_TABLE_V23);
+
+            dbBase.close();
+        }
+
+        // Open database with SQL upgrade
+        Map<String, String> tableByUpgrade;
+        Map<String, String> indicesByUpgrade;
+        try (SQLiteDatabase dbUpgraded = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
+            tableByUpgrade = getTableSQL(dbUpgraded);
+            indicesByUpgrade = getIndexSQL(dbUpgraded);
+        }
+
+        // Open database via
+        context.deleteDatabase(DATABASE_NAME);
+
+        Map<String, String> tablesByCreate;
+        Map<String, String> indicesByCreate;
+        try (SQLiteDatabase dbCreated = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
+            tablesByCreate = getTableSQL(dbCreated);
+            indicesByCreate = getIndexSQL(dbCreated);
+        }
+
+        // then - verify table structure
+        Assert.assertEquals(3, tableByUpgrade.size());
+        Assert.assertEquals(tableByUpgrade.size(), tablesByCreate.size());
+
+        Assert.assertEquals(tablesByCreate.get(TracksColumns.TABLE_NAME), tableByUpgrade.get(TracksColumns.TABLE_NAME));
+        Assert.assertEquals(tablesByCreate.get(TrackPointsColumns.TABLE_NAME), tableByUpgrade.get(TrackPointsColumns.TABLE_NAME));
+        Assert.assertEquals(tablesByCreate.get(WaypointsColumns.TABLE_NAME), tableByUpgrade.get(WaypointsColumns.TABLE_NAME));
+
+        // then - verify custom indices
+        Assert.assertEquals(2, indicesByCreate.size());
+        Assert.assertEquals(indicesByUpgrade.get(TrackPointsColumns.TABLE_NAME), indicesByCreate.get(TrackPointsColumns.TABLE_NAME));
+        Assert.assertEquals(indicesByUpgrade.get(WaypointsColumns.TABLE_NAME), indicesByCreate.get(WaypointsColumns.TABLE_NAME));
+    }
+
+    @Test
+    public void onDowngrade_ToVersion23() {
+        // Create most recent database schema
+        new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase().close();
+
+        // Downgrade schema to version 23 (base version)
+        Map<String, String> tablesByDowngrade;
+        Map<String, String> indicesByDowngrade;
+        try (SQLiteDatabase db = new CustomSQLiteOpenHelper(context, DATABASE_NAME, 23).getReadableDatabase()) {
+            tablesByDowngrade = getTableSQL(db);
+            indicesByDowngrade = getIndexSQL(db);
+        }
+
+        // then - verify table structure
+        Assert.assertEquals(TRACKS_CREATE_TABLE_V23, tablesByDowngrade.get("tracks"));
+        Assert.assertEquals(TRACKPOINTS_CREATE_TABLE_V23, tablesByDowngrade.get("trackpoints"));
+        Assert.assertEquals(WAYPOINTS_CREATE_TABLE_V23, tablesByDowngrade.get("waypoints"));
+
+        // then - verify custom indices
+        Assert.assertEquals(0, indicesByDowngrade.size());
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java

@@ -0,0 +1,28 @@
+package de.dennisguse.opentracks.content.provider;
+
+import android.net.Uri;
+import android.util.Pair;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+
+public class ShareContentProviderTest {
+
+    @Test
+    public void testCreateandParseURI() {
+        long[] trackIds = {1, 3, 5};
+        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "TrackName", TrackFileFormat.KML_ONLY_TRACK);
+
+        Assert.assertArrayEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first));
+    }
+
+    @Test
+    public void testCreateURIescapeFilename() {
+        long[] trackIds = {1};
+        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "../../&1=1", TrackFileFormat.KML_ONLY_TRACK);
+
+        Assert.assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/kml_only_track/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first);
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java

@@ -0,0 +1,92 @@
+package de.dennisguse.opentracks.content.sensor;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import de.dennisguse.opentracks.util.UintUtils;
+
+@RunWith(AndroidJUnit4.class)
+public class SensorDataCyclingTest {
+
+    @Test
+    public void compute_cadence() {
+        // given
+        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 1, 1024); // 1s
+        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 2, 2048); // 2s
+
+        // when
+        current.compute(previous);
+
+        // then
+        Assert.assertEquals(60, current.getCadence_rpm(), 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);
+
+        // when
+        current.compute(previous);
+
+        // then
+        Assert.assertEquals(0, current.getCadence_rpm(), 0.01);
+    }
+
+
+    @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);
+
+        // when
+        current.compute(previous);
+
+        // then
+        Assert.assertFalse(current.hasCadence_rpm());
+    }
+
+    @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);
+
+        // when
+        current.compute(previous);
+
+        // then
+        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
+    }
+
+    @Test
+    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);
+
+        // when
+        current.compute(previous);
+
+        // then
+        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
+    }
+
+    @Test
+    public void compute_speed_rollOverCount() {
+        // given
+        SensorDataCycling.Speed previous = new SensorDataCycling.Speed("sensorAddress", "sensorName", UintUtils.UINT16_MAX - 1, 1024);
+        SensorDataCycling.Speed current = new SensorDataCycling.Speed("sensorAddress", "sensorName", 0, 2048);
+
+        // when
+        current.compute(previous, 2000);
+
+        // then
+        Assert.assertEquals(2, current.getSpeed_mps(), 0.01);
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java

@@ -30,9 +30,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.TrackStubUtils;
+import de.dennisguse.opentracks.chart.ChartPoint;
 import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
@@ -61,290 +61,260 @@ public class ChartFragmentTest {
     @Before
     public void setUp() {
         boolean chartByDistance = false;
-        chartFragment = new ChartFragment(chartByDistance) {
-        };
+        chartFragment = (ChartFragment) ChartFragment.newInstance(chartByDistance);
         chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext(), chartByDistance));
-        chartFragment.setTripStatisticsUpdater(TrackStubUtils.INITIAL_TIME);
+        chartFragment.setTrackStatisticsUpdater(TrackStubUtils.INITIAL_TIME);
     }
 
     /**
-     * Tests the logic to get the incorrect values of sensor in {@link ChartFragment#fillDataPoint(Location, double[])}.
+     * Tests the logic to get the incorrect values of sensor in {@link ChartFragment#createPendingPoint(TrackPoint)}.
      */
     @Test
-    public void testFillDataPoint_sensorIncorrect() {
-        TrackPoint sensorDataSetLocation = TrackStubUtils.createSensorDataSetLocation();
+    public void testCreatePendingPoint_sensorIncorrect() {
+        // given
+        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
 
-        // No input.
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation);
-        Assert.assertEquals(Float.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01);
-        Assert.assertEquals(Float.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01);
-        Assert.assertEquals(Float.NaN, point[ChartView.POWER_SERIES + 1], 0.01);
+        // when
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint);
 
-        // Input incorrect state.
-        // Creates SensorData.
-        SensorDataSet sensorDataSet = new SensorDataSet(SensorDataSet.DATA_UNAVAILABLE, SensorDataSet.DATA_UNAVAILABLE);
-        sensorDataSetLocation.setSensorDataSet(sensorDataSet);
-        // Test.
-        point = fillDataPointTestHelper(sensorDataSetLocation);
-        Assert.assertEquals(Float.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01);
-        Assert.assertEquals(Float.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01);
-        Assert.assertEquals(Float.NaN, point[ChartView.POWER_SERIES + 1], 0.01);
+        // then
+        Assert.assertEquals(Float.NaN, point.getHeartRate(), 0.01);
+        Assert.assertEquals(Float.NaN, point.getCadence(), 0.01);
+        Assert.assertEquals(Float.NaN, point.getPower(), 0.01);
     }
 
     /**
-     * Tests the logic to get the correct values of sensor in {@link ChartFragment#fillDataPoint(Location, double[])}.
+     * Tests the logic to get the correct values of sensor in {@link ChartFragment#createPendingPoint(TrackPoint)}.
      */
     @Test
-    public void testFillDataPoint_sensorCorrect() {
-        TrackPoint sensorDataSetLocation = TrackStubUtils.createSensorDataSetLocation();
-        // No input.
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation);
-        Assert.assertEquals(Float.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01);
-        Assert.assertEquals(Float.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01);
-        Assert.assertEquals(Float.NaN, point[ChartView.POWER_SERIES + 1], 0.01);
+    public void testCreatePendingPoint_sensorCorrect() {
+        // given
+        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint.setHeartRate_bpm(100f);
+        trackPoint.setCyclingCadence_rpm(101f);
+        trackPoint.setPower(102f);
 
-        // Creates SensorData.
-        SensorDataSet sensorDataSet = new SensorDataSet(100, 101, 102);
+        // when
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint);
 
-        // Creates SensorDataSet.
-        sensorDataSetLocation.setSensorDataSet(sensorDataSet);
-        // Test.
-        point = fillDataPointTestHelper(sensorDataSetLocation);
-        Assert.assertEquals(100.0, point[ChartView.HEART_RATE_SERIES + 1], 0.01);
-        Assert.assertEquals(101.0, point[ChartView.CADENCE_SERIES + 1], 0.01);
-        Assert.assertEquals(102.0, point[ChartView.POWER_SERIES + 1], 0.01);
+        // then
+        Assert.assertEquals(100.0, point.getHeartRate(), 0.01);
+        Assert.assertEquals(101.0, point.getCadence(), 0.01);
+        Assert.assertEquals(102.0, point.getPower(), 0.01);
     }
 
     /**
-     * Tests the logic to get the value of metric Distance in {@link ChartFragment#fillDataPoint(Location, double[])}.
+     * Tests the logic to get the value of metric Distance in {@link ChartFragment#createPendingPoint(TrackPoint)}.
      */
     @Test
-    public void testFillDataPoint_distanceMetric() {
-        // By distance.
+    public void testCreatePendingPoint_distanceMetric() {
         chartFragment.setChartByDistance(true);
         // Resets last location and writes first location.
-        TrackPoint sensorDataSetLocation1 = TrackStubUtils.createSensorDataSetLocation();
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation1);
-        Assert.assertEquals(0.0, point[0], 0.01);
+        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
 
         // The second is a same location, just different time.
-        TrackPoint sensorDataSetLocation2 = TrackStubUtils.createSensorDataSetLocation();
-        point = fillDataPointTestHelper(sensorDataSetLocation2);
-        Assert.assertEquals(0.0, point[0], 0.01);
+        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
+        point = chartFragment.createPendingPoint(trackPoint2);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
 
         // The third location is a new location, and use metric.
-        TrackPoint sensorDataSetLocation3 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation3.setLatitude(23);
-        point = fillDataPointTestHelper(sensorDataSetLocation3);
+        TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint3.setLatitude(23);
+        point = chartFragment.createPendingPoint(trackPoint3);
 
         // Computes the distance between Latitude 22 and 23.
         float[] results = new float[4];
-        Location.distanceBetween(sensorDataSetLocation2.getLatitude(), sensorDataSetLocation2.getLongitude(),
-                sensorDataSetLocation3.getLatitude(), sensorDataSetLocation3.getLongitude(), results);
+        Location.distanceBetween(trackPoint2.getLatitude(), trackPoint2.getLongitude(),
+                trackPoint3.getLatitude(), trackPoint3.getLongitude(), results);
         double distance1 = results[0] * UnitConversions.M_TO_KM;
-        Assert.assertEquals(distance1, point[0], 0.01);
+        Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01);
 
         // The fourth location is a new location, and use metric.
-        TrackPoint sensorDataSetLocation4 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation4.setLatitude(24);
-        point = fillDataPointTestHelper(sensorDataSetLocation4);
+        TrackPoint trackPoint4 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint4.setLatitude(24);
+        point = chartFragment.createPendingPoint(trackPoint4);
 
         // Computes the distance between Latitude 23 and 24.
-        Location.distanceBetween(sensorDataSetLocation3.getLatitude(), sensorDataSetLocation3.getLongitude(),
-                sensorDataSetLocation4.getLatitude(), sensorDataSetLocation4.getLongitude(), results);
+        Location.distanceBetween(trackPoint3.getLatitude(), trackPoint3.getLongitude(),
+                trackPoint4.getLatitude(), trackPoint4.getLongitude(), results);
         double distance2 = results[0] * UnitConversions.M_TO_KM;
-        Assert.assertEquals((distance1 + distance2), point[0], 0.01);
+        Assert.assertEquals((distance1 + distance2), point.getTimeOrDistance(), 0.01);
     }
 
     /**
-     * Tests the logic to get the value of imperial Distance in {@link ChartFragment#fillDataPoint(Location, double[])}.
+     * Tests the logic to get the value of imperial Distance in {@link ChartFragment#createPendingPoint(TrackPoint)}.
      */
     @Test
-    public void testFillDataPoint_distanceImperial() {
+    public void testCreatePendingPoint_distanceImperial() {
         // By distance.
         chartFragment.setChartByDistance(true);
         // Setups to use imperial.
         chartFragment.setMetricUnits(false);
 
         // The first is a same location, just different time.
-        TrackPoint sensorDataSetLocation1 = TrackStubUtils.createSensorDataSetLocation();
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation1);
-        Assert.assertEquals(0.0, point[0], 0.01);
+        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
 
         // The second location is a new location, and use imperial.
-        TrackPoint sensorDataSetLocation2 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation2.setLatitude(23);
-        point = fillDataPointTestHelper(sensorDataSetLocation2);
+        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint2.setLatitude(23);
+        point = chartFragment.createPendingPoint(trackPoint2);
 
         /*
          * Computes the distance between Latitude 22 and 23.
          * And for we set using * imperial, the distance should be multiplied by UnitConversions.KM_TO_MI.
          */
         float[] results = new float[4];
-        Location.distanceBetween(sensorDataSetLocation1.getLatitude(), sensorDataSetLocation1.getLongitude(), sensorDataSetLocation2.getLatitude(), sensorDataSetLocation2.getLongitude(), results);
+        Location.distanceBetween(trackPoint1.getLatitude(), trackPoint1.getLongitude(), trackPoint2.getLatitude(), trackPoint2.getLongitude(), results);
         double distance1 = results[0] * UnitConversions.M_TO_KM * UnitConversions.KM_TO_MI;
-        Assert.assertEquals(distance1, point[0], 0.01);
+        Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01);
 
         // The third location is a new location, and use imperial.
-        TrackPoint sensorDataSetLocation3 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation3.setLatitude(24);
-        point = fillDataPointTestHelper(sensorDataSetLocation3);
+        TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint3.setLatitude(24);
+        point = chartFragment.createPendingPoint(trackPoint3);
 
         /*
          * Computes the distance between Latitude 23 and 24.
          * And for we set using * imperial, the distance should be multiplied by UnitConversions.KM_TO_MI.
          */
-        Location.distanceBetween(sensorDataSetLocation2.getLatitude(), sensorDataSetLocation2.getLongitude(), sensorDataSetLocation3.getLatitude(), sensorDataSetLocation3.getLongitude(), results);
+        Location.distanceBetween(trackPoint2.getLatitude(), trackPoint2.getLongitude(), trackPoint3.getLatitude(), trackPoint3.getLongitude(), results);
         double distance2 = results[0] * UnitConversions.M_TO_KM * UnitConversions.KM_TO_MI;
-        Assert.assertEquals(distance1 + distance2, point[0], 0.01);
+        Assert.assertEquals(distance1 + distance2, point.getTimeOrDistance(), 0.01);
     }
 
     /**
-     * Tests the logic to get the values of time in {@link ChartFragment#fillDataPoint(Location, double[])}.
+     * Tests the logic to get the values of time in {@link ChartFragment#createPendingPoint(TrackPoint)}.
      */
     @Test
-    public void testFillDataPoint_time() {
-        // By time
+    public void testCreatePendingPoint_time() {
         chartFragment.setChartByDistance(false);
-        TrackPoint sensorDataSetLocation1 = TrackStubUtils.createSensorDataSetLocation();
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation1);
-        Assert.assertEquals(0.0, point[0], 0.01);
+        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
         long timeSpan = 222;
-        TrackPoint sensorDataSetLocation2 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation2.setTime(sensorDataSetLocation1.getTime() + timeSpan);
-        point = fillDataPointTestHelper(sensorDataSetLocation2);
-        Assert.assertEquals((double) timeSpan, point[0], 0.01);
+        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint2.setTime(trackPoint1.getTime() + timeSpan);
+        point = chartFragment.createPendingPoint(trackPoint2);
+        Assert.assertEquals((double) timeSpan, point.getTimeOrDistance(), 0.01);
     }
 
     /**
-     * Tests the logic to get the value of elevation in {@link ChartFragment#fillDataPoint(Location, double[])} by one and two points.
+     * Tests the logic to get the value of elevation in {@link ChartFragment#createPendingPoint(TrackPoint)} by one and two points.
      */
     @Test
-    public void testFillDataPoint_elevation() {
-        TrackPoint sensorDataSetLocation1 = TrackStubUtils.createSensorDataSetLocation();
+    public void testCreatePendingPoint_elevation() {
+        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
 
         /*
          * At first, clear old points of elevation, so give true to the second parameter.
          * Then only one value INITIAL_ALTITUDE in buffer.
          */
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation1);
-        Assert.assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point[ChartView.ELEVATION_SERIES + 1], 0.01);
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+        Assert.assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point.getElevation(), 0.01);
 
         /*
          * Send another value to buffer, now there are two values, INITIAL_ALTITUDE and INITIAL_ALTITUDE * 2.
          */
-        TrackPoint sensorDataSetLocation2 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation2.setAltitude(TrackStubUtils.INITIAL_ALTITUDE * 2);
-        point = fillDataPointTestHelper(sensorDataSetLocation2);
-        Assert.assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0,
-                point[ChartView.ELEVATION_SERIES + 1], 0.01);
+        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint2.setAltitude(TrackStubUtils.INITIAL_ALTITUDE * 2);
+        point = chartFragment.createPendingPoint(trackPoint2);
+        Assert.assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0, point.getElevation(), 0.01);
     }
 
     /**
-     * Tests the logic to get the value of speed in {@link ChartFragment#fillDataPoint(Location, double[])}.
+     * Tests the logic to get the value of speed in {@link ChartFragment#createPendingPoint(TrackPoint)}.
      * In this test, firstly remove all points in memory, and then fill in two points one by one.
      * The speed values of these points are 129, 130.
      */
     @Test
-    public void testFillDataPoint_speed() {
+    public void testCreatePendingPoint_speed() {
         /*
          * At first, clear old points of speed, so give true to the second parameter.
          * It will not be filled in to the speed buffer.
          */
-        TrackPoint sensorDataSetLocation1 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation1.setSpeed(128.5f);
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation1);
-        Assert.assertEquals(0.0, point[ChartView.SPEED_SERIES + 1], 0.01);
+        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint1.setSpeed(128.5f);
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+        Assert.assertEquals(0.0, point.getSpeed(), 0.01);
 
         /*
          * Tests the logic when both metricUnits and reportSpeed are true.
          * This location will be filled into speed buffer.
          */
-        TrackPoint sensorDataSetLocation2 = TrackStubUtils.createSensorDataSetLocation();
+        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
 
         /*
          * Add a time span here to make sure the second point is valid, the value 222 here is doesn't matter.
          */
-        sensorDataSetLocation2.setTime(sensorDataSetLocation1.getTime() + 222);
-        sensorDataSetLocation2.setSpeed(130);
-        point = fillDataPointTestHelper(sensorDataSetLocation2);
-        Assert.assertEquals(130.0 * UnitConversions.MS_TO_KMH, point[ChartView.SPEED_SERIES + 1], 0.01);
+        trackPoint2.setTime(trackPoint1.getTime() + 222);
+        trackPoint2.setSpeed(130);
+        point = chartFragment.createPendingPoint(trackPoint2);
+        Assert.assertEquals(130.0 * UnitConversions.MS_TO_KMH, point.getSpeed(), 0.01);
     }
 
     /**
      * Tests the logic to compute speed when use Imperial.
      */
     @Test
-    public void testFillDataPoint_speedImperial() {
-        // Setups to use imperial.
+    public void testCreatePendingPoint_speedImperial() {
         chartFragment.setMetricUnits(false);
 
         // First data point is not added to the speed buffer
-        TrackPoint sensorDataSetLocation1 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation1.setSpeed(100.0f);
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation1);
-        Assert.assertEquals(0.0, point[ChartView.SPEED_SERIES + 1], 0.01);
+        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint1.setSpeed(100.0f);
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+        Assert.assertEquals(0.0, point.getSpeed(), 0.01);
 
-        TrackPoint sensorDataSetLocation2 = TrackStubUtils.createSensorDataSetLocation();
+        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
 
         /*
          * Add a time span here to make sure the second point and the speed is valid.
          * Speed is valid if: speedDifference > Constants.MAX_ACCELERATION * timeDifference speedDifference = 102 -100 timeDifference = 222
          */
-        sensorDataSetLocation2.setTime(sensorDataSetLocation2.getTime() + 222);
-        sensorDataSetLocation2.setSpeed(102);
-        point = fillDataPointTestHelper(sensorDataSetLocation2);
-        Assert.assertEquals(102.0 * UnitConversions.MS_TO_KMH * UnitConversions.KM_TO_MI, point[ChartView.SPEED_SERIES + 1], 0.01);
+        trackPoint2.setTime(trackPoint2.getTime() + 222);
+        trackPoint2.setSpeed(102);
+        point = chartFragment.createPendingPoint(trackPoint2);
+        Assert.assertEquals(102.0 * UnitConversions.MS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01);
     }
 
     /**
      * Tests the logic to get pace value when reportSpeed is false.
      */
     @Test
-    public void testFillDataPoint_pace_nonZeroSpeed() {
-        // Setups reportSpeed to false.
+    public void testCreatePendingPoint_pace_nonZeroSpeed() {
         chartFragment.setReportSpeed(false);
 
         // First data point is not added to the speed buffer
-        TrackPoint sensorDataSetLocation1 = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation1.setSpeed(100.0f);
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation1);
-        Assert.assertEquals(0.0, point[ChartView.SPEED_SERIES + 1], 0.01);
+        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint1.setSpeed(100.0f);
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+        Assert.assertEquals(0.0, point.getSpeed(), 0.01);
 
-        TrackPoint sensorDataSetLocation2 = TrackStubUtils.createSensorDataSetLocation();
+        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
 
         /*
          * Add a time span here to make sure the second point and the speed is valid.
          * Speed is valid if: speedDifference > Constants.MAX_ACCELERATION * timeDifference speedDifference = 102 -100 timeDifference = 222
          */
-        sensorDataSetLocation2.setTime(sensorDataSetLocation2.getTime() + 222);
-        sensorDataSetLocation2.setSpeed(102);
-        point = fillDataPointTestHelper(sensorDataSetLocation2);
-        Assert.assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MS_TO_KMH), point[ChartView.PACE_SERIES + 1], 0.01);
+        trackPoint2.setTime(trackPoint2.getTime() + 222);
+        trackPoint2.setSpeed(102);
+        point = chartFragment.createPendingPoint(trackPoint2);
+        Assert.assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MS_TO_KMH), point.getPace(), 0.01);
     }
 
     /**
      * Tests the logic to get pace value when reportSpeed is false and average speed is zero.
      */
     @Test
-    public void testFillDataPoint_pace_zeroSpeed() {
-        // Setups reportSpeed to false.
+    public void testCreatePendingPoint_pace_zeroSpeed() {
         chartFragment.setReportSpeed(false);
-        TrackPoint sensorDataSetLocation = TrackStubUtils.createSensorDataSetLocation();
-        sensorDataSetLocation.setSpeed(0);
-        double[] point = fillDataPointTestHelper(sensorDataSetLocation);
-        Assert.assertEquals(0.0, point[ChartView.PACE_SERIES + 1], 0.01);
-    }
-
-    /**
-     * Helper method to test fillDataPoint.
-     *
-     * @param location location to fill
-     * @return data of this location
-     */
-    private double[] fillDataPointTestHelper(Location location) {
-        double[] point = new double[ChartView.NUM_SERIES + 1];
-        chartFragment.fillDataPoint(location, point);
-        return point;
+        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint.setSpeed(0);
+        ChartPoint point = chartFragment.createPendingPoint(trackPoint);
+        Assert.assertEquals(0.0, point.getPace(), 0.01);
     }
 }

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java

@@ -33,6 +33,7 @@ import java.util.Locale;
 import java.util.SimpleTimeZone;
 
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
@@ -83,24 +84,24 @@ public abstract class AbstractTestFileTrackImporter {
     @Mock
     public ContentProviderUtils contentProviderUtils;
 
-    Location createLocation(int index, long time) {
-        Location location = new Location(LocationManager.GPS_PROVIDER);
-        location.setLatitude(TRACK_LATITUDE + index);
-        location.setLongitude(TRACK_LONGITUDE + index);
-        location.setAltitude(TRACK_ELEVATION + index);
-        location.setTime(time);
-        return location;
+    TrackPoint createTrackPoint(int index, long time) {
+        Location trackPoint = new Location(LocationManager.GPS_PROVIDER);
+        trackPoint.setLatitude(TRACK_LATITUDE + index);
+        trackPoint.setLongitude(TRACK_LONGITUDE + index);
+        trackPoint.setAltitude(TRACK_ELEVATION + index);
+        trackPoint.setTime(time);
+        return new TrackPoint(trackPoint);
     }
 
     /**
      * Expects the first track point to be added.
      *
-     * @param location     the location
+     * @param trackPoint     the trackPoint
      * @param trackId      the track id
      * @param trackPointId the track point id
      */
-    protected void expectFirstTrackPoint(Location location, long trackId, long trackPointId) {
-        when(contentProviderUtils.bulkInsertTrackPoint(location != null ? (Location[]) any() : (Location[]) any(), eq(1), eq(trackId))).thenReturn(1);
+    protected void expectFirstTrackPoint(TrackPoint trackPoint, long trackId, long trackPointId) {
+        when(contentProviderUtils.bulkInsertTrackPoint(trackPoint != null ? (TrackPoint[]) any() : (TrackPoint[]) any(), eq(trackId))).thenReturn(1);
     }
 
     /**
@@ -124,7 +125,7 @@ public abstract class AbstractTestFileTrackImporter {
         Assert.assertEquals(name, track.getName());
         Assert.assertEquals(description, track.getDescription());
         if (time != -1L) {
-            Assert.assertEquals(time, track.getTripStatistics().getStartTime());
+            Assert.assertEquals(time, track.getTrackStatistics().getStartTime_ms());
         }
     }
 }

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -1,8 +1,8 @@
 package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
-import android.location.Location;
 import android.util.Log;
+import android.util.Pair;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.LargeTest;
@@ -21,10 +21,12 @@ import java.util.List;
 
 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.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -32,42 +34,41 @@ import static org.junit.Assert.assertNotNull;
 /**
  * Export a track to {@link TrackFileFormat} and verify that the import is identical.
  * <p>
- * TODO: test ignores {@link de.dennisguse.opentracks.stats.TripStatistics} for now.
+ * TODO: test ignores {@link TrackStatistics} for now.
  */
 @RunWith(JUnit4.class)
 public class ExportImportTest {
 
     private static final String TAG = ExportImportTest.class.getSimpleName();
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
-    private ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
+    private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
 
     private static final String TRACK_ICON = "the track icon";
     private static final String TRACK_CATEGORY = "the category";
     private static final String TRACK_DESCRIPTION = "the description";
     private final List<Waypoint> waypoints = new ArrayList<>();
     private long importTrackId;
-    private long trackId = System.currentTimeMillis();
+    private final long trackId = System.currentTimeMillis();
 
     @Before
     public void setUp() {
-        Track track = TestDataUtil.getTrack(trackId, 10);
-        track.setIcon(TRACK_ICON);
-        track.setCategory(TRACK_CATEGORY);
-        track.setDescription(TRACK_DESCRIPTION);
-        contentProviderUtils.insertTrack(track);
-        contentProviderUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track.getLocations().size(), track.getId());
+        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        track.first.setIcon(TRACK_ICON);
+        track.first.setCategory(TRACK_CATEGORY);
+        track.first.setDescription(TRACK_DESCRIPTION);
+        contentProviderUtils.insertTrack(track.first);
+        contentProviderUtils.bulkInsertTrackPoint(track.second, track.first.getId());
 
         for (int i = 0; i < 3; i++) {
-            Waypoint waypoint = new Waypoint();
+            Waypoint waypoint = new Waypoint(track.second[i].getLocation());
             waypoint.setName("the waypoint " + i);
             waypoint.setDescription("the waypoint description " + i);
             waypoint.setCategory("the waypoint category" + i);
             waypoint.setIcon("the waypoing icon" + i);
             waypoint.setPhotoUrl("the photo url" + i);
             waypoint.setTrackId(trackId);
-            waypoint.setLocation(track.getLocations().get(i));
             contentProviderUtils.insertWaypoint(waypoint);
 
             waypoints.add(waypoint);
@@ -114,7 +115,7 @@ public class ExportImportTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals(track.getLocations(), importedTrack.getLocations());
+        //TODO assertEquals(track.getTrackPoints(), importedTrack.getTrackPoints());
         assertEquals(track.getCategory(), importedTrack.getCategory());
         assertEquals(track.getDescription(), importedTrack.getDescription());
         assertEquals(track.getName(), importedTrack.getName());
@@ -184,7 +185,7 @@ public class ExportImportTest {
         // 1. track
         Track trackImported = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(trackImported);
-        assertEquals(track.getLocations(), trackImported.getLocations());
+        //TODO assertEquals(track.getTrackPoints(), trackImported.getTrackPoints());
         assertEquals(track.getCategory(), trackImported.getCategory());
         assertEquals(track.getDescription(), trackImported.getDescription());
         assertEquals(track.getName(), trackImported.getName());

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java

@@ -16,8 +16,6 @@
 
 package de.dennisguse.opentracks.io.file.importer;
 
-import android.location.Location;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,10 +26,10 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.eq;
@@ -74,9 +72,9 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         String longitude = Double.toString(TRACK_LONGITUDE + index);
         String elevation = Double.toString(TRACK_ELEVATION + index);
         StringBuilder buffer = new StringBuilder();
-        buffer.append("<trkpt lat=\"" + latitude + "\" lon=\"" + longitude + "\"><ele>" + elevation + "</ele>");
+        buffer.append("<trkpt lat=\"").append(latitude).append("\" lon=\"").append(longitude).append("\"><ele>").append(elevation).append("</ele>");
         if (time != null) {
-            buffer.append("<time>" + time + "</time>");
+            buffer.append("<time>").append(time).append("</time>");
         }
         buffer.append("</trkpt>");
         return buffer.toString();
@@ -85,14 +83,14 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
     @Test
     public void testOneTrackOneSegment() throws Exception {
         // given
-        Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
-        Location location1 = createLocation(1, DATE_FORMAT_1.parse(TRACK_TIME_1).getTime());
+        TrackPoint trackPoint0 = createTrackPoint(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
+        TrackPoint trackPoint1 = createTrackPoint(1, DATE_FORMAT_1.parse(TRACK_TIME_1).getTime());
 
         when(contentProviderUtils.insertTrack((Track) any())).thenReturn(TRACK_ID_0_URI);
-        expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
+        expectFirstTrackPoint(trackPoint0, TRACK_ID_0, TRACK_POINT_ID_0);
 
         // A flush happens at the end
-        when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(1), eq(TRACK_ID_0))).thenReturn(1);
+        when(contentProviderUtils.bulkInsertTrackPoint((TrackPoint[]) any(), eq(TRACK_ID_0))).thenReturn(1);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_1);
         when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
         ArgumentCaptor<Track> trackCaptor = ArgumentCaptor.forClass(Track.class);
@@ -109,19 +107,19 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         verify(contentProviderUtils, atLeastOnce()).updateTrack(trackCaptor.capture());
         long time0 = DATE_FORMAT_0.parse(TRACK_TIME_0).getTime();
         long time1 = DATE_FORMAT_1.parse(TRACK_TIME_1).getTime();
-        Assert.assertEquals(time1 - time0, trackCaptor.getValue().getTripStatistics().getTotalTime());
+        Assert.assertEquals(time1 - time0, trackCaptor.getValue().getTrackStatistics().getTotalTime());
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, time0);
     }
 
     @Test
     public void testOneTrackTwoSegments() throws Exception {
         // given
-        Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
+        TrackPoint trackPoint0 = createTrackPoint(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
 
         when(contentProviderUtils.insertTrack((Track) any())).thenReturn(TRACK_ID_0_URI);
-        expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
+        expectFirstTrackPoint(trackPoint0, TRACK_ID_0, TRACK_POINT_ID_0);
         // A flush happens at the end
-        when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(5), eq(TRACK_ID_0))).thenReturn(5);
+        when(contentProviderUtils.bulkInsertTrackPoint((TrackPoint[]) any(), eq(TRACK_ID_0))).thenReturn(5);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_3);
         when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
@@ -141,7 +139,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         long time1 = DATE_FORMAT_1.parse(TRACK_TIME_1).getTime();
         long time2 = DATE_FORMAT_1.parse(TRACK_TIME_2).getTime();
         long time3 = DATE_FORMAT_1.parse(TRACK_TIME_3).getTime();
-        Assert.assertEquals(time1 - time0 + time3 - time2, trackCaptor.getValue().getTripStatistics().getTotalTime());
+        Assert.assertEquals(time1 - time0 + time3 - time2, trackCaptor.getValue().getTrackStatistics().getTotalTime());
 
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
     }
@@ -153,7 +151,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         expectFirstTrackPoint(null, TRACK_ID_0, TRACK_POINT_ID_0);
 
         // A flush happens at the end
-        when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(5), eq(TRACK_ID_0))).thenReturn(5);
+        when(contentProviderUtils.bulkInsertTrackPoint((TrackPoint[]) any(), eq(TRACK_ID_0))).thenReturn(5);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_3);
         when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
@@ -169,7 +167,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         verify(contentProviderUtils, atLeastOnce()).updateTrack(trackCaptor.capture());
         Assert.assertEquals(TRACK_ID_0, trackId);
 
-        Assert.assertEquals(0, trackCaptor.getValue().getTripStatistics().getTotalTime());
+        Assert.assertEquals(0, trackCaptor.getValue().getTrackStatistics().getTotalTime());
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, -1L);
     }
 
@@ -207,7 +205,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         when(contentProviderUtils.insertTrack((Track) any())).thenReturn(TRACK_ID_0_URI);
 
         // For the following, use StubReturn since we don't care whether they are invoked or not.
-        when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), anyInt(), anyLong())).thenReturn(1);
+        when(contentProviderUtils.bulkInsertTrackPoint((TrackPoint[]) any(), anyLong())).thenReturn(1);
         when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
         contentProviderUtils.deleteTrack(context, TRACK_ID_0);
 

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java

@@ -16,8 +16,6 @@
 
 package de.dennisguse.opentracks.io.file.importer;
 
-import android.location.Location;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,6 +26,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 import static org.mockito.Mockito.any;
@@ -69,14 +68,14 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
     @Test
     public void testOneTrackOneSegment() throws Exception {
         // given
-        Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
-        Location location1 = createLocation(1, DATE_FORMAT_1.parse(TRACK_TIME_1).getTime());
+        TrackPoint trackPoint0 = createTrackPoint(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
+        TrackPoint trackPointl1 = createTrackPoint(1, DATE_FORMAT_1.parse(TRACK_TIME_1).getTime());
 
         contentProviderUtils.clearTrack(context, TRACK_ID_0);
-        expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
+        expectFirstTrackPoint(trackPoint0, TRACK_ID_0, TRACK_POINT_ID_0);
 
         // A flush happens at the end
-        when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(1), eq(TRACK_ID_0))).thenReturn(1);
+        when(contentProviderUtils.bulkInsertTrackPoint((TrackPoint[]) any(), eq(TRACK_ID_0))).thenReturn(1);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_1);
         when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
@@ -94,20 +93,20 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
 
         long time0 = DATE_FORMAT_0.parse(TRACK_TIME_0).getTime();
         long time1 = DATE_FORMAT_1.parse(TRACK_TIME_1).getTime();
-        Assert.assertEquals(time1 - time0, trackCaptor.getValue().getTripStatistics().getTotalTime());
+        Assert.assertEquals(time1 - time0, trackCaptor.getValue().getTrackStatistics().getTotalTime());
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, time0);
     }
 
     @Test
     public void testOneTrackTwoSegments() throws Exception {
         // given
-        Location location0 = createLocation(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
+        TrackPoint trackPoint0 = createTrackPoint(0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
 
         contentProviderUtils.clearTrack(context, TRACK_ID_0);
-        expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0);
+        expectFirstTrackPoint(trackPoint0, TRACK_ID_0, TRACK_POINT_ID_0);
 
         // A flush happens at the end
-        when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(5), eq(TRACK_ID_0))).thenReturn(5);
+        when(contentProviderUtils.bulkInsertTrackPoint((TrackPoint[]) any(), eq(TRACK_ID_0))).thenReturn(5);
         when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_3);
         when(contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context))).thenReturn(null);
 
@@ -127,7 +126,7 @@ public class KmlFileTrackImporterTest extends AbstractTestFileTrackImporter {
         long time1 = DATE_FORMAT_1.parse(TRACK_TIME_1).getTime();
         long time2 = DATE_FORMAT_1.parse(TRACK_TIME_2).getTime();
         long time3 = DATE_FORMAT_1.parse(TRACK_TIME_3).getTime();
-        Assert.assertEquals(time1 - time0 + time3 - time2, trackCaptor.getValue().getTripStatistics().getTotalTime());
+        Assert.assertEquals(time1 - time0 + time3 - time2, trackCaptor.getValue().getTrackStatistics().getTotalTime());
 
         verifyTrack(trackCaptor.getValue(), TRACK_NAME_0, TRACK_DESCRIPTION_0, DATE_FORMAT_0.parse(TRACK_TIME_0).getTime());
     }

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java

@@ -2,7 +2,6 @@ package de.dennisguse.opentracks.services;
 
 import android.app.NotificationManager;
 import android.content.Context;
-import android.location.Location;
 
 import androidx.core.app.NotificationCompat;
 import androidx.test.core.app.ApplicationProvider;
@@ -12,6 +11,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import de.dennisguse.opentracks.content.data.TrackPoint;
+
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
@@ -21,10 +22,10 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class TrackRecordingServiceNotificationManagerTest {
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @Mock
-    private Location locationMock;
+    private TrackPoint locationMock;
 
     @Mock
     private NotificationCompat.Builder notificationCompatBuilder;
@@ -42,10 +43,10 @@ public class TrackRecordingServiceNotificationManagerTest {
         TrackRecordingServiceNotificationManager subject = new TrackRecordingServiceNotificationManager(notificationManager, notificationCompatBuilder);
 
         // when
-        subject.updateLocation(context, locationMock, 100);
-        subject.updateLocation(context, locationMock, 100);
-        subject.updateLocation(context, locationMock, 1000);
-        subject.updateLocation(context, locationMock, 100);
+        subject.updateTrackPoint(context, locationMock, 100);
+        subject.updateTrackPoint(context, locationMock, 100);
+        subject.updateTrackPoint(context, locationMock, 1000);
+        subject.updateTrackPoint(context, locationMock, 100);
 
         // then
         verify(notificationCompatBuilder, times(6)).setOnlyAlertOnce(true);

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java

@@ -24,6 +24,7 @@ import android.os.IBinder;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.GrantPermissionRule;
@@ -43,10 +44,12 @@ import java.util.concurrent.TimeoutException;
 
 import de.dennisguse.opentracks.R;
 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.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 /**
@@ -66,7 +69,7 @@ public class TrackRecordingServiceTest {
     @Rule
     public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
     private ContentProviderUtils contentProviderUtils;
 
     private final long trackId = Math.abs(new Random().nextLong());
@@ -86,7 +89,7 @@ public class TrackRecordingServiceTest {
 
         // Let's use default values.
         SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
-        sharedPreferences.edit().clear().apply();
+        sharedPreferences.edit().clear().commit();
 
         // Ensure that the database is empty before every test
         contentProviderUtils.deleteAllTracks(context);
@@ -121,13 +124,16 @@ public class TrackRecordingServiceTest {
     @MediumTest
     @Test
     public void testRecording_noTracks() throws Exception {
+        // given
         List<Track> tracks = contentProviderUtils.getAllTracks();
         Assert.assertTrue(tracks.isEmpty());
 
+        // when
         Intent startIntent = createStartIntent(context);
         mServiceRule.startService(startIntent);
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(startIntent));
 
+        // then
         // Test if we start in no-recording mode by default.
         Assert.assertFalse(service.isRecording());
         Assert.assertEquals(-1L, service.getRecordingTrackId());
@@ -136,19 +142,92 @@ public class TrackRecordingServiceTest {
     @MediumTest
     @Test
     public void testRecording_oldTracks() throws Exception {
+        // given
         createDummyTrack(trackId, -1L, false);
 
+        // when
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+
+        // then
         Assert.assertFalse(service.isRecording());
         Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, service.getRecordingTrackId());
     }
 
     @MediumTest
     @Test
-    public void testRecording_orphanedRecordingTrack() throws Exception {
-        Intent startIntent = createStartIntent(context);
-        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(startIntent));
+    public void testRecording_serviceRestart_whileRecording() throws Exception {
+        // given
+        createDummyTrack(trackId, -1L, true);
 
+        //when
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+
+        // then
+        Assert.assertTrue(service.isRecording());
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_pauseAndResume() throws Exception {
+        // given
+        createDummyTrack(trackId, -1L, true);
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        insertLocation(service);
+
+        // when
+        service.pauseCurrentTrack();
+
+        // then
+        Assert.assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size());
+
+        //when
+        service.resumeTrack(trackId);
+        insertLocation(service);
+
+        // then
+        Assert.assertTrue(service.isRecording());
+        Assert.assertEquals(trackId, service.getRecordingTrackId());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(5, trackPoints.size());
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(3).getLatitude(), 0.01);
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_resumeStoppedTrack() throws Exception {
+        // given
+        createDummyTrack(trackId, -1L, true);
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        insertLocation(service);
+        service.endCurrentTrack();
+
+        Assert.assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size());
+
+        // when
+        service.resumeTrack(trackId);
+        insertLocation(service);
+
+        // then
+        Assert.assertTrue(service.isRecording());
+        Assert.assertEquals(trackId, service.getRecordingTrackId());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(4, trackPoints.size());
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
+    }
+
+    @FlakyTest(detail = "Sometimes fails on CI.")
+    @MediumTest
+    @Test
+    public void testRecording_orphanedRecordingTrack() throws Exception {
+        // given
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+
+        // when
         // Just set recording track to a bogus value.
         // Make sure that the service will not start recording and will clear the bogus track.
         PreferencesUtils.setLong(context, R.string.recording_track_id_key, 123L);
@@ -161,88 +240,67 @@ public class TrackRecordingServiceTest {
     @MediumTest
     @Test
     public void testStartNewTrack_alreadyRecording() throws Exception {
+        // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         service.startNewTrack();
         Assert.assertTrue(service.isRecording());
+
         long trackId = service.getRecordingTrackId();
 
+        // when
         long newTrackId = service.startNewTrack();
+
+        // then
         Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, newTrackId);
 
         Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
         Assert.assertEquals(trackId, service.getRecordingTrackId());
-
-        service.endCurrentTrack();
     }
 
     @MediumTest
     @Test
     public void testEndCurrentTrack_noRecording() throws Exception {
+        // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         Assert.assertFalse(service.isRecording());
 
+        // when
         // Ending the current track when there is no recording should not result in any error.
         service.endCurrentTrack();
 
+        // then
         Assert.assertFalse(PreferencesUtils.isRecording(context));
         Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, service.getRecordingTrackId());
     }
 
-    // NOTE: Do not use to create a track that is currently recording.
-    private void createDummyTrack(long id, long stopTime, boolean isRecording) {
-        Track dummyTrack = new Track();
-        dummyTrack.setId(id);
-        dummyTrack.setName("Dummy Track");
-        TripStatistics tripStatistics = new TripStatistics();
-        tripStatistics.setStopTime(stopTime);
-        dummyTrack.setTripStatistics(tripStatistics);
-        addTrack(dummyTrack, isRecording);
-    }
-
-    private void addTrack(Track track, boolean isRecording) {
-        Assert.assertTrue(track.getId() >= 0);
-        contentProviderUtils.insertTrack(track);
-        Assert.assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId());
-        PreferencesUtils.setLong(context, R.string.recording_track_id_key, isRecording ? track.getId() : PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
-        PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, !isRecording);
-    }
-
-    /**
-     * Inserts a location and waits for 200ms.
-     */
-    private void insertLocation(TrackRecordingServiceInterface trackRecordingService) throws InterruptedException {
-        Location location = new Location("gps");
-        location.setLongitude(35.0f);
-        location.setLatitude(45.0f);
-        location.setAccuracy(5);
-        location.setSpeed(10);
-        location.setTime(System.currentTimeMillis());
-        location.setBearing(3.0f);
-        trackRecordingService.insertTrackPoint(location);
-
-        Thread.sleep(200);
-    }
-
     @MediumTest
     @Test
     public void testInsertWaypointMarker_noRecordingTrack() throws Exception {
+        // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         Assert.assertFalse(service.isRecording());
 
+        // when
         long waypointId = service.insertWaypoint(null, null, null, null);
+
+        // then
         Assert.assertEquals(-1L, waypointId);
     }
 
     @MediumTest
     @Test
     public void testInsertWaypointMarker_validWaypoint() throws Exception {
+        // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         service.startNewTrack();
         Assert.assertTrue(service.isRecording());
         insertLocation(service);
-
         long trackId = service.getRecordingTrackId();
+
+        // when
         long waypointId = service.insertWaypoint(null, null, null, null);
+
+        // then
         Assert.assertNotEquals(-1L, waypointId);
         Waypoint wpt = contentProviderUtils.getWaypoint(waypointId);
         Assert.assertEquals(context.getString(R.string.marker_waypoint_icon_url), wpt.getIcon());
@@ -253,4 +311,48 @@ public class TrackRecordingServiceTest {
 
         service.endCurrentTrack();
     }
+
+    private void addTrack(Track track, boolean isRecording) {
+        Assert.assertTrue(track.getId() >= 0);
+        contentProviderUtils.insertTrack(track);
+        Assert.assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId());
+        PreferencesUtils.setLong(context, R.string.recording_track_id_key, isRecording ? track.getId() : PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
+        PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, !isRecording);
+    }
+
+    // NOTE: Do not use to create a track that is currently recording.
+    private void createDummyTrack(long id, long stopTime, boolean isRecording) {
+        Track dummyTrack = new Track();
+        dummyTrack.setId(id);
+        dummyTrack.setName("Dummy Track");
+        TrackStatistics trackStatistics = new TrackStatistics();
+        trackStatistics.setStopTime_ms(stopTime);
+        dummyTrack.setTrackStatistics(trackStatistics);
+        addTrack(dummyTrack, isRecording);
+    }
+
+    private static void insertLocation(TrackRecordingServiceInterface trackRecordingService) throws InterruptedException {
+        insertLocation(trackRecordingService, 45.0f, 35f, 5, 10, System.currentTimeMillis());
+    }
+
+    static void insertLocation(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed) throws InterruptedException {
+        insertLocation(trackRecordingService, latitude, longitude, accuracy, speed, System.currentTimeMillis());
+    }
+
+    /**
+     * Inserts a location and waits for 200ms.
+     */
+    private static void insertLocation(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed, long time) throws InterruptedException {
+        Location location = new Location("gps");
+        location.setLongitude(longitude);
+        location.setLatitude(latitude);
+        location.setAccuracy(accuracy);
+        location.setSpeed(speed);
+        location.setTime(time);
+        location.setBearing(3.0f);
+        trackRecordingService.insertLocation(location);
+
+        //TODO Needed?
+        Thread.sleep(200);
+    }
 }

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java

@@ -0,0 +1,327 @@
+package de.dennisguse.opentracks.services;
+
+import android.content.ContentProvider;
+import android.content.Context;
+import android.content.SharedPreferences;
+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.Assert;
+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.TrackPoint;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+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.SensorDataSet;
+import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+
+/**
+ * Tests insert location.
+ * <p>
+ * //TODO ATTENTION: This tests deletes all stored tracks in the database.
+ * So, if it is executed on a real device, data might be lost.
+ */
+@RunWith(AndroidJUnit4.class)
+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 TrackRecordingServiceInterface service;
+
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
+    @Before
+    public void setUp() throws TimeoutException {
+        // Set up the mock content resolver
+        ContentProvider customContentProvider = new CustomContentProvider() {
+        };
+        customContentProvider.attachInfo(context, null);
+
+        contentProviderUtils = new ContentProviderUtils(context);
+
+        // Let's use default values.
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        sharedPreferences.edit().clear().commit();
+
+        service = ((TrackRecordingServiceInterface) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)));
+        //Disable executorService to not insert locations from GPS via LocationManager
+        service.enableLocationExecutor(false);
+    }
+
+    @After
+    public void tearDown() {
+        // Reset service (if some previous test failed)
+        service.enableLocationExecutor(true);
+        if (service.isRecording() || service.isPaused()) {
+            service.endCurrentTrack();
+        }
+
+        // Ensure that the database is empty after every test
+        contentProviderUtils.deleteAllTracks(context);
+    }
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_movingAccurate() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        // when
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.0001, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.0002, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.0003, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.0004, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.0005, 35.0, 5, 15);
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(6, trackPoints.size());
+        Assert.assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01);
+    }
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_movingInaccurate() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        // when
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.1, 35.0, Long.MAX_VALUE, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.2, 35.0, Long.MAX_VALUE, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.3, 35.0, Long.MAX_VALUE, 15);
+        TrackRecordingServiceTest.insertLocation(service, 99.0, 35.0, Long.MAX_VALUE, 15);
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(1, trackPoints.size());
+        Assert.assertEquals(45.0, trackPoints.get(0).getLatitude(), 0.01);
+    }
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_slowMovingAccurate() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        // when
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.000001, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.000002, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.000003, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.000004, 35.0, 5, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.000005, 35.0, 5, 15);
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(2, trackPoints.size());
+        Assert.assertEquals(45.000005, trackPoints.get(1).getLatitude(), 0.01);
+    }
+
+//    @MediumTest
+//    @Test
+//    public void testOnLocationChangedAsync_repeatedTime() throws Exception {
+//        // when
+//        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 15, 5);
+//        TrackRecordingServiceTest.insertLocation(service, 55.0, 35.0, 5, 15, 5);
+//        TrackRecordingServiceTest.insertLocation(service, 65.0, 35.0, 5, 15, 5);
+//
+//        service.endCurrentTrack();
+//
+//        // then
+//        Assert.assertFalse(service.isRecording());
+//
+//        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+//        Assert.assertEquals(1, trackPoints.size());
+//        Assert.assertEquals(45.0, trackPoints.get(0).getLatitude(), 0.01);
+//    }
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_idle() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        // when
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 2, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 3, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 4, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 6, 0);
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(3, trackPoints.size());
+        Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
+        Assert.assertEquals(6, trackPoints.get(2).getAccuracy(), 0.01);
+    }
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_idle_withMovement() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        // when
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 15);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 2, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 3, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 4, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 6, 15);
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(4, trackPoints.size());
+        Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
+        Assert.assertEquals(5, trackPoints.get(2).getAccuracy(), 0.01); //TODO Check why this trackPoint is inserted.
+        Assert.assertEquals(6, trackPoints.get(3).getAccuracy(), 0.01);
+    }
+
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_idle_withSensorData() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        service.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
+
+            @Override
+            public boolean isEnabled() {
+                return true;
+            }
+
+            @Override
+            public SensorDataSet getSensorData() {
+                SensorDataSet sensorDataSet = new SensorDataSet();
+                sensorDataSet.set(new SensorDataHeartRate("sensorName", "sensorAddress", 5f));
+                return sensorDataSet;
+            }
+        });
+
+        // when
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 0, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 2, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 3, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 4, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 0);
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(6, trackPoints.size());
+        Assert.assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(1, trackPoints.get(1).getAccuracy(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
+        Assert.assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
+        Assert.assertEquals(4, trackPoints.get(4).getAccuracy(), 0.01);
+        Assert.assertEquals(5, trackPoints.get(5).getAccuracy(), 0.01);
+    }
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_segment() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        // when
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.1, 35.0, 2, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.1, 35.0, 3, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.2, 35.0, 4, 0);
+        TrackRecordingServiceTest.insertLocation(service, 45.2, 35.0, 5, 0);
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(7, trackPoints.size());
+        Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
+        Assert.assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(4).getLatitude(), 0.01);
+        Assert.assertEquals(4, trackPoints.get(5).getAccuracy(), 0.01);
+        Assert.assertEquals(5, trackPoints.get(6).getAccuracy(), 0.01);
+    }
+
+    @MediumTest
+    @Test
+    public void testOnLocationChangedAsync_firstTrackPointInvalid() throws Exception {
+        // given
+        long trackId = service.startNewTrack();
+
+        // when
+        service.insertLocation(TrackPoint.createPause().getLocation());
+        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 0, 0);
+        service.insertLocation(TrackPoint.createPause().getLocation());
+
+        service.endCurrentTrack();
+
+        // then
+        Assert.assertFalse(service.isRecording());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(1, trackPoints.size());
+        Assert.assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01);
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java

@@ -28,7 +28,7 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 /**
@@ -45,7 +45,7 @@ public class TrackRecordingServiceTestLooper {
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     private ContentProviderUtils contentProviderUtils;
 
@@ -215,7 +215,7 @@ public class TrackRecordingServiceTestLooper {
             location.setSpeed(10);
             location.setTime(startTime + i * 10000);
             location.setBearing(3.0f);
-            service.insertTrackPoint(location);
+            service.insertLocation(location);
 
             if (i % 7 == 0) {
                 service.insertWaypoint(null, null, null, null);
@@ -229,9 +229,9 @@ public class TrackRecordingServiceTestLooper {
         track = contentProviderUtils.getTrack(id);
         Assert.assertNotNull(track);
         Assert.assertEquals(id, track.getId());
-        TripStatistics tripStatistics = track.getTripStatistics();
-        Assert.assertNotNull(tripStatistics);
-        Assert.assertTrue(tripStatistics.getStartTime() > 0);
-        Assert.assertTrue(tripStatistics.getStopTime() >= tripStatistics.getStartTime());
+        TrackStatistics trackStatistics = track.getTrackStatistics();
+        Assert.assertNotNull(trackStatistics);
+        Assert.assertTrue(trackStatistics.getStartTime_ms() > 0);
+        Assert.assertTrue(trackStatistics.getStopTime_ms() >= trackStatistics.getStartTime_ms());
     }
 }

src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java

@@ -36,7 +36,7 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class AnnouncementPeriodicTaskFactoryTest {
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @BeforeClass
     public static void preSetUp() {

src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java

@@ -22,28 +22,28 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /**
- * Tests for {@link TripStatistics}.
+ * Tests for {@link TrackStatistics}.
  * This only tests non-trivial pieces of that class.
  *
  * @author Rodrigo Damazio
  */
 @RunWith(JUnit4.class)
-public class TripStatisticsTest {
+public class TrackStatisticsTest {
 
-    private TripStatistics statistics;
+    private TrackStatistics statistics;
 
     @Before
     public void setUp() {
-        statistics = new TripStatistics();
+        statistics = new TrackStatistics();
     }
 
     @Test
     public void testMerge() {
-        TripStatistics statistics2 = new TripStatistics();
-        statistics.setStartTime(1000L);  // Resulting start time
-        statistics.setStopTime(2500L);
-        statistics2.setStartTime(3000L);
-        statistics2.setStopTime(4000L);  // Resulting stop time
+        TrackStatistics statistics2 = new TrackStatistics();
+        statistics.setStartTime_ms(1000L);  // Resulting start time
+        statistics.setStopTime_ms(2500L);
+        statistics2.setStartTime_ms(3000L);
+        statistics2.setStopTime_ms(4000L);  // Resulting stop time
         statistics.setTotalTime(1500L);
         statistics2.setTotalTime(1000L);  // Result: 1500+1000
         statistics.setMovingTime(700L);
@@ -58,15 +58,11 @@ public class TripStatisticsTest {
         statistics.setMinElevation(1200.0);  // Resulting min elevation
         statistics2.setMaxElevation(3575.0);  // Resulting max elevation
         statistics2.setMinElevation(2800.0);
-        statistics.setMaxGrade(15.0);
-        statistics.setMinGrade(-25.0);  // Resulting min grade
-        statistics2.setMaxGrade(35.0);  // Resulting max grade
-        statistics2.setMinGrade(0.0);
 
         statistics.merge(statistics2);
 
-        Assert.assertEquals(1000L, statistics.getStartTime());
-        Assert.assertEquals(4000L, statistics.getStopTime());
+        Assert.assertEquals(1000L, statistics.getStartTime_ms());
+        Assert.assertEquals(4000L, statistics.getStopTime_ms());
         Assert.assertEquals(2500L, statistics.getTotalTime());
         Assert.assertEquals(1300L, statistics.getMovingTime());
         Assert.assertEquals(1100.0, statistics.getTotalDistance(), 0.001);
@@ -74,8 +70,6 @@ public class TripStatisticsTest {
         Assert.assertEquals(statistics.getTotalDistance() / (statistics.getMovingTime() / 1000.0), statistics.getMaxSpeed(), 0.001);
         Assert.assertEquals(1200.0, statistics.getMinElevation(), 0.001);
         Assert.assertEquals(3575.0, statistics.getMaxElevation(), 0.001);
-        Assert.assertEquals(-25.0, statistics.getMinGrade(), 0.001);
-        Assert.assertEquals(35.0, statistics.getMaxGrade(), 0.001);
     }
 
     @Test

src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java

@@ -0,0 +1,34 @@
+package de.dennisguse.opentracks.util;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import de.dennisguse.opentracks.stats.TrackStatistics;
+
+@RunWith(AndroidJUnit4.class)
+public class AnnouncementUtilsTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void getAnnouncement() {
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setTotalElevationGain(6000);
+
+        // when
+        String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane");
+
+        // then
+        Assert.assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement);
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java

@@ -0,0 +1,76 @@
+package de.dennisguse.opentracks.util;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
+
+public class BluetoothUtilsTest {
+
+    @Test
+    public void parseHeartRate_uint8() {
+        // given
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEART_RATE_SERVICE_UUID, 0, 0);
+        characteristic.setValue(new byte[]{0x02, 0x3C});
+
+        // when
+        int heartRate = BluetoothUtils.parseHeartRate(characteristic);
+
+        // then
+        Assert.assertEquals(60, heartRate);
+    }
+
+    @Test
+    public void parseHeartRate_uint16() {
+        // given
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEART_RATE_SERVICE_UUID, 0, 0);
+        characteristic.setValue(new byte[]{0x01, 0x01, 0x01});
+
+        // when
+        int heartRate = BluetoothUtils.parseHeartRate(characteristic);
+
+        // then
+        Assert.assertEquals(257, heartRate);
+    }
+
+    @Test
+    public void parseCyclingSpeedCadence_crankOnly() {
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        characteristic.setValue(new byte[]{0x01, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99});
+
+        // when
+        SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
+
+        // then
+        Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
+        Assert.assertNull(sensor.getSpeed());
+    }
+
+    @Test
+    public void parseCyclingSpeedCadence_wheelOnly() {
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        characteristic.setValue(new byte[]{0x02, (byte) 0xE1, 0x00, 0x45, (byte) 0x99});
+
+        // when
+        SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
+
+        // then
+        Assert.assertNull(sensor.getCadence());
+        Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
+    }
+
+    @Test
+    public void parseCyclingSpeedCadence_crankWheel() {
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        characteristic.setValue(new byte[]{0x03, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99, (byte) 0xE1, 0x00, 0x45, (byte) 0x99});
+
+        // when
+        SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
+
+        // then
+        Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
+        Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java

@@ -21,6 +21,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 import java.io.File;
+import java.util.Arrays;
 
 /**
  * Tests for {@link FileUtils}.
@@ -108,9 +109,7 @@ public class FileUtilsTest {
         File directory = new File("/dir1/dir2/");
         String suffix = ".gpx";
         char[] name = new char[FileUtils.MAX_FAT32_PATH_LENGTH];
-        for (int i = 0; i < name.length; i++) {
-            name[i] = 'a';
-        }
+        Arrays.fill(name, 'a');
         String nameString = new String(name);
         String truncated = FileUtils.truncateFileName(directory, nameString, suffix);
 

src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java

@@ -36,7 +36,7 @@ import java.util.TimeZone;
 @RunWith(AndroidJUnit4.class)
 public class StringUtilsTest {
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
 
     /**
@@ -164,7 +164,10 @@ public class StringUtilsTest {
         GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
         calendar.set(year, month - 1, day, hour, minute, second);
         calendar.set(GregorianCalendar.MILLISECOND, millisecond);
-        Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime));
+
+        // This comparision tends to be flaky (difference of 1ms)
+        // Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime));
+        Assert.assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1);
     }
 
     /**

src/androidTest/java/de/dennisguse/opentracks/util/TrackPointUtilsTest.java

@@ -0,0 +1,52 @@
+package de.dennisguse.opentracks.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import de.dennisguse.opentracks.content.data.TrackPoint;
+
+public class TrackPointUtilsTest {
+
+    @Test
+    public void fixTime_none() {
+        // given
+        long time = System.currentTimeMillis();
+        TrackPoint trackPoint = new TrackPoint();
+        trackPoint.setTime(time);
+
+        // when
+        TrackPointUtils.fixTime(trackPoint);
+
+        // then
+        Assert.assertEquals(time, trackPoint.getTime());
+    }
+
+    @Test
+    public void fixTime_0() {
+        // given
+        long time = System.currentTimeMillis();
+        TrackPoint trackPoint = new TrackPoint();
+        trackPoint.setTime(0);
+
+        // when
+        TrackPointUtils.fixTime(trackPoint);
+
+        // then
+        Assert.assertEquals(time, trackPoint.getTime(), 1000);
+    }
+
+    @Test
+    public void fixTime_gpsWeekRollover() {
+        // given
+        long time = System.currentTimeMillis();
+        TrackPoint trackPoint = new TrackPoint();
+        trackPoint.setTime(time - 1024 * UnitConversions.ONE_WEEK_MS);
+
+        // when
+        TrackPointUtils.fixTime(trackPoint);
+
+        // then
+        Assert.assertEquals(time, trackPoint.getTime());
+    }
+
+}

src/main/AndroidManifest.xml

@@ -15,9 +15,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.dennisguse.opentracks"
-    android:installLocation="auto"
-    android:versionCode="3272"
-    android:versionName="v3.3.2"> <!-- For FDroid. -->
+    android:installLocation="auto">
     <!-- Permission to initialize services -->
     <application
         android:name=".Startup"
@@ -31,7 +29,9 @@ limitations under the License.
         <!-- Activities -->
         <activity android:name=".AboutActivity" />
 
-        <activity android:name=".TrackDeleteActivity" />
+        <activity
+            android:name=".TrackDeleteActivity"
+            android:theme="@style/ThemeCustomTransparent" />
 
         <activity
             android:name=".HelpActivity"

src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java

@@ -26,7 +26,7 @@ import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
  *
  * @author Jimmy Shih
  */
-public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
+class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
     private final long[] trackIds;
     private final Context context;

src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java

@@ -16,18 +16,38 @@
 
 package de.dennisguse.opentracks;
 
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
 import android.util.Log;
+import android.util.Pair;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.IOException;
 
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
 
 /**
  * An activity to add/edit a marker.
@@ -39,16 +59,27 @@ public class MarkerEditActivity extends AbstractActivity {
     public static final String EXTRA_TRACK_ID = "track_id";
     public static final String EXTRA_MARKER_ID = "marker_id";
 
+    private static final int CAMERA_REQUEST_CODE = 5;
+    private static final int GALLERY_IMG_REQUEST_CODE = 7;
+
     private static final String TAG = MarkerEditActivity.class.getSimpleName();
     private long trackId;
     private long markerId;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private Waypoint waypoint;
 
+    private MenuItem insertPhotoMenuItem;
+    private MenuItem insertGalleryImgMenuItem;
+
+    private Uri photoUri;
+    private boolean hasCamera;
+
     // UI elements
     private EditText waypointName;
     private AutoCompleteTextView waypointMarkerType;
     private EditText waypointDescription;
+    private ImageView waypointPhoto;
+    private ImageView waypointDeletePhotoBtn;
     private Button done;
 
     @Override
@@ -57,7 +88,9 @@ public class MarkerEditActivity extends AbstractActivity {
 
         trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
         markerId = getIntent().getLongExtra(EXTRA_MARKER_ID, -1L);
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
+
+        hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
 
         // Setup UI elements
         waypointName = findViewById(R.id.marker_edit_waypoint_name);
@@ -65,6 +98,19 @@ public class MarkerEditActivity extends AbstractActivity {
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line);
         waypointMarkerType.setAdapter(adapter);
         waypointDescription = findViewById(R.id.marker_edit_waypoint_description);
+        waypointPhoto = findViewById(R.id.marker_edit_waypoint_photo);
+
+        waypointDeletePhotoBtn = findViewById(R.id.marker_edit_waypoint_photo_delete);
+        waypointDeletePhotoBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (waypoint != null && waypoint.hasPhoto())
+                    waypoint.setPhotoUrl(null);
+                waypointPhoto.setImageBitmap(null);
+                photoUri = null;
+                hideAndShowOptions();
+            }
+        });
 
         Button cancel = findViewById(R.id.marker_edit_cancel);
         cancel.setOnClickListener(new OnClickListener() {
@@ -94,6 +140,64 @@ public class MarkerEditActivity extends AbstractActivity {
         return R.layout.marker_edit;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.marker_edit, menu);
+
+        insertPhotoMenuItem = menu.findItem(R.id.marker_edit_insert_photo);
+        insertPhotoMenuItem.setVisible(hasCamera);
+        insertGalleryImgMenuItem = menu.findItem(R.id.marker_edit_insert_gallery_img);
+        hideAndShowOptions();
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.marker_edit_insert_photo:
+                createWaypointWithPicture();
+                return true;
+            case R.id.marker_edit_insert_gallery_img:
+                createWaypointWithGalleryImage();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == CAMERA_REQUEST_CODE) {
+            if (resultCode == RESULT_CANCELED) {
+                Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
+                return;
+            } else if (resultCode == RESULT_OK) {
+                setWaypointImageView(photoUri);
+            }
+        } else if (requestCode == GALLERY_IMG_REQUEST_CODE) {
+            if (resultCode == RESULT_CANCELED) {
+                Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
+                return;
+            } else if (resultCode == RESULT_OK)  {
+                Uri srcUri = data.getData();
+                try (ParcelFileDescriptor parcelFd = getContentResolver().openFileDescriptor(srcUri, "r")) {
+                    FileDescriptor srcFd = parcelFd.getFileDescriptor();
+                    File dstFile = new File(FileUtils.getImageUrl(this, getTrackId()));
+                    FileUtils.copy(srcFd, dstFile);
+
+                    photoUri = FileUtils.getUriForFile(this, dstFile);
+                    setWaypointImageView(photoUri);
+                } catch(Exception e) {
+                    Log.e(TAG, e.getMessage());
+                    Toast.makeText(this, R.string.marker_add_canceled, Toast.LENGTH_LONG).show();
+                    return;
+                }
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
     /**
      * Updates the UI based on the marker id.
      */
@@ -133,7 +237,62 @@ public class MarkerEditActivity extends AbstractActivity {
             waypointName.setText(waypoint.getName());
             waypointMarkerType.setText(waypoint.getCategory());
             waypointDescription.setText(waypoint.getDescription());
+            if (waypoint.hasPhoto()) {
+                photoUri = waypoint.getPhotoURI();
+                setWaypointImageView(photoUri);
+            }
         }
+
+        hideAndShowOptions();
+    }
+
+    /**
+     * Checks and hide/shows all buttons/options about marker photo options.
+     *
+     * If a photo is set then one's options are shown, otherwise another ones are shown.
+     */
+    private void hideAndShowOptions() {
+        boolean isPhotoSet = (waypoint != null && waypoint.hasPhoto()) || photoUri != null;
+        if (insertPhotoMenuItem != null && insertGalleryImgMenuItem != null) {
+            insertPhotoMenuItem.setVisible(!isPhotoSet);
+            insertGalleryImgMenuItem.setVisible(!isPhotoSet);
+        }
+        waypointDeletePhotoBtn.setVisibility(isPhotoSet ? View.VISIBLE : View.GONE);
+    }
+
+    /**
+     * Returns the trackId. If trackId == -1 then get it from waypoint object.
+     */
+    private long getTrackId() {
+        return trackId == -1 ? waypoint.getTrackId() : trackId;
+    }
+
+    /**
+     * Sets the ImageView waypointPhoto with the uri photo.
+     *
+     * @param uri the uri photo.
+     */
+    private void setWaypointImageView(Uri uri) {
+        try (ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r")) {
+            FileDescriptor fd = pfd.getFileDescriptor();
+            Bitmap bitmap = BitmapFactory.decodeFileDescriptor(fd);
+            waypointPhoto.setImageBitmap(bitmap);
+            hideAndShowOptions();
+        } catch(IOException e) {
+            Log.e(TAG, e.getMessage());
+            Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private void createWaypointWithPicture() {
+        Pair<Intent, Uri> intentAndPhotoUri = IntentUtils.createTakePictureIntent(this, getTrackId());
+        photoUri = intentAndPhotoUri.second;
+        startActivityForResult(intentAndPhotoUri.first, CAMERA_REQUEST_CODE);
+    }
+
+    private void createWaypointWithGalleryImage() {
+        Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        startActivityForResult(intent, GALLERY_IMG_REQUEST_CODE);
     }
 
     /**
@@ -144,7 +303,7 @@ public class MarkerEditActivity extends AbstractActivity {
                 waypointName.getText().toString(),
                 waypointMarkerType.getText().toString(),
                 waypointDescription.getText().toString(),
-                null);
+                photoUri != null ? photoUri.toString() : null);
     }
 
     /**
@@ -154,6 +313,7 @@ public class MarkerEditActivity extends AbstractActivity {
         waypoint.setName(waypointName.getText().toString());
         waypoint.setCategory(waypointMarkerType.getText().toString());
         waypoint.setDescription(waypointDescription.getText().toString());
+        waypoint.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
 
         new ContentProviderUtils(this).updateWaypoint(waypoint);
     }

src/main/java/de/dennisguse/opentracks/MarkerListActivity.java

@@ -61,7 +61,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
 
     private static final String[] PROJECTION = new String[]{WaypointsColumns._ID,
             WaypointsColumns.NAME, WaypointsColumns.DESCRIPTION, WaypointsColumns.CATEGORY,
-            WaypointsColumns.TYPE, WaypointsColumns.TIME, WaypointsColumns.PHOTOURL,
+            WaypointsColumns.TIME, WaypointsColumns.PHOTOURL,
             WaypointsColumns.LATITUDE, WaypointsColumns.LONGITUDE};
 
     private ContentProviderUtils contentProviderUtils;
@@ -179,7 +179,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                             new String[]{String.valueOf(track.getId())}, null);
                 } else {
                     return new CursorLoader(MarkerListActivity.this, WaypointsColumns.CONTENT_URI, PROJECTION,
-                            WaypointsColumns.STARTTIME + " IS NULL", null, null);
+                            null, null, null);
                 }
             }
 

src/main/java/de/dennisguse/opentracks/SearchListActivity.java

@@ -50,7 +50,7 @@ import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.ActivityUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
@@ -172,7 +172,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
 
         contentProviderUtils = new ContentProviderUtils(this);
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
         searchEngine = new SearchEngine(contentProviderUtils);
 
         arrayAdapter = new ArrayAdapter<Map<String, Object>>(this, R.layout.list_item, R.id.list_item_name) {
@@ -424,7 +424,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
     private Map<String, Object> prepareTrackForDisplay(Track track) {
         Map<String, Object> resultMap = new HashMap<>();
 
-        TripStatistics tripStatistics = track.getTripStatistics();
+        TrackStatistics trackStatistics = track.getTrackStatistics();
         String icon = track.getIcon();
         String category = icon != null && !icon.equals("") ? null : track.getCategory();
 
@@ -433,10 +433,10 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
         resultMap.put(ICON_ID_FIELD, TrackIconUtils.getIconDrawable(icon));
         resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_track);
         resultMap.put(NAME_FIELD, track.getName());
-        resultMap.put(TOTAL_TIME_FIELD, StringUtils.formatElapsedTime(tripStatistics.getTotalTime()));
-        resultMap.put(TOTAL_DISTANCE_FIELD, StringUtils.formatDistance(this, tripStatistics.getTotalDistance(), metricUnits));
+        resultMap.put(TOTAL_TIME_FIELD, StringUtils.formatElapsedTime(trackStatistics.getTotalTime()));
+        resultMap.put(TOTAL_DISTANCE_FIELD, StringUtils.formatDistance(this, trackStatistics.getTotalDistance(), metricUnits));
         resultMap.put(MARKER_COUNT_FIELD, contentProviderUtils.getWaypointCount(track.getId()));
-        resultMap.put(START_TIME_FIELD, tripStatistics.getStartTime());
+        resultMap.put(START_TIME_FIELD, trackStatistics.getStartTime_ms());
         resultMap.put(CATEGORY_FIELD, category);
         resultMap.put(DESCRIPTION_FIELD, track.getDescription());
         resultMap.put(PHOTO_URL_FIELD, null);

src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java

@@ -16,16 +16,12 @@
 
 package de.dennisguse.opentracks;
 
-import android.Manifest;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.MediaStore;
-import android.util.Pair;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -34,8 +30,6 @@ import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
@@ -46,12 +40,12 @@ import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.fragments.ChartDistanceFragment;
-import de.dennisguse.opentracks.fragments.ChartTimeFragment;
+import de.dennisguse.opentracks.fragments.ChartFragment;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.StatsFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -59,7 +53,7 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
 
 /**
- * An activity to show the track detail.
+ * An activity to show the track detail, record a new track or resumes an existing one.
  *
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
@@ -72,16 +66,8 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     private static final String TAG = TrackDetailActivity.class.getSimpleName();
 
     private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key";
-    private static final String PHOTO_URI_KEY = "photo_uri_key";
-    private static final String HAS_PHOTO_KEY = "has_photo_key";
-
-    private static final int CAMERA_REQUEST_CODE = 5;
-    private static final int EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 6;
 
     // The following are set in onCreate
-    private boolean hasCamera;
-    private Uri photoUri;
-    private boolean hasPhoto;
     private ContentProviderUtils contentProviderUtils;
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
@@ -104,12 +90,36 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                 @Override
                 public void run() {
                     trackController.update(isRecording(), recordingTrackPaused);
-                    if (hasPhoto && photoUri != null) {
-                        hasPhoto = false;
-                        long markerId = trackRecordingServiceConnection.addMarker(TrackDetailActivity.this, null, null, null, photoUri.toString());
-                    }
                 }
             });
+
+            if (recordingTrackId == -1L) {
+                TrackRecordingServiceInterface service = trackRecordingServiceConnection.getServiceIfBound();
+                if (service == null) {
+                    Log.d(TAG, "could not get TrackRecordingService");
+                    return;
+                }
+
+                // Starts or resumes a track.
+                int msg;
+                if (trackId == -1L) {
+                    // trackId isn't initialized -> leads a new recording.
+                    trackId = service.startNewTrack();
+                    recordingTrackId = trackId;
+                    msg = R.string.track_detail_record_success;
+                } else {
+                    // trackId is initialized -> resumes the track.
+                    recordingTrackId = trackId;
+                    service.resumeTrack(trackId);
+                    msg = R.string.track_detail_resume_success;
+                }
+
+                // A recording track is on.
+                Toast.makeText(TrackDetailActivity.this, msg, Toast.LENGTH_SHORT).show();
+                trackDataHub.loadTrack(trackId);
+                trackController.update(true, false);
+                trackController.onResume(true, recordingTrackPaused);
+            }
         }
     };
 
@@ -150,9 +160,9 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     };
 
     private MenuItem insertMarkerMenuItem;
-    private MenuItem insertPhotoMenuItem;
     private MenuItem markerListMenuItem;
     private MenuItem shareMenuItem;
+    private MenuItem resumeMenuItem;
 
     private final OnClickListener recordListener = new OnClickListener() {
         @Override
@@ -184,16 +194,12 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         super.onCreate(savedInstanceState);
         recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
 
-        hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
-        photoUri = savedInstanceState != null ? (Uri) savedInstanceState.getParcelable(PHOTO_URI_KEY) : null;
-        hasPhoto = savedInstanceState != null && savedInstanceState.getBoolean(HAS_PHOTO_KEY, false);
-
         contentProviderUtils = new ContentProviderUtils(this);
         handleIntent(getIntent());
 
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback);
+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
         trackDataHub = new TrackDataHub(this);
 
         FragmentPagerAdapter adapter = new FragmentPagerAdapter(getSupportFragmentManager(), 1) {
@@ -206,17 +212,15 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
             @Override
             public Fragment getItem(int position) {
                 switch (position) {
-                    case 0:
-                        return new StatsFragment();
                     case 1:
-                        return new ChartTimeFragment();
+                        return ChartFragment.newInstance(false);
                     case 2:
-                        return new ChartDistanceFragment();
+                        return ChartFragment.newInstance(true);
+                    default: //0
+                        return new StatsFragment();
                 }
-                return null;
             }
 
-            @Nullable
             @Override
             public CharSequence getPageTitle(int position) {
                 switch (position) {
@@ -286,11 +290,16 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     @Override
     protected void onResume() {
         super.onResume();
-        trackDataHub.loadTrack(trackId);
 
         // Update UI
         this.invalidateOptionsMenu();
-        trackController.onResume(isRecording(), recordingTrackPaused);
+
+        if (trackId != -1L) {
+            trackDataHub.loadTrack(trackId);
+            trackController.onResume(isRecording(), recordingTrackPaused);
+        } else {
+            startRecording();
+        }
     }
 
     @Override
@@ -311,23 +320,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(CURRENT_TAB_TAG_KEY, pager.getCurrentItem());
-
-        if (photoUri != null) {
-            outState.putParcelable(PHOTO_URI_KEY, photoUri);
-        }
-        outState.putBoolean(HAS_PHOTO_KEY, hasPhoto);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == CAMERA_REQUEST_CODE) {
-            if (resultCode == RESULT_CANCELED) {
-                Toast.makeText(this, R.string.marker_add_canceled, Toast.LENGTH_LONG).show();
-                return;
-            }
-            hasPhoto = resultCode == RESULT_OK;
-        }
-        super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
@@ -347,10 +339,9 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         getMenuInflater().inflate(R.menu.track_detail, menu);
 
         insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
-        insertPhotoMenuItem = menu.findItem(R.id.track_detail_insert_photo);
-        insertPhotoMenuItem.setVisible(new Intent(MediaStore.ACTION_IMAGE_CAPTURE).resolveActivity(getPackageManager()) != null);
         shareMenuItem = menu.findItem(R.id.track_detail_share);
         markerListMenuItem = menu.findItem(R.id.track_detail_markers);
+        resumeMenuItem = menu.findItem(R.id.track_detail_resume_track);
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -376,9 +367,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                 intent = Intent.createChooser(intent, null);
                 startActivity(intent);
                 return true;
-            case R.id.track_detail_insert_photo:
-                createWaypointWithPicture();
-                return true;
             case R.id.track_detail_menu_show_on_map:
                 IntentUtils.showTrackOnMap(this, new long[]{trackId});
                 return true;
@@ -395,6 +383,9 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
             case R.id.track_detail_delete:
                 deleteTracks(new long[]{trackId});
                 return true;
+            case R.id.track_detail_resume_track:
+                startRecording();
+                return true;
             case R.id.track_detail_settings:
                 intent = IntentUtils.newIntent(this, SettingsActivity.class);
                 startActivity(intent);
@@ -404,20 +395,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE) {
-            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
-                Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show();
-            } else {
-                createWaypointWithPicture();
-            }
-            return;
-        }
-
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
     @Override
     protected TrackRecordingServiceConnection getTrackRecordingServiceConnection() {
         return trackRecordingServiceConnection;
@@ -451,9 +428,13 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                 return;
             }
             trackId = waypoint.getTrackId();
+            if (trackId == -1L) {
+                finish();
+                return;
+            }
         }
+
         if (trackId == -1L) {
-            finish();
             return;
         }
         Track track = contentProviderUtils.getTrack(trackId);
@@ -475,25 +456,21 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
      */
     private void updateMenuItems(boolean isPaused) {
         insertMarkerMenuItem.setVisible(isRecording() && !isPaused);
-        insertPhotoMenuItem.setVisible(hasCamera && isRecording() && !isPaused);
         shareMenuItem.setVisible(!isRecording());
         markerListMenuItem.setShowAsAction(isRecording() ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_IF_ROOM);
         String title;
         if (isRecording()) {
             title = getString(isPaused ? R.string.generic_paused : R.string.generic_recording);
+            resumeMenuItem.setVisible(false);
         } else {
             Track track = contentProviderUtils.getTrack(trackId);
             title = track != null ? track.getName() : "";
+            // Only visible if there aren't other tracks that is recording.
+            resumeMenuItem.setVisible(recordingTrackId == -1L);
         }
         setTitle(title);
     }
 
-    private void createWaypointWithPicture() {
-        Pair<Intent, Uri> intentAndPhotoUri = IntentUtils.createTakePictureIntent(this, trackId);
-        photoUri = intentAndPhotoUri.second;
-        startActivityForResult(intentAndPhotoUri.first, CAMERA_REQUEST_CODE);
-    }
-
     public void chooseActivityType(String category) {
         ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), category);
     }
@@ -508,4 +485,15 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     private boolean isRecording() {
         return trackId == recordingTrackId;
     }
+
+    private void startRecording() {
+        trackRecordingServiceConnection.startAndBind(this);
+
+        /*
+         * 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.
+         */
+        bindChangedCallback.run();
+    }
 }

src/main/java/de/dennisguse/opentracks/TrackEditActivity.java

@@ -65,7 +65,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
         long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
         if (trackId == -1L) {
             Log.e(TAG, "invalid trackId");

src/main/java/de/dennisguse/opentracks/TrackListActivity.java

@@ -28,7 +28,6 @@ import android.location.LocationManager;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -160,7 +159,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     // Menu items
     private MenuItem searchMenuItem;
     private MenuItem startGpsMenuItem;
-//    private MenuItem deleteAllMenuItem;
 
     private final OnClickListener stopListener = new OnClickListener() {
         @Override
@@ -172,8 +170,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
 
     private boolean startGps = false; // true to start gps
 
-    private boolean startNewRecording = false; // true to start a new recording
-
     // Callback when the trackRecordingServiceConnection binding changes.
     private final Runnable bindChangedCallback = new Runnable() {
         @Override
@@ -188,7 +184,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                 }
             });
 
-            if (!startGps && !startNewRecording) {
+            if (!startGps) {
                 return;
             }
 
@@ -197,17 +193,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                 Log.d(TAG, "service not available to start gps or a new recording");
                 return;
             }
-            if (startNewRecording) {
-                startGps = false;
-
-                long trackId = service.startNewTrack();
-                startNewRecording = false;
-                Intent intent = IntentUtils.newIntent(TrackListActivity.this, TrackDetailActivity.class)
-                        .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(intent);
-                Toast.makeText(TrackListActivity.this, R.string.track_list_record_success, Toast.LENGTH_SHORT)
-                        .show();
-            }
             if (startGps) {
                 service.startGps();
                 startGps = false;
@@ -220,18 +205,19 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
             if (!PreferencesUtils.isRecording(recordingTrackId)) {
                 // Not recording -> Recording
                 updateMenuItems(false, true);
-                startRecording();
+                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackDetailActivity.class);
+                startActivity(newIntent);
             } else if (recordingTrackPaused) {
-                    // Paused -> Resume
-                    updateMenuItems(false, true);
-                    trackRecordingServiceConnection.resumeTrack();
-                    trackController.update(true, false);
-                } else {
-                    // Recording -> Paused
-                    updateMenuItems(false, true);
-                    trackRecordingServiceConnection.pauseTrack();
-                    trackController.update(true, true);
-                }
+                // Paused -> Resume
+                updateMenuItems(false, true);
+                trackRecordingServiceConnection.resumeTrack();
+                trackController.update(true, false);
+            } else {
+                // Recording -> Paused
+                updateMenuItems(false, true);
+                trackRecordingServiceConnection.pauseTrack();
+                trackController.update(true, true);
+            }
         }
     };
 
@@ -244,7 +230,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         contentProviderUtils = new ContentProviderUtils(this);
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback);
+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
         trackController = new TrackController(this, trackRecordingServiceConnection, true, recordListener, stopListener);
 
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
@@ -366,7 +352,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         searchMenuItem = menu.findItem(R.id.track_list_search);
         ActivityUtils.configureSearchWidget(this, searchMenuItem, trackController);
 
-        startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
+        // Workaround for https://github.com/OpenTracksApp/OpenTracks/issues/200
+        //startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -395,11 +382,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                 } else {
                     startGps = !ServiceUtils.isTrackRecordingServiceRunning(this);
 
-                    // Show toast
-                    Toast toast = Toast.makeText(this, startGps ? R.string.gps_starting : R.string.gps_stopping, Toast.LENGTH_SHORT);
-                    toast.setGravity(Gravity.CENTER, 0, 0);
-                    toast.show();
-
                     // Invoke trackRecordingService
                     if (startGps) {
                         trackRecordingServiceConnection.startAndBind(this);
@@ -456,7 +438,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     /**
      * Shows start up dialogs.
      */
-    public void showStartupDialogs() {
+    private void showStartupDialogs() {
         // If stats_units_key is undefined, set it
         if (PreferencesUtils.getString(this, R.string.stats_units_key, "").equals("")) {
             String statsUnits = getString(Locale.US.equals(Locale.getDefault()) ? R.string.stats_units_imperial : R.string.stats_units_metric);
@@ -479,7 +461,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
      * @param isRecording  true if recording
      */
     private void updateMenuItems(boolean isGpsStarted, boolean isRecording) {
-        boolean hasTrack = listView != null && listView.getCount() != 0;
         if (startGpsMenuItem != null) {
             startGpsMenuItem.setVisible(!isRecording);
             if (!isRecording) {
@@ -489,21 +470,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         }
     }
 
-    /**
-     * Starts a new recording.
-     */
-    private void startRecording() {
-        startNewRecording = true;
-        trackRecordingServiceConnection.startAndBind(this);
-
-        /*
-         * 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.
-         */
-        bindChangedCallback.run();
-    }
-
     /**
      * Handles a context item selection.
      *

src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java

@@ -0,0 +1,103 @@
+package de.dennisguse.opentracks.chart;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
+import de.dennisguse.opentracks.util.UnitConversions;
+
+public class ChartPoint {
+    //X-axis
+    private double timeOrDistance;
+
+    //Y-axis
+    private double elevation;
+    private double speed;
+    private double pace;
+    private double heartRate = Double.NaN;
+    private double cadence = Double.NaN;
+    private double power = Double.NaN;
+
+    @VisibleForTesting
+    ChartPoint(double elevation) {
+        this.elevation = elevation;
+    }
+
+    public ChartPoint(@NonNull TrackStatisticsUpdater trackStatisticsUpdater, TrackPoint trackPoint, boolean chartByDistance, boolean metricUnits) {
+        TrackStatistics trackStatistics = trackStatisticsUpdater.getTrackStatistics();
+
+        if (chartByDistance) {
+            double distance = trackStatistics.getTotalDistance() * UnitConversions.M_TO_KM;
+            if (!metricUnits) {
+                distance *= UnitConversions.KM_TO_MI;
+            }
+            timeOrDistance = distance;
+        } else {
+            timeOrDistance = trackStatistics.getTotalTime();
+        }
+
+        elevation = trackStatisticsUpdater.getSmoothedElevation();
+        if (!metricUnits) {
+            elevation *= UnitConversions.M_TO_FT;
+        }
+
+        speed = trackStatisticsUpdater.getSmoothedSpeed() * UnitConversions.MS_TO_KMH;
+        if (!metricUnits) {
+            speed *= UnitConversions.KM_TO_MI;
+        }
+        pace = speed == 0 ? 0.0 : 60.0 / speed;
+        if (trackPoint != null) {
+            if (trackPoint.hasHeartRate()) {
+                heartRate = trackPoint.getHeartRate_bpm();
+            }
+            if (trackPoint.hasCyclingCadence()) {
+                cadence = trackPoint.getCyclingCadence_rpm();
+            }
+            if (trackPoint.hasPower()) {
+                power = trackPoint.getPower();
+            }
+        }
+    }
+
+    public double getTimeOrDistance() {
+        return timeOrDistance;
+    }
+
+    public double getElevation() {
+        return elevation;
+    }
+
+    public double getSpeed() {
+        return speed;
+    }
+
+    public double getPace() {
+        return pace;
+    }
+
+    public boolean hasHeartRate() {
+        return Double.isNaN(heartRate);
+    }
+
+    public double getHeartRate() {
+        return heartRate;
+    }
+
+    public boolean hasCadence() {
+        return Double.isNaN(cadence);
+    }
+
+    public double getCadence() {
+        return cadence;
+    }
+
+    public boolean hasPower() {
+        return Double.isNaN(power);
+    }
+
+    public double getPower() {
+        return power;
+    }
+}

src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java

@@ -23,6 +23,8 @@ import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Path;
 
+import androidx.annotation.NonNull;
+
 import java.text.NumberFormat;
 
 import de.dennisguse.opentracks.stats.ExtremityMonitor;
@@ -32,7 +34,7 @@ import de.dennisguse.opentracks.stats.ExtremityMonitor;
  *
  * @author Sandor Dornbush
  */
-class ChartValueSeries {
+abstract class ChartValueSeries {
 
     private static final float STROKE_WIDTH = 2f;
 
@@ -126,26 +128,26 @@ class ChartValueSeries {
     }
 
     /**
-     * Updates the series with a new value.
-     *
-     * @param value the new value
+     * Updates the series with a new {@link ChartPoint}.
      */
-    void update(double value) {
-        extremityMonitor.update(value);
+    void update(ChartPoint chartPoint) {
+        if (isChartPointValid(chartPoint)) {
+            extremityMonitor.update(extractDataFromChartPoint(chartPoint));
+        }
     }
 
-    /**
-     * Gets the path.
-     */
+    abstract double extractDataFromChartPoint(@NonNull ChartPoint chartPoint);
+
+    boolean isChartPointValid(@NonNull ChartPoint chartPoint) {
+        return !Double.isNaN(extractDataFromChartPoint(chartPoint));
+    }
+
+    protected abstract boolean drawIfChartPointHasNoData();
+
     Path getPath() {
         return path;
     }
 
-    /**
-     * Draws the path on canvas.
-     *
-     * @param canvas the canvas
-     */
     void drawPath(Canvas canvas) {
         canvas.drawPath(path, fillPaint);
         canvas.drawPath(path, strokePaint);

src/main/java/de/dennisguse/opentracks/chart/ChartView.java

@@ -33,6 +33,7 @@ import android.view.ScaleGestureDetector;
 import android.view.View;
 import android.widget.Scroller;
 
+import androidx.annotation.NonNull;
 import androidx.core.view.GestureDetectorCompat;
 
 import java.text.NumberFormat;
@@ -62,14 +63,6 @@ public class ChartView extends View {
 
     static final int Y_AXIS_INTERVALS = 5;
 
-    public static final int NUM_SERIES = 6;
-    public static final int ELEVATION_SERIES = 0;
-    public static final int SPEED_SERIES = 1;
-    public static final int PACE_SERIES = 2;
-    public static final int HEART_RATE_SERIES = 3;
-    public static final int CADENCE_SERIES = 4;
-    public static final int POWER_SERIES = 5;
-
     private static final int TARGET_X_AXIS_INTERVALS = 4;
 
     private static final int MIN_ZOOM_LEVEL = 1;
@@ -89,8 +82,11 @@ public class ChartView extends View {
         X_FRACTION_FORMAT.setMinimumFractionDigits(1);
     }
 
-    private final ChartValueSeries[] series = new ChartValueSeries[NUM_SERIES];
-    private final List<double[]> chartData = new ArrayList<>();
+    private final List<ChartValueSeries> seriesList = new ArrayList<>();
+    private final ChartValueSeries speedSeries;
+    private final ChartValueSeries paceSeries;
+
+    private final List<ChartPoint> chartPoints = new ArrayList<>();
     private final List<Waypoint> waypoints = new ArrayList<>();
     private final ExtremityMonitor xExtremityMonitor = new ExtremityMonitor();
     private final Paint axisPaint;
@@ -192,58 +188,124 @@ public class ChartView extends View {
         }
     });
 
-    public ChartView(Context context, boolean chartByDistance) {
+    public ChartView(Context context, final boolean chartByDistance) {
         super(context);
         this.chartByDistance = chartByDistance;
 
-        series[ELEVATION_SERIES] = new ChartValueSeries(context,
+        seriesList.add(new ChartValueSeries(context,
                 Integer.MIN_VALUE,
                 Integer.MAX_VALUE,
                 new int[]{5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000},
                 R.string.description_elevation_metric,
                 R.string.description_elevation_imperial,
                 R.color.chart_elevation_fill,
-                R.color.chart_elevation_border);
-        series[SPEED_SERIES] = new ChartValueSeries(context,
+                R.color.chart_elevation_border) {
+            @Override
+            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getElevation();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return true;
+            }
+        });
+
+        speedSeries = new ChartValueSeries(context,
                 0,
                 Integer.MAX_VALUE,
                 new int[]{1, 5, 10, 20, 50, 100},
                 R.string.description_speed_metric,
                 R.string.description_speed_imperial,
                 R.color.chart_speed_fill,
-                R.color.chart_speed_border);
-        series[PACE_SERIES] = new ChartValueSeries(context,
+                R.color.chart_speed_border) {
+            @Override
+            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getSpeed();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return reportSpeed;
+            }
+        };
+        seriesList.add(speedSeries);
+
+        paceSeries = new ChartValueSeries(context,
                 0,
                 Integer.MAX_VALUE,
                 new int[]{1, 2, 5, 10, 15, 20, 30, 60, 120},
                 R.string.description_pace_metric,
                 R.string.description_pace_imperial,
                 R.color.chart_pace_fill,
-                R.color.chart_pace_border);
-        series[HEART_RATE_SERIES] = new ChartValueSeries(context,
+                R.color.chart_pace_border) {
+            @Override
+            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getPace();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return !reportSpeed;
+            }
+        };
+        seriesList.add(paceSeries);
+
+        seriesList.add(new ChartValueSeries(context,
                 0,
                 Integer.MAX_VALUE,
                 new int[]{25, 50},
                 R.string.description_sensor_heart_rate,
                 R.string.description_sensor_heart_rate,
                 R.color.chart_heart_rate_fill,
-                R.color.chart_heart_rate_border);
-        series[CADENCE_SERIES] = new ChartValueSeries(context,
+                R.color.chart_heart_rate_border) {
+            @Override
+            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getHeartRate();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return false;
+            }
+        });
+
+        seriesList.add(new ChartValueSeries(context,
                 0,
                 Integer.MAX_VALUE,
                 new int[]{5, 10, 25, 50},
                 R.string.description_sensor_cadence,
                 R.string.description_sensor_cadence,
                 R.color.chart_cadence_fill,
-                R.color.chart_cadence_border);
-        series[POWER_SERIES] = new ChartValueSeries(context,
+                R.color.chart_cadence_border) {
+            @Override
+            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getCadence();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return false;
+            }
+        });
+        seriesList.add(new ChartValueSeries(context,
                 0,
                 1000,
                 new int[]{5, 50, 100, 200},
                 R.string.description_sensor_power,
                 R.string.description_sensor_power,
                 R.color.chart_power_fill,
-                R.color.chart_power_border);
+                R.color.chart_power_border) {
+            @Override
+            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getPower();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return false;
+            }
+        });
 
         float scale = context.getResources().getDisplayMetrics().density;
 
@@ -279,6 +341,10 @@ public class ChartView extends View {
         setFocusable(true);
         setClickable(true);
         updateDimensions();
+
+        // either speedSeries or paceSeries should be enabled.
+        speedSeries.setEnabled(reportSpeed);
+        paceSeries.setEnabled(!reportSpeed);
     }
 
     @Override
@@ -286,13 +352,8 @@ public class ChartView extends View {
         return true;
     }
 
-    /**
-     * Sets the enabled value for a chart value series.
-     *
-     * @param index the chart value series index
-     */
-    public void setChartValueSeriesEnabled(int index, boolean enabled) {
-        series[index].setEnabled(enabled);
+    public boolean getMetricUnits() {
+        return metricUnits;
     }
 
     /**
@@ -304,38 +365,48 @@ public class ChartView extends View {
         metricUnits = value;
     }
 
+    public boolean getReportSpeed() {
+        return reportSpeed;
+    }
+
     /**
      * Sets report speed.
      *
-     * @param value true to report speed
+     * @param value report speed (true) or pace (false)
      */
     public void setReportSpeed(boolean value) {
         reportSpeed = value;
     }
 
-    /**
-     * Sets show pointer.
-     *
-     * @param value true to show pointer
-     */
+    public boolean applyReportSpeed() {
+        if (reportSpeed) {
+            if (!speedSeries.isEnabled()) {
+                speedSeries.setEnabled(true);
+                paceSeries.setEnabled(false);
+                return true;
+            }
+        } else {
+            if (!paceSeries.isEnabled()) {
+                speedSeries.setEnabled(false);
+                paceSeries.setEnabled(true);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public void setShowPointer(boolean value) {
         showPointer = value;
     }
 
-    /**
-     * Adds data points.
-     *
-     * @param dataPoints an array of data points to be added
-     */
-    public void addDataPoints(List<double[]> dataPoints) {
-        synchronized (chartData) {
-            chartData.addAll(dataPoints);
-            for (double[] dataPoint : dataPoints) {
-                xExtremityMonitor.update(dataPoint[0]);
-                for (int j = 0; j < series.length; j++) {
-                    if (!Double.isNaN(dataPoint[j + 1])) {
-                        series[j].update(dataPoint[j + 1]);
-                    }
+    public void addChartPoints(List<ChartPoint> dataPoints) {
+        synchronized (chartPoints) {
+            chartPoints.addAll(dataPoints);
+            for (ChartPoint dataPoint : dataPoints) {
+                xExtremityMonitor.update(dataPoint.getTimeOrDistance());
+                for (ChartValueSeries i : seriesList) {
+                    i.update(dataPoint);
                 }
             }
             updateDimensions();
@@ -347,8 +418,8 @@ public class ChartView extends View {
      * Clears all data.
      */
     public void reset() {
-        synchronized (chartData) {
-            chartData.clear();
+        synchronized (chartPoints) {
+            chartPoints.clear();
             xExtremityMonitor.reset();
             zoomLevel = 1;
             updateDimensions();
@@ -356,50 +427,34 @@ public class ChartView extends View {
     }
 
     /**
-     * Resets scroll. To be called on the UI thread.
+     * Resets scroll.
+     * To be called on the UI thread.
      */
     public void resetScroll() {
         scrollTo(0, 0);
     }
 
-    /**
-     * Adds a waypoint.
-     *
-     * @param waypoint the waypoint
-     */
     public void addWaypoint(Waypoint waypoint) {
         synchronized (waypoints) {
             waypoints.add(waypoint);
         }
     }
 
-    /**
-     * Clears the waypoints.
-     */
     public void clearWaypoints() {
         synchronized (waypoints) {
             waypoints.clear();
         }
     }
 
-    /**
-     * Returns true if can zoom in.
-     */
-    public boolean canZoomIn() {
+    private boolean canZoomIn() {
         return zoomLevel < MAX_ZOOM_LEVEL;
     }
 
-    /**
-     * Returns true if can zoom out.
-     */
-    public boolean canZoomOut() {
+    private boolean canZoomOut() {
         return zoomLevel > MIN_ZOOM_LEVEL;
     }
 
-    /**
-     * Zooms in one level.
-     */
-    public void zoomIn() {
+    private void zoomIn() {
         if (canZoomIn()) {
             zoomLevel++;
             updatePaths();
@@ -407,10 +462,7 @@ public class ChartView extends View {
         }
     }
 
-    /**
-     * Zooms out one level.
-     */
-    public void zoomOut() {
+    private void zoomOut() {
         if (canZoomOut()) {
             zoomLevel--;
             scroller.abortAnimation();
@@ -430,7 +482,7 @@ public class ChartView extends View {
      *
      * @param velocityX velocity of fling in pixels per second
      */
-    public void fling(int velocityX) {
+    private void fling(int velocityX) {
         int maxWidth = effectiveWidth * (zoomLevel - 1);
         scroller.fling(getScrollX(), 0, velocityX, 0, 0, maxWidth, 0, 0);
         invalidate();
@@ -441,7 +493,7 @@ public class ChartView extends View {
      *
      * @param deltaX the number of pixels to scroll
      */
-    public void scrollBy(int deltaX) {
+    private void scrollBy(int deltaX) {
         int scrollX = getScrollX() + deltaX;
         if (scrollX < 0) {
             scrollX = 0;
@@ -485,8 +537,7 @@ public class ChartView extends View {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        synchronized (chartData) {
-
+        synchronized (chartPoints) {
             canvas.save();
 
             canvas.drawColor(Color.WHITE);
@@ -529,7 +580,7 @@ public class ChartView extends View {
      * @param canvas the canvas
      */
     private void drawDataSeries(Canvas canvas) {
-        for (ChartValueSeries chartValueSeries : series) {
+        for (ChartValueSeries chartValueSeries : seriesList) {
             if (chartValueSeries.isEnabled() && chartValueSeries.hasData()) {
                 chartValueSeries.drawPath(canvas);
             }
@@ -543,11 +594,7 @@ public class ChartView extends View {
      */
     private void drawWaypoints(Canvas canvas) {
         synchronized (waypoints) {
-            for (int i = 0; i < waypoints.size(); i++) {
-                final Waypoint waypoint = waypoints.get(i);
-                if (waypoint.getLocation() == null) {
-                    continue;
-                }
+            for (Waypoint waypoint : waypoints) {
                 double xValue = getWaypointXValue(waypoint);
                 if (xValue > maxX) {
                     continue;
@@ -595,9 +642,8 @@ public class ChartView extends View {
         int lines = titleDimensions[0];
         int lineHeight = titleDimensions[1];
         int count = 0;
-        for (int i = 0; i < series.length; i++) {
-            ChartValueSeries chartValueSeries = series[i];
-            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(i)) {
+        for (ChartValueSeries chartValueSeries : seriesList) {
+            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(chartValueSeries)) {
                 count++;
                 String title = getContext().getString(chartValueSeries.getTitleId(metricUnits));
                 Paint paint = chartValueSeries.getTitlePaint();
@@ -615,9 +661,8 @@ public class ChartView extends View {
     private int[] getTitleDimensions() {
         int lines = 0;
         int lineHeight = 0;
-        for (int i = 0; i < series.length; i++) {
-            ChartValueSeries chartValueSeries = series[i];
-            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(i)) {
+        for (ChartValueSeries chartValueSeries : seriesList) {
+            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(chartValueSeries)) {
                 lines++;
                 String title = getContext().getString(chartValueSeries.getTitleId(metricUnits));
                 Rect rect = getRect(chartValueSeries.getTitlePaint(), title);
@@ -651,9 +696,6 @@ public class ChartView extends View {
         }
     }
 
-    /**
-     * Gets the x axis label.
-     */
     private String getXAxisLabel() {
         Context context = getContext();
         if (chartByDistance) {
@@ -677,9 +719,6 @@ public class ChartView extends View {
         canvas.drawText(marker, getX(value), topBorder + effectiveHeight + spacing + rect.height(), xAxisMarkerPaint);
     }
 
-    /**
-     * Gets the x axis interval.
-     */
     private double getXAxisInterval() {
         double interval = maxX / zoomLevel / TARGET_X_AXIS_INTERVALS;
         if (interval < 1) {
@@ -694,16 +733,13 @@ public class ChartView extends View {
         return interval;
     }
 
-    /**
-     * Gets the x axis marker positions.
-     */
     private List<Double> getXAxisMarkerPositions(double interval) {
         List<Double> markers = new ArrayList<>();
         markers.add(0d);
         for (int i = 1; i * interval < maxX; i++) {
             markers.add(i * interval);
         }
-        // At least 2 markers
+
         if (markers.size() < 2) {
             markers.add(maxX);
         }
@@ -720,11 +756,12 @@ public class ChartView extends View {
         int y = topBorder;
         canvas.drawLine(x, y, x, y + effectiveHeight, axisPaint);
 
+        //TODO
         int markerXPosition = x - spacer;
-        for (int i = 0; i < series.length; i++) {
-            int index = series.length - 1 - i;
-            ChartValueSeries chartValueSeries = series[index];
-            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(index)) {
+        for (int i = 0; i < seriesList.size(); i++) {
+            int index = seriesList.size() - 1 - i;
+            ChartValueSeries chartValueSeries = seriesList.get(index);
+            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(chartValueSeries)) {
                 markerXPosition -= drawYAxisMarkers(chartValueSeries, canvas, markerXPosition) + spacer;
             }
         }
@@ -772,29 +809,29 @@ public class ChartView extends View {
      * @param canvas the canvas
      */
     private void drawPointer(Canvas canvas) {
-        int index = -1;
-        for (int i = 0; i < series.length; i++) {
-            ChartValueSeries chartValueSeries = series[i];
+        ChartValueSeries firstChartValueSeries = null;
+        for (ChartValueSeries chartValueSeries : seriesList) {
             if (chartValueSeries.isEnabled() && chartValueSeries.hasData()) {
-                index = i;
+                firstChartValueSeries = chartValueSeries;
                 break;
             }
         }
-        if (index != -1 && chartData.size() > 0) {
+        if (firstChartValueSeries != null && chartPoints.size() > 0) {
             int dx = getX(maxX) - pointer.getIntrinsicWidth() / 2;
-            int dy = getY(series[index], chartData.get(chartData.size() - 1)[index + 1])
-                    - pointer.getIntrinsicHeight();
+            double value = firstChartValueSeries.extractDataFromChartPoint(chartPoints.get(chartPoints.size() - 1));
+            int dy = getY(firstChartValueSeries, value) - pointer.getIntrinsicHeight();
             canvas.translate(dx, dy);
             pointer.draw(canvas);
         }
     }
 
     /**
-     * Updates paths. The path needs to be updated any time after the data or the dimensions change.
+     * Updates paths.
+     * The path needs to be updated any time after the data or the dimensions change.
      */
     private void updatePaths() {
-        synchronized (chartData) {
-            for (ChartValueSeries chartValueSeries : series) {
+        synchronized (chartPoints) {
+            for (ChartValueSeries chartValueSeries : seriesList) {
                 chartValueSeries.getPath().reset();
             }
             drawPaths();
@@ -802,24 +839,23 @@ public class ChartView extends View {
         }
     }
 
-    /**
-     * Draws all paths.
-     */
     private void drawPaths() {
-        boolean[] hasMoved = new boolean[series.length];
+        boolean[] hasMoved = new boolean[seriesList.size()];
 
-        for (double[] dataPoint : chartData) {
-            for (int j = 0; j < series.length; j++) {
-                double value = dataPoint[j + 1];
-                if (Double.isNaN(value)) {
+        for (ChartPoint dataPoint : chartPoints) {
+            for (int i = 0; i < seriesList.size(); i++) {
+                ChartValueSeries chartValueSeries = seriesList.get(i);
+
+                if (!chartValueSeries.isChartPointValid(dataPoint)) {
                     continue;
                 }
-                ChartValueSeries chartValueSeries = series[j];
+
+                double value = chartValueSeries.extractDataFromChartPoint(dataPoint);
                 Path path = chartValueSeries.getPath();
-                int x = getX(dataPoint[0]);
+                int x = getX(dataPoint.getTimeOrDistance());
                 int y = getY(chartValueSeries, value);
-                if (!hasMoved[j]) {
-                    hasMoved[j] = true;
+                if (!hasMoved[i]) {
+                    hasMoved[i] = true;
                     path.moveTo(x, y);
                 } else {
                     path.lineTo(x, y);
@@ -828,37 +864,32 @@ public class ChartView extends View {
         }
     }
 
-    /**
-     * Closes all paths.
-     */
     private void closePaths() {
-        for (int i = 0; i < series.length; i++) {
-            int first = getFirstPopulatedChartDataIndex(i);
+        for (ChartValueSeries chartValueSeries : seriesList) {
+            int first = getFirstPopulatedChartDataIndex(chartValueSeries);
 
             if (first != -1) {
-                int xCorner = getX(chartData.get(first)[0]);
+                int xCorner = getX(chartPoints.get(first).getTimeOrDistance());
                 int yCorner = topBorder + effectiveHeight;
-                ChartValueSeries chartValueSeries = series[i];
                 Path path = chartValueSeries.getPath();
                 // Bottom right corner
-                path.lineTo(getX(chartData.get(chartData.size() - 1)[0]), yCorner);
+                path.lineTo(getX(chartPoints.get(chartPoints.size() - 1).getTimeOrDistance()), yCorner);
                 // Bottom left corner
                 path.lineTo(xCorner, yCorner);
                 // Top right corner
-                path.lineTo(xCorner, getY(chartValueSeries, chartData.get(first)[i + 1]));
+                double value = chartValueSeries.extractDataFromChartPoint(chartPoints.get(first));
+                path.lineTo(xCorner, getY(chartValueSeries, value));
             }
         }
     }
 
     /**
      * Finds the index of the first data point containing data for a series.
-     * Returns -1 if no data point contains data for the series.
-     *
-     * @param seriesIndex the series's index
+     * @return -1 if no data point contains data for the series.
      */
-    private int getFirstPopulatedChartDataIndex(int seriesIndex) {
-        for (int i = 0; i < chartData.size(); i++) {
-            if (!Double.isNaN(chartData.get(i)[seriesIndex + 1])) {
+    private int getFirstPopulatedChartDataIndex(ChartValueSeries chartValueSeries) {
+        for (int i = 0; i < chartPoints.size(); i++) {
+            if (chartValueSeries.isChartPointValid(chartPoints.get(i))) {
                 return i;
             }
         }
@@ -870,7 +901,7 @@ public class ChartView extends View {
      */
     private void updateDimensions() {
         maxX = xExtremityMonitor.hasData() ? xExtremityMonitor.getMax() : 1.0;
-        for (ChartValueSeries chartValueSeries : series) {
+        for (ChartValueSeries chartValueSeries : seriesList) {
             chartValueSeries.updateDimension();
         }
         float density = getContext().getResources().getDisplayMetrics().density;
@@ -878,9 +909,8 @@ public class ChartView extends View {
         yAxisOffset = (int) (density * Y_AXIS_OFFSET);
 
         int markerLength = 0;
-        for (int i = 0; i < series.length; i++) {
-            ChartValueSeries chartValueSeries = series[i];
-            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(i)) {
+        for (ChartValueSeries chartValueSeries : seriesList) {
+            if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(chartValueSeries)) {
                 Rect rect = getRect(chartValueSeries.getMarkerPaint(), chartValueSeries.getLargestMarker());
                 markerLength += rect.width() + spacer;
             }
@@ -973,22 +1003,12 @@ public class ChartView extends View {
 
     /**
      * Returns true if the index is allowed when the chartData is empty.
-     *
-     * @param index the index
      */
-    private boolean allowIfEmpty(int index) {
-        if (!chartData.isEmpty()) {
+    private boolean allowIfEmpty(ChartValueSeries chartValueSeries) {
+        if (!chartPoints.isEmpty()) {
             return false;
         }
-        switch (index) {
-            case ELEVATION_SERIES:
-                return true;
-            case SPEED_SERIES:
-                return reportSpeed;
-            case PACE_SERIES:
-                return !reportSpeed;
-            default:
-                return false;
-        }
+
+        return chartValueSeries.drawIfChartPointHasNoData();
     }
 }

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

@@ -1,44 +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 android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-
-/**
- * Data source on the phone.
- *
- * @author Rodrigo Damazio
- */
-class DataSource {
-
-    private final ContentResolver contentResolver;
-
-    DataSource(Context context) {
-        contentResolver = context.getContentResolver();
-    }
-
-    void registerContentObserver(Uri uri, ContentObserver observer) {
-        contentResolver.registerContentObserver(uri, false, observer);
-    }
-
-    void unregisterContentObserver(ContentObserver observer) {
-        contentResolver.unregisterContentObserver(observer);
-    }
-}

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

@@ -1,41 +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;
-
-
-/**
- * Listener to be invoked when {@link DataSource} changes.
- *
- * @author Jimmy Shih
- */
-public interface DataSourceListener {
-
-    /**
-     * Notifies when the tracks table is updated.
-     */
-    void notifyTracksTableUpdated();
-
-    /**
-     * Notifies when the waypoints table is updated.
-     */
-    void notifyWaypointsTableUpdated();
-
-    /**
-     * Notifies when the track points table is updated.
-     */
-    void notifyTrackPointsTableUpdated();
-}

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

@@ -1,208 +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 android.database.ContentObserver;
-import android.os.Handler;
-import android.util.Log;
-
-import java.util.EnumSet;
-import java.util.Set;
-
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.content.data.WaypointsColumns;
-
-/**
- * Creates observers/listeners and manages their registration with {@link DataSource}.
- * The observers/listeners calls {@link DataSourceListener} when data changes.
- *
- * @author Rodrigo Damazio
- */
-class DataSourceManager {
-
-    private static final String TAG = DataSourceManager.class.getSimpleName();
-
-    private final DataSource dataSource;
-
-    private final DataSourceListener dataSourceListener;
-
-    // Registered listeners
-    private final Set<TrackDataType> registeredListeners = EnumSet.noneOf(TrackDataType.class);
-    private final Handler handler;
-    private final TracksTableObserver tracksTableObserver;
-    private final WaypointsTableObserver waypointsTableObserver;
-    private final TrackPointsTableObserver trackPointsTableObserver;
-
-    DataSourceManager(DataSource dataSource, DataSourceListener dataSourceListener) {
-        this.dataSource = dataSource;
-        this.dataSourceListener = dataSourceListener;
-
-        handler = new Handler();
-        tracksTableObserver = new TracksTableObserver();
-        waypointsTableObserver = new WaypointsTableObserver();
-        trackPointsTableObserver = new TrackPointsTableObserver();
-    }
-
-    /**
-     * Updates listeners with data source.
-     *
-     * @param listeners the listeners
-     */
-    void updateListeners(EnumSet<TrackDataType> listeners) {
-        EnumSet<TrackDataType> neededListeners = EnumSet.copyOf(listeners);
-
-        // Map SAMPLED_OUT_POINT_UPDATES to POINT_UPDATES since they correspond to the same internal listener
-        if (neededListeners.contains(TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE)) {
-            neededListeners.remove(TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE);
-            neededListeners.add(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE);
-        }
-
-        Log.d(TAG, "Updating listeners " + neededListeners);
-
-        // Unnecessary = registered - needed
-        Set<TrackDataType> unnecessaryListeners = EnumSet.copyOf(registeredListeners);
-        unnecessaryListeners.removeAll(neededListeners);
-
-        // Missing = needed - registered
-        Set<TrackDataType> missingListeners = EnumSet.copyOf(neededListeners);
-        missingListeners.removeAll(registeredListeners);
-
-        // Remove unnecessary listeners
-        for (TrackDataType trackDataType : unnecessaryListeners) {
-            unregisterListener(trackDataType);
-        }
-
-        // Add missing listeners
-        for (TrackDataType trackDataType : missingListeners) {
-            registerListener(trackDataType);
-        }
-
-        // Update registered listeners
-        registeredListeners.clear();
-        registeredListeners.addAll(neededListeners);
-    }
-
-    /**
-     * Registers a listener with data source.
-     *
-     * @param trackDataType the listener data type
-     */
-    private void registerListener(TrackDataType trackDataType) {
-        switch (trackDataType) {
-            case TRACKS_TABLE:
-                dataSource.registerContentObserver(TracksColumns.CONTENT_URI, tracksTableObserver);
-                break;
-            case WAYPOINTS_TABLE:
-                dataSource.registerContentObserver(WaypointsColumns.CONTENT_URI, waypointsTableObserver);
-                break;
-            case SAMPLED_IN_TRACK_POINTS_TABLE:
-                dataSource.registerContentObserver(
-                        TrackPointsColumns.CONTENT_URI, trackPointsTableObserver);
-                break;
-            case SAMPLED_OUT_TRACK_POINTS_TABLE:
-                // Do nothing. SAMPLED_OUT_POINT_UPDATES is mapped to POINT_UPDATES.
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Unregisters a listener with data source.
-     *
-     * @param trackDataType listener data type
-     */
-    private void unregisterListener(TrackDataType trackDataType) {
-        switch (trackDataType) {
-            case TRACKS_TABLE:
-                dataSource.unregisterContentObserver(tracksTableObserver);
-                break;
-            case WAYPOINTS_TABLE:
-                dataSource.unregisterContentObserver(waypointsTableObserver);
-                break;
-            case SAMPLED_IN_TRACK_POINTS_TABLE:
-                dataSource.unregisterContentObserver(trackPointsTableObserver);
-                break;
-            case SAMPLED_OUT_TRACK_POINTS_TABLE:
-                // Do nothing. SAMPLED_OUT_POINT_UPDATES is mapped to POINT_UPDATES.
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Unregisters all listeners with data source.
-     */
-    void unregisterAllListeners() {
-        for (TrackDataType trackDataType : TrackDataType.values()) {
-            unregisterListener(trackDataType);
-        }
-    }
-
-    /**
-     * Observer when the tracks table is updated.
-     *
-     * @author Jimmy Shih
-     */
-    private class TracksTableObserver extends ContentObserver {
-
-        TracksTableObserver() {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            dataSourceListener.notifyTracksTableUpdated();
-        }
-    }
-
-    /**
-     * Observer when the waypoints table is updated.
-     *
-     * @author Jimmy Shih
-     */
-    private class WaypointsTableObserver extends ContentObserver {
-
-        WaypointsTableObserver() {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            dataSourceListener.notifyWaypointsTableUpdated();
-        }
-    }
-
-    /**
-     * Observer when the track points table is updated.
-     *
-     * @author Jimmy Shih
-     */
-    private class TrackPointsTableObserver extends ContentObserver {
-
-        TrackPointsTableObserver() {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            dataSourceListener.notifyTrackPointsTableUpdated();
-        }
-    }
-}

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

@@ -23,7 +23,7 @@ import androidx.annotation.VisibleForTesting;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
@@ -67,7 +67,7 @@ public class DescriptionGenerator {
         writeString(track.getName(), builder, R.string.generic_name_line, lineBreak);
         writeString(track.getCategory(), builder, R.string.description_activity_type, lineBreak);
         writeString(track.getDescription(), builder, R.string.generic_description_line, lineBreak);
-        builder.append(generateTripStatisticsDescription(track.getTripStatistics(), html));
+        builder.append(generateTrackStatisticsDescription(track.getTrackStatistics(), html));
 
         return builder.toString();
     }
@@ -89,12 +89,12 @@ public class DescriptionGenerator {
     }
 
     /**
-     * Generates a description for a {@link TripStatistics}.
+     * Generates a description for a {@link TrackStatistics}.
      *
-     * @param stats the trip statistics
+     * @param stats the track statistics
      * @param html  true to use "<br>" for line break instead of "\n"
      */
-    private String generateTripStatisticsDescription(TripStatistics stats, boolean html) {
+    private String generateTrackStatisticsDescription(TrackStatistics stats, boolean html) {
         String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK;
         StringBuilder builder = new StringBuilder();
 
@@ -126,22 +126,20 @@ public class DescriptionGenerator {
         writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak);
 
         // Max elevation
-        writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak);
+        if (stats.hasElevationMax()) {
+            writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak);
+        }
 
         // Min elevation
-        writeElevation(stats.getMinElevation(), builder, R.string.description_min_elevation, lineBreak);
+        if (stats.hasElevationMin()) {
+            writeElevation(stats.getMinElevation(), builder, R.string.description_min_elevation, lineBreak);
+        }
 
         // Elevation gain
         writeElevation(stats.getTotalElevationGain(), builder, R.string.description_elevation_gain, lineBreak);
 
-        // Max grade
-        writeGrade(stats.getMaxGrade(), builder, R.string.description_max_grade, lineBreak);
-
-        // Min grade
-        writeGrade(stats.getMinGrade(), builder, R.string.description_min_grade, lineBreak);
-
         // Recorded time
-        builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTime(context, stats.getStartTime())));
+        builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTime(context, stats.getStartTime_ms())));
         builder.append(lineBreak);
 
         return builder.toString();
@@ -228,19 +226,4 @@ public class DescriptionGenerator {
         builder.append(context.getString(resId, elevationInM, elevationInFt));
         builder.append(lineBreak);
     }
-
-    /**
-     * Writes grade.
-     *
-     * @param grade     grade in fraction
-     * @param builder   StringBuilder to append grade
-     * @param resId     resource id grade string
-     * @param lineBreak line break string
-     */
-    @VisibleForTesting
-    void writeGrade(double grade, StringBuilder builder, int resId, String lineBreak) {
-        long gradeInPercent = Double.isNaN(grade) || Double.isInfinite(grade) ? 0L : Math.round(grade * 100);
-        builder.append(context.getString(resId, gradeInPercent));
-        builder.append(lineBreak);
-    }
 }

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

@@ -33,7 +33,7 @@ import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
@@ -247,9 +247,9 @@ public class SearchEngine {
 
         score *= getTitleBoost(query, track.getName(), track.getDescription(), track.getCategory());
 
-        TripStatistics statistics = track.getTripStatistics();
+        TrackStatistics statistics = track.getTrackStatistics();
 
-        long meanTimestamp = (statistics.getStartTime() + statistics.getStopTime()) / 2L;
+        long meanTimestamp = (statistics.getStartTime_ms() + statistics.getStopTime_ms()) / 2L;
         score *= getTimeBoost(query, meanTimestamp);
 
         // Score the currently-selected track lower (user is already there, wouldn't be searching for it).

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

@@ -16,10 +16,11 @@
 
 package de.dennisguse.opentracks.content;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.database.ContentObserver;
 import android.database.Cursor;
-import android.location.Location;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
@@ -27,24 +28,29 @@ import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.Set;
 
 import de.dennisguse.opentracks.R;
 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.data.Waypoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointFactory;
 import de.dennisguse.opentracks.content.provider.TrackPointIterator;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 /**
- * Track data hub. Receives data from {@link DataSource} and distributes it to {@link TrackDataListener} after some processing.
+ * Track data hub.
+ * Receives data from {@link de.dennisguse.opentracks.content.provider.CustomContentProvider} and distributes it to {@link TrackDataListener} after some processing.
+ *
+ * {@link TrackPoint}s are filtered/downsampled with a dynamic sampling frequency.
  *
  * @author Rodrigo Damazio
  */
-public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     /**
      * Target number of track points displayed by the map overlay.
@@ -70,8 +76,6 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
     private boolean started;
     private HandlerThread handlerThread;
     private Handler handler;
-    private DataSource dataSource;
-    private DataSourceManager dataSourceManager;
 
     // Preference values
     private long selectedTrackId;
@@ -80,8 +84,13 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
 
     // Track points sampling state
     private int numLoadedPoints;
-    private long firstSeenLocationId;
-    private long lastSeenLocationId;
+    private long firstSeenTrackPointId;
+    private long lastSeenTrackPointId;
+
+    // Registered listeners
+    private ContentObserver tracksTableObserver;
+    private ContentObserver waypointsTableObserver;
+    private ContentObserver trackPointsTableObserver;
 
     public TrackDataHub(Context context) {
         this(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACK_POINTS);
@@ -102,19 +111,43 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
             return;
         }
         started = true;
-        handlerThread = new HandlerThread("TrackDataHubHandlerThread");
+        handlerThread = new HandlerThread(TAG);
         handlerThread.start();
         handler = new Handler(handlerThread.getLooper());
-        dataSource = newDataSource();
-        dataSourceManager = new DataSourceManager(dataSource, this);
+
+        //register listeners
+        ContentResolver contentResolver = context.getContentResolver();
+        tracksTableObserver = new ContentObserver(handler) {
+            @Override
+            public void onChange(boolean selfChange) {
+                notifyTracksTableUpdate(trackDataManager.getListenerTracks());
+            }
+        };
+        contentResolver.registerContentObserver(TracksColumns.CONTENT_URI, false, tracksTableObserver);
+
+        waypointsTableObserver = new ContentObserver(handler) {
+            @Override
+            public void onChange(boolean selfChange) {
+                notifyWaypointsTableUpdate(trackDataManager.getListenerWaypoints());
+            }
+        };
+        contentResolver.registerContentObserver(WaypointsColumns.CONTENT_URI, false, waypointsTableObserver);
+
+        trackPointsTableObserver = new ContentObserver(handler) {
+            @Override
+            public void onChange(boolean selfChange) {
+                notifyTrackPointsTableUpdate(true, trackDataManager.getListenerTrackPoints_SampledIn(), trackDataManager.getListenerTrackPoints_SampledOut());
+            }
+        };
+        contentResolver.registerContentObserver(TrackPointsColumns.CONTENT_URI_BY_ID, false, trackPointsTableObserver);
+
 
         PreferencesUtils.register(context, this);
         onSharedPreferenceChanged(null, null);
         runInHandlerThread(new Runnable() {
             @Override
             public void run() {
-                if (dataSourceManager != null) {
-                    dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes());
+                if (started) {
                     loadDataForAll();
                 }
             }
@@ -131,14 +164,17 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
 
         started = false;
 
-        dataSourceManager.unregisterAllListeners();
+        //Unregister listeners
+        ContentResolver contentResolver = context.getContentResolver();
+        contentResolver.unregisterContentObserver(tracksTableObserver);
+        contentResolver.unregisterContentObserver(waypointsTableObserver);
+        contentResolver.unregisterContentObserver(trackPointsTableObserver);
+
         if (handlerThread != null) {
             handlerThread.getLooper().quit();
             handlerThread = null;
         }
         handler = null;
-        dataSource = null;
-        dataSourceManager = null;
     }
 
     public void loadTrack(final long trackId) {
@@ -159,15 +195,13 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
      * Registers a {@link TrackDataListener}.
      *
      * @param trackDataListener the track data listener
-     * @param trackDataTypes    the track data types
      */
-    public void registerTrackDataListener(final TrackDataListener trackDataListener, final EnumSet<TrackDataType> trackDataTypes) {
+    public void registerTrackDataListener(final TrackDataListener trackDataListener, final boolean tracksTable, final boolean waypointsTable, final boolean trackPointsTable_SampleIn, final boolean trackPointsTable_SampleOut) {
         runInHandlerThread(new Runnable() {
             @Override
             public void run() {
-                trackDataManager.registerListener(trackDataListener, trackDataTypes);
-                if (dataSourceManager != null) {
-                    dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes());
+                trackDataManager.registerTrackDataListener(trackDataListener, tracksTable, waypointsTable, trackPointsTable_SampleIn, trackPointsTable_SampleOut);
+                if (started) {
                     loadDataForListener(trackDataListener);
                 }
             }
@@ -183,22 +217,7 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
         runInHandlerThread(new Runnable() {
             @Override
             public void run() {
-                trackDataManager.unregisterListener(trackDataListener);
-                if (dataSourceManager != null) {
-                    dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes());
-                }
-            }
-        });
-    }
-
-    /**
-     * Reloads data for a {@link TrackDataListener}.
-     */
-    public void reloadDataForListener(final TrackDataListener trackDataListener) {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                loadDataForListener(trackDataListener);
+                trackDataManager.unregisterTrackDataListener(trackDataListener);
             }
         });
     }
@@ -217,37 +236,6 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
         return selectedTrackId == recordingTrackId && recordingTrackPaused;
     }
 
-    @Override
-    public void notifyTracksTableUpdated() {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                notifyTracksTableUpdate(trackDataManager.getListeners(TrackDataType.TRACKS_TABLE));
-            }
-        });
-    }
-
-    @Override
-    public void notifyWaypointsTableUpdated() {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                notifyWaypointsTableUpdate(trackDataManager.getListeners(TrackDataType.WAYPOINTS_TABLE));
-            }
-        });
-    }
-
-    @Override
-    public void notifyTrackPointsTableUpdated() {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                notifyTrackPointsTableUpdate(true, trackDataManager.getListeners(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE),
-                        trackDataManager.getListeners(TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE));
-            }
-        });
-    }
-
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, final String key) {
         runInHandlerThread(new Runnable() {
@@ -268,19 +256,17 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
      */
     private void loadDataForAll() {
         resetSamplingState();
-        if (trackDataManager.getNumberOfListeners() == 0) {
+        if (!trackDataManager.hasListeners()) {
             return;
         }
 
-        notifyTracksTableUpdate(trackDataManager.getListeners(TrackDataType.TRACKS_TABLE));
+        notifyTracksTableUpdate(trackDataManager.getListenerTracks());
 
-        for (TrackDataListener listener : trackDataManager.getListeners(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE)) {
+        for (TrackDataListener listener : trackDataManager.getListenerTrackPoints_SampledIn()) {
             listener.clearTrackPoints();
         }
-        notifyTrackPointsTableUpdate(true,
-                trackDataManager.getListeners(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE),
-                trackDataManager.getListeners(TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE));
-        notifyWaypointsTableUpdate(trackDataManager.getListeners(TrackDataType.WAYPOINTS_TABLE));
+        notifyTrackPointsTableUpdate(true, trackDataManager.getListenerTrackPoints_SampledIn(), trackDataManager.getListenerTrackPoints_SampledOut());
+        notifyWaypointsTableUpdate(trackDataManager.getListenerWaypoints());
     }
 
     /**
@@ -290,14 +276,13 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
      */
     private void loadDataForListener(TrackDataListener trackDataListener) {
         Set<TrackDataListener> trackDataListeners = Collections.singleton(trackDataListener);
-        EnumSet<TrackDataType> trackDataTypes = trackDataManager.getTrackDataTypes(trackDataListener);
 
-        if (trackDataTypes.contains(TrackDataType.TRACKS_TABLE)) {
+        if (trackDataManager.listensForTracks(trackDataListener)) {
             notifyTracksTableUpdate(trackDataListeners);
         }
 
-        boolean hasSampledIn = trackDataTypes.contains(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE);
-        boolean hasSampledOut = trackDataTypes.contains(TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE);
+        boolean hasSampledIn = trackDataManager.listensForTrackPoints_SampledIn(trackDataListener);
+        boolean hasSampledOut = trackDataManager.listensForTrackPoints_SampledOut(trackDataListener);
         if (hasSampledIn || hasSampledOut) {
             trackDataListener.clearTrackPoints();
             boolean isOnlyListener = trackDataManager.getNumberOfListeners() == 1;
@@ -308,7 +293,7 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
             notifyTrackPointsTableUpdate(isOnlyListener, trackDataListeners, sampledOutListeners);
         }
 
-        if (trackDataTypes.contains(TrackDataType.WAYPOINTS_TABLE)) {
+        if (trackDataManager.listensForWaypoints(trackDataListener)) {
             notifyWaypointsTableUpdate(trackDataListeners);
         }
     }
@@ -383,60 +368,60 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
             }
         }
 
-        int localNumLoadedPoints = updateSamplingState ? numLoadedPoints : 0;
-        long localFirstSeenLocationId = updateSamplingState ? firstSeenLocationId : -1L;
-        long localLastSeenLocationId = updateSamplingState ? lastSeenLocationId : -1L;
-        long maxPointId = updateSamplingState ? -1L : lastSeenLocationId;
+        int localNumLoadedTrackPoints = updateSamplingState ? numLoadedPoints : 0;
+        long localFirstSeenTrackPointId = updateSamplingState ? firstSeenTrackPointId : -1L;
+        long localLastSeenTrackPointIdId = updateSamplingState ? lastSeenTrackPointId : -1L;
+        long maxPointId = updateSamplingState ? -1L : lastSeenTrackPointId;
 
         long lastTrackPointId = contentProviderUtils.getLastTrackPointId(selectedTrackId);
         int samplingFrequency = -1;
         boolean includeNextPoint = false;
 
-        try (TrackPointIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenLocationId + 1, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY)) {
+        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenTrackPointIdId + 1, false)) {
 
-            while (locationIterator.hasNext()) {
-                Location location = locationIterator.next();
-                long locationId = locationIterator.getTrackPointId();
+            while (trackPointIterator.hasNext()) {
+                TrackPoint trackPoint = trackPointIterator.next();
+                long trackPointId = trackPointIterator.getTrackPointId();
 
                 // Stop if past the last wanted point
-                if (maxPointId != -1L && locationId > maxPointId) {
+                if (maxPointId != -1L && trackPointId > maxPointId) {
                     break;
                 }
 
-                if (localFirstSeenLocationId == -1) {
-                    localFirstSeenLocationId = locationId;
+                if (localFirstSeenTrackPointId == -1) {
+                    localFirstSeenTrackPointId = trackPointId;
                 }
 
                 if (samplingFrequency == -1) {
-                    long numTotalPoints = Math.max(0L, lastTrackPointId - localFirstSeenLocationId);
+                    long numTotalPoints = Math.max(0L, lastTrackPointId - localFirstSeenTrackPointId);
                     samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
                 }
 
-                if (!LocationUtils.isValidLocation(location)) { //This can be split markers (not anymore supported feature)
+                if (!LocationUtils.isValidLocation(trackPoint.getLocation())) { //This can be split markers (not anymore supported feature)
                     includeNextPoint = true;
                 } else {
                     // Also include the last point if the selected track is not recording.
-                    if (includeNextPoint || (localNumLoadedPoints % samplingFrequency == 0) || (locationId == lastTrackPointId && !isSelectedTrackRecording())) {
+                    if (includeNextPoint || (localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) {
                         includeNextPoint = false;
                         for (TrackDataListener trackDataListener : sampledInListeners) {
-                            trackDataListener.onSampledInTrackPoint(location);
+                            trackDataListener.onSampledInTrackPoint(trackPoint);
                         }
                     } else {
                         for (TrackDataListener trackDataListener : sampledOutListeners) {
-                            trackDataListener.onSampledOutTrackPoint(location);
+                            trackDataListener.onSampledOutTrackPoint(trackPoint);
                         }
                     }
                 }
 
-                localNumLoadedPoints++;
-                localLastSeenLocationId = locationId;
+                localNumLoadedTrackPoints++;
+                localLastSeenTrackPointIdId = trackPointId;
             }
         }
 
         if (updateSamplingState) {
-            numLoadedPoints = localNumLoadedPoints;
-            firstSeenLocationId = localFirstSeenLocationId;
-            lastSeenLocationId = localLastSeenLocationId;
+            numLoadedPoints = localNumLoadedTrackPoints;
+            firstSeenTrackPointId = localFirstSeenTrackPointId;
+            lastSeenTrackPointId = localLastSeenTrackPointIdId;
         }
 
         for (TrackDataListener listener : sampledInListeners) {
@@ -449,16 +434,8 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
      */
     private void resetSamplingState() {
         numLoadedPoints = 0;
-        firstSeenLocationId = -1L;
-        lastSeenLocationId = -1L;
-    }
-
-    /**
-     * Creates a {@link DataSource}.
-     */
-    @VisibleForTesting
-    private DataSource newDataSource() {
-        return new DataSource(context);
+        firstSeenTrackPointId = -1L;
+        lastSeenTrackPointId = -1L;
     }
 
     /**
@@ -466,6 +443,7 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
      *
      * @param runnable the runnable
      */
+    @Deprecated //TODO: Why actually catch this problem: I guess it would be better to fail hard.
     @VisibleForTesting
     private void runInHandlerThread(Runnable runnable) {
         if (handler == null) {
@@ -475,13 +453,4 @@ public class TrackDataHub implements DataSourceListener, SharedPreferences.OnSha
         }
         handler.post(runnable);
     }
-
-    /**
-     * Gets the value selectedTrackId.
-     *
-     * @return the selectedTrackId
-     */
-    public long getSelectedTrackId() {
-        return selectedTrackId;
-    }
 }

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

@@ -16,9 +16,8 @@
 
 package de.dennisguse.opentracks.content;
 
-import android.location.Location;
-
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 
 /**
@@ -43,20 +42,20 @@ public interface TrackDataListener {
     /**
      * Called when a sampled in track point is read.
      *
-     * @param location the location
+     * @param trackPoint the trackPoint
      */
-    void onSampledInTrackPoint(Location location);
+    void onSampledInTrackPoint(TrackPoint trackPoint);
 
     /**
      * Called when a sampled out track point is read.
      *
-     * @param location the location
+     * @param trackPoint the trackPoint
      */
-    void onSampledOutTrackPoint(Location location);
+    void onSampledOutTrackPoint(TrackPoint trackPoint);
 
     /**
      * Called when finish sending new track points.
-     * This gets called after every batch of calls to {@link #onSampledInTrackPoint(Location)} and {@link #onSampledOutTrackPoint(Location)}.
+     * This gets called after every batch of calls to {@link #onSampledInTrackPoint(TrackPoint)} and {@link #onSampledOutTrackPoint(TrackPoint)}.
      */
     void onNewTrackPointsDone();
 

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

@@ -16,13 +16,7 @@
 
 package de.dennisguse.opentracks.content;
 
-import android.util.Log;
-
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -34,84 +28,68 @@ class TrackDataManager {
 
     private static final String TAG = TrackDataManager.class.getSimpleName();
 
-    private final Map<TrackDataListener, EnumSet<TrackDataType>> listenerToTypesMap = new HashMap<>();
+    private final Set<TrackDataListener> dataListenerTracks = new HashSet<>();
+    private final Set<TrackDataListener> dataListenerWaypoints = new HashSet<>();
+    private final Set<TrackDataListener> dataListenerTrackPoints_SampledIn = new HashSet<>();
+    private final Set<TrackDataListener> dataListenerTrackPoints_SampledOut = new HashSet<>();
 
-    private final Map<TrackDataType, Set<TrackDataListener>> typeToListenersMap = new EnumMap<>(TrackDataType.class);
-
-    TrackDataManager() {
-        for (TrackDataType trackDataType : TrackDataType.values()) {
-            typeToListenersMap.put(trackDataType, new LinkedHashSet<TrackDataListener>());
-        }
+    void registerTrackDataListener(final TrackDataListener trackDataListener, boolean tracksTable, boolean waypointsTable, boolean trackPointsTable_SampleIn, boolean trackPointsTable_SampleOut) {
+        if (tracksTable) dataListenerTracks.add(trackDataListener);
+        if (waypointsTable) dataListenerWaypoints.add(trackDataListener);
+        if (trackPointsTable_SampleIn) dataListenerTrackPoints_SampledIn.add(trackDataListener);
+        if (trackPointsTable_SampleOut) dataListenerTrackPoints_SampledOut.add(trackDataListener);
     }
 
-    /**
-     * Registers a listener.
-     *
-     * @param listener       the listener
-     * @param trackDataTypes the track data types the listener is interested
-     */
-    void registerListener(TrackDataListener listener, EnumSet<TrackDataType> trackDataTypes) {
-        if (listenerToTypesMap.containsKey(listener)) {
-            Log.w(TAG, "Tried to register a listener that is already registered. Ignore.");
-            return;
-        }
-        listenerToTypesMap.put(listener, trackDataTypes);
-        for (TrackDataType trackDataType : trackDataTypes) {
-            typeToListenersMap.get(trackDataType).add(listener);
-        }
+    void unregisterTrackDataListener(TrackDataListener trackDataListener) {
+        dataListenerTracks.add(trackDataListener);
+        dataListenerWaypoints.add(trackDataListener);
+        dataListenerTrackPoints_SampledIn.add(trackDataListener);
+        dataListenerTrackPoints_SampledOut.add(trackDataListener);
     }
 
-    /**
-     * Unregisters a listener.
-     *
-     * @param listener the listener
-     */
-    void unregisterListener(TrackDataListener listener) {
-        EnumSet<TrackDataType> removedTypes = listenerToTypesMap.remove(listener);
-        if (removedTypes == null) {
-            Log.w(TAG, "Tried to unregister a listener that is not registered. Ignore.");
-            return;
-        }
-
-        // Remove the listener from the typeToListenersMap
-        for (TrackDataType trackDataType : removedTypes) {
-            typeToListenersMap.get(trackDataType).remove(listener);
-        }
+    boolean hasListeners() {
+        return dataListenerTracks.size() + dataListenerWaypoints.size() + dataListenerTrackPoints_SampledIn.size() + dataListenerTrackPoints_SampledOut.size() > 0;
     }
 
-    /**
-     * Gets the number of {@link TrackDataListener}.
-     */
     int getNumberOfListeners() {
-        return listenerToTypesMap.size();
+        Set<TrackDataListener> listener = new HashSet<>();
+        listener.addAll(dataListenerTracks);
+        listener.addAll(dataListenerWaypoints);
+        listener.addAll(dataListenerTrackPoints_SampledIn);
+        listener.addAll(dataListenerTrackPoints_SampledOut);
+
+        return listener.size();
     }
 
-    /**
-     * Gets the track data types for a listener.
-     *
-     * @param listener the listener
-     */
-    EnumSet<TrackDataType> getTrackDataTypes(TrackDataListener listener) {
-        return listenerToTypesMap.get(listener);
+    boolean listensForTracks(TrackDataListener listener) {
+        return dataListenerTracks.contains(listener);
     }
 
-    /**
-     * Gets the listeners for a {@link TrackDataType}.
-     *
-     * @param type the type
-     */
-    Set<TrackDataListener> getListeners(TrackDataType type) {
-        return typeToListenersMap.get(type);
+    boolean listensForWaypoints(TrackDataListener listener) {
+        return dataListenerWaypoints.contains(listener);
     }
 
-    /**
-     * Gets all the registered {@link TrackDataType}.
-     */
-    EnumSet<TrackDataType> getRegisteredTrackDataTypes() {
-        EnumSet<TrackDataType> types = EnumSet.noneOf(TrackDataType.class);
-        for (EnumSet<TrackDataType> value : listenerToTypesMap.values()) {
-            types.addAll(value);
-        }
-        return types;
+    boolean listensForTrackPoints_SampledIn(TrackDataListener listener) {
+        return dataListenerTrackPoints_SampledIn.contains(listener);
+    }
+
+    boolean listensForTrackPoints_SampledOut(TrackDataListener listener) {
+        return dataListenerTrackPoints_SampledOut.contains(listener);
+    }
+
+    Set<TrackDataListener> getListenerTracks() {
+        return dataListenerTracks;
+    }
+
+    Set<TrackDataListener> getListenerWaypoints() {
+        return dataListenerWaypoints;
+    }
+
+    Set<TrackDataListener> getListenerTrackPoints_SampledIn() {
+        return dataListenerTrackPoints_SampledIn;
+    }
+
+    Set<TrackDataListener> getListenerTrackPoints_SampledOut() {
+        return dataListenerTrackPoints_SampledOut;
     }
 }

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

@@ -1,29 +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;
-
-/**
- * Types of track data.
- *
- * @author Jimmy Shih
- */
-public enum TrackDataType {
-    TRACKS_TABLE, // tracks table changes
-    WAYPOINTS_TABLE, // waypoints table changes
-    SAMPLED_IN_TRACK_POINTS_TABLE, // sampled-in track points table changes
-    SAMPLED_OUT_TRACK_POINTS_TABLE, // sampled-out track points table changes
-}

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

@@ -16,14 +16,7 @@
 
 package de.dennisguse.opentracks.content.data;
 
-import android.location.Location;
-
-import androidx.annotation.VisibleForTesting;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 
 /**
  * A track.
@@ -38,16 +31,9 @@ public class Track {
     private String description = "";
     private String category = "";
 
-    /*
-     * The number of location points (present even if the points themselves are not loaded)
-     */
-    private int numberOfPoints = 0;
     private String icon = "";
 
-    private TripStatistics tripStatistics = new TripStatistics();
-
-    // Location points (which may not have been loaded)
-    private List<Location> locations = new ArrayList<>();
+    private TrackStatistics trackStatistics = new TrackStatistics();
 
     public Track() {
     }
@@ -84,14 +70,6 @@ public class Track {
         this.category = category;
     }
 
-    public int getNumberOfPoints() {
-        return numberOfPoints;
-    }
-
-    public void setNumberOfPoints(int numberOfPoints) {
-        this.numberOfPoints = numberOfPoints;
-    }
-
     public String getIcon() {
         return icon;
     }
@@ -100,24 +78,11 @@ public class Track {
         this.icon = icon;
     }
 
-    public TripStatistics getTripStatistics() {
-        return tripStatistics;
+    public TrackStatistics getTrackStatistics() {
+        return trackStatistics;
     }
 
-    public void setTripStatistics(TripStatistics tripStatistics) {
-        this.tripStatistics = tripStatistics;
-    }
-
-    @VisibleForTesting
-    public void addLocation(Location location) {
-        locations.add(location);
-    }
-
-    public List<Location> getLocations() {
-        return locations;
-    }
-
-    public void setLocations(ArrayList<Location> locations) {
-        this.locations = locations;
+    public void setTrackStatistics(TrackStatistics trackStatistics) {
+        this.trackStatistics = trackStatistics;
     }
 }

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

@@ -16,37 +16,206 @@
 package de.dennisguse.opentracks.content.data;
 
 import android.location.Location;
+import android.location.LocationManager;
 
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import androidx.annotation.NonNull;
 
 /**
  * This class extends the standard Android location with extra information.
  *
  * @author Sandor Dornbush
  */
-public class TrackPoint extends Location {
+public class TrackPoint {
 
-    private SensorDataSet sensorDataSet = null;
+    private final Location location;
 
-    public TrackPoint(Location location, SensorDataSet sensorDataSet) {
-        super(location);
-        this.sensorDataSet = sensorDataSet;
+    private Float heartRate_bpm = null;
+    private Float cyclingCadence_rpm = null;
+    private Float power = null;
+
+    public TrackPoint() {
+        this.location = new Location("");
     }
 
-    public TrackPoint(String provider) {
-        super(provider);
+    public TrackPoint(@NonNull Location location) {
+        this.location = location;
     }
 
-    public SensorDataSet getSensorDataSet() {
-        return sensorDataSet;
+    public TrackPoint(@NonNull TrackPoint trackPoint) {
+        this.location = trackPoint.getLocation();
+
+        this.heartRate_bpm = trackPoint.getHeartRate_bpm();
+        this.cyclingCadence_rpm = trackPoint.getCyclingCadence_rpm();
+        this.power = trackPoint.getPower();
     }
 
-    public void setSensorDataSet(SensorDataSet sensorDataSet) {
-        this.sensorDataSet = sensorDataSet;
+    public TrackPoint(double latitude, double longitude, Double altitude, long time) {
+        location = new Location(LocationManager.GPS_PROVIDER);
+        location.setLatitude(latitude);
+        location.setLongitude(longitude);
+        if (altitude != null) {
+            location.setAltitude(altitude);
+        }
+        location.setTime(time);
     }
 
-    public void reset() {
-        super.reset();
-        sensorDataSet = null;
+    public static TrackPoint createPause() {
+        return createPauseWithTime(System.currentTimeMillis());
+    }
+
+    public static TrackPoint createPauseWithTime(long time) {
+        Location pause = new Location(LocationManager.GPS_PROVIDER);
+        pause.setLongitude(0);
+        pause.setLatitude(TrackPointsColumns.PAUSE_LATITUDE);
+        pause.setTime(time);
+        return new TrackPoint(pause);
+    }
+
+    public static TrackPoint createResume() {
+        return createResumeWithTime(System.currentTimeMillis());
+    }
+
+    public static TrackPoint createResumeWithTime(long time) {
+        Location resume = new Location(LocationManager.GPS_PROVIDER);
+        resume.setLongitude(0);
+        resume.setLatitude(TrackPointsColumns.RESUME_LATITUDE);
+        resume.setTime(time);
+        return new TrackPoint(resume);
+    }
+
+    public @NonNull
+    Location getLocation() {
+        return location;
+    }
+
+    public double getLatitude() {
+        return location.getLatitude();
+    }
+
+    public void setLatitude(double latitude) {
+        location.setLatitude(latitude);
+    }
+
+    public double getLongitude() {
+        return location.getLongitude();
+    }
+
+    public void setLongitude(double longitude) {
+        location.setLongitude(longitude);
+    }
+
+    public long getTime() {
+        return location.getTime();
+    }
+
+    public void setTime(long time) {
+        location.setTime(time);
+    }
+
+    public boolean hasAltitude() {
+        return location.hasAltitude();
+    }
+
+    public double getAltitude() {
+        return location.getAltitude();
+    }
+
+    public void setAltitude(double altitude) {
+        location.setAltitude(altitude);
+    }
+
+    public boolean hasSpeed() {
+        return location.hasSpeed();
+    }
+
+    public float getSpeed() {
+        return location.getSpeed();
+    }
+
+    public void setSpeed(float speed) {
+        location.setSpeed(speed);
+    }
+
+    public boolean hasBearing() {
+        return location.hasBearing();
+    }
+
+    public float getBearing() {
+        return location.getBearing();
+    }
+
+    public void setBearing(float bearing) {
+        location.setBearing(bearing);
+    }
+
+    public boolean hasAccuracy() {
+        return location.hasAccuracy();
+    }
+
+    public float getAccuracy() {
+        return location.getAccuracy();
+    }
+
+    public void setAccuracy(float horizontalAccuracy) {
+        location.setAccuracy(horizontalAccuracy);
+    }
+
+    public float distanceTo(@NonNull TrackPoint dest) {
+        return location.distanceTo(dest.getLocation());
+    }
+
+    public float bearingTo(@NonNull TrackPoint dest) {
+        return location.bearingTo(dest.getLocation());
+    }
+
+    public float bearingTo(@NonNull Location dest) {
+        return location.bearingTo(dest);
+    }
+
+    // Sensor data
+    public boolean hasSensorData() {
+        return hasHeartRate() || hasCyclingCadence() || hasPower();
+    }
+
+    public boolean hasHeartRate() {
+        return heartRate_bpm != null && heartRate_bpm > 0;
+    }
+
+    public float getHeartRate_bpm() {
+        return heartRate_bpm;
+    }
+
+    public void setHeartRate_bpm(Float heartRate_bpm) {
+        this.heartRate_bpm = heartRate_bpm;
+    }
+
+    public boolean hasCyclingCadence() {
+        return cyclingCadence_rpm != null;
+    }
+
+    public Float getCyclingCadence_rpm() {
+        return cyclingCadence_rpm;
+    }
+
+    public void setCyclingCadence_rpm(Float cyclingCadence_rpm) {
+        this.cyclingCadence_rpm = cyclingCadence_rpm;
+    }
+
+    public boolean hasPower() {
+        return power != null;
+    }
+
+    public Float getPower() {
+        return power;
+    }
+
+    public void setPower(Float power) {
+        this.power = power;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "time=" + getTime() + ": lat=" + getLatitude() + " lng=" + getLongitude() + " acc=" + getAccuracy();
     }
 }

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

@@ -29,15 +29,20 @@ import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 public interface TrackPointsColumns extends BaseColumns {
 
     String TABLE_NAME = "trackpoints";
-    Uri CONTENT_URI = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/" + TABLE_NAME);
+    Uri CONTENT_URI_BY_ID = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/" + TABLE_NAME);
+    Uri CONTENT_URI_BY_TRACKID = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/" + TABLE_NAME + "/trackid");
     String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.de.dennisguse.trackpoint";
     String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.de.dennisguse.trackpoint";
     String DEFAULT_SORT_ORDER = "_id";
 
     // Columns
     String TRACKID = "trackid";
+
     String LONGITUDE = "longitude";
     String LATITUDE = "latitude";
+    double PAUSE_LATITUDE = 100.0;
+    double RESUME_LATITUDE = 200.0;
+
     String TIME = "time";
     String ALTITUDE = "elevation";
     String ACCURACY = "accuracy";
@@ -59,5 +64,7 @@ public interface TrackPointsColumns extends BaseColumns {
             + BEARING + " FLOAT, "
             + SENSOR_HEARTRATE + " FLOAT, "
             + SENSOR_CADENCE + " FLOAT, "
-            + SENSOR_POWER + " FLOAT);";
+            + SENSOR_POWER + " FLOAT)";
+
+    String CREATE_TABLE_INDEX = "CREATE INDEX " + TABLE_NAME + "_" + TRACKID + "_index ON " + TABLE_NAME + "(" + TRACKID + ")";
 }

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

@@ -38,34 +38,20 @@ public interface TracksColumns extends BaseColumns {
     String NAME = "name"; // track name
     String DESCRIPTION = "description"; // track description
     String CATEGORY = "category"; // track activity type
-    @Deprecated
-    String STARTID = "startid"; // first track point id // TODO UNUSED
-    @Deprecated
-    String STOPID = "stopid"; // last track point id // TODO UNUSED
     String STARTTIME = "starttime"; // track start time
     String STOPTIME = "stoptime"; // track stop time
-    String NUMPOINTS = "numpoints"; // number of track points
+    @Deprecated
+    String NUMPOINTS = "numpoints"; // number of track points //TODO UNUSED
     String TOTALDISTANCE = "totaldistance"; // total distance
     String TOTALTIME = "totaltime"; // total time
     String MOVINGTIME = "movingtime"; // moving time
 
-    @Deprecated
-    String MINLAT = "minlat"; // minimum latitude // TODO UNUSED
-    @Deprecated
-    String MAXLAT = "maxlat"; // maximum latitude // TODO UNUSED
-    @Deprecated
-    String MINLON = "minlon"; // minimum longitude //TODO UNUSED
-    @Deprecated
-    String MAXLON = "maxlon"; // maximum longitude //TODO UNUSED
-
     String AVGSPEED = "avgspeed"; // average speed
     String AVGMOVINGSPEED = "avgmovingspeed"; // average moving speed
     String MAXSPEED = "maxspeed"; // maximum speed
     String MINELEVATION = "minelevation"; // minimum elevation
     String MAXELEVATION = "maxelevation"; // maximum elevation
     String ELEVATIONGAIN = "elevationgain"; // elevation gain
-    String MINGRADE = "mingrade"; // minimum grade
-    String MAXGRADE = "maxgrade"; // maximum grade
     String ICON = "icon"; // track activity type icon
 
     String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" // table
@@ -73,25 +59,17 @@ public interface TracksColumns extends BaseColumns {
             + NAME + " TEXT, " // name
             + DESCRIPTION + " TEXT, " // description
             + CATEGORY + " TEXT, " // category
-            + STARTID + " INTEGER, " // start id
-            + STOPID + " INTEGER, " // stop id
             + STARTTIME + " INTEGER, " // start time
             + STOPTIME + " INTEGER, " // stop time
             + NUMPOINTS + " INTEGER, " // num points
             + TOTALDISTANCE + " FLOAT, " // total distance
             + TOTALTIME + " INTEGER, " // total time
             + MOVINGTIME + " INTEGER, " // moving time
-            + MINLAT + " INTEGER, " // min latitude
-            + MAXLAT + " INTEGER, " // max latitude
-            + MINLON + " INTEGER, " // min longitude
-            + MAXLON + " INTEGER, " // max longitude
             + AVGSPEED + " FLOAT, " // average speed
             + AVGMOVINGSPEED + " FLOAT, " // average moving speed
             + MAXSPEED + " FLOAT, " // max speed
             + MINELEVATION + " FLOAT, " // min elevation
             + MAXELEVATION + " FLOAT, " // max elevation
             + ELEVATIONGAIN + " FLOAT, " // elevation gain
-            + MINGRADE + " FLOAT, " // min grade
-            + MAXGRADE + " FLOAT, " // max grade
-            + ICON + " TEXT);"; // icon
+            + ICON + " TEXT)"; // icon
 }

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

@@ -19,6 +19,9 @@ package de.dennisguse.opentracks.content.data;
 import android.location.Location;
 import android.net.Uri;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
 /**
  * A waypoint.
  *
@@ -35,13 +38,19 @@ public final class Waypoint {
     private long trackId = -1L;
     private double length = 0.0;
     private long duration = 0;
-    private Location location = null;
+    private Location location;
     private String photoUrl = "";
 
-    public Waypoint() {
+    @VisibleForTesting
+    public Waypoint(@NonNull TrackPoint trackPoint) {
+        this.location = trackPoint.getLocation();
     }
 
-    public Waypoint(String name, String description, String category, String icon, long trackId, double length, long duration, Location location, String photoUrl) {
+    public Waypoint(@NonNull Location location) {
+        this.location = location;
+    }
+
+    public Waypoint(String name, String description, String category, String icon, long trackId, double length, long duration, @NonNull Location location, String photoUrl) {
         this.name = name;
         this.description = description;
         this.category = category;
@@ -117,14 +126,11 @@ public final class Waypoint {
         this.duration = duration;
     }
 
-    public Location getLocation() {
+    public @NonNull
+    Location getLocation() {
         return location;
     }
 
-    public void setLocation(Location location) {
-        this.location = location;
-    }
-
     public String getPhotoUrl() {
         return photoUrl;
     }

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

@@ -40,49 +40,17 @@ public interface WaypointsColumns extends BaseColumns {
     String CATEGORY = "category"; // waypoint category
     String ICON = "icon"; // waypoint icon
     String TRACKID = "trackid"; // track id
-    @Deprecated
-    String TYPE = "type"; // type // TODO UNUSED
 
     String LENGTH = "length"; // length of the track (without smoothing)
-    String DURATION = "duration"; // total duration of the track (not from last waypoint)
-    String STARTTIME = "starttime"; // start time of the trip statistics
-    @Deprecated
-    String STARTID = "startid"; // start track point id // TODO UNUSED
-    @Deprecated
-    String STOPID = "stopid"; // stop track point id // TODO UNUSED
+    String DURATION = "duration"; // total duration of the track from the beginning until now
 
     String LONGITUDE = "longitude"; // longitude
     String LATITUDE = "latitude"; // latitude
     String TIME = "time"; // time
     String ALTITUDE = "elevation"; // altitude
     String ACCURACY = "accuracy"; // accuracy
-    String SPEED = "speed"; // speed
     String BEARING = "bearing"; // bearing
 
-    @Deprecated
-    String TOTALDISTANCE = "totaldistance"; // total distance
-    @Deprecated
-    String TOTALTIME = "totaltime"; // total time
-    @Deprecated
-    String MOVINGTIME = "movingtime"; // moving time
-    @Deprecated
-    String AVGSPEED = "avgspeed"; // average speed
-
-    @Deprecated
-    String AVGMOVINGSPEED = "avgmovingspeed"; // average moving speed  // TODO UNUSED
-    @Deprecated
-    String MAXSPEED = "maxspeed"; // max speed // TODO UNUSED
-    @Deprecated
-    String MINELEVATION = "minelevation"; // min elevation // TODO UNUSED
-    @Deprecated
-    String MAXELEVATION = "maxelevation"; // max elevation // TODO UNUSED
-    @Deprecated
-    String ELEVATIONGAIN = "elevationgain"; // elevation gain // TODO UNUSED
-    @Deprecated
-    String MINGRADE = "mingrade"; // min grade // TODO UNUSED
-    @Deprecated
-    String MAXGRADE = "maxgrade"; // max grade // TODO UNUSED
-
     String PHOTOURL = "photoUrl"; // url for the photo
 
     String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
@@ -92,30 +60,16 @@ public interface WaypointsColumns extends BaseColumns {
             + CATEGORY + " TEXT, "
             + ICON + " TEXT, "
             + TRACKID + " INTEGER, "
-            + TYPE + " INTEGER, "
             + LENGTH + " FLOAT, "
             + DURATION + " INTEGER, "
-            + STARTTIME + " INTEGER, "
-            + STARTID + " INTEGER, "
-            + STOPID + " INTEGER, "
             + LONGITUDE + " INTEGER, "
             + LATITUDE + " INTEGER, "
             + TIME + " INTEGER, "
             + ALTITUDE + " FLOAT, "
             + ACCURACY + " FLOAT, "
-            + SPEED + " FLOAT, "
             + BEARING + " FLOAT, "
-            + TOTALDISTANCE + " FLOAT, "
-            + TOTALTIME + " INTEGER, "
-            + MOVINGTIME + " INTEGER, "
-            + AVGSPEED + " FLOAT, "
-            + AVGMOVINGSPEED + " FLOAT, "
-            + MAXSPEED + " FLOAT, "
-            + MINELEVATION + " FLOAT, "
-            + MAXELEVATION + " FLOAT, "
-            + ELEVATIONGAIN + " FLOAT, "
-            + MINGRADE + " FLOAT, "
-            + MAXGRADE + " FLOAT, "
             + PHOTOURL + " TEXT"
-            + ");";
+            + ")";
+
+    String CREATE_TABLE_INDEX = "CREATE INDEX " + TABLE_NAME + "_" + TRACKID + "_index ON " + TABLE_NAME + "(" + TRACKID + ")";
 }

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

@@ -22,6 +22,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.location.Location;
 import android.net.Uri;
+import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -39,8 +40,7 @@ import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
 
 /**
@@ -54,20 +54,15 @@ public class ContentProviderUtils {
     private static final String TAG = ContentProviderUtils.class.getSimpleName();
     private static final int MAX_LATITUDE = 90000000;
 
-    /**
-     * The authority (the first part of the URI) for the app's content provider.
-     */
+    // The authority (the first part of the URI) for the app's content provider.
     static final String AUTHORITY_PACKAGE = BuildConfig.APPLICATION_ID + ".content";
 
-    /**
-     * The base URI for the app's content provider.
-     */
+    // The base URI for the app's content provider.
     public static final String CONTENT_BASE_URI = "content://" + AUTHORITY_PACKAGE;
 
-    /**
-     * Maximum number of waypoints that will be loaded at one time.
-     */
+    // Maximum number of waypoints that will be loaded at one time.
     public static final int MAX_LOADED_WAYPOINTS_POINTS = 10000;
+    private static final String ID_SEPARATOR = ",";
 
     private final IContentResolver contentResolver;
     private int defaultCursorBatchSize = 2000;
@@ -85,7 +80,7 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Clears a track: removes waypoints and trackpoints.
+     * Clears a track: removes waypoints and trackPoints.
      * Only keeps the track id.
      *
      * @param trackId the track id
@@ -109,7 +104,6 @@ public class ContentProviderUtils {
         int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
         int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
         int stopTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STOPTIME);
-        int numPointsIndex = cursor.getColumnIndexOrThrow(TracksColumns.NUMPOINTS);
         int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
         int totalTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALTIME);
         int movingTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.MOVINGTIME);
@@ -117,12 +111,10 @@ public class ContentProviderUtils {
         int minElevationIndex = cursor.getColumnIndexOrThrow(TracksColumns.MINELEVATION);
         int maxElevationIndex = cursor.getColumnIndexOrThrow(TracksColumns.MAXELEVATION);
         int elevationGainIndex = cursor.getColumnIndexOrThrow(TracksColumns.ELEVATIONGAIN);
-        int minGradeIndex = cursor.getColumnIndexOrThrow(TracksColumns.MINGRADE);
-        int maxGradeIndex = cursor.getColumnIndexOrThrow(TracksColumns.MAXGRADE);
         int iconIndex = cursor.getColumnIndexOrThrow(TracksColumns.ICON);
 
         Track track = new Track();
-        TripStatistics tripStatistics = track.getTripStatistics();
+        TrackStatistics trackStatistics = track.getTrackStatistics();
         if (!cursor.isNull(idIndex)) {
             track.setId(cursor.getLong(idIndex));
         }
@@ -136,40 +128,31 @@ public class ContentProviderUtils {
             track.setCategory(cursor.getString(categoryIndex));
         }
         if (!cursor.isNull(startTimeIndex)) {
-            tripStatistics.setStartTime(cursor.getLong(startTimeIndex));
+            trackStatistics.setStartTime_ms(cursor.getLong(startTimeIndex));
         }
         if (!cursor.isNull(stopTimeIndex)) {
-            tripStatistics.setStopTime(cursor.getLong(stopTimeIndex));
-        }
-        if (!cursor.isNull(numPointsIndex)) {
-            track.setNumberOfPoints(cursor.getInt(numPointsIndex));
+            trackStatistics.setStopTime_ms(cursor.getLong(stopTimeIndex));
         }
         if (!cursor.isNull(totalDistanceIndex)) {
-            tripStatistics.setTotalDistance(cursor.getFloat(totalDistanceIndex));
+            trackStatistics.setTotalDistance(cursor.getFloat(totalDistanceIndex));
         }
         if (!cursor.isNull(totalTimeIndex)) {
-            tripStatistics.setTotalTime(cursor.getLong(totalTimeIndex));
+            trackStatistics.setTotalTime(cursor.getLong(totalTimeIndex));
         }
         if (!cursor.isNull(movingTimeIndex)) {
-            tripStatistics.setMovingTime(cursor.getLong(movingTimeIndex));
+            trackStatistics.setMovingTime(cursor.getLong(movingTimeIndex));
         }
         if (!cursor.isNull(maxSpeedIndex)) {
-            tripStatistics.setMaxSpeed(cursor.getFloat(maxSpeedIndex));
+            trackStatistics.setMaxSpeed(cursor.getFloat(maxSpeedIndex));
         }
         if (!cursor.isNull(minElevationIndex)) {
-            tripStatistics.setMinElevation(cursor.getFloat(minElevationIndex));
+            trackStatistics.setMinElevation(cursor.getFloat(minElevationIndex));
         }
         if (!cursor.isNull(maxElevationIndex)) {
-            tripStatistics.setMaxElevation(cursor.getFloat(maxElevationIndex));
+            trackStatistics.setMaxElevation(cursor.getFloat(maxElevationIndex));
         }
         if (!cursor.isNull(elevationGainIndex)) {
-            tripStatistics.setTotalElevationGain(cursor.getFloat(elevationGainIndex));
-        }
-        if (!cursor.isNull(minGradeIndex)) {
-            tripStatistics.setMinGrade(cursor.getFloat(minGradeIndex));
-        }
-        if (!cursor.isNull(maxGradeIndex)) {
-            tripStatistics.setMaxGrade(cursor.getFloat(maxGradeIndex));
+            trackStatistics.setTotalElevationGain(cursor.getFloat(elevationGainIndex));
         }
         if (!cursor.isNull(iconIndex)) {
             track.setIcon(cursor.getString(iconIndex));
@@ -178,16 +161,16 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Deletes all tracks (including waypoints and track points).
+     * Deletes all tracks (including waypoints and trackPoints).
      */
     public void deleteAllTracks(Context context) {
-        contentResolver.delete(TrackPointsColumns.CONTENT_URI, null, null);
+        contentResolver.delete(TrackPointsColumns.CONTENT_URI_BY_ID, null, null);
         contentResolver.delete(WaypointsColumns.CONTENT_URI, null, null);
         // Delete tracks last since it triggers a database vaccum call
         contentResolver.delete(TracksColumns.CONTENT_URI, null, null);
 
         File dir = FileUtils.getPhotoDir(context);
-        deleteDirectoryRecurse(context, dir);
+        FileUtils.deleteDirectoryRecurse(dir);
     }
 
     /**
@@ -198,45 +181,30 @@ public class ContentProviderUtils {
     public void deleteTrack(Context context, long trackId) {
         deleteTrackPointsAndWaypoints(context, trackId);
 
-        // Delete track last since it triggers a database vaccum call
-        contentResolver.delete(TracksColumns.CONTENT_URI, TracksColumns._ID + "=?",
-                new String[]{Long.toString(trackId)});
+        // Delete track folder resources.
+        FileUtils.deleteDirectoryRecurse(FileUtils.getPhotoDir(context, trackId));
+
+        // Delete track last since it triggers a database vacuum call
+        contentResolver.delete(TracksColumns.CONTENT_URI, TracksColumns._ID + "=?", new String[]{Long.toString(trackId)});
     }
 
     /**
-     * Deletes track points and waypoints of a track.
-     * Assumes {@link TracksColumns#NUMPOINTS} will be updated by the caller.
+     * Deletes trackPoints and waypoints of a track.
      *
      * @param trackId the track id
      */
     private void deleteTrackPointsAndWaypoints(Context context, long trackId) {
         String where = TrackPointsColumns.TRACKID + "=?";
         String[] selectionArgs = new String[]{Long.toString(trackId)};
-        contentResolver.delete(TrackPointsColumns.CONTENT_URI, where, selectionArgs);
+        contentResolver.delete(TrackPointsColumns.CONTENT_URI_BY_ID, where, selectionArgs);
 
-        contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns.TRACKID + "=?",
-                new String[]{Long.toString(trackId)});
-        deleteDirectoryRecurse(context, FileUtils.getPhotoDir(context, trackId));
-    }
-
-    /**
-     * Delete the directory recursively.
-     *
-     * @param dir the directory
-     */
-    private void deleteDirectoryRecurse(Context context, File dir) {
-        if (dir.exists() && dir.isDirectory()) {
-            for (File child : dir.listFiles()) {
-                deleteDirectoryRecurse(context, child);
-            }
-            dir.delete();
-        }
+        contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns.TRACKID + "=?", new String[]{Long.toString(trackId)});
     }
 
     /**
      * Gets all the tracks.
-     * If no track exists, an empty list is returned.
-     * NOTE: the returned tracks do not have any track points attached.
+     *
+     * @return the tracks do not have any trackPoints attached.
      */
     @VisibleForTesting
     public List<Track> getAllTracks() {
@@ -252,9 +220,6 @@ public class ContentProviderUtils {
         return tracks;
     }
 
-    /**
-     * Gets the last track or null.
-     */
     public Track getLastTrack() {
         try (Cursor cursor = getTrackCursor(null, null, TracksColumns.STARTTIME + " DESC")) {
             // Using the same order as shown in the track list
@@ -266,10 +231,8 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Gets a track by a track id or null
-     * Note that the returned track doesn't have any track points attached.
-     *
      * @param trackId the track id.
+     * @return the track doesn't have any trackPoints attached
      */
     public Track getTrack(long trackId) {
         if (trackId < 0) {
@@ -297,7 +260,7 @@ public class ContentProviderUtils {
 
     /**
      * Inserts a track.
-     * NOTE: This doesn't insert any track points.
+     * NOTE: This doesn't insert any trackPoints.
      *
      * @param track the track
      * @return the content provider URI of the inserted track.
@@ -308,18 +271,17 @@ public class ContentProviderUtils {
 
     /**
      * Updates a track.
-     * NOTE: This doesn't update any track points.
+     * NOTE: This doesn't update any trackPoints.
      *
      * @param track the track
      */
     public void updateTrack(Track track) {
-        contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(track),
-                TracksColumns._ID + "=?", new String[]{Long.toString(track.getId())});
+        contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(track), TracksColumns._ID + "=?", new String[]{Long.toString(track.getId())});
     }
 
     private ContentValues createContentValues(Track track) {
         ContentValues values = new ContentValues();
-        TripStatistics tripStatistics = track.getTripStatistics();
+        TrackStatistics trackStatistics = track.getTrackStatistics();
 
         // Value < 0 indicates no id is available
         if (track.getId() >= 0) {
@@ -328,20 +290,17 @@ 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, tripStatistics.getStartTime());
-        values.put(TracksColumns.STOPTIME, tripStatistics.getStopTime());
-        values.put(TracksColumns.NUMPOINTS, track.getNumberOfPoints());
-        values.put(TracksColumns.TOTALDISTANCE, tripStatistics.getTotalDistance());
-        values.put(TracksColumns.TOTALTIME, tripStatistics.getTotalTime());
-        values.put(TracksColumns.MOVINGTIME, tripStatistics.getMovingTime());
-        values.put(TracksColumns.AVGSPEED, tripStatistics.getAverageSpeed());
-        values.put(TracksColumns.AVGMOVINGSPEED, tripStatistics.getAverageMovingSpeed());
-        values.put(TracksColumns.MAXSPEED, tripStatistics.getMaxSpeed());
-        values.put(TracksColumns.MINELEVATION, tripStatistics.getMinElevation());
-        values.put(TracksColumns.MAXELEVATION, tripStatistics.getMaxElevation());
-        values.put(TracksColumns.ELEVATIONGAIN, tripStatistics.getTotalElevationGain());
-        values.put(TracksColumns.MINGRADE, tripStatistics.getMinGrade());
-        values.put(TracksColumns.MAXGRADE, tripStatistics.getMaxGrade());
+        values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime_ms());
+        values.put(TracksColumns.STOPTIME, trackStatistics.getStopTime_ms());
+        values.put(TracksColumns.TOTALDISTANCE, trackStatistics.getTotalDistance());
+        values.put(TracksColumns.TOTALTIME, trackStatistics.getTotalTime());
+        values.put(TracksColumns.MOVINGTIME, trackStatistics.getMovingTime());
+        values.put(TracksColumns.AVGSPEED, trackStatistics.getAverageSpeed());
+        values.put(TracksColumns.AVGMOVINGSPEED, trackStatistics.getAverageMovingSpeed());
+        values.put(TracksColumns.MAXSPEED, trackStatistics.getMaxSpeed());
+        values.put(TracksColumns.MINELEVATION, trackStatistics.getMinElevation());
+        values.put(TracksColumns.MAXELEVATION, trackStatistics.getMaxElevation());
+        values.put(TracksColumns.ELEVATIONGAIN, trackStatistics.getTotalElevationGain());
         values.put(TracksColumns.ICON, track.getIcon());
 
         return values;
@@ -367,11 +326,28 @@ public class ContentProviderUtils {
         int timeIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.TIME);
         int altitudeIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.ALTITUDE);
         int accuracyIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.ACCURACY);
-        int speedIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.SPEED);
         int bearingIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.BEARING);
         int photoUrlIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.PHOTOURL);
 
-        Waypoint waypoint = new Waypoint();
+        Location location = new Location("");
+        if (!cursor.isNull(longitudeIndex) && !cursor.isNull(latitudeIndex)) {
+            location.setLongitude(((double) cursor.getInt(longitudeIndex)) / 1E6);
+            location.setLatitude(((double) cursor.getInt(latitudeIndex)) / 1E6);
+        }
+        if (!cursor.isNull(timeIndex)) {
+            location.setTime(cursor.getLong(timeIndex));
+        }
+        if (!cursor.isNull(altitudeIndex)) {
+            location.setAltitude(cursor.getFloat(altitudeIndex));
+        }
+        if (!cursor.isNull(accuracyIndex)) {
+            location.setAccuracy(cursor.getFloat(accuracyIndex));
+        }
+        if (!cursor.isNull(bearingIndex)) {
+            location.setBearing(cursor.getFloat(bearingIndex));
+        }
+
+        Waypoint waypoint = new Waypoint(location);
 
         if (!cursor.isNull(idIndex)) {
             waypoint.setId(cursor.getLong(idIndex));
@@ -398,47 +374,17 @@ public class ContentProviderUtils {
             waypoint.setDuration(cursor.getLong(durationIndex));
         }
 
-        Location location = new Location("");
-        if (!cursor.isNull(longitudeIndex) && !cursor.isNull(latitudeIndex)) {
-            location.setLongitude(((double) cursor.getInt(longitudeIndex)) / 1E6);
-            location.setLatitude(((double) cursor.getInt(latitudeIndex)) / 1E6);
-        }
-        if (!cursor.isNull(timeIndex)) {
-            location.setTime(cursor.getLong(timeIndex));
-        }
-        if (!cursor.isNull(altitudeIndex)) {
-            location.setAltitude(cursor.getFloat(altitudeIndex));
-        }
-        if (!cursor.isNull(accuracyIndex)) {
-            location.setAccuracy(cursor.getFloat(accuracyIndex));
-        }
-        if (!cursor.isNull(speedIndex)) {
-            location.setSpeed(cursor.getFloat(speedIndex));
-        }
-        if (!cursor.isNull(bearingIndex)) {
-            location.setBearing(cursor.getFloat(bearingIndex));
-        }
-        waypoint.setLocation(location);
-
         if (!cursor.isNull(photoUrlIndex)) {
             waypoint.setPhotoUrl(cursor.getString(photoUrlIndex));
         }
         return waypoint;
     }
 
-    /**
-     * Deletes a waypoint.
-     * If deleting a statistics waypoint, this will also correct the next statistics waypoint after the deleted one to reflect the  deletion.
-     * The generator is used to update the next statistics waypoint.
-     *
-     * @param waypointId the waypoint id
-     */
-
-    public void deleteWaypoint(long waypointId) {
+    public void deleteWaypoint(Context context, long waypointId) {
         final Waypoint waypoint = getWaypoint(waypointId);
         if (waypoint != null && waypoint.hasPhoto()) {
             Uri uri = waypoint.getPhotoURI();
-            File file = new File(uri.getPath());
+            File file = FileUtils.getPhotoFileIfExists(context, waypoint.getTrackId(), uri);
             if (file.exists()) {
                 File parent = file.getParentFile();
                 file.delete();
@@ -451,10 +397,10 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Gets the next waypoint number for a type.
-     * Returns -1 if not able to get the next waypoint number.
+     * Gets the next waypoint number.
      *
      * @param trackId the track id
+     * @return -1 if not able to get the next waypoint number.
      */
     public int getNextWaypointNumber(long trackId) {
         if (trackId < 0) {
@@ -471,12 +417,6 @@ public class ContentProviderUtils {
         return -1;
     }
 
-    /**
-     * Gets a waypoint from a waypoint id.
-     * Returns null if not found.
-     *
-     * @param waypointId the waypoint id
-     */
     public Waypoint getWaypoint(long waypointId) {
         if (waypointId < 0) {
             return null;
@@ -497,8 +437,7 @@ public class ContentProviderUtils {
      * @param selection     the selection. Can be null
      * @param selectionArgs the selection arguments. Can be null
      * @param sortOrder     the sort order. Can be null
-     * @param maxWaypoints  the maximum number of waypoints to return. -1 for no
-     *                      limit
+     * @param maxWaypoints  the maximum number of waypoints to return. -1 for no limit
      */
     public Cursor getWaypointCursor(String selection, String[] selectionArgs, String sortOrder, int maxWaypoints) {
         return getWaypointCursor(null, selection, selectionArgs, sortOrder, maxWaypoints);
@@ -555,12 +494,13 @@ public class ContentProviderUtils {
         String[] projection = new String[]{"count(*) AS count"};
         String selection = WaypointsColumns.TRACKID + "=?";
         String[] selectionArgs = new String[]{Long.toString(trackId)};
-        Cursor cursor = contentResolver.query(WaypointsColumns.CONTENT_URI, projection, selection, selectionArgs, WaypointsColumns._ID);
-
-        cursor.moveToFirst();
-        int count = cursor.getInt(0);
-        cursor.close();
-        return count;
+        try (Cursor cursor = contentResolver.query(WaypointsColumns.CONTENT_URI, projection, selection, selectionArgs, WaypointsColumns._ID)) {
+            if (cursor == null) {
+                return 0;
+            }
+            cursor.moveToFirst();
+            return cursor.getInt(0);
+        }
     }
 
     /**
@@ -601,22 +541,17 @@ public class ContentProviderUtils {
         values.put(WaypointsColumns.DURATION, waypoint.getDuration());
 
         Location location = waypoint.getLocation();
-        if (location != null) {
-            values.put(WaypointsColumns.LONGITUDE, (int) (location.getLongitude() * 1E6));
-            values.put(WaypointsColumns.LATITUDE, (int) (location.getLatitude() * 1E6));
-            values.put(WaypointsColumns.TIME, location.getTime());
-            if (location.hasAltitude()) {
-                values.put(WaypointsColumns.ALTITUDE, location.getAltitude());
-            }
-            if (location.hasAccuracy()) {
-                values.put(WaypointsColumns.ACCURACY, location.getAccuracy());
-            }
-            if (location.hasSpeed()) {
-                values.put(WaypointsColumns.SPEED, location.getSpeed());
-            }
-            if (location.hasBearing()) {
-                values.put(WaypointsColumns.BEARING, location.getBearing());
-            }
+        values.put(WaypointsColumns.LONGITUDE, (int) (location.getLongitude() * 1E6));
+        values.put(WaypointsColumns.LATITUDE, (int) (location.getLatitude() * 1E6));
+        values.put(WaypointsColumns.TIME, location.getTime());
+        if (location.hasAltitude()) {
+            values.put(WaypointsColumns.ALTITUDE, location.getAltitude());
+        }
+        if (location.hasAccuracy()) {
+            values.put(WaypointsColumns.ACCURACY, location.getAccuracy());
+        }
+        if (location.hasBearing()) {
+            values.put(WaypointsColumns.BEARING, location.getBearing());
         }
 
         values.put(WaypointsColumns.PHOTOURL, waypoint.getPhotoUrl());
@@ -643,34 +578,63 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Inserts multiple track points.
+     * Fills a {@link TrackPoint} from a cursor.
      *
-     * @param locations an array of locations
-     * @param length    the number of locations (from the beginning of the array) to
-     *                  insert, or -1 for all of them
-     * @param trackId   the track id
-     * @return the number of points inserted
+     * @param cursor  the cursor pointing to a trackPoint.
+     * @param indexes the cached trackPoints indexes
      */
-    public int bulkInsertTrackPoint(Location[] locations, int length, long trackId) {
-        if (length == -1) {
-            length = locations.length;
+    static TrackPoint fillTrackPoint(Cursor cursor, CachedTrackPointsIndexes indexes) {
+        TrackPoint trackPoint = new TrackPoint();
+
+        if (!cursor.isNull(indexes.longitudeIndex)) {
+            trackPoint.setLongitude(((double) cursor.getInt(indexes.longitudeIndex)) / 1E6);
         }
-        ContentValues[] values = new ContentValues[length];
-        for (int i = 0; i < length; i++) {
-            values[i] = createContentValues(locations[i], trackId);
+        if (!cursor.isNull(indexes.latitudeIndex)) {
+            trackPoint.setLatitude(((double) cursor.getInt(indexes.latitudeIndex)) / 1E6);
         }
-        return contentResolver.bulkInsert(TrackPointsColumns.CONTENT_URI, values);
+        if (!cursor.isNull(indexes.timeIndex)) {
+            trackPoint.setTime(cursor.getLong(indexes.timeIndex));
+        }
+        if (!cursor.isNull(indexes.altitudeIndex)) {
+            trackPoint.setAltitude(cursor.getFloat(indexes.altitudeIndex));
+        }
+        if (!cursor.isNull(indexes.accuracyIndex)) {
+            trackPoint.setAccuracy(cursor.getFloat(indexes.accuracyIndex));
+        }
+        if (!cursor.isNull(indexes.speedIndex)) {
+            trackPoint.setSpeed(cursor.getFloat(indexes.speedIndex));
+        }
+        if (!cursor.isNull(indexes.bearingIndex)) {
+            trackPoint.setBearing(cursor.getFloat(indexes.bearingIndex));
+        }
+
+        if (!cursor.isNull(indexes.sensorHeartRateIndex)) {
+            trackPoint.setHeartRate_bpm(cursor.getFloat(indexes.sensorHeartRateIndex));
+        }
+        if (!cursor.isNull(indexes.sensorCadenceIndex)) {
+            trackPoint.setCyclingCadence_rpm(cursor.getFloat(indexes.sensorCadenceIndex));
+        }
+        if (!cursor.isNull(indexes.sensorPowerIndex)) {
+            trackPoint.setPower(cursor.getFloat(indexes.sensorPowerIndex));
+        }
+
+        return trackPoint;
     }
 
     /**
-     * Creates a location object from a cursor.
+     * Inserts multiple trackPoints.
      *
-     * @param cursor the cursor pointing to the location
+     * @param trackPoints an array of trackPoints
+     * @param trackId     the trackPoints id
+     * @return the number of trackPoints inserted
      */
-    public Location createTrackPoint(Cursor cursor) {
-        Location location = new TrackPoint("");
-        fillTrackPoint(cursor, new CachedTrackPointsIndexes(cursor), location);
-        return location;
+    //TODO Only used for testing and file import; might be better to replace it.
+    public int bulkInsertTrackPoint(TrackPoint[] trackPoints, long trackId) {
+        ContentValues[] values = new ContentValues[trackPoints.length];
+        for (int i = 0; i < values.length; i++) {
+            values[i] = createContentValues(trackPoints[i], trackId);
+        }
+        return contentResolver.bulkInsert(TrackPointsColumns.CONTENT_URI_BY_ID, values);
     }
 
     /**
@@ -684,9 +648,7 @@ public class ContentProviderUtils {
         if (trackId < 0) {
             return -1L;
         }
-        String selection = TrackPointsColumns._ID + "=(select min(" + TrackPointsColumns._ID
-                + ") from " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID
-                + "=?)";
+        String selection = TrackPointsColumns._ID + "=(SELECT MIN(" + TrackPointsColumns._ID + ") FROM " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=?)";
         String[] selectionArgs = new String[]{Long.toString(trackId)};
         try (Cursor cursor = getTrackPointCursor(new String[]{TrackPointsColumns._ID}, selection, selectionArgs, TrackPointsColumns._ID)) {
             if (cursor != null && cursor.moveToFirst()) {
@@ -707,9 +669,7 @@ public class ContentProviderUtils {
         if (trackId < 0) {
             return -1L;
         }
-        String selection = TrackPointsColumns._ID + "=(select max(" + TrackPointsColumns._ID
-                + ") from " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID
-                + "=?)";
+        String selection = TrackPointsColumns._ID + "=(SELECT MAX(" + TrackPointsColumns._ID + ") from " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=?)";
         String[] selectionArgs = new String[]{Long.toString(trackId)};
         try (Cursor cursor = getTrackPointCursor(new String[]{TrackPointsColumns._ID}, selection, selectionArgs, TrackPointsColumns._ID)) {
             if (cursor != null && cursor.moveToFirst()) {
@@ -720,19 +680,17 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Gets the track point id of a location.
+     * Gets the trackPoint id for a location.
      *
      * @param trackId  the track id
      * @param location the location
-     * @return track point id if the location is in the track. -1L otherwise.
+     * @return trackPoint id if the location is in the track. -1L otherwise.
      */
     public long getTrackPointId(long trackId, Location location) {
         if (trackId < 0) {
             return -1L;
         }
-        String selection = TrackPointsColumns._ID + "=(select max(" + TrackPointsColumns._ID
-                + ") from " + TrackPointsColumns.TABLE_NAME
-                + " WHERE " + TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns.TIME + "=?)";
+        String selection = TrackPointsColumns._ID + "=(SELECT MAX(" + TrackPointsColumns._ID + ") FROM " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns.TIME + "=?)";
         String[] selectionArgs = new String[]{Long.toString(trackId), Long.toString(location.getTime())};
         try (Cursor cursor = getTrackPointCursor(new String[]{TrackPointsColumns._ID}, selection, selectionArgs, TrackPointsColumns._ID)) {
             if (cursor != null && cursor.moveToFirst()) {
@@ -743,28 +701,19 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Gets the last valid location for a track.
-     * Returns null if it doesn't exist.
+     * Creates a {@link TrackPoint} object from a cursor.
      *
-     * @param trackId the track id
+     * @param cursor the cursor pointing to the location
      */
-    @Deprecated
-    public Location getLastValidTrackPoint(long trackId) {
-        if (trackId < 0) {
-            return null;
-        }
-        String selection = TrackPointsColumns._ID + "=(select max(" + TrackPointsColumns._ID + ") from "
-                + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=? AND "
-                + TrackPointsColumns.LATITUDE + "<=" + MAX_LATITUDE + ")";
-        String[] selectionArgs = new String[]{Long.toString(trackId)};
-        return findTrackPointBy(selection, selectionArgs);
+    public TrackPoint createTrackPoint(Cursor cursor) {
+        return fillTrackPoint(cursor, new CachedTrackPointsIndexes(cursor));
     }
 
     /**
      * Creates a location cursor. The caller owns the returned cursor and is responsible for closing it.
      *
      * @param trackId           the track id
-     * @param startTrackPointId the starting track point id. -1L to ignore
+     * @param startTrackPointId the starting trackPoint id. -1L to ignore
      * @param maxLocations      maximum number of locations to return. -1 for no limit
      * @param descending        true to sort the result in descending order (latest location first)
      */
@@ -777,8 +726,7 @@ public class ContentProviderUtils {
         String[] selectionArgs;
         if (startTrackPointId >= 0) {
             String comparison = descending ? "<=" : ">=";
-            selection = TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns._ID + comparison
-                    + "?";
+            selection = TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns._ID + comparison + "?";
             selectionArgs = new String[]{Long.toString(trackId), Long.toString(startTrackPointId)};
         } else {
             selection = TrackPointsColumns.TRACKID + "=?";
@@ -795,99 +743,67 @@ public class ContentProviderUtils {
         return getTrackPointCursor(null, selection, selectionArgs, sortOrder);
     }
 
-
     /**
-     * Fills a track point from a cursor.
+     * Gets the last valid location for a track.
+     * Returns null if it doesn't exist.
      *
-     * @param cursor   the cursor pointing to a location.
-     * @param indexes  the cached track points indexes
-     * @param location the track point
+     * @param trackId the track id
      */
-    static void fillTrackPoint(Cursor cursor, CachedTrackPointsIndexes indexes, Location location) {
-        location.reset();
-
-        if (!cursor.isNull(indexes.longitudeIndex)) {
-            location.setLongitude(((double) cursor.getInt(indexes.longitudeIndex)) / 1E6);
-        }
-        if (!cursor.isNull(indexes.latitudeIndex)) {
-            location.setLatitude(((double) cursor.getInt(indexes.latitudeIndex)) / 1E6);
-        }
-        if (!cursor.isNull(indexes.timeIndex)) {
-            location.setTime(cursor.getLong(indexes.timeIndex));
-        }
-        if (!cursor.isNull(indexes.altitudeIndex)) {
-            location.setAltitude(cursor.getFloat(indexes.altitudeIndex));
-        }
-        if (!cursor.isNull(indexes.accuracyIndex)) {
-            location.setAccuracy(cursor.getFloat(indexes.accuracyIndex));
-        }
-        if (!cursor.isNull(indexes.speedIndex)) {
-            location.setSpeed(cursor.getFloat(indexes.speedIndex));
-        }
-        if (!cursor.isNull(indexes.bearingIndex)) {
-            location.setBearing(cursor.getFloat(indexes.bearingIndex));
-        }
-        if (location instanceof TrackPoint) {
-            TrackPoint sensorDataSetLocation = (TrackPoint) location;
-
-            float heartRate = cursor.isNull(indexes.sensorHeartRateIndex) ? SensorDataSet.DATA_UNAVAILABLE : cursor.getFloat(indexes.sensorHeartRateIndex);
-            float cadence = cursor.isNull(indexes.sensorCadenceIndex) ? SensorDataSet.DATA_UNAVAILABLE : cursor.getFloat(indexes.sensorCadenceIndex);
-            float power = cursor.isNull(indexes.sensorPowerIndex) ? SensorDataSet.DATA_UNAVAILABLE : cursor.getFloat(indexes.sensorPowerIndex);
-
-            sensorDataSetLocation.setSensorDataSet(new SensorDataSet(heartRate, cadence, power, SensorDataSet.DATA_UNAVAILABLE, location.getTime()));
+    @Deprecated
+    public TrackPoint getLastValidTrackPoint(long trackId) {
+        if (trackId < 0) {
+            return null;
         }
+        String selection = TrackPointsColumns._ID + "=(SELECT MAX(" + TrackPointsColumns._ID + ") FROM " + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns.LATITUDE + "<=" + MAX_LATITUDE + ")";
+        String[] selectionArgs = new String[]{Long.toString(trackId)};
+        return findTrackPointBy(selection, selectionArgs);
     }
 
     /**
-     * Inserts a track point.
+     * Inserts a trackPoint.
      *
-     * @param location the location
-     * @param trackId  the track id
-     * @return the content provider URI of the inserted track point
+     * @param trackPoint the trackPoint
+     * @param trackId    the track id
+     * @return the content provider URI of the inserted trackPoint
      */
-    public Uri insertTrackPoint(Location location, long trackId) {
-        return contentResolver.insert(TrackPointsColumns.CONTENT_URI, createContentValues(location, trackId));
+    public Uri insertTrackPoint(TrackPoint trackPoint, long trackId) {
+        return contentResolver.insert(TrackPointsColumns.CONTENT_URI_BY_ID, createContentValues(trackPoint, trackId));
     }
 
     /**
-     * Creates the {@link ContentValues} for a {@link Location}.
+     * Creates the {@link ContentValues} for a {@link TrackPoint}.
      *
-     * @param location the location
-     * @param trackId  the track id
+     * @param trackPoint the trackPoint
+     * @param trackId    the track id
      */
-    private ContentValues createContentValues(Location location, long trackId) {
+    private ContentValues createContentValues(TrackPoint trackPoint, long trackId) {
         ContentValues values = new ContentValues();
         values.put(TrackPointsColumns.TRACKID, trackId);
-        values.put(TrackPointsColumns.LONGITUDE, (int) (location.getLongitude() * 1E6));
-        values.put(TrackPointsColumns.LATITUDE, (int) (location.getLatitude() * 1E6));
+        values.put(TrackPointsColumns.LONGITUDE, (int) (trackPoint.getLongitude() * 1E6));
+        values.put(TrackPointsColumns.LATITUDE, (int) (trackPoint.getLatitude() * 1E6));
 
-        values.put(TrackPointsColumns.TIME, location.getTime());
-        if (location.hasAltitude()) {
-            values.put(TrackPointsColumns.ALTITUDE, location.getAltitude());
+        values.put(TrackPointsColumns.TIME, trackPoint.getTime());
+        if (trackPoint.hasAltitude()) {
+            values.put(TrackPointsColumns.ALTITUDE, trackPoint.getAltitude());
         }
-        if (location.hasAccuracy()) {
-            values.put(TrackPointsColumns.ACCURACY, location.getAccuracy());
+        if (trackPoint.hasAccuracy()) {
+            values.put(TrackPointsColumns.ACCURACY, trackPoint.getAccuracy());
         }
-        if (location.hasSpeed()) {
-            values.put(TrackPointsColumns.SPEED, location.getSpeed());
+        if (trackPoint.hasSpeed()) {
+            values.put(TrackPointsColumns.SPEED, trackPoint.getSpeed());
         }
-        if (location.hasBearing()) {
-            values.put(TrackPointsColumns.BEARING, location.getBearing());
+        if (trackPoint.hasBearing()) {
+            values.put(TrackPointsColumns.BEARING, trackPoint.getBearing());
         }
 
-        //SensorData
-        if (location instanceof TrackPoint) {
-            TrackPoint sensorDataSetLocation = (TrackPoint) location;
-            SensorDataSet sensorDataSet = sensorDataSetLocation.getSensorDataSet();
-            if (sensorDataSet != null && sensorDataSet.hasHeartRate()) {
-                values.put(TrackPointsColumns.SENSOR_HEARTRATE, sensorDataSetLocation.getSensorDataSet().getHeartRate());
-            }
-            if (sensorDataSet != null && sensorDataSet.hasCadence()) {
-                values.put(TrackPointsColumns.SENSOR_CADENCE, sensorDataSetLocation.getSensorDataSet().getCadence());
-            }
-            if (sensorDataSet != null && sensorDataSet.hasPower()) {
-                values.put(TrackPointsColumns.SENSOR_POWER, sensorDataSetLocation.getSensorDataSet().getPower());
-            }
+        if (trackPoint.hasHeartRate()) {
+            values.put(TrackPointsColumns.SENSOR_HEARTRATE, trackPoint.getHeartRate_bpm());
+        }
+        if (trackPoint.hasCyclingCadence()) {
+            values.put(TrackPointsColumns.SENSOR_CADENCE, trackPoint.getCyclingCadence_rpm());
+        }
+        if (trackPoint.hasPower()) {
+            values.put(TrackPointsColumns.SENSOR_POWER, trackPoint.getPower());
         }
         return values;
     }
@@ -896,19 +812,18 @@ public class ContentProviderUtils {
      * Creates a new read-only iterator over a given track's points.
      * It provides a lightweight way of iterating over long tracks without failing due to the underlying cursor limitations.
      * Since it's a read-only iterator, {@link Iterator#remove()} always throws {@link UnsupportedOperationException}.
-     * Each call to {@link TrackPointIterator#next()} may advance to the next DB record, and if so, the iterator calls {@link TrackPointFactory#createLocation()} and populates it with information retrieved from the record.
+     * Each call to {@link TrackPointIterator#next()} may advance to the next DB record.
      * When done with iteration, {@link TrackPointIterator#close()} must be called.
      *
      * @param trackId           the track id
-     * @param startTrackPointId the starting track point id. -1L to ignore
+     * @param startTrackPointId the starting trackPoint id. -1L to ignore
      * @param descending        true to sort the result in descending order (latest location first)
-     * @param trackPointFactory   the location factory
      */
-    public TrackPointIterator getTrackPointLocationIterator(final long trackId, final long startTrackPointId, final boolean descending, final TrackPointFactory trackPointFactory) {
-        return new TrackPointIterator(this, trackId, startTrackPointId, descending, trackPointFactory);
+    public TrackPointIterator getTrackPointLocationIterator(final long trackId, final long startTrackPointId, final boolean descending) {
+        return new TrackPointIterator(this, trackId, startTrackPointId, descending);
     }
 
-    private Location findTrackPointBy(String selection, String[] selectionArgs) {
+    private TrackPoint findTrackPointBy(String selection, String[] selectionArgs) {
         try (Cursor cursor = getTrackPointCursor(null, selection, selectionArgs, TrackPointsColumns._ID)) {
             if (cursor != null && cursor.moveToNext()) {
                 return createTrackPoint(cursor);
@@ -918,7 +833,7 @@ public class ContentProviderUtils {
     }
 
     /**
-     * Gets a track point cursor.
+     * Gets a trackPoint cursor.
      *
      * @param projection    the projection
      * @param selection     the selection
@@ -926,7 +841,25 @@ public class ContentProviderUtils {
      * @param sortOrder     the sort order
      */
     private Cursor getTrackPointCursor(String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        return contentResolver.query(TrackPointsColumns.CONTENT_URI, projection, selection, selectionArgs, sortOrder);
+        return contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, projection, selection, selectionArgs, sortOrder);
+    }
+
+    @VisibleForTesting
+    public List<TrackPoint> getTrackPoints(long trackId) {
+        List<TrackPoint> trackPoints = null;
+
+        try (Cursor trackPointCursor = getTrackPointCursor(trackId, -1L, -1, false)) {
+            if (trackPointCursor != null) {
+                trackPointCursor.moveToFirst();
+                trackPoints = new ArrayList<>(trackPointCursor.getCount());
+                for (int i = 0; i < trackPointCursor.getCount(); i++) {
+                    trackPoints.add(createTrackPoint(trackPointCursor));
+                    trackPointCursor.moveToNext();
+                }
+            }
+        }
+
+        return trackPoints;
     }
 
     int getDefaultCursorBatchSize() {
@@ -942,4 +875,26 @@ public class ContentProviderUtils {
     void setDefaultCursorBatchSize(int defaultCursorBatchSize) {
         this.defaultCursorBatchSize = defaultCursorBatchSize;
     }
+
+    /**
+     * Formats an array of IDs as comma separated string value
+     *
+     * @param ids array with IDs
+     * @return comma separated list of ids
+     */
+    public static String formatIdListForUri(long[] ids) {
+        StringBuilder idsPathSegment = new StringBuilder();
+        for (long id : ids) {
+            if (idsPathSegment.length() > 0) {
+                idsPathSegment.append(ID_SEPARATOR);
+            }
+            idsPathSegment.append(id);
+        }
+        return idsPathSegment.toString();
+    }
+
+    public static String[] parseTrackIdsFromUri(Uri url) {
+        return TextUtils.split(url.getLastPathSegment(), ID_SEPARATOR);
+    }
+
 }

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

@@ -25,7 +25,6 @@ import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -45,27 +44,25 @@ import de.dennisguse.opentracks.content.data.WaypointsColumns;
  */
 public abstract class CustomContentProvider extends ContentProvider {
 
-    @VisibleForTesting
-    static final int DATABASE_VERSION = 23;
-
-    @VisibleForTesting
-    static final String DATABASE_NAME = "database.db";
-
     private static final String TAG = CustomContentProvider.class.getSimpleName();
 
+    private static final String SQL_LIST_DELIMITER = ",";
+
     private final UriMatcher uriMatcher;
 
     private SQLiteDatabase db;
 
     public CustomContentProvider() {
         uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.TABLE_NAME, UrlType.TRACKPOINTS.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.TABLE_NAME + "/#", UrlType.TRACKPOINTS_BY_ID.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.TABLE_NAME + "/#", UrlType.TRACKPOINTS_BY_TRACKID.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME, UrlType.TRACKS.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/#", UrlType.TRACKS_BY_ID.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.TABLE_NAME, UrlType.WAYPOINTS.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.TABLE_NAME + "/#", UrlType.WAYPOINTS_BY_ID.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.CONTENT_URI_BY_ID.getPath(), UrlType.TRACKPOINTS.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.CONTENT_URI_BY_ID.getPath() + "/#", UrlType.TRACKPOINTS_BY_ID.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.CONTENT_URI_BY_TRACKID.getPath() + "/*", UrlType.TRACKPOINTS_BY_TRACKID.ordinal());
+
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.CONTENT_URI.getPath(), UrlType.TRACKS.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.CONTENT_URI.getPath() + "/*", UrlType.TRACKS_BY_ID.ordinal());
+
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.CONTENT_URI.getPath(), UrlType.WAYPOINTS.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.CONTENT_URI.getPath() + "/#", UrlType.WAYPOINTS_BY_ID.ordinal());
     }
 
     @Override
@@ -81,7 +78,7 @@ public abstract class CustomContentProvider extends ContentProvider {
      */
     @VisibleForTesting
     boolean onCreate(Context context) {
-        DatabaseHelper databaseHelper = new DatabaseHelper(context);
+        CustomSQLiteOpenHelper databaseHelper = new CustomSQLiteOpenHelper(context);
         try {
             db = databaseHelper.getWritableDatabase();
         } catch (SQLiteException e) {
@@ -200,11 +197,11 @@ public abstract class CustomContentProvider extends ContentProvider {
                 break;
             case TRACKPOINTS_BY_ID:
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
-                queryBuilder.appendWhere(TrackPointsColumns._ID + "=" + url.getPathSegments().get(1));
+                queryBuilder.appendWhere(TrackPointsColumns._ID + "=" + ContentUris.parseId(url));
                 break;
             case TRACKPOINTS_BY_TRACKID:
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
-                queryBuilder.appendWhere(TrackPointsColumns.TRACKID + "=" + url.getPathSegments().get(1));
+                queryBuilder.appendWhere(TrackPointsColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
                 break;
             case TRACKS:
                 queryBuilder.setTables(TracksColumns.TABLE_NAME);
@@ -212,7 +209,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 break;
             case TRACKS_BY_ID:
                 queryBuilder.setTables(TracksColumns.TABLE_NAME);
-                queryBuilder.appendWhere(TracksColumns._ID + "=" + url.getPathSegments().get(1));
+                queryBuilder.appendWhere(TracksColumns._ID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
                 break;
             case WAYPOINTS:
                 queryBuilder.setTables(WaypointsColumns.TABLE_NAME);
@@ -220,7 +217,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 break;
             case WAYPOINTS_BY_ID:
                 queryBuilder.setTables(WaypointsColumns.TABLE_NAME);
-                queryBuilder.appendWhere(WaypointsColumns._ID + "=" + url.getPathSegments().get(1));
+                queryBuilder.appendWhere(WaypointsColumns._ID + "=" + ContentUris.parseId(url));
                 break;
             default:
                 throw new IllegalArgumentException("Unknown url " + url);
@@ -242,7 +239,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 break;
             case TRACKPOINTS_BY_ID:
                 table = TrackPointsColumns.TABLE_NAME;
-                whereClause = TrackPointsColumns._ID + "=" + url.getPathSegments().get(1);
+                whereClause = TrackPointsColumns._ID + "=" + ContentUris.parseId(url);
                 if (!TextUtils.isEmpty(where)) {
                     whereClause += " AND (" + where + ")";
                 }
@@ -253,7 +250,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 break;
             case TRACKS_BY_ID:
                 table = TracksColumns.TABLE_NAME;
-                whereClause = TracksColumns._ID + "=" + url.getPathSegments().get(1);
+                whereClause = TracksColumns._ID + "=" + ContentUris.parseId(url);
                 if (!TextUtils.isEmpty(where)) {
                     whereClause += " AND (" + where + ")";
                 }
@@ -264,7 +261,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 break;
             case WAYPOINTS_BY_ID:
                 table = WaypointsColumns.TABLE_NAME;
-                whereClause = WaypointsColumns._ID + "=" + url.getPathSegments().get(1);
+                whereClause = WaypointsColumns._ID + "=" + ContentUris.parseId(url);
                 if (!TextUtils.isEmpty(where)) {
                     whereClause += " AND (" + where + ")";
                 }
@@ -289,8 +286,15 @@ public abstract class CustomContentProvider extends ContentProvider {
      *
      * @param url the url
      */
+    @NonNull
     private UrlType getUrlType(Uri url) {
-        return UrlType.values()[uriMatcher.match(url)];
+        UrlType[] urlTypes = UrlType.values();
+        int matchIndex = uriMatcher.match(url);
+        if (0 <= matchIndex && matchIndex < urlTypes.length) {
+            return urlTypes[matchIndex];
+        }
+
+        throw new IllegalArgumentException("Unknown URL " + url);
     }
 
     /**
@@ -328,7 +332,7 @@ public abstract class CustomContentProvider extends ContentProvider {
         }
         long rowId = db.insert(TrackPointsColumns.TABLE_NAME, TrackPointsColumns._ID, values);
         if (rowId >= 0) {
-            return ContentUris.appendId(TrackPointsColumns.CONTENT_URI.buildUpon(), rowId).build();
+            return ContentUris.appendId(TrackPointsColumns.CONTENT_URI_BY_ID.buildUpon(), rowId).build();
         }
         throw new SQLiteException("Failed to insert a track point " + url);
     }
@@ -380,31 +384,4 @@ public abstract class CustomContentProvider extends ContentProvider {
         WAYPOINTS,
         WAYPOINTS_BY_ID
     }
-
-    /**
-     * Database helper for creating and upgrading the database.
-     */
-    @VisibleForTesting
-    static class DatabaseHelper extends SQLiteOpenHelper {
-
-        public DatabaseHelper(Context context) {
-            this(context, DATABASE_NAME);
-        }
-
-        @VisibleForTesting
-        public DatabaseHelper(Context context, String databaseName) {
-            super(context, databaseName, null, DATABASE_VERSION);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-            db.execSQL(TrackPointsColumns.CREATE_TABLE);
-            db.execSQL(TracksColumns.CREATE_TABLE);
-            db.execSQL(WaypointsColumns.CREATE_TABLE);
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        }
-    }
-}
+}

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

@@ -0,0 +1,145 @@
+package de.dennisguse.opentracks.content.provider;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
+
+/**
+ * Database helper for creating and upgrading the database.
+ */
+@VisibleForTesting
+class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
+
+    @VisibleForTesting
+    private static final int DATABASE_VERSION = 25;
+    private static final String TAG = CustomSQLiteOpenHelper.class.getSimpleName();
+
+    @VisibleForTesting
+    private static final String DATABASE_NAME = "database.db";
+
+
+    public CustomSQLiteOpenHelper(Context context) {
+        this(context, DATABASE_NAME);
+    }
+
+    @VisibleForTesting
+    public CustomSQLiteOpenHelper(Context context, String databaseName) {
+        super(context, databaseName, null, DATABASE_VERSION);
+    }
+
+    @VisibleForTesting
+    public CustomSQLiteOpenHelper(Context context, String databaseName, int databaseVersion) {
+        super(context, databaseName, null, databaseVersion);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(TrackPointsColumns.CREATE_TABLE);
+        db.execSQL(TrackPointsColumns.CREATE_TABLE_INDEX);
+
+        db.execSQL(TracksColumns.CREATE_TABLE);
+
+        db.execSQL(WaypointsColumns.CREATE_TABLE);
+        db.execSQL(WaypointsColumns.CREATE_TABLE_INDEX);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        for (int toVersion = oldVersion + 1; toVersion <= newVersion; toVersion++) {
+            Log.i(TAG, "Upgrade from " + oldVersion + " to " + toVersion);
+            switch (toVersion) {
+                case 24:
+                    upgradeFrom23to24(db);
+                    break;
+                case 25:
+                    upgradeFrom24to25(db);
+                    break;
+
+                default:
+                    throw new RuntimeException("Not implemented: upgrade to " + toVersion);
+            }
+        }
+    }
+
+    @Override
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        for (int toVersion = oldVersion - 1; toVersion >= newVersion; toVersion--) {
+            Log.i(TAG, "Downgrade from " + oldVersion + " to " + toVersion);
+            switch (toVersion) {
+                case 23:
+                    downgradeFrom24to23(db);
+                    break;
+                case 24:
+                    downgradeFrom25to24(db);
+                    break;
+
+                default:
+                    throw new RuntimeException("Not implemented: downgrade to " + toVersion);
+            }
+        }
+    }
+
+    /**
+     * Upgrade from database version 23 (waypoints, tracks): remove unused columns.
+     * SQLite3 does not support drop columns; therefore new tables are created and data is copied.
+     */
+    private void upgradeFrom23to24(SQLiteDatabase db) {
+        db.beginTransaction();
+        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)");
+        db.execSQL("INSERT INTO tracks SELECT _id, name, description, category, starttime, stoptime, numpoints, totaldistance, totaltime, movingtime, avgspeed, avgmovingspeed, maxspeed, minelevation, maxelevation, elevationgain, icon FROM tracks_old");
+        db.execSQL("DROP TABLE tracks_old");
+
+        db.execSQL("ALTER TABLE waypoints RENAME TO waypoints_old");
+        db.execSQL("CREATE TABLE waypoints (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, icon TEXT, trackid INTEGER, length FLOAT, duration INTEGER, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, bearing FLOAT, photoUrl TEXT)");
+        db.execSQL("INSERT INTO waypoints SELECT _id, name, description, category, icon, trackid, length, duration, longitude, latitude, time, elevation, accuracy, bearing, photoUrl FROM waypoints_old");
+        db.execSQL("DROP TABLE waypoints_old");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom24to23(SQLiteDatabase db) {
+        //Not needed as the delete columns did not contain any data
+        db.beginTransaction();
+        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, mingrade FLOAT, maxgrade FLOAT, icon TEXT)");
+        db.execSQL("INSERT INTO tracks SELECT _id, name, description, category, starttime, stoptime, numpoints, totaldistance, totaltime, movingtime, avgspeed, avgmovingspeed, maxspeed, minelevation, maxelevation, elevationgain, 0, 0, icon FROM tracks_old");
+        db.execSQL("DROP TABLE tracks_old");
+
+        db.execSQL("ALTER TABLE waypoints RENAME TO waypoints_old");
+        db.execSQL("CREATE TABLE waypoints (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, icon TEXT, trackid INTEGER, type INTEGER, length FLOAT, duration INTEGER, starttime INTEGER, startid INTEGER, stopid INTEGER, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, speed FLOAT, bearing FLOAT, totaldistance FLOAT, totaltime INTEGER, movingtime INTEGER, avgspeed FLOAT, avgmovingspeed FLOAT, maxspeed FLOAT, minelevation FLOAT, maxelevation FLOAT, elevationgain FLOAT, mingrade FLOAT, maxgrade FLOAT, photoUrl TEXT)");
+        db.execSQL("INSERT INTO waypoints SELECT _id, name, description, category, icon, trackid, 0, length, duration, 0, 0, 0, longitude, latitude, time, elevation, accuracy, 0, bearing, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, photoUrl FROM waypoints_old");
+        db.execSQL("DROP TABLE waypoints_old");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void upgradeFrom24to25(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("CREATE INDEX trackpoints_trackid_index ON trackpoints(trackid)");
+        db.execSQL("CREATE INDEX waypoints_trackid_index ON waypoints(trackid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom25to24(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("DROP INDEX trackpoints_trackid_index");
+        db.execSQL("DROP INDEX waypoints_trackid_index");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+}

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

@@ -19,6 +19,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 
 import de.dennisguse.opentracks.android.IContentResolver;
 import de.dennisguse.opentracks.content.data.Track;
@@ -42,7 +43,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
 
     private static final String[] COLUMNS = {OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE};
 
-    public static final String TAG = ShareContentProvider.class.getSimpleName();
+    private static final String TAG = ShareContentProvider.class.getSimpleName();
 
     private static final int URI_GPX = 0;
     private static final int URI_KML_ONLY = 1;
@@ -58,30 +59,30 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
     private static final String TRACKID_DELIMITER = "_";
 
     static {
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.GPX.getName() + "/*", URI_GPX);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.GPX.getName() + "/*/*", URI_GPX);
 
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KML_ONLY_TRACK.getName() + "/*", URI_KML_ONLY);
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KML_WITH_TRACKDETAIL.getName() + "/*", URI_KML_WITH_TRACKDETAIL);
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.getName() + "/*", URI_KML_WITH_TRACKDETAIL_SENSORDATA);
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_ONLY_TRACK.getName() + "/*", URI_KMZ_ONLY_TRACK);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KML_ONLY_TRACK.getName() + "/*/*", URI_KML_ONLY);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KML_WITH_TRACKDETAIL.getName() + "/*/*", URI_KML_WITH_TRACKDETAIL);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.getName() + "/*/*", URI_KML_WITH_TRACKDETAIL_SENSORDATA);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_ONLY_TRACK.getName() + "/*/*", URI_KMZ_ONLY_TRACK);
 
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL.getName() + "/*", URI_KMZ_WITH_TRACKDETAIL);
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.getName() + "/*", URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA);
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES.getName() + "/*", URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL.getName() + "/*/*", URI_KMZ_WITH_TRACKDETAIL);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.getName() + "/*/*", URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA);
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES.getName() + "/*/*", URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES);
     }
 
-    public static Pair<Uri, String> createURI(long[] trackIds, @NonNull TrackFileFormat trackFileFormat) {
+    public static Pair<Uri, String> createURI(long[] trackIds, String trackName, @NonNull TrackFileFormat trackFileFormat) {
         if (trackIds.length == 0) {
             throw new UnsupportedOperationException();
         }
 
-        StringBuilder builder = new StringBuilder();
+        StringBuilder trackIdBuilder = new StringBuilder();
         for (long trackId : trackIds) {
-            builder.append(trackId).append(TRACKID_DELIMITER);
+            trackIdBuilder.append(trackId).append(TRACKID_DELIMITER);
         }
-        builder.deleteCharAt(builder.lastIndexOf(TRACKID_DELIMITER));
+        trackIdBuilder.deleteCharAt(trackIdBuilder.lastIndexOf(TRACKID_DELIMITER));
 
-        Uri uri = Uri.parse(TracksColumns.CONTENT_URI + "/" + trackFileFormat.getName() + "/" + builder + "." + trackFileFormat.getExtension());
+        Uri uri = Uri.parse(TracksColumns.CONTENT_URI + "/" + trackFileFormat.getName() + "/" + trackIdBuilder + "/" + Uri.encode(trackName) + "." + trackFileFormat.getExtension());
         String mime = getTypeMime(uri);
 
         Log.d(TAG, "Created uri " + uri.toString() + " with MIME " + mime);
@@ -89,18 +90,18 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
         return new Pair<>(uri, mime);
     }
 
-    private static long[] parseURI(Uri uri) {
-        String lastPathSegment = uri.getLastPathSegment();
-        if (lastPathSegment == null) {
+    static long[] parseURI(Uri uri) {
+        List<String> uriPaths = uri.getPathSegments();
+        if (uriPaths == null || uriPaths.size() < 2) {
+            Log.d(TAG, "URI does not contain any trackIds.");
             return new long[]{};
         }
 
-        String fileExtension = "." + getTrackFileFormat(uri).getExtension();
-        String[] lastPathSegmentSplit = lastPathSegment.replace(fileExtension, "").split(TRACKID_DELIMITER);
+        String[] uriTrackIds = uriPaths.get(2).split(TRACKID_DELIMITER);
 
-        long[] trackIds = new long[lastPathSegmentSplit.length];
+        long[] trackIds = new long[uriTrackIds.length];
         for (int i = 0; i < trackIds.length; i++) {
-            trackIds[i] = Long.valueOf(lastPathSegmentSplit[i]);
+            trackIds[i] = Long.parseLong(uriTrackIds[i]);
         }
         return trackIds;
     }
@@ -150,7 +151,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
     }
 
     @Nullable
-    public static String getTypeMime(@NonNull Uri uri) {
+    private static String getTypeMime(@NonNull Uri uri) {
         return getTrackFileFormat(uri).getMimeType();
     }
 

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

@@ -1,21 +0,0 @@
-package de.dennisguse.opentracks.content.provider;
-
-import android.location.LocationManager;
-
-import de.dennisguse.opentracks.content.data.TrackPoint;
-
-/**
- * Creates a new {@link TrackPoint}.
- * An implementation can create new instances or reuse existing instances for optimization.
- */
-public class TrackPointFactory {
-
-    /**
-     * The default {@link TrackPointFactory} which creates a location each time.
-     */
-    public static final TrackPointFactory DEFAULT_LOCATION_FACTORY = new TrackPointFactory();
-
-    public TrackPoint createLocation() {
-        return new TrackPoint(LocationManager.GPS_PROVIDER);
-    }
-}

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

@@ -18,21 +18,15 @@ public class TrackPointIterator implements Iterator<TrackPoint>, AutoCloseable {
     private final ContentProviderUtils contentProviderUtils;
     private final long trackId;
     private final boolean descending;
-    private final TrackPointFactory trackPointFactory;
     private final CachedTrackPointsIndexes indexes;
     private long lastTrackPointId = -1L;
     private Cursor cursor;
 
 
-    public TrackPointIterator(ContentProviderUtils contentProviderUtils, long trackId, long startTrackPointId, boolean descending, TrackPointFactory trackPointFactory) {
-        if (trackPointFactory == null) {
-            throw new IllegalArgumentException("trackPointFactory is null");
-        }
-
+    public TrackPointIterator(ContentProviderUtils contentProviderUtils, long trackId, long startTrackPointId, boolean descending) {
         this.contentProviderUtils = contentProviderUtils;
         this.trackId = trackId;
         this.descending = descending;
-        this.trackPointFactory = trackPointFactory;
 
         cursor = getCursor(startTrackPointId);
         indexes = cursor != null ? new CachedTrackPointsIndexes(cursor)
@@ -91,9 +85,7 @@ public class TrackPointIterator implements Iterator<TrackPoint>, AutoCloseable {
             }
         }
         lastTrackPointId = cursor.getLong(indexes.idIndex);
-        TrackPoint trackPoint = trackPointFactory.createLocation();
-        ContentProviderUtils.fillTrackPoint(cursor, indexes, trackPoint);
-        return trackPoint;
+        return ContentProviderUtils.fillTrackPoint(cursor, indexes);
     }
 
     @Override
@@ -108,4 +100,13 @@ public class TrackPointIterator implements Iterator<TrackPoint>, AutoCloseable {
     public void remove() {
         throw new UnsupportedOperationException();
     }
+
+    public int getCount() {
+        if (cursor == null) {
+            return -1;
+        }
+
+        return cursor.getCount();
+    }
+
 }

src/main/java/de/dennisguse/opentracks/content/sensor/SensorData.java

@@ -0,0 +1,39 @@
+package de.dennisguse.opentracks.content.sensor;
+
+import androidx.annotation.VisibleForTesting;
+
+import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
+
+public class SensorData {
+
+    private String sensorAddress;
+    private String sensorName;
+
+    private long timestamp_ms;
+
+    SensorData(String sensorAddress, String sensorName) {
+        this(sensorAddress, sensorName, System.currentTimeMillis());
+    }
+
+    @VisibleForTesting
+    SensorData(String sensorAddress, String sensorName, long timestamp_ms) {
+        this.sensorAddress = sensorAddress;
+        this.sensorName = sensorName;
+        this.timestamp_ms = timestamp_ms;
+    }
+
+    public String getSensorAddress() {
+        return sensorAddress;
+    }
+
+    public String getSensorName() {
+        return sensorName;
+    }
+
+    /**
+     * Is the data recent considering the current time.
+     */
+    public boolean isRecent() {
+        return timestamp_ms + BluetoothRemoteSensorManager.MAX_SENSOR_DATE_SET_AGE_MS > System.currentTimeMillis();
+    }
+}

src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java

@@ -0,0 +1,175 @@
+package de.dennisguse.opentracks.content.sensor;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import de.dennisguse.opentracks.util.UintUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+
+/**
+ * Provides cadence in rpm and speed in milliseconds from Bluetooth LE Cycling Cadence and Speed sensors.
+ * <p>
+ * https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=261449
+ */
+public final class SensorDataCycling {
+
+    private static final String TAG = SensorDataCycling.class.getSimpleName();
+
+    private static final int INVALID_VALUE_INT = -1;
+    private static final float INVALID_VALUE_FLOAT = Float.NaN;
+
+    private SensorDataCycling() {
+    }
+
+    public static class Cadence extends SensorData {
+
+        private long crankRevolutionsCount; // UINT32
+        private int crankRevolutionsTime; // UINT16; 1/1024s
+        private float cadence_rpm = INVALID_VALUE_FLOAT;
+
+        public Cadence(String sensorAddress, String sensorName, long crankRevolutionsCount, int crankRevolutionsTime) {
+            super(sensorAddress, sensorName);
+            this.crankRevolutionsCount = crankRevolutionsCount;
+            this.crankRevolutionsTime = crankRevolutionsTime;
+        }
+
+        /**
+         * Workaround for Wahoo CADENCE: provides speed instead of cadence
+         */
+        public Cadence(@NonNull SensorDataCycling.Speed speed) {
+            this(speed.getSensorAddress(), speed.getSensorName(), speed.getWheelRevolutionsCount(), speed.getWheelRevolutionsTime());
+        }
+
+        public boolean hasData() {
+            return crankRevolutionsCount != INVALID_VALUE_INT && crankRevolutionsTime != INVALID_VALUE_INT;
+        }
+
+        public long getCrankRevolutionsCount() {
+            return crankRevolutionsCount;
+        }
+
+        public int getCrankRevolutionsTime() {
+            return crankRevolutionsTime;
+        }
+
+        public boolean hasCadence_rpm() {
+            return !Float.isNaN(cadence_rpm);
+        }
+
+        public float getCadence_rpm() {
+            return cadence_rpm;
+        }
+
+        public void compute(Cadence previous) {
+            if (hasData() && previous != null && previous.hasData()) {
+                long timeDiff_ms = UintUtils.diff(crankRevolutionsTime, previous.crankRevolutionsTime, UintUtils.UINT16_MAX) / 1024 * UnitConversions.S_TO_MS;
+                if (timeDiff_ms <= 0) {
+                    Log.e(TAG, "Timestamps difference is invalid: cannot compute cadence.");
+                    cadence_rpm = INVALID_VALUE_FLOAT;
+                } else {
+                    long crankDiff = UintUtils.diff(crankRevolutionsCount, previous.crankRevolutionsCount, UintUtils.UINT32_MAX);
+                    float cadence_ms = crankDiff / (float) timeDiff_ms;
+                    cadence_rpm = (float) (cadence_ms / UnitConversions.MS_TO_S / UnitConversions.S_TO_MIN);
+                }
+            }
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "cadence=" + getCadence_rpm() + "_" + getCrankRevolutionsTime();
+        }
+
+        @Override
+        public boolean equals(@Nullable Object obj) {
+            if (!(obj instanceof Cadence)) return false;
+
+            Cadence comp = (Cadence) obj;
+            return getCrankRevolutionsCount() == comp.getCrankRevolutionsCount() && getCrankRevolutionsTime() == comp.getCrankRevolutionsTime();
+        }
+    }
+
+    public static class Speed extends SensorData {
+
+        private int wheelRevolutionsCount; // UINT16
+        private int wheelRevolutionsTime; // UINT16; 1/1024s
+        private float speed_mps = INVALID_VALUE_FLOAT;
+
+        public Speed(String sensorAddress, String sensorName, int wheelRevolutionsCount, int wheelRevolutionsTime) {
+            super(sensorAddress, sensorName);
+            this.wheelRevolutionsCount = wheelRevolutionsCount;
+            this.wheelRevolutionsTime = wheelRevolutionsTime;
+        }
+
+        public boolean hasData() {
+            return wheelRevolutionsCount != INVALID_VALUE_INT && wheelRevolutionsTime != INVALID_VALUE_INT;
+        }
+
+        public int getWheelRevolutionsCount() {
+            return wheelRevolutionsCount;
+        }
+
+        public int getWheelRevolutionsTime() {
+            return wheelRevolutionsTime;
+        }
+
+        public boolean hasSpeed_mps() {
+            return !Float.isNaN(speed_mps);
+        }
+
+        public float getSpeed_mps() {
+            return speed_mps;
+        }
+
+        public void compute(Speed previous, int wheel_circumference_mm) {
+            if (hasData() && previous != null && previous.hasData()) {
+                long timeDiff_ms = UintUtils.diff(wheelRevolutionsTime, previous.wheelRevolutionsTime, UintUtils.UINT16_MAX) / 1024 * UnitConversions.S_TO_MS;
+                if (timeDiff_ms <= 0) {
+                    Log.e(TAG, "Timestamps difference is invalid: cannot compute cadence.");
+                    speed_mps = INVALID_VALUE_FLOAT;
+                } else {
+                    long wheelDiff = UintUtils.diff(wheelRevolutionsCount, previous.wheelRevolutionsCount, UintUtils.UINT16_MAX);
+                    double timeDiff_s = timeDiff_ms * UnitConversions.MS_TO_S;
+                    speed_mps = (float) (wheelDiff * wheel_circumference_mm * UnitConversions.MM_TO_M / timeDiff_s);
+                }
+            }
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "speed=" + getSpeed_mps() + "_" + getWheelRevolutionsTime();
+        }
+
+        @Override
+        public boolean equals(@Nullable Object obj) {
+            if (!(obj instanceof Speed)) return false;
+
+            Speed comp = (Speed) obj;
+            return getWheelRevolutionsCount() == comp.getWheelRevolutionsCount() && getWheelRevolutionsTime() == comp.getWheelRevolutionsTime();
+        }
+    }
+
+    public static class CadenceAndSpeed extends SensorData {
+
+        private Cadence cadence;
+        private Speed speed;
+
+        public CadenceAndSpeed(String sensorAddress, String sensorName, @NonNull Cadence cadence, @NonNull Speed speed) {
+            super(sensorAddress, sensorName);
+            this.cadence = cadence;
+            this.speed = speed;
+        }
+
+        public Cadence getCadence() {
+            return cadence;
+        }
+
+        public Speed getSpeed() {
+            return speed;
+        }
+    }
+}
+

src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataHeartRate.java

@@ -0,0 +1,27 @@
+package de.dennisguse.opentracks.content.sensor;
+
+import androidx.annotation.NonNull;
+
+public class SensorDataHeartRate extends SensorData {
+
+    private float heartRate_bpm;
+
+    public SensorDataHeartRate(String name, String address, float heartRate_bpm) {
+        super(name, address);
+        this.heartRate_bpm = heartRate_bpm;
+    }
+
+    public boolean hasHeartRate_bpm() {
+        return !Float.isNaN(heartRate_bpm);
+    }
+
+    public float getHeartRate_bpm() {
+        return heartRate_bpm;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "heart=" + heartRate_bpm;
+    }
+}

src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java

@@ -1,94 +1,86 @@
 package de.dennisguse.opentracks.content.sensor;
 
+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.content.data.TrackPoint;
+
+/**
+ *
+ */
 public final class SensorDataSet {
 
-    public static final float DATA_UNAVAILABLE = Float.NaN;
+    private SensorDataHeartRate heartRate;
 
-    //TODO It might be necessary to consider: if sensor was connected as well.
-    private String sensorName;
-    private String sensorAddress;
-    private float heartRate;
-    private float cadence;
-    private float power;
-    private float batteryLevel;
-    private long creationTimestamp;
+    private SensorDataCycling.Cadence cyclingCadence;
 
-    public SensorDataSet(float heartRate, float cadence, float power, float batteryLevel, long creationTimestamp) {
-        this.heartRate = heartRate;
-        this.cadence = cadence;
-        this.power = power;
-        this.batteryLevel = batteryLevel;
-        this.creationTimestamp = creationTimestamp;
+    private SensorDataCycling.Speed cyclingSpeed;
+
+    public SensorDataSet() {
     }
 
-    public SensorDataSet(float heartRate, float cadence, float power, float batteryLevel) {
-        this(heartRate, cadence, power, batteryLevel, System.currentTimeMillis());
-    }
-
-    public SensorDataSet(float heartRate, float cadence, float power) {
-        this(heartRate, cadence, power, DATA_UNAVAILABLE, System.currentTimeMillis());
-    }
-
-    public SensorDataSet(float heartRate, float cadence) {
-        this(heartRate, cadence, DATA_UNAVAILABLE, DATA_UNAVAILABLE, System.currentTimeMillis());
-    }
-
-    public SensorDataSet(float heartRate, String sensorName, String sensorAddress) {
-        this(heartRate, DATA_UNAVAILABLE, DATA_UNAVAILABLE, DATA_UNAVAILABLE, System.currentTimeMillis());
-        this.sensorName = sensorName;
-        this.sensorAddress = sensorAddress;
-    }
-
-    public boolean hasHeartRate() {
-        return !Float.isNaN(heartRate) && heartRate > 0;
-    }
-
-    public float getHeartRate() {
+    public SensorDataHeartRate getHeartRate() {
         return heartRate;
     }
 
-    public boolean hasCadence() {
-        return !Float.isNaN(cadence);
+    public SensorDataCycling.Cadence getCyclingCadence() {
+        return cyclingCadence;
     }
 
-    public float getCadence() {
-        return cadence;
+    public SensorDataCycling.Speed getCyclingSpeed() {
+        return cyclingSpeed;
     }
 
-    public boolean hasPower() {
-        return !Float.isNaN(power);
+    public void set(SensorData data) {
+        if (data == null) {
+            return;
+        }
+
+        if (data instanceof SensorDataHeartRate) {
+            this.heartRate = (SensorDataHeartRate) data;
+            return;
+        }
+
+        if (data instanceof SensorDataCycling.Cadence) {
+            this.cyclingCadence = (SensorDataCycling.Cadence) data;
+            return;
+        }
+        if (data instanceof SensorDataCycling.Speed) {
+            this.cyclingSpeed = (SensorDataCycling.Speed) data;
+            return;
+        }
+        if (data instanceof SensorDataCycling.CadenceAndSpeed) {
+            set(((SensorDataCycling.CadenceAndSpeed) data).getCadence());
+            set(((SensorDataCycling.CadenceAndSpeed) data).getSpeed());
+        }
+
+        throw new UnsupportedOperationException();
     }
 
-    public float getPower() {
-        return power;
+    public void clear() {
+        this.heartRate = null;
+        this.cyclingCadence = null;
+        this.cyclingSpeed = null;
     }
 
-    public long getCreationTime() {
-        return creationTimestamp;
+    public void fillTrackPoint(TrackPoint trackPoint) {
+        if (heartRate != null) {
+            trackPoint.setHeartRate_bpm(heartRate.getHeartRate_bpm());
+        }
+
+        if (cyclingCadence != null && cyclingCadence.hasCadence_rpm()) {
+            trackPoint.setCyclingCadence_rpm(cyclingCadence.getCadence_rpm());
+        }
+
+        if (cyclingSpeed != null && cyclingSpeed.hasSpeed_mps()) {
+            trackPoint.setSpeed(cyclingSpeed.getSpeed_mps());
+        }
     }
 
-    /**
-     * Is the data recent considering the current time.
-     *
-     * @param maxAge the maximal age in milliseconds.
-     */
-    public boolean isRecent(long maxAge) {
-        return creationTimestamp + maxAge > System.currentTimeMillis();
-    }
-
-    public boolean hasBatteryLevel() {
-        return !Float.isNaN(batteryLevel);
-    }
-
-    public float getBatteryLevel() {
-        return batteryLevel;
-    }
-
-    public String getSensorName() {
-        return sensorName;
-    }
-
-    public String getSensorAddress() {
-        return sensorAddress;
+    @NonNull
+    @Override
+    public String toString() {
+        return (getHeartRate() != null ? "" + getHeartRate() : "")
+                + (getCyclingCadence() != null ? " " + getCyclingCadence() : "")
+                + (getCyclingSpeed() != null ? " " + getCyclingSpeed() : "");
     }
 }

src/main/java/de/dennisguse/opentracks/content/sensor/SensorState.java

@@ -1,29 +0,0 @@
-package de.dennisguse.opentracks.content.sensor;
-
-import android.content.Context;
-
-import de.dennisguse.opentracks.R;
-
-public enum SensorState {
-    NONE,
-    CONNECTING,
-    CONNECTED,
-    DISCONNECTING,
-    DISCONNECTED;
-
-    public static String getStateAsString(SensorState state, Context c) {
-        switch (state) {
-            case NONE:
-                return c.getString(R.string.value_none);
-            case CONNECTING:
-                return c.getString(R.string.sensor_state_connecting);
-            case CONNECTED:
-                return c.getString(R.string.sensor_state_connected);
-            case DISCONNECTING:
-            case DISCONNECTED:
-                return c.getString(R.string.sensor_state_disconnected);
-            default:
-                return "";
-        }
-    }
-}

src/main/java/de/dennisguse/opentracks/fragments/ChartDistanceFragment.java

@@ -1,8 +0,0 @@
-package de.dennisguse.opentracks.fragments;
-
-public class ChartDistanceFragment extends ChartFragment {
-
-    public ChartDistanceFragment() {
-        super(true);
-    }
-}

src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java

@@ -17,7 +17,6 @@
 package de.dennisguse.opentracks.fragments;
 
 import android.content.SharedPreferences;
-import android.location.Location;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,56 +24,61 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.chart.ChartPoint;
 import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
-import de.dennisguse.opentracks.content.TrackDataType;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
-import de.dennisguse.opentracks.stats.TripStatistics;
-import de.dennisguse.opentracks.stats.TripStatisticsUpdater;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
  * A fragment to display track chart to the user.
+ * ChartFragment uses a {@link TrackStatisticsUpdater} internally and recomputes the {@link TrackStatistics} from the beginning.
  *
  * @author Sandor Dornbush
  * @author Rodrigo Damazio
  */
-public abstract class ChartFragment extends Fragment implements TrackDataListener {
+public class ChartFragment extends Fragment implements TrackDataListener {
 
-    private static final String STATE_CHART_VIEW_BY_DISTANCE_KEY = "chartViewByDistance";
+    private static final String KEY_CHART_VIEW_BY_DISTANCE_KEY = "chartViewByDistance";
 
-    private final List<double[]> pendingPoints = new ArrayList<>();
+    public static Fragment newInstance(boolean chartByDistance) {
+        Bundle bundle = new Bundle();
+        bundle.putBoolean(KEY_CHART_VIEW_BY_DISTANCE_KEY, chartByDistance);
+
+        ChartFragment chartFragment = new ChartFragment();
+        chartFragment.setArguments(bundle);
+        return chartFragment;
+    }
+
+    private final List<ChartPoint> pendingPoints = new ArrayList<>();
 
     private TrackDataHub trackDataHub;
 
     // Stats gathered from the received data
-    private TripStatisticsUpdater tripStatisticsUpdater;
+    private TrackStatisticsUpdater trackStatisticsUpdater;
     private long startTime;
 
-    private boolean metricUnits = true;
-    private boolean reportSpeed = true;
+    //TODO Why is this needed?
     private int recordingDistanceInterval;
+    private String category = "";
 
     // Modes of operation
     private boolean chartByDistance;
-    private final boolean[] chartShow = new boolean[]{true, true, true, true, true, true};
 
     // UI elements
     private ChartView chartView;
@@ -82,13 +86,9 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
     private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (!isResumed()) {
-                return;
-            }
             if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key)) {
-                boolean metric = PreferencesUtils.isMetricUnits(getContext());
-                if (metricUnits != metric) {
-                    metricUnits = metric;
+                boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
+                if (metricUnits != chartView.getMetricUnits()) {
                     chartView.setMetricUnits(metricUnits);
                     runOnUiThread(new Runnable() {
                         @Override
@@ -101,12 +101,11 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
                 }
             }
             if (PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) {
-                boolean speed = PreferencesUtils.isReportSpeed(getContext());
-                if (reportSpeed != speed) {
-                    reportSpeed = speed;
+                boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
+                if (reportSpeed != chartView.getReportSpeed()) {
                     chartView.setReportSpeed(reportSpeed);
-                    setSeriesEnabled(ChartView.SPEED_SERIES, reportSpeed);
-                    setSeriesEnabled(ChartView.PACE_SERIES, !reportSpeed);
+                    chartView.applyReportSpeed();
+
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
@@ -139,14 +138,13 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
         }
     };
 
-    public ChartFragment(boolean chartByDistance) {
-        this.chartByDistance = chartByDistance;
-    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        chartByDistance = getArguments().getBoolean(KEY_CHART_VIEW_BY_DISTANCE_KEY, true);
+
         recordingDistanceInterval = PreferencesUtils.getRecordingDistanceIntervalDefault(getContext());
 
         // Create a chartView here to store data thus won't need to reload all the data on every onStart or onResume.
@@ -171,6 +169,7 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
         super.onResume();
         resumeTrackDataHub();
         PreferencesUtils.register(getContext(), sharedPreferenceChangeListener);
+        sharedPreferenceChangeListener.onSharedPreferenceChanged(null, null);
 
         checkChartSettings();
         getActivity().runOnUiThread(updateChart);
@@ -180,7 +179,7 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
     public void onPause() {
         super.onPause();
         pauseTrackDataHub();
-        PreferencesUtils.register(getContext(), sharedPreferenceChangeListener);
+        PreferencesUtils.unregister(getContext(), sharedPreferenceChangeListener);
     }
 
     @Override
@@ -190,35 +189,29 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
         layout.removeView(chartView);
     }
 
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBoolean(STATE_CHART_VIEW_BY_DISTANCE_KEY, chartByDistance);
-    }
-
-    @Override
-    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-        if (savedInstanceState != null) {
-            chartByDistance = savedInstanceState.getBoolean(STATE_CHART_VIEW_BY_DISTANCE_KEY);
-        }
-    }
-
     @Override
     public void onTrackUpdated(Track track) {
         if (isResumed()) {
-            if (track == null || track.getTripStatistics() == null) {
+            if (track == null || track.getTrackStatistics() == null) {
                 startTime = -1L;
+                category = "";
                 return;
             }
-            startTime = track.getTripStatistics().getStartTime();
+
+            category = track.getCategory();
+            boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
+            if (reportSpeed != chartView.getReportSpeed()) {
+                chartView.setReportSpeed(reportSpeed);
+                chartView.applyReportSpeed();
+            }
+            startTime = track.getTrackStatistics().getStartTime_ms();
         }
     }
 
     @Override
     public void clearTrackPoints() {
         if (isResumed()) {
-            tripStatisticsUpdater = startTime != -1L ? new TripStatisticsUpdater(startTime) : null;
+            trackStatisticsUpdater = startTime != -1L ? new TrackStatisticsUpdater(startTime) : null;
             pendingPoints.clear();
             chartView.reset();
             runOnUiThread(new Runnable() {
@@ -233,25 +226,25 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
     }
 
     @Override
-    public void onSampledInTrackPoint(Location location) {
+    public void onSampledInTrackPoint(TrackPoint trackPoint) {
         if (isResumed()) {
-            double[] data = new double[ChartView.NUM_SERIES + 1];
-            fillDataPoint(location, data);
-            pendingPoints.add(data);
+            pendingPoints.add(createPendingPoint(trackPoint));
         }
     }
 
     @Override
-    public void onSampledOutTrackPoint(Location location) {
+    public void onSampledOutTrackPoint(TrackPoint trackPoint) {
         if (isResumed()) {
-            fillDataPoint(location, null);
+            if (trackStatisticsUpdater != null) {
+                trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval);
+            }
         }
     }
 
     @Override
     public void onNewTrackPointsDone() {
         if (isResumed()) {
-            chartView.addDataPoints(pendingPoints);
+            chartView.addChartPoints(pendingPoints);
             pendingPoints.clear();
             runOnUiThread(updateChart);
         }
@@ -282,46 +275,19 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
      * Checks the chart settings.
      */
     private void checkChartSettings() {
-        boolean needUpdate = false;
-
-        if (setSeriesEnabled(ChartView.SPEED_SERIES, reportSpeed)) {
-            needUpdate = true;
-        }
-        if (setSeriesEnabled(ChartView.PACE_SERIES, !reportSpeed)) {
-            needUpdate = true;
-        }
-
+        boolean needUpdate = chartView.applyReportSpeed();
         if (needUpdate) {
             chartView.postInvalidate();
         }
     }
 
-    /**
-     * Sets the series enabled value.
-     *
-     * @param index the series index
-     * @param value the value
-     * @return true if changed
-     */
-    private boolean setSeriesEnabled(int index, boolean value) {
-        if (chartShow[index] != value) {
-            chartShow[index] = value;
-            chartView.setChartValueSeriesEnabled(index, value);
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Resumes the trackDataHub.
      * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
      */
     private synchronized void resumeTrackDataHub() {
         trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
-        trackDataHub.registerTrackDataListener(this, EnumSet.of(TrackDataType.TRACKS_TABLE,
-                TrackDataType.WAYPOINTS_TABLE, TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE,
-                TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE));
+        trackDataHub.registerTrackDataListener(this, true, true, true, true);
     }
 
     /**
@@ -341,16 +307,6 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
         return trackDataHub != null && trackDataHub.isSelectedTrackRecording();
     }
 
-    /**
-     * Reloads the trackDataHub.
-     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
-     */
-    private synchronized void reloadTrackDataHub() {
-        if (trackDataHub != null) {
-            trackDataHub.reloadDataForListener(this);
-        }
-    }
-
     /**
      * Runs a runnable on the UI thread if possible.
      *
@@ -363,82 +319,15 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
         }
     }
 
-    /**
-     * Given a location, fill in a data point, an array of double[]. <br>
-     * data[0] = time/distance <br>
-     * data[1] = elevation <br>
-     * data[2] = speed <br>
-     * data[3] = pace <br>
-     * data[4] = heart rate <br>
-     * data[5] = cadence <br>
-     * data[6] = power <br>
-     *
-     * @param location the location
-     * @param data     the data point to fill in, can be null
-     */
     @VisibleForTesting
-    void fillDataPoint(Location location, double[] data) {
-        double timeOrDistance = Double.NaN;
-        double elevation = Double.NaN;
-        double speed = Double.NaN;
-        double pace = Double.NaN;
-
-        if (tripStatisticsUpdater != null) {
-            tripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
-            TripStatistics tripStatistics = tripStatisticsUpdater.getTripStatistics();
-            if (chartByDistance) {
-                double distance = tripStatistics.getTotalDistance() * UnitConversions.M_TO_KM;
-                if (!metricUnits) {
-                    distance *= UnitConversions.KM_TO_MI;
-                }
-                timeOrDistance = distance;
-            } else {
-                timeOrDistance = tripStatistics.getTotalTime();
-            }
-
-            elevation = tripStatisticsUpdater.getSmoothedElevation();
-            if (!metricUnits) {
-                elevation *= UnitConversions.M_TO_FT;
-            }
-
-            speed = tripStatisticsUpdater.getSmoothedSpeed() * UnitConversions.MS_TO_KMH;
-            if (!metricUnits) {
-                speed *= UnitConversions.KM_TO_MI;
-            }
-            pace = speed == 0 ? 0.0 : 60.0 / speed;
-        }
-
-        double heartRate = Double.NaN;
-        double cadence = Double.NaN;
-        double power = Double.NaN;
-        if (location instanceof TrackPoint && ((TrackPoint) location).getSensorDataSet() != null) {
-            SensorDataSet sensorDataSet = ((TrackPoint) location).getSensorDataSet();
-            if (sensorDataSet.hasHeartRate()) {
-                heartRate = sensorDataSet.getHeartRate();
-            }
-            if (sensorDataSet.hasCadence()) {
-                cadence = sensorDataSet.getCadence();
-            }
-            if (sensorDataSet.hasPower()) {
-                power = sensorDataSet.getPower();
-            }
-        }
-
-        //TODO: Is related to ChartView.ELEVATION_SERIES etc.
-        if (data != null) {
-            data[0] = timeOrDistance;
-            data[1] = elevation;
-            data[2] = speed;
-            data[3] = pace;
-            data[4] = heartRate;
-            data[5] = cadence;
-            data[6] = power;
-        }
+    ChartPoint createPendingPoint(@NonNull TrackPoint trackPoint) {
+        trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval);
+        return new ChartPoint(trackStatisticsUpdater, trackPoint, chartByDistance, chartView.getMetricUnits());
     }
 
     @VisibleForTesting
-    void setTripStatisticsUpdater(long time) {
-        tripStatisticsUpdater = new TripStatisticsUpdater(time);
+    void setTrackStatisticsUpdater(long time) {
+        trackStatisticsUpdater = new TrackStatisticsUpdater(time);
     }
 
     @VisibleForTesting
@@ -448,12 +337,12 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
 
     @VisibleForTesting
     void setMetricUnits(boolean value) {
-        metricUnits = value;
+        chartView.setMetricUnits(value);
     }
 
     @VisibleForTesting
     void setReportSpeed(boolean value) {
-        reportSpeed = value;
+        chartView.setReportSpeed(value);
     }
 
     @VisibleForTesting

src/main/java/de/dennisguse/opentracks/fragments/ChartTimeFragment.java

@@ -1,8 +0,0 @@
-package de.dennisguse.opentracks.fragments;
-
-public class ChartTimeFragment extends ChartFragment {
-
-    public ChartTimeFragment() {
-        super(false);
-    }
-}

src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java

@@ -32,7 +32,7 @@ import de.dennisguse.opentracks.util.ResourceUtils;
  *
  * @author apoorvn
  */
-public class ChooseActivityTypeImageAdapter extends BaseAdapter {
+class ChooseActivityTypeImageAdapter extends BaseAdapter {
 
     private final List<Integer> imageIds;
     private int selected = -1;

src/main/java/de/dennisguse/opentracks/fragments/ConfirmDeleteDialogFragment.java

@@ -36,12 +36,9 @@ import de.dennisguse.opentracks.util.DialogUtils;
 public class ConfirmDeleteDialogFragment extends DialogFragment {
 
     private static final String CONFIRM_DELETE_DIALOG_TAG = "confirmDeleteDialog";
-    private ConfirmDeleteCaller caller;
-    private final long[] trackIds;
+    private static final String KEY_TRACK_IDS = "trackIds";
 
-    public ConfirmDeleteDialogFragment(long[] trackIds) {
-        this.trackIds = trackIds;
-    }
+    private ConfirmDeleteCaller caller;
 
     /**
      * Create a new instance.
@@ -49,7 +46,12 @@ public class ConfirmDeleteDialogFragment extends DialogFragment {
      * @param trackIds list of track ids to delete. To delete all, set to size 1 with trackIds[0] == -1L
      */
     public static void showDialog(FragmentManager fragmentManager, long[] trackIds) {
-        new ConfirmDeleteDialogFragment(trackIds).show(fragmentManager, CONFIRM_DELETE_DIALOG_TAG);
+        Bundle bundle = new Bundle();
+        bundle.putLongArray(KEY_TRACK_IDS, trackIds);
+
+        ConfirmDeleteDialogFragment deleteTrackDialogFragment = new ConfirmDeleteDialogFragment();
+        deleteTrackDialogFragment.setArguments(bundle);
+        deleteTrackDialogFragment.show(fragmentManager, CONFIRM_DELETE_DIALOG_TAG);
     }
 
     @Override
@@ -65,6 +67,8 @@ public class ConfirmDeleteDialogFragment extends DialogFragment {
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final long[] trackIds = getArguments().getLongArray(KEY_TRACK_IDS);
+
         int titleId;
         int messageId;
         titleId = trackIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.track_delete_one_confirm_title;

src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java

@@ -38,16 +38,17 @@ import de.dennisguse.opentracks.util.DialogUtils;
 public class DeleteMarkerDialogFragment extends DialogFragment {
 
     private static final String DELETE_MARKER_DIALOG_TAG = "deleteMarkerDialog";
-    private final long[] markerIds;
+    private static final String KEY_MARKER_IDS = "markerIds";
 
     private DeleteMarkerCaller caller;
 
-    public DeleteMarkerDialogFragment(long[] markerIds) {
-        this.markerIds = markerIds;
-    }
-
     public static void showDialog(FragmentManager fragmentManager, long[] markerIds) {
-        new DeleteMarkerDialogFragment(markerIds).show(fragmentManager, DELETE_MARKER_DIALOG_TAG);
+        Bundle bundle = new Bundle();
+        bundle.putLongArray(KEY_MARKER_IDS, markerIds);
+
+        DeleteMarkerDialogFragment deleteMarkerDialogFragment = new DeleteMarkerDialogFragment();
+        deleteMarkerDialogFragment.setArguments(bundle);
+        deleteMarkerDialogFragment.show(fragmentManager, DELETE_MARKER_DIALOG_TAG);
     }
 
     @Override
@@ -63,6 +64,8 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final long[] markerIds = getArguments().getLongArray(KEY_MARKER_IDS);
+
         final FragmentActivity fragmentActivity = getActivity();
         int titleId;
         int messageId;
@@ -82,7 +85,7 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
                             public void run() {
                                 ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
                                 for (long markerId : markerIds) {
-                                    contentProviderUtils.deleteWaypoint(markerId);
+                                    contentProviderUtils.deleteWaypoint(getContext(), markerId);
                                 }
                                 caller.onDeleteMarkerDone();
                             }

src/main/java/de/dennisguse/opentracks/fragments/FileTypeDialogFragment.java

@@ -40,18 +40,19 @@ import de.dennisguse.opentracks.io.file.TrackFileFormat;
 public class FileTypeDialogFragment extends DialogFragment {
 
     private static final String FILE_TYPE_DIALOG_TAG = "fileType";
-    private final int titleId;
+    private static final String KEY_TITLE_ID = "titleId";
+    private static final String KEY_OPTION_ID = "optionId";
 
     private FileTypeCaller caller;
-    private final int optionId;
-
-    public FileTypeDialogFragment(int titleId, int optionId) {
-        this.titleId = titleId;
-        this.optionId = optionId;
-    }
 
     public static void showDialog(FragmentManager fragmentManager, int titleId, int optionId) {
-        new FileTypeDialogFragment(titleId, optionId).show(fragmentManager, FILE_TYPE_DIALOG_TAG);
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_TITLE_ID, titleId);
+        bundle.putInt(KEY_OPTION_ID, optionId);
+
+        FileTypeDialogFragment fileTypeDialogFragment = new FileTypeDialogFragment();
+        fileTypeDialogFragment.setArguments(bundle);
+        fileTypeDialogFragment.show(fragmentManager, FILE_TYPE_DIALOG_TAG);
     }
 
     @Override
@@ -67,6 +68,9 @@ public class FileTypeDialogFragment extends DialogFragment {
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
+        int optionId = getArguments().getInt(KEY_OPTION_ID);
+        final int titleId = getArguments().getInt(KEY_TITLE_ID);
+
         final TrackFileFormat[] trackFileFormats = {TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES, TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA, TrackFileFormat.GPX};
         String[] choices = new String[trackFileFormats.length];
         for (int i = 0; i < choices.length; i++) {

src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java

@@ -57,7 +57,11 @@ public class MarkerDetailFragment extends Fragment {
 
     private static final String TAG = MarkerDetailFragment.class.getSimpleName();
     private static final String KEY_MARKER_ID = "markerId";
+
     private static final long HIDE_TEXT_DELAY = 4 * UnitConversions.ONE_SECOND_MS;
+
+    private MenuItem shareMarkerImageMenuItem;
+
     private ContentProviderUtils contentProviderUtils;
     private Handler handler;
     private ImageView photoView;
@@ -143,6 +147,7 @@ public class MarkerDetailFragment extends Fragment {
         // Need to update the waypoint in case returning after an edit
         updateWaypoint(true);
         updateUi();
+        updateMenuItems();
     }
 
     @Override
@@ -168,8 +173,14 @@ public class MarkerDetailFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.marker_detail, menu);
-
+        shareMarkerImageMenuItem = menu.findItem(R.id.marker_detail_share);
         updateWaypoint(false);
+        updateMenuItems();
+    }
+
+    private void updateMenuItems() {
+        if (shareMarkerImageMenuItem != null)
+            shareMarkerImageMenuItem.setVisible(waypoint.hasPhoto());
     }
 
     @Override
@@ -186,6 +197,13 @@ public class MarkerDetailFragment extends Fragment {
                         .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerId);
                 startActivity(intent);
                 return true;
+            case R.id.marker_detail_share:
+                if (waypoint.hasPhoto()) {
+                    intent = IntentUtils.newShareImageIntent(getContext(), waypoint.getPhotoURI());
+                    intent = Intent.createChooser(intent, null);
+                    startActivity(intent);
+                }
+                return true;
             case R.id.marker_detail_delete:
                 DeleteMarkerDialogFragment.showDialog(getChildFragmentManager(), new long[]{markerId});
                 return true;

src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java

@@ -17,7 +17,6 @@
 package de.dennisguse.opentracks.fragments;
 
 import android.content.SharedPreferences;
-import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
@@ -34,24 +33,22 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import java.util.EnumSet;
-
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
-import de.dennisguse.opentracks.content.TrackDataType;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
-import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackPointUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
@@ -72,8 +69,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     //TODO Initialize immediately and remove in onDestroy()
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
 
-    private Location lastLocation = null;
-    private TripStatistics lastTripStatistics = null;
+    private TrackPoint lastTrackPoint = null;
+    private TrackStatistics lastTrackStatistics = null;
 
     private String category = "";
     @Deprecated //TODO This should be handled somewhere else; not in the UI.
@@ -96,6 +93,16 @@ public class StatsFragment extends Fragment implements TrackDataListener {
             }
             if (PreferencesUtils.isKey(getContext(), R.string.recording_track_id_key, key)) {
                 recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(getContext());
+                if (PreferencesUtils.getRecordingTrackId(getContext()) != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
+                    // A recording track id has been set -> Resumes track and starts timer.
+                    resumeTrackDataHub();
+                    if (trackRecordingServiceConnection == null) {
+                        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
+                    }
+                    trackRecordingServiceConnection.startConnection(getContext());
+
+                    handlerUpdateUI.post(updateUIeachSecond);
+                }
             }
         }
     };
@@ -106,15 +113,18 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     }
 
     /* Views */
-    private View sensorContainerView;
+    private View heartRateContainer;
     private TextView heartRateValueView;
     private TextView heartRateSensorView;
+    private View cadenceContainer;
+    private TextView cadenceValueView;
+    private TextView cadenceSensorView;
 
     private TextView totalTimeValueView;
     private final Runnable updateUIeachSecond = new Runnable() {
         public void run() {
             if (isResumed() && isSelectedTrackRecording()) {
-                if (!isSelectedTrackPaused() && lastTripStatistics != null) {
+                if (!isSelectedTrackPaused() && lastTrackStatistics != null) {
                     updateTotalTime();
                     updateSensorDataUI();
                 }
@@ -137,17 +147,12 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     private TextView speedMovingLabel;
     private TextView speedMovingValue;
     private TextView speedMovingUnit;
-    private View gradeElevationSeparator;
-    private View gradeElevationContainer;
-    private TextView elevationMinValue;
-    private TextView elevationMinUnit;
-    private TextView elevationMaxValue;
-    private TextView elevationMaxUnit;
+    private View elevationSeparator;
+    private View elevationContainer;
     private View speedContainer;
     private TextView speedLabel;
     private TextView speedValue;
     private TextView speedUnit;
-    private View elevationContainer;
     private TextView elevationValue;
     private TextView elevationUnit;
     private View coordinateSeparator;
@@ -159,10 +164,14 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        sensorContainerView = view.findViewById(R.id.stats_sensor_container);
+        heartRateContainer = view.findViewById(R.id.stats_sensor_heart_rate_container);
         heartRateValueView = view.findViewById(R.id.stats_sensor_heart_rate_value);
         heartRateSensorView = view.findViewById(R.id.stats_sensor_heart_rate_sensor_value);
 
+        cadenceContainer = view.findViewById(R.id.stats_sensor_cadence_container);
+        cadenceValueView = view.findViewById(R.id.stats_sensor_cadence_value);
+        cadenceSensorView = view.findViewById(R.id.stats_sensor_cadence_sensor_value);
+
         totalTimeValueView = view.findViewById(R.id.stats_total_time_value);
 
         distanceValue = view.findViewById(R.id.stats_distance_value);
@@ -185,21 +194,14 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         speedMovingValue = view.findViewById(R.id.stats_moving_speed_value);
         speedMovingUnit = view.findViewById(R.id.stats_moving_speed_unit);
 
-        gradeElevationSeparator = view.findViewById(R.id.stats_elevation_separator);
-        gradeElevationContainer = view.findViewById(R.id.stats_elevation_container);
-
-        elevationMinValue = view.findViewById(R.id.stats_elevation_min_value);
-        elevationMinUnit = view.findViewById(R.id.stats_elevation_min_unit);
-
-        elevationMaxValue = view.findViewById(R.id.stats_elevation_max_value);
-        elevationMaxUnit = view.findViewById(R.id.stats_elevation_max_unit);
+        elevationSeparator = view.findViewById(R.id.stats_elevation_separator);
+        elevationContainer = view.findViewById(R.id.stats_elevation_container);
 
         speedContainer = view.findViewById(R.id.stats_speed);
         speedLabel = view.findViewById(R.id.stats_speed_label);
         speedValue = view.findViewById(R.id.stats_speed_value);
         speedUnit = view.findViewById(R.id.stats_speed_unit);
 
-        elevationContainer = view.findViewById(R.id.stats_elevation);
         elevationValue = view.findViewById(R.id.stats_elevation_current_value);
         elevationUnit = view.findViewById(R.id.stats_elevation_current_unit);
 
@@ -246,7 +248,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         resumeTrackDataHub();
         PreferencesUtils.register(getContext(), sharedPreferenceChangeListener);
 
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(getContext(), null);
+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
         trackRecordingServiceConnection.startConnection(getContext());
 
         handlerUpdateUI.post(updateUIeachSecond);
@@ -273,9 +275,12 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        sensorContainerView = null;
+        heartRateContainer = null;
         heartRateValueView = null;
         heartRateSensorView = null;
+        cadenceContainer = null;
+        cadenceValueView = null;
+        cadenceSensorView = null;
 
         totalTimeValueView = null;
 
@@ -299,21 +304,14 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         speedMovingValue = null;
         speedMovingUnit = null;
 
-        gradeElevationSeparator = null;
-        gradeElevationContainer = null;
-
-        elevationMinValue = null;
-        elevationMinUnit = null;
-
-        elevationMaxValue = null;
-        elevationMaxUnit = null;
+        elevationSeparator = null;
+        elevationContainer = null;
 
         speedContainer = null;
         speedLabel = null;
         speedValue = null;
         speedUnit = null;
 
-        elevationContainer = null;
         elevationValue = null;
         elevationUnit = null;
 
@@ -331,7 +329,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
                 @Override
                 public void run() {
                     if (isResumed()) {
-                        lastTripStatistics = track != null ? track.getTripStatistics() : null;
+                        lastTrackStatistics = track != null ? track.getTrackStatistics() : null;
                         category = track != null ? track.getCategory() : "";
                         updateUI();
                     }
@@ -342,17 +340,17 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
     @Override
     public void clearTrackPoints() {
-        lastLocation = null;
+        lastTrackPoint = null;
     }
 
     @Override
-    public void onSampledInTrackPoint(Location location) {
-        lastLocation = location;
+    public void onSampledInTrackPoint(TrackPoint trackPoint) {
+        lastTrackPoint = trackPoint;
     }
 
     @Override
-    public void onSampledOutTrackPoint(Location location) {
-        lastLocation = location;
+    public void onSampledOutTrackPoint(TrackPoint trackPoint) {
+        lastTrackPoint = trackPoint;
     }
 
     @Override
@@ -363,15 +361,15 @@ public class StatsFragment extends Fragment implements TrackDataListener {
                 public void run() {
                     if (isResumed()) {
                         if (!isSelectedTrackRecording() || isSelectedTrackPaused()) {
-                            lastLocation = null;
+                            lastTrackPoint = null;
                         }
 
-                        if (lastLocation != null) {
-                            boolean hasFix = !LocationUtils.isLocationOld(lastLocation);
-                            boolean hasGoodFix = lastLocation.hasAccuracy() && lastLocation.getAccuracy() < recordingGpsAccuracy;
+                        if (lastTrackPoint != null) {
+                            boolean hasFix = !LocationUtils.isLocationOld(lastTrackPoint.getLocation());
+                            boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(lastTrackPoint, recordingGpsAccuracy);
 
                             if (!hasFix || !hasGoodFix) {
-                                lastLocation = null;
+                                lastTrackPoint = null;
                             }
                         }
                         setLocationValues();
@@ -402,8 +400,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
      */
     private synchronized void resumeTrackDataHub() {
         trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
-        trackDataHub.registerTrackDataListener(this, EnumSet.of(TrackDataType.TRACKS_TABLE,
-                TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE, TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE));
+        trackDataHub.registerTrackDataListener(this, true, false, true, true);
     }
 
     /**
@@ -438,7 +435,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     }
 
     /**
-     * Tries to fetch most recent {@link SensorDataSet} {@link de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager}.
+     * Tries to fetch most recent {@link SensorDataSet} from {@link de.dennisguse.opentracks.services.TrackRecordingService}.
      */
     private void updateSensorDataUI() {
         TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
@@ -447,33 +444,65 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         if (trackRecordingService == null) {
             Log.d(STATS_FRAGMENT_TAG, "Cannot get the track recording service.");
         } else {
-            //TODO sensorState = trackRecordingService.getSensorState();
             sensorDataSet = trackRecordingService.getSensorData();
         }
 
         setHeartRateSensorData(sensorDataSet, isSelectedTrackRecording());
+        setCadenceSensorData(sensorDataSet, isSelectedTrackRecording());
+        setSpeedSensorData(sensorDataSet, isSelectedTrackRecording());
     }
 
     private void setHeartRateSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
-        // heart rate
         int isVisible = View.VISIBLE;
-        if (!isRecording || PreferencesUtils.isBluetoothHeartRateSensorAddressDefault(getContext())) {
+        if (!isRecording || PreferencesUtils.isBluetoothHeartRateSensorAddressNone(getContext())) {
             isVisible = View.INVISIBLE;
         }
-        sensorContainerView.setVisibility(isVisible);
+        heartRateContainer.setVisibility(isVisible);
 
         if (isRecording) {
-            String heartRate = getContext().getString(R.string.value_unknown);
+            String sensorValue = getContext().getString(R.string.value_unknown);
             String sensorName = getContext().getString(R.string.value_unknown);
-            if (sensorDataSet != null && sensorDataSet.isRecent(BluetoothRemoteSensorManager.MAX_SENSOR_DATE_SET_AGE_MS)) {
-                sensorName = sensorDataSet.getSensorName();
-                if (sensorDataSet.hasHeartRate()) {
-                    heartRate = StringUtils.formatDecimal(sensorDataSet.getHeartRate(), 0);
+            if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
+                sensorName = sensorDataSet.getHeartRate().getSensorName();
+                if (sensorDataSet.getHeartRate().hasHeartRate_bpm() && sensorDataSet.getHeartRate().isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(sensorDataSet.getHeartRate().getHeartRate_bpm(), 0);
                 }
             }
 
             heartRateSensorView.setText(sensorName);
-            heartRateValueView.setText(heartRate);
+            heartRateValueView.setText(sensorValue);
+        }
+    }
+
+    private void setCadenceSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
+        int isVisible = View.VISIBLE;
+        if (!isRecording || PreferencesUtils.isBluetoothCyclingCadenceSensorAddressNone(getContext())) {
+            isVisible = View.INVISIBLE;
+        }
+        cadenceContainer.setVisibility(isVisible);
+
+        if (isRecording) {
+            String sensorValue = getContext().getString(R.string.value_unknown);
+            String sensorName = getContext().getString(R.string.value_unknown);
+            if (sensorDataSet != null && sensorDataSet.getCyclingCadence() != null) {
+                sensorName = sensorDataSet.getCyclingCadence().getSensorName();
+                if (sensorDataSet.getCyclingCadence().hasCadence_rpm() && sensorDataSet.getCyclingCadence().isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(sensorDataSet.getCyclingCadence().getCadence_rpm(), 0);
+                }
+            }
+
+            cadenceSensorView.setText(sensorName);
+            cadenceValueView.setText(sensorValue);
+        }
+    }
+
+    private void setSpeedSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
+        if (isRecording) {
+            if (sensorDataSet != null && sensorDataSet.getCyclingSpeed() != null) {
+                if (sensorDataSet.getCyclingSpeed().hasSpeed_mps() && sensorDataSet.getCyclingSpeed().isRecent()) {
+                    setSpeed(sensorDataSet.getCyclingSpeed().getSpeed_mps());
+                }
+            }
         }
     }
 
@@ -481,12 +510,12 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         String trackIconValue = TrackIconUtils.getIconValue(getContext(), category);
 
         boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
-        boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext());
+        boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
         boolean isRecording = isSelectedTrackRecording();
 
         // Set total distance
         {
-            double totalDistance = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getTotalDistance();
+            double totalDistance = lastTrackStatistics == null ? Double.NaN : lastTrackStatistics.getTotalDistance();
             Pair<String, String> parts = StringUtils.getDistanceParts(getContext(), totalDistance, metricUnits);
 
             distanceValue.setText(parts.first);
@@ -505,14 +534,14 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         }
 
         // Set time
-        if (lastTripStatistics != null) {
-            movingTimeValue.setText(StringUtils.formatElapsedTime(lastTripStatistics.getMovingTime()));
+        if (lastTrackStatistics != null) {
+            movingTimeValue.setText(StringUtils.formatElapsedTime(lastTrackStatistics.getMovingTime()));
             updateTotalTime();
         }
 
         // Set average speed/pace
         {
-            double speed = lastTripStatistics != null ? lastTripStatistics.getAverageSpeed() : Double.NaN;
+            double speed = lastTrackStatistics != null ? lastTrackStatistics.getAverageSpeed() : Double.NaN;
             speedAvgLabel.setText(reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace);
 
             Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
@@ -522,7 +551,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
         // Set max speed/pace
         {
-            double speed = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getMaxSpeed();
+            double speed = lastTrackStatistics == null ? Double.NaN : lastTrackStatistics.getMaxSpeed();
 
             speedMaxLabel.setText(reportSpeed ? R.string.stats_max_speed : R.string.stats_fastest_pace);
 
@@ -533,7 +562,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
         // Set moving speed/pace
         {
-            double speed = lastTripStatistics != null ? lastTripStatistics.getAverageMovingSpeed() : Double.NaN;
+            double speed = lastTrackStatistics != null ? lastTrackStatistics.getAverageMovingSpeed() : Double.NaN;
 
             speedMovingLabel.setText(reportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace);
 
@@ -542,66 +571,53 @@ public class StatsFragment extends Fragment implements TrackDataListener {
             speedMovingUnit.setText(parts.second);
         }
 
-
-        // Set elevation
+        // Make elevation visible?
         {
-            boolean showElevation = PreferencesUtils.isShowStatsGradeElevation(getContext());
-            gradeElevationSeparator.setVisibility(showElevation ? View.VISIBLE : View.GONE);
-
-            gradeElevationContainer.setVisibility(showElevation ? View.VISIBLE : View.GONE);
-
-            if (showElevation) {
-                {
-                    double elevation = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getMinElevation();
-                    Pair<String, String> parts = StringUtils.formatElevation(getContext(), elevation, metricUnits);
-
-                    elevationMinValue.setText(parts.first);
-                    elevationMinUnit.setText(parts.second);
-                }
-
-                {
-                    double elevation = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getMaxElevation();
-                    Pair<String, String> parts = StringUtils.formatElevation(getContext(), elevation, metricUnits);
-
-                    elevationMaxValue.setText(parts.first);
-                    elevationMaxUnit.setText(parts.second);
-                }
-            }
+            boolean showElevation = PreferencesUtils.isShowStatsElevation(getContext());
+            elevationSeparator.setVisibility(showElevation ? View.VISIBLE : View.GONE);
         }
     }
 
     private void updateTotalTime() {
         long totalTime;
         if (isSelectedTrackRecording()) {
-            totalTime = System.currentTimeMillis() - lastTripStatistics.getStopTime() + lastTripStatistics.getTotalTime();
+            totalTime = calculateTotalTime();
         } else {
-            totalTime = lastTripStatistics.getTotalTime();
+            totalTime = lastTrackStatistics.getTotalTime();
         }
         totalTimeValueView.setText(StringUtils.formatElapsedTime(totalTime));
     }
 
+    /**
+     * Return time from service.
+     * If service isn't bound then use lastTrackStatistics for calculate it.
+     */
+    private long calculateTotalTime() {
+        TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
+        if (trackRecordingService != null) {
+            return trackRecordingService.getTotalTime();
+        } else {
+            return System.currentTimeMillis() - lastTrackStatistics.getStopTime_ms() + lastTrackStatistics.getTotalTime();
+        }
+    }
+
     private void setLocationValues() {
         boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
-        boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext());
         boolean isRecording = isSelectedTrackRecording();
 
         // Set speed/pace
         speedContainer.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
         if (isRecording) {
-            speedLabel.setText(reportSpeed ? R.string.stats_speed : R.string.stats_pace);
-
-            double speed = lastLocation != null && lastLocation.hasSpeed() ? lastLocation.getSpeed() : Double.NaN;
-            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
-            speedValue.setText(parts.first);
-            speedUnit.setText(parts.second);
+            double speed = lastTrackPoint != null && lastTrackPoint.hasSpeed() ? lastTrackPoint.getSpeed() : Double.NaN;
+            setSpeed(speed);
         }
 
         // Set elevation
-        boolean showGradeElevation = isRecording && PreferencesUtils.isShowStatsGradeElevation(getContext());
-        elevationContainer.setVisibility(showGradeElevation ? View.VISIBLE : View.GONE);
+        boolean showElevation = isRecording && PreferencesUtils.isShowStatsElevation(getContext());
+        elevationContainer.setVisibility(showElevation ? View.VISIBLE : View.GONE);
 
-        if (showGradeElevation) {
-            double altitude = lastLocation != null && lastLocation.hasAltitude() ? lastLocation.getAltitude() : Double.NaN;
+        if (showElevation) {
+            double altitude = lastTrackPoint != null && lastTrackPoint.hasAltitude() ? lastTrackPoint.getAltitude() : Double.NaN;
             Pair<String, String> parts = StringUtils.formatElevation(getContext(), altitude, metricUnits);
 
             elevationValue.setText(parts.first);
@@ -614,13 +630,24 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         coordinateSeparator.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
         coordinateContainer.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
         if (showCoordinate) {
-            double latitude = lastLocation != null ? lastLocation.getLatitude() : Double.NaN;
+            double latitude = lastTrackPoint != null ? lastTrackPoint.getLatitude() : Double.NaN;
             String latitudeText = Double.isNaN(latitude) || Double.isInfinite(latitude) ? getContext().getString(R.string.value_unknown) : StringUtils.formatCoordinate(latitude);
             latitudeValue.setText(latitudeText);
 
-            double longitude = lastLocation != null ? lastLocation.getLongitude() : Double.NaN;
+            double longitude = lastTrackPoint != null ? lastTrackPoint.getLongitude() : Double.NaN;
             String longitudeText = Double.isNaN(longitude) || Double.isInfinite(longitude) ? getContext().getString(R.string.value_unknown) : StringUtils.formatCoordinate(longitude);
             longitudeValue.setText(longitudeText);
         }
     }
+
+    private void setSpeed(double speed) {
+        boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
+        boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
+
+        speedLabel.setText(reportSpeed ? R.string.stats_speed : R.string.stats_pace);
+
+        Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
+        speedValue.setText(parts.first);
+        speedUnit.setText(parts.second);
+    }
 }

src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java

@@ -232,7 +232,9 @@ public enum TrackFileFormat {
     /**
      * Returns whether the format supports photos.
      */
-    public boolean includesPhotos() { return false; };
+    public boolean includesPhotos() {
+        return false;
+    }
 
     /**
      * Returns the name of for each format.

src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java

@@ -32,7 +32,6 @@ import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
-import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.SystemUtils;
 
 /**
@@ -41,7 +40,7 @@ import de.dennisguse.opentracks.util.SystemUtils;
  * @author Jimmy Shih
  */
 //TODO Make independent from ExportActivity?
-public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
+class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
     private static final String TAG = ExportAsyncTask.class.getSimpleName();
     private final TrackFileFormat trackFileFormat;
@@ -51,10 +50,10 @@ public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
     private ExportActivity exportActivity;
     private WakeLock wakeLock;
 
-    private boolean completed;
+    private boolean completed = false;
 
-    private int processedTrackCount;
-    private int totalTrackCount;
+    private int processedTrackCount = 0;
+    private int totalTrackCount = 0;
 
     /**
      * Creates an AsyncTask.
@@ -69,22 +68,6 @@ public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
         this.directory = directory;
         context = exportActivity.getApplicationContext();
         contentProviderUtils = new ContentProviderUtils(context);
-
-        completed = false;
-        processedTrackCount = 0;
-        totalTrackCount = 0;
-    }
-
-    /**
-     * Sets the current activity associated with this AsyncTask.
-     *
-     * @param exportActivity the current activity, can be null
-     */
-    public void setActivity(ExportActivity exportActivity) {
-        this.exportActivity = exportActivity;
-        if (completed && exportActivity != null) {
-            exportActivity.onAsyncTaskCompleted(processedTrackCount, totalTrackCount);
-        }
     }
 
     @Override
@@ -98,17 +81,12 @@ public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
     protected Boolean doInBackground(Void... params) {
         try {
             Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
-            boolean isRecording = PreferencesUtils.isRecording(exportActivity);
-            boolean isPaused = PreferencesUtils.isRecordingTrackPaused(exportActivity);
-            // Get the wake lock if not recording or paused
-            if (!isRecording || isPaused) {
-                wakeLock = SystemUtils.acquireWakeLock(exportActivity, wakeLock);
-            }
+
+            wakeLock = SystemUtils.acquireWakeLock(exportActivity, wakeLock);
+
             return exportAllTracks();
         } finally {
-            if (wakeLock != null && wakeLock.isHeld()) {
-                wakeLock.release();
-            }
+            wakeLock = SystemUtils.releaseWakeLock(wakeLock);
         }
     }
 

src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java

@@ -18,7 +18,6 @@ package de.dennisguse.opentracks.io.file.exporter;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.location.Location;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -29,7 +28,6 @@ import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointFactory;
 import de.dennisguse.opentracks.content.provider.TrackPointIterator;
 import de.dennisguse.opentracks.util.LocationUtils;
 
@@ -72,9 +70,9 @@ public class FileTrackExporter implements TrackExporter {
                 writeWaypoints(track1);
             }
             trackWriter.writeBeginTracks();
-            long startTime = tracks[0].getTripStatistics().getStartTime();
+            long startTime = tracks[0].getTrackStatistics().getStartTime_ms();
             for (Track track : tracks) {
-                long offset = track.getTripStatistics().getStartTime() - startTime;
+                long offset = track.getTrackStatistics().getStartTime_ms() - startTime;
                 writeLocations(track, offset);
             }
             trackWriter.writeEndTracks();
@@ -126,25 +124,25 @@ public class FileTrackExporter implements TrackExporter {
         boolean wroteTrack = false;
         boolean wroteSegment = false;
         boolean isLastLocationValid = false;
-        TrackWriterTrackPointFactory trackPointFactory = new TrackWriterTrackPointFactory();
         int locationNumber = 0;
+        TrackPoint lastTrackPoint = null;
 
-        try (TrackPointIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, trackPointFactory)) {
+        try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false)) {
 
-            while (locationIterator.hasNext()) {
+            while (trackPointIterator.hasNext()) {
                 if (Thread.interrupted()) {
                     throw new InterruptedException();
                 }
-                Location location = locationIterator.next();
+                TrackPoint trackPoint = trackPointIterator.next();
 
-                setLocationTime(location, offset);
+                setLocationTime(trackPoint, offset);
                 locationNumber++;
 
-                boolean isLocationValid = LocationUtils.isValidLocation(location);
+                boolean isLocationValid = LocationUtils.isValidLocation(trackPoint.getLocation());
                 boolean isSegmentValid = isLocationValid && isLastLocationValid;
                 if (!wroteTrack && isSegmentValid) {
                     // Found the first two consecutive locations that are valid
-                    trackWriter.writeBeginTrack(track, trackPointFactory.lastLocation);
+                    trackWriter.writeBeginTrack(track, lastTrackPoint);
                     wroteTrack = true;
                 }
 
@@ -154,14 +152,14 @@ public class FileTrackExporter implements TrackExporter {
                         trackWriter.writeOpenSegment();
                         wroteSegment = true;
 
-                        // Write the previous location, which we had previously skipped
-                        trackWriter.writeLocation(trackPointFactory.lastLocation);
+                        // Write the previous trackPoint, which we had previously skipped
+                        trackWriter.writeTrackPoint(lastTrackPoint);
                     }
 
-                    // Write the current location
-                    trackWriter.writeLocation(location);
+                    // Write the current trackPoint
+                    trackWriter.writeTrackPoint(trackPoint);
                     if (trackExporterListener != null) {
-                        trackExporterListener.onProgressUpdate(locationNumber, track.getNumberOfPoints());
+                        trackExporterListener.onProgressUpdate(locationNumber, trackPointIterator.getCount());
                     }
                 } else {
                     if (wroteSegment) {
@@ -169,7 +167,7 @@ public class FileTrackExporter implements TrackExporter {
                         wroteSegment = false;
                     }
                 }
-                trackPointFactory.swapLocations();
+                lastTrackPoint = trackPoint;
                 isLastLocationValid = isLocationValid;
             }
 
@@ -179,7 +177,7 @@ public class FileTrackExporter implements TrackExporter {
             }
 
             if (wroteTrack) {
-                Location lastValidTrackPoint = contentProviderUtils.getLastValidTrackPoint(track.getId());
+                TrackPoint lastValidTrackPoint = contentProviderUtils.getLastValidTrackPoint(track.getId());
                 setLocationTime(lastValidTrackPoint, offset);
                 trackWriter.writeEndTrack(track, lastValidTrackPoint);
             } else {
@@ -191,41 +189,14 @@ public class FileTrackExporter implements TrackExporter {
     }
 
     /**
-     * Sets a location time.
+     * Sets a trackPoint time.
      *
-     * @param location the location
-     * @param offset   the time offset
+     * @param trackPoint the trackPoint
+     * @param offset     the time offset
      */
-    private void setLocationTime(Location location, long offset) {
-        if (location != null) {
-            location.setTime(location.getTime() - offset);
-        }
-    }
-
-    /**
-     * Track writer location factory. Keeping the last two locations.
-     *
-     * @author Jimmy Shih
-     */
-    private class TrackWriterTrackPointFactory extends TrackPointFactory {
-        TrackPoint currentLocation;
-        TrackPoint lastLocation;
-
-        @Override
-        public TrackPoint createLocation() {
-            if (currentLocation == null) {
-                currentLocation = new TrackPoint("");
-            }
-            return currentLocation;
-        }
-
-        void swapLocations() {
-            TrackPoint tempLocation = lastLocation;
-            lastLocation = currentLocation;
-            currentLocation = tempLocation;
-            if (currentLocation != null) {
-                currentLocation.reset();
-            }
+    private void setLocationTime(TrackPoint trackPoint, long offset) {
+        if (trackPoint != null) {
+            trackPoint.setTime(trackPoint.getTime() - offset);
         }
     }
 }

src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java

@@ -24,6 +24,7 @@ import java.text.NumberFormat;
 import java.util.Locale;
 
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.StringUtils;
 
@@ -139,7 +140,7 @@ public class GpxTrackWriter implements TrackWriter {
     }
 
     @Override
-    public void writeBeginTrack(Track track, Location startLocation) {
+    public void writeBeginTrack(Track track, TrackPoint startTrackPoint) {
         if (printWriter != null) {
             printWriter.println("<trk>");
             printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
@@ -150,7 +151,7 @@ public class GpxTrackWriter implements TrackWriter {
     }
 
     @Override
-    public void writeEndTrack(Track track, Location endLocation) {
+    public void writeEndTrack(Track track, TrackPoint endTrackPoint) {
         if (printWriter != null) {
             printWriter.println("</trk>");
         }
@@ -167,14 +168,14 @@ public class GpxTrackWriter implements TrackWriter {
     }
 
     @Override
-    public void writeLocation(Location location) {
+    public void writeTrackPoint(TrackPoint trackPoint) {
         if (printWriter != null) {
-            printWriter.println("<trkpt " + formatLocation(location) + ">");
-            if (location.hasAltitude()) {
-                printWriter.println("<ele>" + ELEVATION_FORMAT.format(location.getAltitude()) + "</ele>");
+            printWriter.println("<trkpt " + formatLocation(trackPoint.getLocation()) + ">");
+            if (trackPoint.hasAltitude()) {
+                printWriter.println("<ele>" + ELEVATION_FORMAT.format(trackPoint.getAltitude()) + "</ele>");
             }
             printWriter.println(
-                    "<time>" + StringUtils.formatDateTimeIso8601(location.getTime()) + "</time>");
+                    "<time>" + StringUtils.formatDateTimeIso8601(trackPoint.getTime()) + "</time>");
             printWriter.println("</trkpt>");
         }
     }

src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java

@@ -18,7 +18,6 @@ package de.dennisguse.opentracks.io.file.exporter;
 import android.content.Context;
 import android.database.Cursor;
 import android.location.Location;
-import android.net.Uri;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
@@ -31,7 +30,7 @@ import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 
 /**
@@ -69,14 +68,14 @@ public class KmlTrackWriter implements TrackWriter {
     private final List<Float> cadenceList = new ArrayList<>();
     private final List<Float> heartRateList = new ArrayList<>();
 
-    private Location startLocation;
+    private TrackPoint startTrackPoint;
 
     /**
-     * @param context            the context
-     * @param hasMultipleTracks  should encode multiple tracks into one file?
+     * @param context           the context
+     * @param hasMultipleTracks should encode multiple tracks into one file?
      * @param exportTrackDetail should detailed information about the track be exported (e.g., title, description, waypoints, timing)?
-     * @param exportSensorData   should {@link SensorDataSet} be exported?
-     * @param exportPhotos       should pictures be exported (if true: exports to KMZ)?
+     * @param exportSensorData  should {@link TrackPoint}'s sensor data be exported?
+     * @param exportPhotos      should pictures be exported (if true: exports to KMZ)?
      */
     public KmlTrackWriter(Context context, boolean hasMultipleTracks, boolean exportTrackDetail, boolean exportSensorData, boolean exportPhotos) {
         this.context = context;
@@ -162,9 +161,10 @@ public class KmlTrackWriter implements TrackWriter {
     @Override
     public void writeWaypoint(Waypoint waypoint) {
         if (printWriter != null && exportTrackDetail) {
-            if (waypoint.hasPhoto() && exportPhotos) {
+            boolean existsPhoto = FileUtils.getPhotoFileIfExists(context, waypoint.getTrackId(), waypoint.getPhotoURI()) != null;
+            if (waypoint.hasPhoto() && exportPhotos && existsPhoto) {
                 float heading = getHeading(waypoint.getTrackId(), waypoint.getLocation());
-                writePhotoOverlay(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(), waypoint.getLocation(), waypoint.getPhotoUrl(), heading);
+                writePhotoOverlay(waypoint, heading);
             } else {
                 writePlacemark(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(), WAYPOINT_STYLE, waypoint.getLocation());
             }
@@ -188,11 +188,12 @@ public class KmlTrackWriter implements TrackWriter {
     }
 
     @Override
-    public void writeBeginTrack(Track track, Location startLocation) {
-        this.startLocation = startLocation;
+    public void writeBeginTrack(Track track, TrackPoint startTrackPoint) {
+        this.startTrackPoint = startTrackPoint;
         if (printWriter != null) {
             String name = context.getString(R.string.marker_label_start, track.getName());
-            writePlacemark(name, "", "", START_STYLE, startLocation);
+            Location location = startTrackPoint != null ? startTrackPoint.getLocation() : null;
+            writePlacemark(name, "", "", START_STYLE, location);
             printWriter.println("<Placemark>");
 
             if (exportTrackDetail) {
@@ -210,7 +211,7 @@ public class KmlTrackWriter implements TrackWriter {
     }
 
     @Override
-    public void writeEndTrack(Track track, Location endLocation) {
+    public void writeEndTrack(Track track, TrackPoint endTrackPoint) {
         if (printWriter != null) {
             printWriter.println("</gx:MultiTrack>");
             printWriter.println("</Placemark>");
@@ -218,7 +219,8 @@ public class KmlTrackWriter implements TrackWriter {
             if (exportTrackDetail) {
                 String name = context.getString(R.string.marker_label_end, track.getName());
                 String description = descriptionGenerator.generateTrackDescription(track, false);
-                writePlacemark(name, "", description, END_STYLE, endLocation);
+                Location location = endTrackPoint != null ? endTrackPoint.getLocation() : null;
+                writePlacemark(name, "", description, END_STYLE, location);
             }
         }
     }
@@ -256,26 +258,23 @@ public class KmlTrackWriter implements TrackWriter {
     }
 
     @Override
-    public void writeLocation(Location location) {
+    public void writeTrackPoint(TrackPoint trackPoint) {
         if (printWriter != null) {
             if (exportTrackDetail) {
-                printWriter.println("<when>" + getTime(location) + "</when>");
+                printWriter.println("<when>" + getTime(trackPoint.getLocation()) + "</when>");
             }
 
-            printWriter.println("<gx:coord>" + getCoordinates(location, " ") + "</gx:coord>");
+            printWriter.println("<gx:coord>" + getCoordinates(trackPoint.getLocation(), " ") + "</gx:coord>");
 
-            if (exportSensorData && location instanceof TrackPoint) {
-                SensorDataSet sensorDataSet = ((TrackPoint) location).getSensorDataSet();
-                if (sensorDataSet != null) {
-                    if (sensorDataSet.hasHeartRate()) {
-                        heartRateList.add(sensorDataSet.getHeartRate());
-                    }
-                    if (sensorDataSet.hasCadence()) {
-                        cadenceList.add(sensorDataSet.getCadence());
-                    }
-                    if (sensorDataSet.hasPower()) {
-                        powerList.add(sensorDataSet.getPower());
-                    }
+            if (exportSensorData) {
+                if (trackPoint.hasHeartRate()) {
+                    heartRateList.add(trackPoint.getHeartRate_bpm());
+                }
+                if (trackPoint.hasCyclingCadence()) {
+                    cadenceList.add(trackPoint.getCyclingCadence_rpm());
+                }
+                if (trackPoint.hasPower()) {
+                    powerList.add(trackPoint.getPower());
                 }
             }
         }
@@ -320,32 +319,29 @@ public class KmlTrackWriter implements TrackWriter {
     }
 
     /**
-     * Writes a photo overlay.
-     *  @param name        the name
-     * @param category    the category
-     * @param description the description
-     * @param location    the location
-     * @param photoUrl    the photo url
-     * @param heading     the heading
+     * Writes a photo overlay from waypoint.
+     *
+     * @param waypoint Waypoint object.
+     * @param heading  the heading.
      */
-    private void writePhotoOverlay(String name, String category, String description, Location location, String photoUrl, float heading) {
-        if (location != null && exportTrackDetail) {
+    private void writePhotoOverlay(Waypoint waypoint, float heading) {
+        if (exportTrackDetail) {
             printWriter.println("<PhotoOverlay>");
-            printWriter.println("<name>" + StringUtils.formatCData(name) + "</name>");
-            printWriter.println("<description>" + StringUtils.formatCData(description) + "</description>");
+            printWriter.println("<name>" + StringUtils.formatCData(waypoint.getName()) + "</name>");
+            printWriter.println("<description>" + StringUtils.formatCData(waypoint.getDescription()) + "</description>");
             printWriter.print("<Camera>");
-            printWriter.print("<longitude>" + location.getLongitude() + "</longitude>");
-            printWriter.print("<latitude>" + location.getLatitude() + "</latitude>");
+            printWriter.print("<longitude>" + waypoint.getLocation().getLongitude() + "</longitude>");
+            printWriter.print("<latitude>" + waypoint.getLocation().getLatitude() + "</latitude>");
             printWriter.print("<altitude>20</altitude>");
             printWriter.print("<heading>" + heading + "</heading>");
             printWriter.print("<tilt>90</tilt>");
             printWriter.println("</Camera>");
-            printWriter.println("<TimeStamp><when>" + getTime(location) + "</when></TimeStamp>");
+            printWriter.println("<TimeStamp><when>" + getTime(waypoint.getLocation()) + "</when></TimeStamp>");
             printWriter.println("<styleUrl>#" + KmlTrackWriter.WAYPOINT_STYLE + "</styleUrl>");
-            writeCategory(category);
+            writeCategory(waypoint.getCategory());
 
             if (exportPhotos) {
-                printWriter.println("<Icon><href>" + Uri.decode(photoUrl) + "</href></Icon>");
+                printWriter.println("<Icon><href>" + KmzTrackExporter.buildKmzImageFilePath(waypoint) + "</href></Icon>");
             }
 
             printWriter.print("<ViewVolume>");
@@ -356,7 +352,7 @@ public class KmlTrackWriter implements TrackWriter {
             printWriter.print("<topFov>45</topFov>");
             printWriter.println("</ViewVolume>");
             printWriter.println("<Point>");
-            printWriter.println("<coordinates>" + getCoordinates(location, ",") + "</coordinates>");
+            printWriter.println("<coordinates>" + getCoordinates(waypoint.getLocation(), ",") + "</coordinates>");
             printWriter.println("</Point>");
             printWriter.println("</PhotoOverlay>");
         }
@@ -371,7 +367,7 @@ public class KmlTrackWriter implements TrackWriter {
         if (exportTrackDetail) {
             return StringUtils.formatDateTimeIso8601(location.getTime());
         } else {
-            return StringUtils.formatDateTimeIso8601(location.getTime() - startLocation.getTime());
+            return StringUtils.formatDateTimeIso8601(location.getTime() - startTrackPoint.getTime());
         }
     }
 
@@ -386,7 +382,7 @@ public class KmlTrackWriter implements TrackWriter {
         if (trackPointId == -1L) {
             return location.getBearing();
         }
-        Location viewLocation;
+        TrackPoint viewLocation;
         try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackPointId, 10, true)) {
             if (cursor == null || cursor.getCount() == 0) {
                 return location.getBearing();
@@ -452,7 +448,7 @@ public class KmlTrackWriter implements TrackWriter {
     /**
      * Writes a sensor style.
      *
-     * @param name        the name of the sesnor
+     * @param name       the name of the sesnor
      * @param sensorType the sensor display name
      */
     private void writeSensorStyle(String name, String sensorType) {