Release v3.2.11

MarkerDetailActivity: removed leftover statistic functionality.
Removed WaypointCreationRequest.
2019-12-25 10:19:22 +01:00 · 2019-12-23 21:44:22 +01:00 · 2019-12-23 21:39:37 +01:00 · 2019-12-23 07:43:05 +01:00 · 2019-12-22 20:39:43 +01:00 · 2019-12-22 20:33:23 +01:00
167 changed files with 5669 additions and 8600 deletions
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+liberapay: dennis.guse
+custom: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Report issues of Opentracks features
+about: Report issues of OpenTracks features
 title: ''
 labels: potential bug
 assignees: ''
@@ -0,0 +1,10 @@
+# Thanks for your contribution.
+
+**Describe the pull request**
+A clear and concise description of what the pull request changes/adds.
+
+**Link to the the issue**
+(If available): The link to the issue that this pull request solves.
+
+**License agreement**
+By opening this pull request, you are providing your contribution under the _Apache License 2.0_ (see [LICENSE.md](LICENSE.md)).
@@ -73,8 +73,12 @@ captures/
 .idea/workspace.xml

 # Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
-#*.jks
+*.jks

 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+
+# Fastlane
+Appfile
+releasePlayStore/*
+Gemfile.lock
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RenderSettings">
+    <option name="showDecorations" value="true" />
+  </component>
+</project>
@@ -19,25 +19,26 @@ android:
    # installing tools to start, then use `sdkmanager` below to get the rest
    - tools
    - build-tools-28.0.3
-    - android-28
+    - 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 &
+#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
+#  - ./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/
@@ -1,16 +0,0 @@
-# OpenTrack: Developer information
-
-## Create releases for FDroid
-
-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)
-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)
-7. Push commits and tags to public repository
-8. Add changelog to tag (Github releases)  
-
-## Translations (localization)
-
-Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
@@ -2,9 +2,30 @@

 _OpenTracks_ is a sport tracking application that completely respects your privacy.

-<a href="https://f-droid.org/packages/de.dennisguse.opentracks">
-    <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="60">
-</a>
+<table>
+    <tr>
+        <th>Free</th>
+        <th>Paid</th>
+        <th>Donations</th>
+    </tr>
+    <tr>
+        <td>
+            <a href="https://f-droid.org/packages/de.dennisguse.opentracks">
+                <img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle">
+            </a>
+        </td>
+        <td>
+            <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">
+                <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle">
+            </a>
+        </td>
+        <td>
+            <a href="https://liberapay.com/dennis.guse/donate">
+                <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45" align="middle">
+            </a>
+        </td>
+    </tr>
+</table>

 ## Features:
 * __Tracking:__ track your sport and outdoor activities 
@@ -26,9 +47,14 @@ _Please note:_
 _Tracks_ does not contain a _map_ (as this would required Internet access).
 To show your tracks on a map, a 3rd party application (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand) or [MAPS.ME](https://play.google.com/store/apps/details?id=com.mapswithme.maps.pro)) needs to be installed.  

-<a href="https://liberapay.com/dennis.guse/donate">
-    <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45">
-</a>
+
+## Screenshots
+<div>
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
+    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
+</div>

 ## Project history

@@ -0,0 +1,37 @@
+# OpenTracks: Developer information
+
+## Craft new releases
+
+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)
+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)
+7. Push commits and tags to public repository
+8. Add changelog to tag (Github releases)
+
+## F-Droid
+Application id: de.dennisguse.opentracks
+
+It if it properly tagged F-Droid takes care of building the app and publishing.
+Usually, it takes two days before the update is published (build, signed, and published). 
+
+The recent build activity can be found [here](https://f-droid.org/wiki/index.php?title=Special:RecentChanges&days=7&from=&hidebots=0&hideanons=1&hideliu=1&limit=500)
+
+## Google Play Store
+Application id: de.dennisguse.opentracks.playstore
+
+Requirement: `gem install fastlane`
+
+1. Build signed apk
+   (requires keystore)
+2. Upload signed apk to [Google Play Console](https://play.google.com/apps/publish)
+3. Update store meta data (e.g., description and screenshots)
+   `fastlane supply --version_code VERSION_CODE --skip_upload_apk`
+   (use the version code from the manifest)
+   (requires API key)
+
+## Translations (localization)
+
+Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).
@@ -6,7 +6,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
    }
 }

@@ -35,10 +35,14 @@ def getVersionName = { ->
    try {
        def stdout = new ByteArrayOutputStream()
        exec {
-            commandLine 'git', 'describe', '--tags', '--dirty'
+            commandLine 'git', 'describe', '--tags'
            standardOutput = stdout
        }
-        return stdout.toString().trim()
+        exec {
+            commandLine 'git', 'log', '--format="%h"', '-n 1'
+            standardOutput = stdout
+        }
+        return stdout.toString().replace('\n', '-').replace('"', '').trim()
    }
    catch (ignored) {
        return null
@@ -70,15 +74,16 @@ android {
        release {
            minifyEnabled false
        }
+
+        releasePlayStore {
+            applicationIdSuffix ".playstore"
+            versionNameSuffix "-PlayStore"
+        }
    }

    applicationVariants.all { variant ->
        variant.resValue "string", "applicationId", variant.applicationId
    }
-
-    lintOptions {
-        disable "AppCompatResource" // TODO Disable complaint to use androidx's SearchView as it is null.
-    }
 }

 dependencies {
@@ -95,4 +100,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'
 }
@@ -17,7 +17,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -43,7 +43,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -41,7 +41,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -33,7 +33,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -39,7 +39,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -18,7 +18,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -21,7 +21,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -0,0 +1,38 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+  
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+end
@@ -1,4 +1,4 @@
-Open Tracks – ein GPS-Tracker, der deine Daten für sich behält.
+OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.
 Erfasst deine Kilometer, ohne dass es jemand anderes tut.

 Funktionen & Features:
@@ -1 +1 @@
-Open Tracks – ein GPS-Tracker, der deine Daten für sich behält.
+OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.
@@ -0,0 +1,8 @@
+v3.2.6: OpenTracks
+
+Changes:
+- Heart rate monitor: scan for available devices
+- Remove shortcut to Bluetooth settings
+
+Developer:
+- Preferences: moved default of preferences from code to xml
@@ -0,0 +1,10 @@
+v3.2.7: OpenTracks
+
+Changes:
+- Notification show GPS accuracy
+- Show heads-up notification if GPS accuracy drops beyond threshold
+- Always show chart by time as well as by distance
+- Added help (in Settings)
+
+Bugfix:
+- TrackDetailActivity: disabled non-working landscape mode (temporary)
@@ -0,0 +1,10 @@
+v3.2.8: OpenTracks
+
+Changes:
+- Chart: zoom via gestures
+
+Bugfixes:
+- Export via KMZ did not export picture filenames correctly
+- Sharing multiple tracks did not include KMZ files
+- MarkerDetailActivity's UI was not shown
+- Settings crashed if preference of heart rate was not initialized
@@ -0,0 +1,10 @@
+v3.2.9: OpenTracks
+
+Changes:
+- Option to keep screen on while recording
+- Markers: removed split markers completely
+- Voice announcement now work without READ_PHONE_STATE permission
+
+Bugfixes:
+- Statistics: heart rate was not shown
+- Statistics: time was briefly reset to 0s
@@ -0,0 +1,11 @@
+v3.2.10: OpenTracks
+
+Changes:
+- ChartView is not configurable anymore
+- After reboot: removed automatic restart of an unfinished recording
+
+Bugfix:
+- Speech announcements use MAY_DUCK (again)
+- ChartView shows markers (again)
+- Fixed landscape layout of TrackListActivity
+- Request legacy file API behavior (necessary for Android 10)
@@ -0,0 +1,12 @@
+v3.2.11: OpenTracks
+
+Bug:
+- Max speed is identical to avg speed
+
+Bugfix:
+- Crash on heart rate sensor selection
+
+Developer:
+- Replaced TabHost by TabsLayout
+- Removed special first waypoint
+- Removed duplicate translations
@@ -0,0 +1,8 @@
+OpenTracks es un tracker deportivo que respeta tu privacidad.
+
+Funciones:
+* Tracker deportivo: haz un seguimiento de tus actividades al aire libre
+* Marca lugares de interés, incluso agrega fotos a los marcadores
+* Pulsómetro (compatible con dispositivos Bluetooth LE)
+* Exporta tus rutas como KML o GPX
+* Completamente offline, no necesitas internet
@@ -0,0 +1 @@
+OpenTracks es un tracker deportivo que respeta tu privacidad.
@@ -0,0 +1 @@
+OpenTracks
@@ -0,0 +1,9 @@
+OpenTracks est une application de suivi d'activités sportives qui respecte totalement votre vie privée.
+
+Fonctionnalités :
+
+* Suivi d'activité : enregistre vos activités sportives et de plein air
+* Photos et repères : ajout de photos et de repères pendant l'enregistrement de l'activité
+* Rythme cardiaque : support des capteurs Bluetooth LE
+* Export : export des traces au format KML ou GPX
+* Pas d'accès internet requis : Internet n'est pas nécessaire pour le fonctionnement de l'application
@@ -0,0 +1 @@
+OpenTracks - Suivi d'activités sportives respectueux de votre vie privée.
@@ -1,103 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningServiceInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import de.dennisguse.opentracks.services.TrackRecordingService;
-
-/**
- * Tests for the BootReceiver.
- *
- * @author Youtao Liu
- */
-@RunWith(AndroidJUnit4.class)
-public class BootReceiverTest {
-    private static final String SERVICE_NAME = "de.dennisguse.opentracks.services.TrackRecordingService";
-
-    private Context context = InstrumentationRegistry.getInstrumentation().getContext();
-
-    /**
-     * Tests the behavior when receive notification which is the phone boot.
-     */
-    @Test
-    public void testOnReceive_startService() {
-        // Make sure no TrackRecordingService
-        Intent stopIntent = new Intent(context, TrackRecordingService.class);
-        context.stopService(stopIntent);
-        Assert.assertFalse(isServiceExisted(context));
-
-        BootReceiver bootReceiver = new BootReceiver();
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_BOOT_COMPLETED);
-        bootReceiver.onReceive(context, intent);
-        // Check if the service is started
-        Assert.assertFalse(isServiceExisted(context));
-    }
-
-    /**
-     * Tests the behavior when receive notification which is not the phone boot.
-     */
-    @Test
-    public void testOnReceive_noStartService() {
-        // Make sure no TrackRecordingService
-        Intent stopIntent = new Intent(context, TrackRecordingService.class);
-        context.stopService(stopIntent);
-        Assert.assertFalse(isServiceExisted(context));
-
-        BootReceiver bootReceiver = new BootReceiver();
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_BUG_REPORT);
-        bootReceiver.onReceive(context, intent);
-
-        // Check if the service is not started
-        Assert.assertFalse(isServiceExisted(context));
-    }
-
-    /**
-     * Checks if a service is started in a context.
-     *
-     * @param context the context for checking a service
-     */
-    private boolean isServiceExisted(Context context) {
-        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        Assert.assertNotNull(activityManager);
-
-        List<ActivityManager.RunningServiceInfo> serviceList = activityManager.getRunningServices(Integer.MAX_VALUE);
-
-        for (int i = 0; i < serviceList.size(); i++) {
-            RunningServiceInfo serviceInfo = serviceList.get(i);
-            ComponentName componentName = serviceInfo.service;
-            if (componentName.getClassName().equals(SERVICE_NAME)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
@@ -19,7 +19,7 @@ package de.dennisguse.opentracks;
 import android.location.Location;

 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;

 /**
@@ -13,7 +13,7 @@
 * License for the specific language governing permissions and limitations under
 * the License.
 */
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.chart;

 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -23,6 +23,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+import de.dennisguse.opentracks.R;
+
 /**
 * Tests {@link ChartValueSeries}.
 *
@@ -27,6 +27,9 @@ import org.junit.Before;
 import org.junit.Test;

 import de.dennisguse.opentracks.content.CustomContentProvider.DatabaseHelper;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;

 /**
 * Tests {@link CustomContentProvider}.
@@ -35,31 +35,31 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;

-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationFactory;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.data.TestDataUtil;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.stats.TripStatistics;

 import static org.mockito.Mockito.when;

 /**
- * A unit test for {@link ContentProviderUtilsImpl}.
+ * A unit test for {@link ContentProviderUtils}.
 *
 * @author Bartlomiej Niechwiej
 * @author Youtao Liu
 */
@RunWith(MockitoJUnitRunner.class)
-public class CustomContentProviderUtilsImplTest {
+public class CustomContentProviderUtilsTest {
    private static final String NAME_PREFIX = "test name";
    private static final String MOCK_DESC = "Mock Next Waypoint Desc!";
    private static final String TEST_DESC = "Test Desc!";
    private static final String TEST_DESC_NEW = "Test Desc new!";
-    private static final double INITIAL_LATITUDE = 37.0;
-    private static final double INITIAL_LONGITUDE = -57.0;
-    private static final double ALTITUDE_INTERVAL = 2.5;

    private Context context = ApplicationProvider.getApplicationContext();
-    private ContentProviderUtils providerUtils;
+    private ContentProviderUtils contentProviderUtils;

    @Mock
    private Cursor cursorMock;
@@ -69,13 +69,13 @@ public class CustomContentProviderUtilsImplTest {

    @Before
    public void setUp() {
-        providerUtils = ContentProviderUtils.Factory.get(context);
-        providerUtils.deleteAllTracks(context);
+        contentProviderUtils = new ContentProviderUtils(context);
+        contentProviderUtils.deleteAllTracks(context);
    }

    @Test
    public void testLocationIterator_noPoints() {
-        testIterator(1, 0, 1, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 0, 1, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
    }

    @Test
@@ -105,38 +105,38 @@ public class CustomContentProviderUtilsImplTest {

    @Test
    public void testLocationIterator_noBatchAscending() {
-        testIterator(1, 50, 100, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 100, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 50, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
    }

    @Test
    public void testLocationIterator_noBatchDescending() {
-        testIterator(1, 50, 100, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 100, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 50, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
    }

    @Test
    public void testLocationIterator_batchAscending() {
-        testIterator(1, 50, 11, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 11, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 25, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
    }

    @Test
    public void testLocationIterator_batchDescending() {
-        testIterator(1, 50, 11, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 50, 11, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
+        testIterator(2, 50, 25, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
    }

    @Test
    public void testLocationIterator_largeTrack() {
-        testIterator(1, 20000, 2000, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        testIterator(1, 20000, 2000, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
    }

    private List<Location> testIterator(long trackId, int numPoints, int batchSize, boolean descending, LocationFactory locationFactory) {
        long lastPointId = initializeTrack(trackId, numPoints);
-        ((ContentProviderUtilsImpl) providerUtils).setDefaultCursorBatchSize(batchSize);
+        ((ContentProviderUtils) contentProviderUtils).setDefaultCursorBatchSize(batchSize);
        List<Location> locations = new ArrayList<Location>(numPoints);
-        try (LocationIterator it = providerUtils.getTrackPointLocationIterator(trackId, -1L, descending, locationFactory)) {
+        try (LocationIterator it = contentProviderUtils.getTrackPointLocationIterator(trackId, -1L, descending, locationFactory)) {
            while (it.hasNext()) {
                Location loc = it.next();
                Assert.assertNotNull(loc);
@@ -155,8 +155,8 @@ public class CustomContentProviderUtilsImplTest {
        track.setId(id);
        track.setName("Test: " + id);
        track.setNumberOfPoints(numPoints);
-        providerUtils.insertTrack(track);
-        track = providerUtils.getTrack(id);
+        contentProviderUtils.insertTrack(track);
+        track = contentProviderUtils.getTrack(id);
        Assert.assertNotNull(track);

        Location[] locations = new Location[numPoints];
@@ -168,12 +168,12 @@ public class CustomContentProviderUtilsImplTest {
            loc.setAltitude(i * 2.5);
            locations[i] = loc;
        }
-        providerUtils.bulkInsertTrackPoint(locations, numPoints, id);
+        contentProviderUtils.bulkInsertTrackPoint(locations, numPoints, id);

        // Load all inserted locations.
        long lastPointId = -1;
        int counter = 0;
-        try (LocationIterator it = providerUtils.getTrackPointLocationIterator(id, -1L, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY)) {
+        try (LocationIterator it = contentProviderUtils.getTrackPointLocationIterator(id, -1L, false, LocationFactory.DEFAULT_LOCATION_FACTORY)) {
            while (it.hasNext()) {
                it.next();
                lastPointId = it.getLocationId();
@@ -189,7 +189,7 @@ public class CustomContentProviderUtilsImplTest {
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#createTrack(Cursor)}.
+     * Tests the method {@link ContentProviderUtils#createTrack(Cursor)}.
     */
    @Test
    public void testCreateTrack() {
@@ -210,22 +210,22 @@ public class CustomContentProviderUtilsImplTest {
        String name = NAME_PREFIX + trackId;
        when(cursorMock.getString(columnIndex++)).thenReturn(name);

-        Track track = providerUtils.createTrack(cursorMock);
+        Track track = contentProviderUtils.createTrack(cursorMock);
        Assert.assertEquals(trackId, track.getId());
        Assert.assertEquals(name, track.getName());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#deleteAllTracks(Context)}
+     * Tests the method {@link ContentProviderUtils#deleteAllTracks(Context)}
     */
    @Test
    public void testDeleteAllTracks() {
        // Insert track, points and waypoint at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
+        Track track = TestDataUtil.getTrack(trackId, 10);
        insertTrackWithLocations(track);
        Waypoint waypoint = new Waypoint();
-        providerUtils.insertWaypoint(waypoint);
+        contentProviderUtils.insertWaypoint(waypoint);
        ContentResolver contentResolver = context.getContentResolver();
        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
        Assert.assertEquals(1, tracksCursor.getCount());
@@ -234,7 +234,7 @@ public class CustomContentProviderUtilsImplTest {
        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
        Assert.assertEquals(1, waypointCursor.getCount());
        // Delete all.
-        providerUtils.deleteAllTracks(context);
+        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());
@@ -245,21 +245,21 @@ public class CustomContentProviderUtilsImplTest {
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#deleteTrack(Context, long)}.
+     * 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 = getTrack(trackId, 10);
+        Track track = TestDataUtil.getTrack(trackId, 10);

-        providerUtils.insertTrack(track);
-        insertTrackWithLocations(getTrack(trackId + 1, 10));
-        insertTrackWithLocations(getTrack(trackId + 2, 10));
+        contentProviderUtils.insertTrack(track);
+        insertTrackWithLocations(TestDataUtil.getTrack(trackId + 1, 10));
+        insertTrackWithLocations(TestDataUtil.getTrack(trackId + 2, 10));

        Waypoint waypoint = new Waypoint();
        waypoint.setTrackId(trackId);
-        providerUtils.insertWaypoint(waypoint);
+        contentProviderUtils.insertWaypoint(waypoint);

        ContentResolver contentResolver = context.getContentResolver();
        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
@@ -269,7 +269,7 @@ public class CustomContentProviderUtilsImplTest {
        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
        Assert.assertEquals(1, waypointCursor.getCount());
        // Delete one track.
-        providerUtils.deleteTrack(context, trackId);
+        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());
@@ -280,63 +280,63 @@ public class CustomContentProviderUtilsImplTest {
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getAllTracks()}
+     * Tests the method {@link ContentProviderUtils#getAllTracks()}
     */
    @Test
    public void testGetAllTracks() {
-        int initialTrackNumber = providerUtils.getAllTracks().size();
+        int initialTrackNumber = contentProviderUtils.getAllTracks().size();
        long trackId = System.currentTimeMillis();
-        providerUtils.insertTrack(getTrack(trackId, 0));
-        List<Track> allTracks = providerUtils.getAllTracks();
+        contentProviderUtils.insertTrack(TestDataUtil.getTrack(trackId, 0));
+        List<Track> allTracks = contentProviderUtils.getAllTracks();
        Assert.assertEquals(initialTrackNumber + 1, allTracks.size());
        Assert.assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getLastTrack()}
+     * Tests the method {@link ContentProviderUtils#getLastTrack()}
     */
    @Test
    public void testGetLastTrack() {
        long trackId = System.currentTimeMillis();
-        providerUtils.insertTrack(getTrack(trackId, 0));
-        Assert.assertEquals(trackId, providerUtils.getLastTrack().getId());
+        contentProviderUtils.insertTrack(TestDataUtil.getTrack(trackId, 0));
+        Assert.assertEquals(trackId, contentProviderUtils.getLastTrack().getId());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrack(long)}
+     * Tests the method {@link ContentProviderUtils#getTrack(long)}
     */
    @Test
    public void testGetTrack() {
        long trackId = System.currentTimeMillis();
-        providerUtils.insertTrack(getTrack(trackId, 0));
-        Assert.assertNotNull(providerUtils.getTrack(trackId));
+        contentProviderUtils.insertTrack(TestDataUtil.getTrack(trackId, 0));
+        Assert.assertNotNull(contentProviderUtils.getTrack(trackId));
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#updateTrack(Track)}
+     * Tests the method {@link ContentProviderUtils#updateTrack(Track)}
     */
    @Test
    public void testUpdateTrack() {
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 0);
+        Track track = TestDataUtil.getTrack(trackId, 0);
        String nameOld = "name1";
        String nameNew = "name2";
        track.setName(nameOld);
-        providerUtils.insertTrack(track);
-        Assert.assertEquals(nameOld, providerUtils.getTrack(trackId).getName());
+        contentProviderUtils.insertTrack(track);
+        Assert.assertEquals(nameOld, contentProviderUtils.getTrack(trackId).getName());
        track.setName(nameNew);
-        providerUtils.updateTrack(track);
-        Assert.assertEquals(nameNew, providerUtils.getTrack(trackId).getName());
+        contentProviderUtils.updateTrack(track);
+        Assert.assertEquals(nameNew, contentProviderUtils.getTrack(trackId).getName());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#createContentValues(Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#createContentValues(Waypoint)}.
     */
    @Test
    public void testCreateContentValues_waypoint() {
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);
        // Bottom
        long startTime = 1000L;
        // AverageSpeed
@@ -357,7 +357,6 @@ public class CustomContentProviderUtilsImplTest {
        // Insert at first.
        Waypoint waypoint = new Waypoint();
        waypoint.setDescription(TEST_DESC);
-        waypoint.setType(WaypointType.STATISTICS);
        waypoint.setTripStatistics(statistics);

        Location location = new Location("test");
@@ -366,9 +365,9 @@ public class CustomContentProviderUtilsImplTest {
        location.setAccuracy((float) 1 / 100.0f);
        location.setAltitude(2.5);
        waypoint.setLocation(location);
-        providerUtils.insertWaypoint(waypoint);
+        contentProviderUtils.insertWaypoint(waypoint);

-        ContentProviderUtilsImpl contentProviderUtils = new ContentProviderUtilsImpl(contentResolverMock);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(contentResolverMock);

        long waypointId = System.currentTimeMillis();
        waypoint.setId(waypointId);
@@ -381,7 +380,7 @@ public class CustomContentProviderUtilsImplTest {
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#createWaypoint(Cursor)}.
+     * Tests the method {@link ContentProviderUtils#createWaypoint(Cursor)}.
     */
    @Test
    public void testCreateWaypoint() {
@@ -408,7 +407,7 @@ public class CustomContentProviderUtilsImplTest {
        long trackId = 11L;
        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);

-        Waypoint waypoint = providerUtils.createWaypoint(cursorMock);
+        Waypoint waypoint = contentProviderUtils.createWaypoint(cursorMock);
        Assert.assertEquals(id, waypoint.getId());
        Assert.assertEquals(name, waypoint.getName());
        Assert.assertEquals(trackId, waypoint.getTrackId());
@@ -416,50 +415,37 @@ public class CustomContentProviderUtilsImplTest {

    /**
     * Tests the method
-     * {@link ContentProviderUtilsImpl#deleteWaypoint(Context, long, DescriptionGenerator)}
+     * {@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 = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        // Insert at first.
        Waypoint waypoint1 = new Waypoint();
        waypoint1.setDescription(TEST_DESC);
        waypoint1.setTrackId(trackId);
-        waypoint1.setType(WaypointType.STATISTICS);
-        providerUtils.insertWaypoint(waypoint1);
+        contentProviderUtils.insertWaypoint(waypoint1);

        // Delete
-        DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
+        contentProviderUtils.deleteWaypoint(context, 1);

-            @Override
-            public String generateWaypointDescription(TripStatistics tripStatistics) {
-                return CustomContentProviderUtilsImplTest.MOCK_DESC;
-            }
-
-            @Override
-            public String generateTrackDescription(Track aTrack, boolean html) {
-                return null;
-            }
-        };
-        providerUtils.deleteWaypoint(context, 1, descriptionGenerator);
-
-        Assert.assertNull(providerUtils.getWaypoint(1));
+        Assert.assertNull(contentProviderUtils.getWaypoint(1));
    }

    /**
     * Tests the method
-     * {@link ContentProviderUtilsImpl#deleteWaypoint(Context, long, DescriptionGenerator)}
+     * {@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 = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        TripStatistics statistics = new TripStatistics();
        statistics.setStartTime(1000L);
@@ -477,180 +463,134 @@ public class CustomContentProviderUtilsImplTest {

        // Insert at first.
        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setDescription(Long.toString(trackId));
+        waypoint1.setDescription(MOCK_DESC);
        waypoint1.setTrackId(trackId);
-        waypoint1.setType(WaypointType.STATISTICS);
        waypoint1.setTripStatistics(statistics);
-        long waypoint1Id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint1));
+        long waypoint1Id = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1));

        Waypoint waypoint2 = new Waypoint();
-        waypoint2.setDescription(Long.toString(trackId));
+        waypoint2.setDescription(MOCK_DESC);
        waypoint2.setTrackId(trackId);
-        waypoint2.setType(WaypointType.STATISTICS);
        waypoint2.setTripStatistics(statistics);
-        long waypoint2Id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint2));
-
+        long waypoint2Id = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint2));

        // Delete
-        DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
-            @Override
-            public String generateWaypointDescription(TripStatistics tripStatistics) {
-                return CustomContentProviderUtilsImplTest.MOCK_DESC;
-            }
+        Assert.assertNotNull(contentProviderUtils.getWaypoint(waypoint1Id));
+        contentProviderUtils.deleteWaypoint(context, waypoint1Id);
+        Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id));

-            @Override
-            public String generateTrackDescription(Track aTrack, boolean html) {
-                return null;
-            }
-        };
-
-        Assert.assertNotNull(providerUtils.getWaypoint(waypoint1Id));
-        providerUtils.deleteWaypoint(context, waypoint1Id, descriptionGenerator);
-        Assert.assertNull(providerUtils.getWaypoint(waypoint1Id));
-
-        Assert.assertEquals(CustomContentProviderUtilsImplTest.MOCK_DESC, providerUtils.getWaypoint(waypoint2Id)
-                .getDescription());
+        Assert.assertEquals(MOCK_DESC, contentProviderUtils.getWaypoint(waypoint2Id).getDescription());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getFirstWaypointId(long)}.
-     */
-    @Test
-    public void testGetFirstWaypointId() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setTrackId(trackId);
-        long waypoint1id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint1));
-
-        Waypoint waypoint2 = new Waypoint();
-        waypoint2.setTrackId(trackId);
-        long waypoint2id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint2));
-
-        Assert.assertEquals(-1L, providerUtils.getFirstWaypointId(-1));
-        Assert.assertEquals(waypoint1id, providerUtils.getFirstWaypointId(trackId));
-        Assert.assertEquals(waypoint2id, providerUtils.getLastWaypoint(trackId, WaypointType.WAYPOINT).getId());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getNextWaypointNumber(long, WaypointType)}.
+     * Tests the method {@link ContentProviderUtils#getNextWaypointNumber(long)}.
     */
    @Test
    public void testGetNextWaypointNumber() {
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setType(WaypointType.STATISTICS);
        waypoint1.setTrackId(trackId);
        Waypoint waypoint2 = new Waypoint();
-        waypoint2.setType(WaypointType.WAYPOINT);
        waypoint2.setTrackId(trackId);
        Waypoint waypoint3 = new Waypoint();
-        waypoint3.setType(WaypointType.STATISTICS);
        waypoint3.setTrackId(trackId);
        Waypoint waypoint4 = new Waypoint();
-        waypoint4.setType(WaypointType.WAYPOINT);
        waypoint4.setTrackId(trackId);
-        providerUtils.insertWaypoint(waypoint1);
-        providerUtils.insertWaypoint(waypoint2);
-        providerUtils.insertWaypoint(waypoint3);
-        providerUtils.insertWaypoint(waypoint4);
+        contentProviderUtils.insertWaypoint(waypoint1);
+        contentProviderUtils.insertWaypoint(waypoint2);
+        contentProviderUtils.insertWaypoint(waypoint3);
+        contentProviderUtils.insertWaypoint(waypoint4);

-        Assert.assertEquals(2, providerUtils.getNextWaypointNumber(trackId, WaypointType.STATISTICS));
-        Assert.assertEquals(3, providerUtils.getNextWaypointNumber(trackId, WaypointType.WAYPOINT));
+        Assert.assertEquals(4, contentProviderUtils.getNextWaypointNumber(trackId));
    }

    /**
     * Tests the method
-     * {@link ContentProviderUtils#getLastWaypoint(long, WaypointType)}.
+     * {@link ContentProviderUtils#getLastWaypoint(long)}.
     */
    @Test
-    public void testGetLastStatisticsWaypoint() {
+    public void testGetLastWaypoint() {
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        Waypoint waypoint1 = new Waypoint();
        waypoint1.setTrackId(trackId);
-        waypoint1.setType(WaypointType.STATISTICS);
        waypoint1.setDescription("Desc1");
        Waypoint waypoint2 = new Waypoint();
        waypoint2.setTrackId(trackId);
-        waypoint2.setType(WaypointType.STATISTICS);
        waypoint2.setDescription("Desc2");
        Waypoint waypoint3 = new Waypoint();
        waypoint3.setTrackId(trackId);
-        waypoint3.setType(WaypointType.WAYPOINT);
        waypoint3.setDescription("Desc3");
-        providerUtils.insertWaypoint(waypoint1);
-        providerUtils.insertWaypoint(waypoint2);
-        providerUtils.insertWaypoint(waypoint3);
+        contentProviderUtils.insertWaypoint(waypoint1);
+        contentProviderUtils.insertWaypoint(waypoint2);
+        contentProviderUtils.insertWaypoint(waypoint3);

-        Assert.assertEquals("Desc2", providerUtils.getLastWaypoint(trackId, WaypointType.STATISTICS).getDescription());
+        Assert.assertEquals("Desc3", contentProviderUtils.getLastWaypoint(trackId).getDescription());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#insertWaypoint(Waypoint)} and
-     * {@link ContentProviderUtilsImpl#getWaypoint(long)}.
+     * Tests the method {@link ContentProviderUtils#insertWaypoint(Waypoint)} and
+     * {@link ContentProviderUtils#getWaypoint(long)}.
     */
    @Test
    public void testInsertAndGetWaypoint() {
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        Waypoint waypoint = new Waypoint();
        waypoint.setDescription(TEST_DESC);
        waypoint.setTrackId(trackId);
-        long waypointId = ContentUris.parseId(providerUtils.insertWaypoint(waypoint));
+        long waypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint));

-        Assert.assertEquals(TEST_DESC, providerUtils.getWaypoint(waypointId).getDescription());
+        Assert.assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#updateWaypoint(Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#updateWaypoint(Waypoint)}.
     */
    @Test
    public void testUpdateWaypoint() {
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);
        // Insert at first.
        Waypoint waypoint = new Waypoint();
        waypoint.setDescription(TEST_DESC);
        waypoint.setTrackId(trackId);
-        long waypointId = ContentUris.parseId(providerUtils.insertWaypoint(waypoint));
+        long waypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint));

        // Update
-        waypoint = providerUtils.getWaypoint(waypointId);
+        waypoint = contentProviderUtils.getWaypoint(waypointId);
        waypoint.setDescription(TEST_DESC_NEW);
-        providerUtils.updateWaypoint(waypoint);
+        contentProviderUtils.updateWaypoint(waypoint);

-        Assert.assertEquals(TEST_DESC_NEW, providerUtils.getWaypoint(waypointId).getDescription());
+        Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#bulkInsertTrackPoint(Location[], int, long)}.
+     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(Location[], int, long)}.
     */
    @Test
    public void testBulkInsertTrackPoint() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
+        Track track = TestDataUtil.getTrack(trackId, 10);
        insertTrackWithLocations(track);

-        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), -1, trackId);
-        Assert.assertEquals(20, providerUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
-        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), 8, trackId);
-        Assert.assertEquals(28, providerUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
+        contentProviderUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), -1, trackId);
+        Assert.assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
+        contentProviderUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), 8, trackId);
+        Assert.assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#createTrackPoint(Cursor)}.
+     * Tests the method {@link ContentProviderUtils#createTrackPoint(Cursor)}.
     */
    @Test
    public void testCreateTrackPoint() {
@@ -701,7 +641,7 @@ public class CustomContentProviderUtilsImplTest {
        byte[] sensor = "Sensor state".getBytes();
        when(cursorMock.getBlob(index++)).thenReturn(sensor);

-        Location location = providerUtils.createTrackPoint(cursorMock);
+        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);
@@ -710,115 +650,115 @@ public class CustomContentProviderUtilsImplTest {

    /**
     * Tests the method
-     * {@link ContentProviderUtilsImpl#insertTrackPoint(Location, long)}.
+     * {@link ContentProviderUtils#insertTrackPoint(Location, long)}.
     */
    @Test
    public void testInsertTrackPoint() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
+        Track track = TestDataUtil.getTrack(trackId, 10);
        insertTrackWithLocations(track);

-        providerUtils.insertTrackPoint(createLocation(22), trackId);
-        Assert.assertEquals(11, providerUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
+        contentProviderUtils.insertTrackPoint(TestDataUtil.createLocation(22), trackId);
+        Assert.assertEquals(11, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getFirstTrackPointId(long)}.
+     * Tests the method {@link ContentProviderUtils#getFirstTrackPointId(long)}.
     */
    @Test
    public void testGetFirstTrackPointId() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
+        Track track = TestDataUtil.getTrack(trackId, 10);
        insertTrackWithLocations(track);

-        Assert.assertNotEquals(-1L, providerUtils.getFirstTrackPointId(trackId));
+        Assert.assertNotEquals(-1L, contentProviderUtils.getFirstTrackPointId(trackId));
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getLastTrackPointId(long)}.
+     * Tests the method {@link ContentProviderUtils#getLastTrackPointId(long)}.
     */
    @Test
    public void testGetLastTrackPointId() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
+        Track track = TestDataUtil.getTrack(trackId, 10);
        insertTrackWithLocations(track);

-        Assert.assertTrue(providerUtils.getFirstTrackPointId(trackId) < providerUtils.getLastTrackPointId(trackId));
+        Assert.assertTrue(contentProviderUtils.getFirstTrackPointId(trackId) < contentProviderUtils.getLastTrackPointId(trackId));
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getLastValidTrackPoint(long)}.
+     * Tests the method {@link ContentProviderUtils#getLastValidTrackPoint(long)}.
     */
    @Test
    public void testGetLastValidTrackPoint() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
+        Track track = TestDataUtil.getTrack(trackId, 10);
        insertTrackWithLocations(track);

-        Location lastLocation = providerUtils.getLastValidTrackPoint(trackId);
+        Location lastLocation = contentProviderUtils.getLastValidTrackPoint(trackId);
        checkLocation(9, lastLocation);
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)} in descending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(long, long, int, boolean)} in descending.
     */
    @Test
    public void testGetTrackPointCursor_desc() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        long[] trackpointIds = new long[track.getNumberOfPoints()];
        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
        }

-        Cursor cursor = providerUtils.getTrackPointCursor(trackId, trackpointIds[1], 5, true);
+        Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[1], 5, true);
        Assert.assertEquals(2, cursor.getCount());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)} in ascending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(long, long, int, boolean)} in ascending.
     */
    @Test
    public void testGetTrackPointCursor_asc() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        long[] trackpointIds = new long[track.getNumberOfPoints()];
        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
        }

-        Cursor cursor = providerUtils.getTrackPointCursor(trackId, trackpointIds[8], 5, false);
+        Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[8], 5, false);
        Assert.assertEquals(2, cursor.getCount());
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in descending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in descending.
     */
    @Test
    public void testGetTrackPointLocationIterator_desc() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        long[] trackpointIds = new long[track.getNumberOfPoints()];
        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
        }

        long startTrackPointId = trackpointIds[9];

-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
        for (int i = 0; i < trackpointIds.length; i++) {
            Assert.assertTrue(locationIterator.hasNext());
            Location location = locationIterator.next();
@@ -829,23 +769,23 @@ public class CustomContentProviderUtilsImplTest {
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in ascending.
+     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in ascending.
     */
    @Test
    public void testGetTrackPointLocationIterator_asc() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
+        Track track = TestDataUtil.getTrack(trackId, 10);
+        contentProviderUtils.insertTrack(track);

        long[] trackpointIds = new long[track.getNumberOfPoints()];
        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
+            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
        }

        long startTrackPointId = trackpointIds[0];

-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
        for (int i = 0; i < trackpointIds.length; i++) {
            Assert.assertTrue(locationIterator.hasNext());
            Location location = locationIterator.next();
@@ -856,50 +796,17 @@ public class CustomContentProviderUtilsImplTest {
        Assert.assertFalse(locationIterator.hasNext());
    }

-    /**
-     * 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
-     */
-    private Track getTrack(long id, int numPoints) {
-        Track track = new Track();
-        track.setId(id);
-        track.setName("Test: " + id);
-        track.setNumberOfPoints(numPoints);
-        for (int i = 0; i < numPoints; i++) {
-            track.addLocation(createLocation(i));
-        }
-        return track;
-    }
-
-    /**
-     * Creates a location.
-     *
-     * @param i the index to set the value of location.
-     * @return created location
-     */
-    private 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);
-        return loc;
-    }
-
    /**
     * Checks the value of a location.
     *
-     * @param i        the index of this location which created in the method {@link CustomContentProviderUtilsImplTest#getTrack(long, int)}
+     * @param i        the index of this location which created in the method {@link TestDataUtil#getTrack(long, int)}
     * @param location the location to be checked
     */
    private void checkLocation(int i, Location location) {
-        Assert.assertEquals(INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01);
-        Assert.assertEquals(INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01);
+        Assert.assertEquals(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01);
+        Assert.assertEquals(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01);
        Assert.assertEquals((float) i / 100.0f, location.getAccuracy(), 0.01);
-        Assert.assertEquals(i * ALTITUDE_INTERVAL, location.getAltitude(), 0.01);
+        Assert.assertEquals(i * TestDataUtil.ALTITUDE_INTERVAL, location.getAltitude(), 0.01);
    }

    /**
@@ -908,7 +815,7 @@ public class CustomContentProviderUtilsImplTest {
     * @param track track to be inserted
     */
    private void insertTrackWithLocations(Track track) {
-        providerUtils.insertTrack(track);
-        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track.getLocations().size(), track.getId());
+        contentProviderUtils.insertTrack(track);
+        contentProviderUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track.getLocations().size(), track.getId());
    }
 }
@@ -27,29 +27,31 @@ import org.junit.Test;
 import org.junit.runner.RunWith;

 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.StringUtils;

 /**
- * Tests for {@link DescriptionGeneratorImpl}.
+ * Tests for {@link DescriptionGenerator}.
 *
 * @author Jimmy Shih
 */
@RunWith(AndroidJUnit4.class)
-public class DescriptionGeneratorImplTest {
+public class DescriptionGeneratorTest {

    private static final long START_TIME = 1288721514000L;
-    private DescriptionGeneratorImpl descriptionGenerator;
+    private DescriptionGenerator descriptionGenerator;

    private Context context = ApplicationProvider.getApplicationContext();

    @Before
    public void setUp() {
-        descriptionGenerator = new DescriptionGeneratorImpl(ApplicationProvider.getApplicationContext());
+        descriptionGenerator = new DescriptionGenerator(ApplicationProvider.getApplicationContext());
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#generateTrackDescription(Track, boolean)}.
+     * Tests {@link DescriptionGenerator#generateTrackDescription(Track, boolean)}.
     */
    @Test
    public void testGenerateTrackDescription() {
@@ -92,7 +94,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#generateWaypointDescription(TripStatistics)}.
+     * Tests {@link DescriptionGenerator#generateWaypointDescription(TripStatistics)}.
     */
    @Test
    public void testGenerateWaypointDescription() {
@@ -128,7 +130,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writeDistance(double, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeDistance(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteDistance() {
@@ -138,7 +140,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writeTime(long, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeTime(long, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteTime() {
@@ -148,7 +150,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writeSpeed(double, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeSpeed(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteSpeed() {
@@ -158,7 +160,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writeElevation(double, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeElevation(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteElevation() {
@@ -168,7 +170,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writePace(double, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writePace(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWritePace() {
@@ -178,7 +180,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteGrade() {
@@ -188,7 +190,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)} with a NaN.
+     * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)} with a NaN.
     */
    @Test
    public void testWriteGrade_nan() {
@@ -198,7 +200,7 @@ public class DescriptionGeneratorImplTest {
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)} with an infinite number.
+     * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)} with an infinite number.
     */
    @Test
    public void testWriteGrade_infinite() {
@@ -36,6 +36,8 @@ import java.util.List;

 import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
 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.stats.TripStatistics;

 /**
@@ -58,7 +60,7 @@ public class SearchEngineTest {

    @Before
    public void setUp() {
-        providerUtils = ContentProviderUtils.Factory.get(context);
+        providerUtils = new ContentProviderUtils(context);
        engine = new SearchEngine(providerUtils);
    }

@@ -0,0 +1,44 @@
+package de.dennisguse.opentracks.content.data;
+
+import android.location.Location;
+
+public class TestDataUtil {
+
+    public static final double INITIAL_LATITUDE = 37.0;
+    public static final double INITIAL_LONGITUDE = -57.0;
+    public static final double ALTITUDE_INTERVAL = 2.5;
+
+    /**
+     * 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
+     */
+    public static Track getTrack(long id, int numPoints) {
+        Track track = new Track();
+        track.setId(id);
+        track.setName("Test: " + id);
+        track.setNumberOfPoints(numPoints);
+        for (int i = 0; i < numPoints; i++) {
+            track.addLocation(createLocation(i));
+        }
+        return track;
+    }
+
+    /**
+     * Creates a location.
+     *
+     * @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;
+    }
+}
@@ -17,17 +17,20 @@
 package de.dennisguse.opentracks.fragments;

 import android.location.Location;
+import android.os.Looper;

 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import de.dennisguse.opentracks.ChartView;
 import de.dennisguse.opentracks.TrackStubUtils;
+import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.util.UnitConversions;
@@ -44,10 +47,23 @@ public class ChartFragmentTest {

    private ChartFragment chartFragment;

+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
+    @AfterClass
+    public static void finalTearDown() {
+        if (Looper.myLooper() != null) Looper.myLooper().quit();
+    }
+
    @Before
    public void setUp() {
-        chartFragment = new ChartFragment();
-        chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext()));
+        boolean chartByDistance = false;
+        chartFragment = new ChartFragment(chartByDistance) {
+        };
+        chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext(), chartByDistance));
        chartFragment.setTripStatisticsUpdater(TrackStubUtils.INITIAL_TIME);
    }

@@ -33,10 +33,10 @@ import java.util.Locale;
 import java.util.SimpleTimeZone;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.TracksColumns;
-import de.dennisguse.opentracks.content.Waypoint;
-import de.dennisguse.opentracks.content.WaypointsColumns;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;

 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
@@ -0,0 +1,219 @@
+package de.dennisguse.opentracks.io.file.importer;
+
+import android.content.Context;
+import android.location.Location;
+import android.util.Log;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.LargeTest;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.data.TestDataUtil;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
+
+import static org.junit.Assert.assertEquals;
+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.
+ */
+@RunWith(JUnit4.class)
+public class ExportImportTest {
+
+    private static final String TAG = ExportImportTest.class.getSimpleName();
+
+    private Context context = ApplicationProvider.getApplicationContext();
+
+    private 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();
+
+    @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());
+
+        for (int i = 0; i < 3; i++) {
+            Waypoint waypoint = new Waypoint();
+            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);
+        }
+
+        assertEquals(waypoints.size(), contentProviderUtils.getWaypointCount(trackId));
+    }
+
+    @After
+    public void tearDown() {
+        contentProviderUtils.deleteTrack(context, trackId);
+        contentProviderUtils.deleteTrack(context, importTrackId);
+    }
+
+    @LargeTest
+    @Test
+    public void kml_only_track() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void kml_with_trackdetail() {
+        // given
+        Track track = contentProviderUtils.getTrack(trackId);
+
+        TrackFileFormat trackFileFormat = TrackFileFormat.KML_WITH_TRACKDETAIL;
+        TrackExporter trackExporter = trackFileFormat.newTrackExporter(context, new Track[]{track}, null);
+
+        // when
+        // 1. export
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        trackExporter.writeTrack(context, outputStream);
+
+        System.out.println(outputStream.toString());
+
+        // 2. import
+        InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
+        AbstractFileTrackImporter trackImporter = new KmlFileTrackImporter(context, -1L);
+        importTrackId = trackImporter.importFile(inputStream);
+
+        // then
+        // 1. track
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+        assertNotNull(importedTrack);
+        assertEquals(track.getLocations(), importedTrack.getLocations());
+        assertEquals(track.getCategory(), importedTrack.getCategory());
+        assertEquals(track.getDescription(), importedTrack.getDescription());
+        assertEquals(track.getName(), importedTrack.getName());
+        assertEquals(track.getIcon(), importedTrack.getIcon());
+
+        // 2. waypoints
+        assertWaypoints();
+
+        //TODO Check absolute time of trackpoints
+    }
+
+    @LargeTest
+    @Test
+    public void kml_with_trackdetail_and_sensordata() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void kmz_only_track() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void kmz_with_trackdetail() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void kmz_with_trackdetail_and_sensordata() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void kmz_with_trackdetail_and_sensordata_and_pictures() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void gpx() {
+        // given
+        Track track = contentProviderUtils.getTrack(trackId);
+
+        TrackFileFormat trackFileFormat = TrackFileFormat.GPX;
+        TrackExporter trackExporter = trackFileFormat.newTrackExporter(context, new Track[]{track}, null);
+
+        // when
+        // 1. export
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        trackExporter.writeTrack(context, outputStream);
+
+        // 2. import
+        InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
+        AbstractFileTrackImporter trackImporter = new GpxFileTrackImporter(context, contentProviderUtils);
+        importTrackId = trackImporter.importFile(inputStream);
+
+        // then
+        // 1. track
+        Track trackImported = contentProviderUtils.getTrack(importTrackId);
+        assertNotNull(trackImported);
+        assertEquals(track.getLocations(), trackImported.getLocations());
+        assertEquals(track.getCategory(), trackImported.getCategory());
+        assertEquals(track.getDescription(), trackImported.getDescription());
+        assertEquals(track.getName(), trackImported.getName());
+
+        //TODO exporting and importing a track icon is not yet supported by GpxTrackWriter.
+        //assertEquals(track.getIcon(), trackImported.getIcon());
+
+        // 2. waypoints
+        assertWaypoints();
+
+        //TODO Check absolute time of trackpoints
+    }
+
+    private void assertWaypoints() {
+        assertEquals(waypoints.size(), contentProviderUtils.getWaypointCount(importTrackId));
+
+        List<Waypoint> importedWaypoints = contentProviderUtils.getWaypoints(importTrackId);
+        for (int i = 0; i < waypoints.size(); i++) {
+            Waypoint waypoint = waypoints.get(i);
+            Waypoint importedWaypoint = importedWaypoints.get(i);
+            assertEquals(waypoint.getCategory(), importedWaypoint.getCategory());
+            assertEquals(waypoint.getDescription(), importedWaypoint.getDescription());
+            // assertEquals(waypoint.getIcon(), importedWaypoint.getIcon()); // TODO for KML
+            assertEquals(waypoint.getName(), importedWaypoint.getName());
+            assertEquals("", importedWaypoint.getPhotoUrl());
+
+            assertEquals(waypoint.getLocation().getLatitude(), importedWaypoint.getLocation().getLatitude(), 0.001);
+            assertEquals(waypoint.getLocation().getLongitude(), importedWaypoint.getLocation().getLongitude(), 0.001);
+            assertEquals(waypoint.getLocation().getAltitude(), importedWaypoint.getLocation().getAltitude(), 0.001);
+        }
+    }
+}
@@ -27,7 +27,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.util.PreferencesUtils;

 import static org.mockito.Mockito.any;
@@ -27,7 +27,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.util.PreferencesUtils;

 import static org.mockito.Mockito.any;
@@ -53,10 +53,8 @@ public class AdaptiveLocationListenerPolicyTest extends TestCase {
        assertEquals(MAX, adocationListenerPolicy.getDesiredPollingInterval());

        adocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_NORMAL);
-        // First get the half of NEW_IDLE_TIME_NORMAL, and then round it to the
-        // nearest second.
-        assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000,
-                adocationListenerPolicy.getDesiredPollingInterval());
+        // First get the half of NEW_IDLE_TIME_NORMAL, and then round it to the nearest second.
+        assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000, adocationListenerPolicy.getDesiredPollingInterval());

        adocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL);
        assertEquals(MIN, adocationListenerPolicy.getDesiredPollingInterval());
@@ -0,0 +1,54 @@
+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;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TrackRecordingServiceNotificationManagerTest {
+
+    private Context context = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private Location locationMock;
+
+    @Mock
+    private NotificationCompat.Builder notificationCompatBuilder;
+
+    @Mock
+    private NotificationManager notificationManager;
+
+    @Test
+    public void updateLocation_triggersAlertOnlyOnFirstInaccurateLocation() {
+        when(locationMock.hasAccuracy()).thenReturn(true);
+        when(locationMock.getAccuracy()).thenReturn(999f);
+        when(notificationCompatBuilder.setContentText(anyString())).thenReturn(notificationCompatBuilder);
+        when(notificationCompatBuilder.setOnlyAlertOnce(anyBoolean())).thenReturn(notificationCompatBuilder);
+
+        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);
+
+        // then
+        verify(notificationCompatBuilder, times(6)).setOnlyAlertOnce(true);
+        verify(notificationCompatBuilder, times(2)).setOnlyAlertOnce(false);
+    }
+}
@@ -44,10 +44,8 @@ import java.util.concurrent.TimeoutException;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.CustomContentProvider;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;

@@ -56,7 +54,7 @@ import de.dennisguse.opentracks.util.PreferencesUtils;
 *
 * @author Bartlomiej Niechwiej
 * <p>
- * ATTENTION: This tests deletes all stored tracks in the database.
+ * //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)
@@ -69,19 +67,14 @@ public class TrackRecordingServiceTest {
    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);

    private Context context = ApplicationProvider.getApplicationContext();
-    private ContentProviderUtils providerUtils;
+    private ContentProviderUtils contentProviderUtils;

-    private long trackId = Math.abs(new Random().nextLong());
+    private final long trackId = Math.abs(new Random().nextLong());

    static Intent createStartIntent(Context context) {
        return new Intent(context, TrackRecordingService.class);
    }

-    static void updateAutoResumePrefs(Context context, int attempts, int timeoutMins) {
-        PreferencesUtils.setInt(context, R.string.auto_resume_track_current_retry_key, attempts);
-        PreferencesUtils.setString(context, R.string.auto_resume_track_timeout_key, "" + timeoutMins);
-    }
-
    @Before
    public void setUp() {
        // Set up the mock content resolver
@@ -89,17 +82,14 @@ public class TrackRecordingServiceTest {
        };
        customContentProvider.attachInfo(context, null);

-        providerUtils = ContentProviderUtils.Factory.get(context);
+        contentProviderUtils = new ContentProviderUtils(context);

        // Let's use default values.
        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
        sharedPreferences.edit().clear().apply();

-        // Disable auto resume by default.
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, 0);
-
        // Ensure that the database is empty before every test
-        providerUtils.deleteAllTracks(context);
+        contentProviderUtils.deleteAllTracks(context);
    }

    @After
@@ -111,7 +101,7 @@ public class TrackRecordingServiceTest {
        }

        // Ensure that the database is empty after every test
-        providerUtils.deleteAllTracks(context);
+        contentProviderUtils.deleteAllTracks(context);
    }

    @SmallTest
@@ -128,128 +118,10 @@ public class TrackRecordingServiceTest {
        Assert.assertNotNull(service);
    }

-    @MediumTest
-    @Test
-    public void testResumeAfterReboot_shouldResume() throws Exception {
-        // Insert a dummy track and mark it as recording track.
-        createDummyTrack(trackId, System.currentTimeMillis(), true);
-
-        // Clear the number of attempts and set the timeout to 10 min.
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
-
-        // Start the service in "resume" mode (simulates the on-reboot action).
-        Intent startIntent = createStartIntent(context);
-        startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
-        mServiceRule.startService(startIntent);
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
-
-        // then
-        Assert.assertNotNull(service);
-
-        // We expect to resume the previous track.
-        Assert.assertTrue(service.isRecording());
-        Assert.assertEquals(trackId, service.getRecordingTrackId());
-    }
-
-    @MediumTest
-    @Test
-    public void testResumeAfterReboot_simulateReboot() throws Exception {
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
-        Assert.assertFalse(service.isRecording());
-
-        // Simulate recording a track.
-        long id = service.startNewTrack();
-        Assert.assertTrue(service.isRecording());
-        Assert.assertEquals(id, service.getRecordingTrackId());
-        mServiceRule.unbindService();
-        Assert.assertEquals(id, PreferencesUtils.getRecordingTrackId(context));
-
-        // Start the service in "resume" mode (simulates the on-reboot action).
-
-        Intent startIntent = createStartIntent(context);
-        startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
-        mServiceRule.startService(startIntent);
-        service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
-
-        // then
-        Assert.assertNotNull(service);
-        Assert.assertTrue(service.isRecording());
-    }
-
-    @MediumTest
-    @Test
-    public void testResumeAfterReboot_noRecordingTrack() throws Exception {
-        // Insert a dummy track and mark it as recording track.
-        createDummyTrack(trackId, System.currentTimeMillis(), false);
-
-        // Clear the number of attempts and set the timeout to 10 min.
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
-
-        // Start the service in "resume" mode (simulates the on-reboot action).
-        Intent startIntent = createStartIntent(context);
-        startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
-        mServiceRule.startService(startIntent);
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
-
-        // then
-        Assert.assertNotNull(service);
-
-        // We don't expect to resume the previous track, because it was stopped.
-        Assert.assertFalse(service.isRecording());
-        Assert.assertEquals(-1L, service.getRecordingTrackId());
-    }
-
-    @MediumTest
-    @Test
-    public void testResumeAfterReboot_expiredTrack() throws Exception {
-        // Insert a dummy track last updated 20 min ago.
-        createDummyTrack(trackId, System.currentTimeMillis() - 1500 * 60 * 1000, true);
-
-        // Clear the number of attempts and set the timeout to 10 min.
-        updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
-
-        // Start the service in "resume" mode (simulates the on-reboot action).
-        Intent startIntent = createStartIntent(context);
-        startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
-        mServiceRule.startService(startIntent);
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
-
-        // then
-        Assert.assertNotNull(service);
-
-        // We don't expect to resume the previous track, because it has expired.
-        Assert.assertFalse(service.isRecording());
-        Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, service.getRecordingTrackId());
-    }
-
-    @MediumTest
-    @Test
-    public void testResumeAfterReboot_tooManyAttempts() throws Exception {
-        // Insert a dummy track.
-        createDummyTrack(trackId, System.currentTimeMillis(), true);
-
-        // Set the number of attempts to max.
-        updateAutoResumePrefs(context, TrackRecordingService.MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)));
-
-        // Start the service in "resume" mode (simulates the on-reboot action).
-        Intent startIntent = createStartIntent(context);
-        startIntent.putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
-        mServiceRule.startService(startIntent);
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(startIntent));
-
-        //then
-        Assert.assertNotNull(service);
-
-        // We don't expect to resume the previous track, because there were already too many attempts.
-        Assert.assertFalse(service.isRecording());
-        Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, service.getRecordingTrackId());
-    }
-
    @MediumTest
    @Test
    public void testRecording_noTracks() throws Exception {
-        List<Track> tracks = providerUtils.getAllTracks();
+        List<Track> tracks = contentProviderUtils.getAllTracks();
        Assert.assertTrue(tracks.isEmpty());

        Intent startIntent = createStartIntent(context);
@@ -289,16 +161,18 @@ public class TrackRecordingServiceTest {
    @MediumTest
    @Test
    public void testStartNewTrack_alreadyRecording() throws Exception {
-        createDummyTrack(trackId, -1L, true);
-
        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
+        service.startNewTrack();
        Assert.assertTrue(service.isRecording());
+        long trackId = service.getRecordingTrackId();

        long newTrackId = service.startNewTrack();
        Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, newTrackId);

        Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
        Assert.assertEquals(trackId, service.getRecordingTrackId());
+
+        service.endCurrentTrack();
    }

    @MediumTest
@@ -314,44 +188,7 @@ public class TrackRecordingServiceTest {
        Assert.assertEquals(PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, service.getRecordingTrackId());
    }

-    @MediumTest
-    @Test
-    public void testInsertStatisticsMarker_noRecordingTrack() throws Exception {
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
-        Assert.assertFalse(service.isRecording());
-
-        long waypointId = service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
-        Assert.assertEquals(-1L, waypointId);
-    }
-
-    @MediumTest
-    @Test
-    public void testInsertStatisticsMarker_validLocation() throws Exception {
-        createDummyTrack(trackId, -1L, true);
-
-        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
-        Assert.assertTrue(service.isRecording());
-        Assert.assertFalse(service.isPaused());
-        insertLocation(service);
-
-        long waypointId1 = service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
-        Assert.assertNotEquals(-1L, waypointId1);
-        long waypointId2 = service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
-        Assert.assertNotEquals(-1L, waypointId2);
-
-        Waypoint wpt = providerUtils.getWaypoint(waypointId1);
-        Assert.assertEquals(context.getString(R.string.marker_statistics_icon_url), wpt.getIcon());
-        Assert.assertEquals(context.getString(R.string.marker_split_name_format, 0), wpt.getName());
-        Assert.assertEquals(WaypointType.STATISTICS, wpt.getType());
-        Assert.assertEquals(trackId, wpt.getTrackId());
-        Assert.assertEquals(0.0, wpt.getLength(), 0.01);
-        Assert.assertNotNull(wpt.getLocation());
-        Assert.assertNotNull(wpt.getTripStatistics());
-        // TODO check the rest of the params.
-
-        // TODO: Check waypoint 2.
-    }
-
+    // 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);
@@ -364,8 +201,8 @@ public class TrackRecordingServiceTest {

    private void addTrack(Track track, boolean isRecording) {
        Assert.assertTrue(track.getId() >= 0);
-        providerUtils.insertTrack(track);
-        Assert.assertEquals(track.getId(), providerUtils.getTrack(track.getId()).getId());
+        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);
    }
@@ -392,28 +229,29 @@ public class TrackRecordingServiceTest {
        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
        Assert.assertFalse(service.isRecording());

-        long waypointId = service.insertWaypoint(WaypointCreationRequest.DEFAULT_WAYPOINT);
+        long waypointId = service.insertWaypoint(null, null, null, null);
        Assert.assertEquals(-1L, waypointId);
    }

    @MediumTest
    @Test
    public void testInsertWaypointMarker_validWaypoint() throws Exception {
-        createDummyTrack(trackId, -1L, true);
-
        ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context)));
+        service.startNewTrack();
        Assert.assertTrue(service.isRecording());
        insertLocation(service);

-        long waypointId = service.insertWaypoint(WaypointCreationRequest.DEFAULT_WAYPOINT);
+        long trackId = service.getRecordingTrackId();
+        long waypointId = service.insertWaypoint(null, null, null, null);
        Assert.assertNotEquals(-1L, waypointId);
-        Waypoint wpt = providerUtils.getWaypoint(waypointId);
+        Waypoint wpt = contentProviderUtils.getWaypoint(waypointId);
        Assert.assertEquals(context.getString(R.string.marker_waypoint_icon_url), wpt.getIcon());
        Assert.assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName());
-        Assert.assertEquals(WaypointType.WAYPOINT, wpt.getType());
        Assert.assertEquals(trackId, wpt.getTrackId());
        Assert.assertEquals(0.0, wpt.getLength(), 0.01);
        Assert.assertNotNull(wpt.getLocation());
        Assert.assertNull(wpt.getTripStatistics());
+
+        service.endCurrentTrack();
    }
 }
@@ -27,8 +27,7 @@ import java.util.concurrent.TimeoutException;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.CustomContentProvider;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;

@@ -68,15 +67,12 @@ public class TrackRecordingServiceTestLooper {
        };
        customContentProvider.attachInfo(context, null);

-        providerUtils = ContentProviderUtils.Factory.get(context);
+        providerUtils = new ContentProviderUtils(context);

        // Let's use default values.
        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
        sharedPreferences.edit().clear().apply();

-        // Disable auto resume by default.
-        TrackRecordingServiceTest.updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, 0);
-
        // Ensure that the database is empty before every test
        providerUtils.deleteAllTracks(context);
    }
@@ -139,7 +135,8 @@ public class TrackRecordingServiceTestLooper {
    @MediumTest
    @Test
    public void testWithProperties_minRecordingDistanceDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
+        int minRecordingIntervalDefault = Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default));
+        PreferencesUtils.setInt(context, R.string.recording_distance_interval_key, minRecordingIntervalDefault);
        fullRecordingSession();
    }

@@ -150,27 +147,6 @@ public class TrackRecordingServiceTestLooper {
        fullRecordingSession();
    }

-    @MediumTest
-    @Test
-    public void testWithProperties_splitFrequencyDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.split_frequency_key, Integer.parseInt(context.getResources().getString(R.string.split_frequency_default)));
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_splitFrequencyByDistance() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.split_frequency_key, -1);
-        fullRecordingSession();
-    }
-
-    @MediumTest
-    @Test
-    public void testWithProperties_splitFrequencyByTime() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.split_frequency_key, 1);
-        fullRecordingSession();
-    }
-
    @MediumTest
    @Test
    public void testWithProperties_metricUnitsDefault() throws TimeoutException {
@@ -202,7 +178,8 @@ public class TrackRecordingServiceTestLooper {
    @MediumTest
    @Test
    public void testWithProperties_minRequiredAccuracyDefault() throws TimeoutException {
-        PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
+        int recordingGPSAccuracyDefault = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default));
+        PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, recordingGPSAccuracyDefault);
        fullRecordingSession();
    }

@@ -240,10 +217,8 @@ public class TrackRecordingServiceTestLooper {
            location.setBearing(3.0f);
            service.insertTrackPoint(location);

-            if (i % 10 == 0) {
-                service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
-            } else if (i % 7 == 0) {
-                service.insertWaypoint(WaypointCreationRequest.DEFAULT_WAYPOINT);
+            if (i % 7 == 0) {
+                service.insertWaypoint(null, null, null, null);
            }
        }

@@ -60,10 +60,15 @@ public class FileUtilsTest extends TestCase {
     */
    public void testSanitizeFileName() {
        String name = "Swim\10ming-^across:/the/ pacific (ocean).";
-        String expected = "Swim_ming-^across_the_ pacific (ocean)_";
+        String expected = "Swim_ming-^across_the_ pacific (ocean).";
        assertEquals(expected, FileUtils.sanitizeFileName(name));
    }

+    public void testSanitizeFileNameWithSuffix() {
+        String name = "FileName.jpeg";
+        assertEquals(name, FileUtils.sanitizeFileName(name));
+    }
+
    /**
     * Tests {@link FileUtils#sanitizeFileName(String)} with i18n characters (in Chinese and Russian).
     * Verifies that they are allowed.
@@ -16,8 +16,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="de.dennisguse.opentracks"
    android:installLocation="auto"
-    android:versionCode="3123"
-    android:versionName="v3.2.5"> <!-- For FDroid. -->
+    android:versionCode="3213"
+    android:versionName="v3.2.11"> <!-- For FDroid. -->
    <!-- Permission to initialize services -->
    <application
        android:name=".Startup"
@@ -25,6 +25,7 @@ limitations under the License.
        android:hardwareAccelerated="true"
        android:icon="@drawable/ic_logo_color_24dp"
        android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
        android:theme="@style/ThemeCustom">

        <!-- Activities -->
@@ -32,6 +33,10 @@ limitations under the License.

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

+        <activity
+            android:name=".HelpActivity"
+            android:label="@string/menu_help" />
+
        <activity
            android:name=".io.file.importer.ImportActivity"
            android:theme="@style/ThemeCustomTransparent">
@@ -50,10 +55,10 @@ limitations under the License.
            </intent-filter>
        </activity>

-        <activity android:name=".MarkerEditActivity" />
-
        <activity android:name=".MarkerDetailActivity" />

+        <activity android:name=".MarkerEditActivity" />
+
        <activity
            android:name=".MarkerListActivity"
            android:label="@string/menu_markers">
@@ -95,7 +100,6 @@ limitations under the License.

        <activity android:name=".settings.SettingsActivity" />

-        <!-- Services -->
        <provider
            android:name=".content.ShareContentProvider"
            android:authorities="${applicationId}.content"
@@ -112,14 +116,6 @@ limitations under the License.
                android:resource="@xml/file_paths" />
        </provider>

-        <!-- Receivers -->
-        <receiver android:name=".BootReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <!-- Providers -->
        <service
            android:name=".services.TrackRecordingService"
            android:enabled="true"
@@ -139,44 +135,23 @@ limitations under the License.
        android:name="android.hardware.location.gps"
        android:required="true" />
    <uses-feature
-        android:name="android.hardware.bluetooth"
+        android:name="android.hardware.android.hardware.bluetooth_le"
        android:required="false" />
-    <!-- Permissions to access sensors -->
    <uses-feature
        android:name="android.hardware.camera"
        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.faketouch"
-        android:required="false" />
-    <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
    <uses-feature
        android:name="android.hardware.sensor.compass"
        android:required="false" />
-    <!-- Permission to read/write external storage -->
-    <uses-feature
-        android:name="android.hardware.telephony"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.telephony.gsm"
-        android:required="false" />
-    <!-- Required features -->
    <uses-feature
        android:name="android.hardware.touchscreen"
        android:required="false" />
-    <!-- Optional features -->
-    <uses-feature
-        android:name="android.hardware.touchscreen.multitouch"
-        android:required="false" />

-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
@@ -17,11 +17,12 @@
 package de.dennisguse.opentracks;

 import android.os.Bundle;
-import android.speech.tts.TextToSpeech;

 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;

+import de.dennisguse.opentracks.util.TTSUtils;
+
 /**
 * @author Jimmy Shih
 */
@@ -32,7 +33,7 @@ public abstract class AbstractActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);

        // Set volume control stream for text to speech
-        setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
+        setVolumeControlStream(TTSUtils.getTTSStream());

        setContentView(getLayoutResId());

@@ -1,57 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import de.dennisguse.opentracks.services.TrackRecordingService;
-
-import static android.content.Intent.ACTION_BOOT_COMPLETED;
-
-/**
- * This class react to the BOOT_COMPLETED broadcast.
- * <p>
- * One example of a broadcast message that this class is interested in,
- * is notification about the phone boot.  We may want to resume a previously
- * started tracking session if the phone crashed (hopefully not), or the user
- * decided to swap the battery or some external event occurred which forced
- * a phone reboot.
- * <p>
- * This class simply delegates to {@link TrackRecordingService} to make a
- * decision whether to continue with the previous track (if any), or just
- * abandon it.
- *
- * @author Bartlomiej Niechwiej
- */
-public class BootReceiver extends BroadcastReceiver {
-
-    private static final String TAG = BootReceiver.class.getSimpleName();
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Log.d(TAG, "BootReceiver.onReceive: " + intent.getAction());
-        if (ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-            Intent startIntent = new Intent(context, TrackRecordingService.class)
-                    .putExtra(TrackRecordingService.RESUME_TRACK_EXTRA_NAME, true);
-            context.startService(startIntent);
-        } else {
-            Log.w(TAG, "BootReceiver: unsupported action");
-        }
-    }
-}
@@ -69,7 +69,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {

    @Override
    protected Boolean doInBackground(Void... params) {
-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);

        if (trackIds.length == 1 && trackIds[0] == -1L) {
            contentProviderUtils.deleteAllTracks(context);
@@ -0,0 +1,9 @@
+package de.dennisguse.opentracks;
+
+public class HelpActivity extends AbstractActivity {
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.help;
+    }
+}
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.List;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.fragments.MarkerDetailFragment;

@@ -61,7 +61,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
            return;
        }

-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);
        Waypoint waypoint = contentProviderUtils.getWaypoint(markerId);

        markerIds = new ArrayList<>();
@@ -26,9 +26,7 @@ import android.widget.Button;
 import android.widget.EditText;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Waypoint;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;

 /**
@@ -48,9 +46,6 @@ public class MarkerEditActivity extends AbstractActivity {
    private Waypoint waypoint;

    // UI elements
-    private View statisticsSection;
-    private EditText statisticsName;
-    private View waypointSection;
    private EditText waypointName;
    private AutoCompleteTextView waypointMarkerType;
    private EditText waypointDescription;
@@ -65,14 +60,9 @@ public class MarkerEditActivity extends AbstractActivity {
        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);

        // Setup UI elements
-        statisticsSection = findViewById(R.id.marker_edit_statistics_section);
-        statisticsName = findViewById(R.id.marker_edit_statistics_name);
-
-        waypointSection = findViewById(R.id.marker_edit_waypoint_section);
        waypointName = findViewById(R.id.marker_edit_waypoint_name);
        waypointMarkerType = findViewById(R.id.marker_edit_waypoint_marker_type);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
-                this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line);
+        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);

@@ -96,7 +86,7 @@ public class MarkerEditActivity extends AbstractActivity {
    @Override
    protected void onStop() {
        super.onStop();
-        trackRecordingServiceConnection.unbind();
+        trackRecordingServiceConnection.unbind(this);
    }

    @Override
@@ -125,9 +115,7 @@ public class MarkerEditActivity extends AbstractActivity {
        });

        if (newMarker) {
-            statisticsSection.setVisibility(View.GONE);
-            waypointSection.setVisibility(View.VISIBLE);
-            int nextWaypointNumber = trackId == -1L ? -1 : ContentProviderUtils.Factory.get(this).getNextWaypointNumber(trackId, WaypointType.WAYPOINT);
+            int nextWaypointNumber = trackId == -1L ? -1 : new ContentProviderUtils(this).getNextWaypointNumber(trackId);
            if (nextWaypointNumber == -1) {
                nextWaypointNumber = 0;
            }
@@ -136,22 +124,15 @@ public class MarkerEditActivity extends AbstractActivity {
            waypointMarkerType.setText("");
            waypointDescription.setText("");
        } else {
-            waypoint = ContentProviderUtils.Factory.get(this).getWaypoint(markerId);
+            waypoint = new ContentProviderUtils(this).getWaypoint(markerId);
            if (waypoint == null) {
                Log.d(TAG, "waypoint is null");
                finish();
                return;
            }
-            boolean statistics = waypoint.getType() == WaypointType.STATISTICS;
-            statisticsSection.setVisibility(statistics ? View.VISIBLE : View.GONE);
-            waypointSection.setVisibility(statistics ? View.GONE : View.VISIBLE);
-            if (statistics) {
-                statisticsName.setText(waypoint.getName());
-            } else {
-                waypointName.setText(waypoint.getName());
-                waypointMarkerType.setText(waypoint.getCategory());
-                waypointDescription.setText(waypoint.getDescription());
-            }
+            waypointName.setText(waypoint.getName());
+            waypointMarkerType.setText(waypoint.getCategory());
+            waypointDescription.setText(waypoint.getDescription());
        }
    }

@@ -159,29 +140,21 @@ public class MarkerEditActivity extends AbstractActivity {
     * Adds a marker.
     */
    private void addMarker() {
-        WaypointCreationRequest waypointCreationRequest = new WaypointCreationRequest(
-                WaypointType.WAYPOINT,
-                false,
+        trackRecordingServiceConnection.addMarker(this,
                waypointName.getText().toString(),
                waypointMarkerType.getText().toString(),
                waypointDescription.getText().toString(),
-                null,
                null);
-        trackRecordingServiceConnection.addMarker(this, waypointCreationRequest);
    }

    /**
     * Saves a marker.
     */
    private void saveMarker() {
-        boolean statistics = waypoint.getType() == WaypointType.STATISTICS;
-        if (statistics) {
-            waypoint.setName(statisticsName.getText().toString());
-        } else {
-            waypoint.setName(waypointName.getText().toString());
-            waypoint.setCategory(waypointMarkerType.getText().toString());
-            waypoint.setDescription(waypointDescription.getText().toString());
-        }
-        ContentProviderUtils.Factory.get(this).updateWaypoint(waypoint);
+        waypoint.setName(waypointName.getText().toString());
+        waypoint.setCategory(waypointMarkerType.getText().toString());
+        waypoint.setDescription(waypointDescription.getText().toString());
+
+        new ContentProviderUtils(this).updateWaypoint(waypoint);
    }
 }
@@ -38,14 +38,14 @@ import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-import de.dennisguse.opentracks.content.WaypointsColumns;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.util.ActivityUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
+import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;

 /**
@@ -69,13 +69,12 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    private SharedPreferences sharedPreferences;

    private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
-    private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
+    private boolean recordingTrackPaused;
    /*
     * Note that sharedPreferenceChangeListener cannot be an anonymous inner
     * class. Anonymous inner class will get garbage collected.
     */
-    private final OnSharedPreferenceChangeListener
-            sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
+    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
        @Override
        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
            // Note that the key can be null
@@ -127,15 +126,14 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
+        long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);

-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        contentProviderUtils = new ContentProviderUtils(this);
        sharedPreferences = PreferencesUtils.getSharedPreferences(this);

-        long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
        track = trackId != -1L ? contentProviderUtils.getTrack(trackId) : null;
-        final long trackFirstWaypointId = trackId != -1 ? contentProviderUtils.getFirstWaypointId(trackId) : -1;
-
-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);

        listView = findViewById(R.id.marker_list);
        listView.setEmptyView(findViewById(R.id.marker_list_empty));
@@ -150,7 +148,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
        resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) {
            @Override
            public void bindView(View view, Context context, Cursor cursor) {
-                int typeIndex = cursor.getColumnIndex(WaypointsColumns.TYPE);
                int nameIndex = cursor.getColumnIndex(WaypointsColumns.NAME);
                int timeIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.TIME);
                int categoryIndex = cursor.getColumnIndex(WaypointsColumns.CATEGORY);
@@ -159,13 +156,13 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                int latitudeIndex = cursor.getColumnIndex(WaypointsColumns.LATITUDE);
                int longitudeIndex = cursor.getColumnIndex(WaypointsColumns.LONGITUDE);

-                boolean statistics = WaypointType.values()[cursor.getInt(typeIndex)] == WaypointType.STATISTICS;
-                int iconId = statistics ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin;
+                int iconId = MarkerUtils.ICON_ID;
                String name = cursor.getString(nameIndex);
                long time = cursor.getLong(timeIndex);
-                String category = statistics ? null : cursor.getString(categoryIndex);
-                String description = statistics ? null : cursor.getString(descriptionIndex);
+                String category = cursor.getString(categoryIndex);
+                String description = cursor.getString(descriptionIndex);
                String photoUrl = cursor.getString(photoUrlIndex);
+                //TODO also show latitude and longitude in list
                double latitude = cursor.getDouble(latitudeIndex);
                double longitude = cursor.getDouble(longitudeIndex);

@@ -181,8 +178,8 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
            public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
                if (track != null) {
                    return new CursorLoader(MarkerListActivity.this, WaypointsColumns.CONTENT_URI, PROJECTION,
-                            WaypointsColumns.TRACKID + "=? AND " + WaypointsColumns._ID + "!=?",
-                            new String[]{String.valueOf(track.getId()), String.valueOf(trackFirstWaypointId)}, null);
+                            WaypointsColumns.TRACKID + "=?",
+                            new String[]{String.valueOf(track.getId())}, null);
                } else {
                    return new CursorLoader(MarkerListActivity.this, WaypointsColumns.CONTENT_URI, PROJECTION,
                            WaypointsColumns.STARTTIME + " IS NULL", null, null);
@@ -244,7 +241,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    }

    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
        if (track != null && item.getItemId() == R.id.marker_list_insert_marker) {
            Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, track.getId());
@@ -44,9 +44,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.SearchEngine;
 import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
 import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
@@ -55,6 +54,7 @@ import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.ActivityUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
+import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -101,7 +101,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa

    private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;

-    private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
+    private boolean recordingTrackPaused;

    // Callback when an item is selected in the contextual action mode
    private ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
@@ -168,7 +168,9 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
        super.onCreate(savedInstanceState);
        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);

-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
+
+        contentProviderUtils = new ContentProviderUtils(this);
        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
        searchEngine = new SearchEngine(contentProviderUtils);
@@ -243,7 +245,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
    protected void onStop() {
        super.onStop();
        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        trackRecordingServiceConnection.unbind();
+        trackRecordingServiceConnection.unbind(this);
    }

    @Override
@@ -391,11 +393,9 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
            }
        }

-        boolean statistics = waypoint.getType() == WaypointType.STATISTICS;
-
        resultMap.put(IS_RECORDING_FIELD, false);
        resultMap.put(IS_PAUSED_FIELD, true);
-        resultMap.put(ICON_ID_FIELD, statistics ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin);
+        resultMap.put(ICON_ID_FIELD, MarkerUtils.ICON_ID);
        resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_marker);
        resultMap.put(NAME_FIELD, waypoint.getName());
        // Display the marker's track name in the total time field
@@ -403,8 +403,8 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
        resultMap.put(TOTAL_DISTANCE_FIELD, null);
        resultMap.put(MARKER_COUNT_FIELD, 0);
        resultMap.put(START_TIME_FIELD, waypoint.getLocation().getTime());
-        resultMap.put(CATEGORY_FIELD, statistics ? null : waypoint.getCategory());
-        resultMap.put(DESCRIPTION_FIELD, statistics ? null : waypoint.getDescription());
+        resultMap.put(CATEGORY_FIELD, waypoint.getCategory());
+        resultMap.put(DESCRIPTION_FIELD, waypoint.getDescription());
        resultMap.put(PHOTO_URL_FIELD, waypoint.getPhotoUrl());
        resultMap.put(TRACK_ID_FIELD, waypoint.getTrackId());
        resultMap.put(MARKER_ID_FIELD, waypoint.getId());
@@ -1,153 +0,0 @@
-/*
- * Copyright 2013q Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TabHost;
-import android.widget.TabHost.TabContentFactory;
-import android.widget.TabWidget;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-
-import java.util.ArrayList;
-
-/**
- * This is a helper class that implements the management of tabs and all details
- * of connecting a ViewPager with associated TabHost. It relies on a trick.
- * Normally a tab host has a simple API for supplying a View or Intent that each
- * tab will show. This is not sufficient for switching between pages. So instead
- * we make the content part of the tab host 0dp high (it is not shown) and the
- * TabsAdapter supplies its own dummy view to show as the tab content. It
- * listens to changes in tabs, and takes care of switch to the correct paged in
- * the ViewPager whenever the selected tab changes.
- * <p>
- * Copied from the FragmentTabsPager sample in the support library.
- *
- * @author Jimmy Shih
- */
-//TODO Rework or better remove.
-public class TabsAdapter extends FragmentPagerAdapter implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener {
-
-    private final Context context;
-    private final TabHost tabHost;
-    private final ViewPager viewPager;
-    private final ArrayList<TabInfo> tabInfos = new ArrayList<>();
-
-    public TabsAdapter(FragmentActivity activity, TabHost tabHost, ViewPager viewPager) {
-        super(activity.getSupportFragmentManager());
-        this.context = activity;
-        this.tabHost = tabHost;
-        this.viewPager = viewPager;
-        this.tabHost.setOnTabChangedListener(this);
-        this.viewPager.setAdapter(this);
-        this.viewPager.setOnPageChangeListener(this);
-    }
-
-    public void addTab(TabHost.TabSpec tabSpec, Class<?> clss, Bundle bundle) {
-        tabSpec.setContent(new DummyTabFactory(context));
-
-        TabInfo info = new TabInfo(clss, bundle);
-
-        tabInfos.add(info);
-        tabHost.addTab(tabSpec);
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public int getCount() {
-        return tabInfos.size();
-    }
-
-    @Override
-    @NonNull
-    public Fragment getItem(int position) {
-        TabInfo info = tabInfos.get(position);
-        return Fragment.instantiate(context, info.clss.getName(), info.bundle);
-    }
-
-    @Override
-    public void onTabChanged(String tabId) {
-        int position = tabHost.getCurrentTab();
-        viewPager.setCurrentItem(position);
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-    }
-
-    @Override
-    public void onPageSelected(int position) {
-        /*
-         * Unfortunately when TabHost changes the current tab, it kindly also takes care of putting focus on it when not in touch mode.
-         * The jerk. This hack  tries to prevent this from pulling focus out of our ViewPager.
-         */
-        TabWidget tabWidget = tabHost.getTabWidget();
-        int oldFocusability = tabWidget.getDescendantFocusability();
-        tabWidget.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-        tabHost.setCurrentTab(position);
-        tabWidget.setDescendantFocusability(oldFocusability);
-    }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-    }
-
-    /**
-     * An object to hold a tab's info.
-     *
-     * @author Jimmy Shih
-     */
-    private static final class TabInfo {
-
-        private final Class<?> clss;
-        private final Bundle bundle;
-
-        TabInfo(Class<?> clss, Bundle bundle) {
-            this.clss = clss;
-            this.bundle = bundle;
-        }
-    }
-
-    /**
-     * A dummy {@link TabContentFactory} that creates an empty view to satisfy the {@link TabHost} API.
-     *
-     * @author Jimmy Shih
-     */
-    private static class DummyTabFactory implements TabHost.TabContentFactory {
-
-        private final Context context;
-
-        DummyTabFactory(Context context) {
-            this.context = context;
-        }
-
-        @Override
-        public View createTabContent(String tag) {
-            View view = new View(context);
-            view.setMinimumWidth(0);
-            view.setMinimumHeight(0);
-            return view;
-        }
-    }
-}
@@ -31,21 +31,23 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
-import android.widget.TabHost;
-import android.widget.TabHost.TabSpec;
 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;

+import com.google.android.material.tabs.TabLayout;
+
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
-import de.dennisguse.opentracks.content.Waypoint;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-import de.dennisguse.opentracks.content.WaypointCreationRequest;
-import de.dennisguse.opentracks.fragments.ChartFragment;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.fragments.ChartDistanceFragment;
+import de.dennisguse.opentracks.fragments.ChartTimeFragment;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.StatsFragment;
@@ -85,7 +87,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
    private SharedPreferences sharedPreferences;
    private TrackRecordingServiceConnection trackRecordingServiceConnection;
    private TrackDataHub trackDataHub;
-    private TabHost tabHost;
+    private ViewPager pager;
    private TrackController trackController;

    // From intent
@@ -93,7 +95,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA

    // Preferences
    private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
-    private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
+    private boolean recordingTrackPaused;

    private final Runnable bindChangedCallback = new Runnable() {
        @Override
@@ -105,8 +107,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                    trackController.update(isRecording(), recordingTrackPaused);
                    if (hasPhoto && photoUri != null) {
                        hasPhoto = false;
-                        WaypointCreationRequest waypointCreationRequest = new WaypointCreationRequest(WaypointType.WAYPOINT, false, null, null, null, null, photoUri.toString());
-                        long markerId = trackRecordingServiceConnection.addMarker(TrackDetailActivity.this, waypointCreationRequest);
+                        long markerId = trackRecordingServiceConnection.addMarker(TrackDetailActivity.this, null, null, null, photoUri.toString());
                        if (markerId != -1L) {
                            //TODO: Make configurable.
                            FileUtils.updateMediaScanner(TrackDetailActivity.this, photoUri);
@@ -116,26 +117,31 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
            });
        }
    };
-    /*
-     * Note that sharedPreferenceChangeListener cannot be an anonymous inner
-     * class. Anonymous inner class will get garbage collected.
-     */
-    private final OnSharedPreferenceChangeListener
-            sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
+
+    // Note that sharedPreferenceChangeListener cannot be an anonymous inner class. Anonymous inner class will get garbage collected.
+    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
        @Override
        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.recording_track_id_key, key)) {
                recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackDetailActivity.this);
+                setLockscreenPolicy();
+                setScreenOnPolicy();
            }

            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.recording_track_paused_key, key)) {
                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackDetailActivity.this);
+                setLockscreenPolicy();
+                setScreenOnPolicy();
            }

            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.stats_show_on_lockscreen_while_recording_key, key)) {
                setLockscreenPolicy();
            }

+            if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.stats_keep_screen_on_while_recording_key, key)) {
+                setScreenOnPolicy();
+            }
+
            if (key == null) return;

            runOnUiThread(new Runnable() {
@@ -182,11 +188,13 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        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 = ContentProviderUtils.Factory.get(this);
+        contentProviderUtils = new ContentProviderUtils(this);
        handleIntent(getIntent());

        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
@@ -194,25 +202,46 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback);
        trackDataHub = TrackDataHub.newInstance(this);

-        tabHost = findViewById(R.id.tackdetail_tabhost);
-        tabHost.setup();
+        FragmentPagerAdapter adapter = new FragmentPagerAdapter(getSupportFragmentManager(), 1) {
+            @Override
+            public int getCount() {
+                return 3;
+            }

-        ViewPager viewPager = findViewById(R.id.pager);
-        TabsAdapter tabsAdapter = new TabsAdapter(this, tabHost, viewPager);
-
-        TabSpec statsTabSpec = tabHost.newTabSpec(StatsFragment.STATS_FRAGMENT_TAG).setIndicator(getString(R.string.track_detail_stats_tab));
-        tabsAdapter.addTab(statsTabSpec, StatsFragment.class, null);
-
-        TabSpec chartTabSpec = tabHost.newTabSpec(ChartFragment.CHART_FRAGMENT_TAG).setIndicator(getString(R.string.track_detail_chart_tab));
-        tabsAdapter.addTab(chartTabSpec, ChartFragment.class, null);
+            @NonNull
+            @Override
+            public Fragment getItem(int position) {
+                switch (position) {
+                    case 0:
+                        return new StatsFragment();
+                    case 1:
+                        return new ChartTimeFragment();
+                    case 2:
+                        return new ChartDistanceFragment();
+                }
+                return null;
+            }

+            @Nullable
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getString(R.string.track_detail_stats_tab);
+                    case 1:
+                        return getString(R.string.settings_chart_by_time);
+                    case 2:
+                        return getString(R.string.settings_chart_by_distance);
+                }
+                return "Unknown Tab";
+            }
+        };
+        pager = findViewById(R.id.track_detail_activity_view_pager);
+        pager.setAdapter(adapter);
+        TabLayout tabs = findViewById(R.id.track_detail_activity_tablayout);
+        tabs.setupWithViewPager(pager);
        if (savedInstanceState != null) {
-            tabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAB_TAG_KEY));
-        }
-
-        // Set the background after all three tabs are added
-        for (int i = 0; i < tabHost.getTabWidget().getChildCount(); i++) {
-            tabHost.getTabWidget().getChildAt(i).setBackgroundResource(R.drawable.tab_indicator);
+            pager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
        }

        trackController = new TrackController(this, trackRecordingServiceConnection, false, recordListener, stopListener);
@@ -221,11 +250,13 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
    @Override
    public void onAttachedToWindow() {
        setLockscreenPolicy();
+        setScreenOnPolicy();
        super.onAttachedToWindow();
    }

    private void setLockscreenPolicy() {
-        boolean showOnLockScreen = PreferencesUtils.shouldShowStatsOnLockscreen(TrackDetailActivity.this);
+        boolean showOnLockScreen = PreferencesUtils.shouldShowStatsOnLockscreen(TrackDetailActivity.this)
+                && PreferencesUtils.isRecording(this);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
            setShowWhenLocked(showOnLockScreen);
@@ -236,6 +267,17 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
        }
    }

+    private void setScreenOnPolicy() {
+        boolean keepScreenOn = PreferencesUtils.shouldKeepScreenOn(TrackDetailActivity.this)
+                && PreferencesUtils.isRecording(this);
+
+        if (keepScreenOn) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        }
+    }
+
    @Override
    protected void onStart() {
        super.onStart();
@@ -267,14 +309,15 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
    protected void onStop() {
        super.onStop();
        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        trackRecordingServiceConnection.unbind();
+        trackRecordingServiceConnection.unbind(this);
        trackDataHub.stop();
    }

    @Override
    protected void onSaveInstanceState(@NonNull Bundle outState) {
        super.onSaveInstanceState(outState);
-        outState.putString(CURRENT_TAB_TAG_KEY, tabHost.getCurrentTabTag());
+        outState.putInt(CURRENT_TAB_TAG_KEY, pager.getCurrentItem());
+
        if (photoUri != null) {
            outState.putParcelable(PHOTO_URI_KEY, photoUri);
        }
@@ -407,16 +450,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
        return trackDataHub;
    }

-    /**
-     * Gets the track id.
-     */
-    public long getTrackId() {
-        return trackId;
-    }
-
-    /**
-     * Handles the data in the intent.
-     */
    private void handleIntent(Intent intent) {
        trackId = intent.getLongExtra(EXTRA_TRACK_ID, -1L);
        long markerId = intent.getLongExtra(EXTRA_MARKER_ID, -1L);
@@ -31,7 +31,7 @@ import android.widget.Spinner;
 import androidx.annotation.NonNull;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -73,7 +73,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
            return;
        }

-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        contentProviderUtils = new ContentProviderUtils(this);
        track = contentProviderUtils.getTrack(trackId);
        if (track == null) {
            Log.e(TAG, "No track for " + trackId);
@@ -175,7 +175,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
    @Override
    protected void onStop() {
        super.onStop();
-        trackRecordingServiceConnection.unbind();
+        trackRecordingServiceConnection.unbind(this);
    }

    @Override
@@ -51,7 +51,7 @@ import androidx.loader.content.Loader;
 import java.util.Locale;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.services.ITrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -125,7 +125,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        }
    };

-    private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
+    private boolean recordingTrackPaused;

    /*
     * Note that sharedPreferenceChangeListener cannot be an anonymous inner class.
@@ -141,7 +141,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
            if (PreferencesUtils.isKey(TrackListActivity.this, R.string.recording_track_id_key, key)) {
                recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackListActivity.this);
                if (key != null && PreferencesUtils.isRecording(recordingTrackId)) {
-                    trackRecordingServiceConnection.startAndBind();
+                    trackRecordingServiceConnection.startAndBind(TrackListActivity.this);
                }
            }
            if (PreferencesUtils.isKey(TrackListActivity.this, R.string.recording_track_paused_key, key)) {
@@ -164,7 +164,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
    // Menu items
    private MenuItem searchMenuItem;
    private MenuItem startGpsMenuItem;
-    private MenuItem deleteAllMenuItem;
+//    private MenuItem deleteAllMenuItem;

    private final OnClickListener stopListener = new OnClickListener() {
        @Override
@@ -225,8 +225,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                // Not recording -> Recording
                updateMenuItems(false, true);
                startRecording();
-            } else {
-                if (recordingTrackPaused) {
+            } else if (recordingTrackPaused) {
                    // Paused -> Resume
                    updateMenuItems(false, true);
                    trackRecordingServiceConnection.resumeTrack();
@@ -237,7 +236,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                    trackRecordingServiceConnection.pauseTrack();
                    trackController.update(true, true);
                }
-            }
        }
    };

@@ -245,7 +243,9 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        contentProviderUtils = ContentProviderUtils.Factory.get(this);
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
+
+        contentProviderUtils = new ContentProviderUtils(this);
        sharedPreferences = PreferencesUtils.getSharedPreferences(this);

        trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback);
@@ -344,7 +344,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        super.onStop();

        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        trackRecordingServiceConnection.unbind();
+        trackRecordingServiceConnection.unbind(this);
    }

    @Override
@@ -371,7 +371,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        ActivityUtils.configureSearchWidget(this, searchMenuItem, trackController);

        startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
-        deleteAllMenuItem = menu.findItem(R.id.track_list_delete_all);

        return super.onCreateOptionsMenu(menu);
    }
@@ -407,14 +406,14 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe

                    // Invoke trackRecordingService
                    if (startGps) {
-                        trackRecordingServiceConnection.startAndBind();
+                        trackRecordingServiceConnection.startAndBind(this);
                        bindChangedCallback.run();
                    } else {
                        ITrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
                        if (trackRecordingService != null) {
                            trackRecordingService.stopGps();
                        }
-                        trackRecordingServiceConnection.unbindAndStop();
+                        trackRecordingServiceConnection.unbindAndStop(this);
                    }

                    // Update menu after starting or stopping gps
@@ -425,9 +424,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                intent = IntentUtils.newIntent(this, MarkerListActivity.class);
                startActivity(intent);
                return true;
-            case R.id.track_list_delete_all:
-                deleteTracks(new long[]{-1L});
-                return true;
            case R.id.track_list_settings:
                intent = IntentUtils.newIntent(this, SettingsActivity.class);
                startActivity(intent);
@@ -495,9 +491,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                startGpsMenuItem.setIcon(isGpsStarted ? R.drawable.ic_gps_fixed_24dp : R.drawable.ic_gps_off_24dp);
            }
        }
-        if (deleteAllMenuItem != null) {
-            deleteAllMenuItem.setVisible(hasTrack && !isRecording);
-        }
    }

    /**
@@ -505,7 +498,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     */
    private void startRecording() {
        startNewRecording = true;
-        trackRecordingServiceConnection.startAndBind();
+        trackRecordingServiceConnection.startAndBind(this);

        /*
         * If the binding has happened, then invoke the callback to start a new recording.
@@ -14,7 +14,7 @@
 * the License.
 */

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

 import android.content.Context;
 import android.graphics.Canvas;
@@ -23,8 +23,6 @@ import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Path;

-import androidx.annotation.VisibleForTesting;
-
 import java.text.NumberFormat;

 import de.dennisguse.opentracks.stats.ExtremityMonitor;
@@ -203,7 +201,6 @@ class ChartValueSeries {
    /**
     * Gets the interval value.
     */
-    @VisibleForTesting
    int getInterval() {
        return interval;
    }
@@ -218,7 +215,6 @@ class ChartValueSeries {
    /**
     * Gets the max marker value.
     */
-    @VisibleForTesting
    int getMaxMarkerValue() {
        return maxMarkerValue;
    }
@@ -14,7 +14,7 @@
 * the License.
 */

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

 import android.content.Context;
 import android.content.Intent;
@@ -27,33 +27,40 @@ import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.view.GestureDetector;
 import android.view.MotionEvent;
-import android.view.VelocityTracker;
+import android.view.ScaleGestureDetector;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.widget.Scroller;

+import androidx.core.view.GestureDetectorCompat;
+
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.List;

-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.MarkerDetailActivity;
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.stats.ExtremityMonitor;
 import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.UnitConversions;

 /**
 * Visualization of the chart.
+ * Provides support for zooming (via pinch), scrolling, flinging, and selecting shown markers (single touch).
 *
 * @author Sandor Dornbush
 * @author Leif Hendrik Wilden
 */
 public class ChartView extends View {

-    public static final float MEDIUM_TEXT_SIZE = 18f;
-    public static final float SMALL_TEXT_SIZE = 12f;
+    static final float MEDIUM_TEXT_SIZE = 18f;
+    static final float SMALL_TEXT_SIZE = 12f;

-    public static final int Y_AXIS_INTERVALS = 5;
+    static final int Y_AXIS_INTERVALS = 5;

    public static final int NUM_SERIES = 6;
    public static final int ELEVATION_SERIES = 0;
@@ -74,25 +81,28 @@ public class ChartView extends View {
    private static final int SPACER = 4;
    private static final int Y_AXIS_OFFSET = 16;

+    //TODO Determine from actual size of the used drawable
+    private static final float WAYPOINT_X_ANCHOR = 13f / 48f;
+
    static {
        X_FRACTION_FORMAT.setMaximumFractionDigits(1);
        X_FRACTION_FORMAT.setMinimumFractionDigits(1);
    }

    private final ChartValueSeries[] series = new ChartValueSeries[NUM_SERIES];
-    private final ArrayList<double[]> chartData = new ArrayList<>();
-    private final ArrayList<Waypoint> waypoints = new ArrayList<>();
+    private final List<double[]> chartData = new ArrayList<>();
+    private final List<Waypoint> waypoints = new ArrayList<>();
    private final ExtremityMonitor xExtremityMonitor = new ExtremityMonitor();
    private final Paint axisPaint;
    private final Paint xAxisMarkerPaint;
    private final Paint gridPaint;
+    private final Paint markerPaint;
    private final Drawable pointer;
+    private final Drawable waypointMarker;
    private final int markerWidth;
    private final int markerHeight;
    private final Scroller scroller;
    private double maxX = 1.0;
-    private VelocityTracker velocityTracker = null;
-    private float lastMotionEventX = -1;
    private int zoomLevel = 1;

    private int leftBorder = BORDER;
@@ -107,18 +117,84 @@ public class ChartView extends View {
    private int effectiveWidth = 0;
    private int effectiveHeight = 0;

-    private boolean chartByDistance = true;
+    private boolean chartByDistance;
    private boolean metricUnits = true;
    private boolean reportSpeed = true;
    private boolean showPointer = false;

-    /**
-     * Constructor.
-     *
-     * @param context the context
-     */
-    public ChartView(Context context) {
+    private GestureDetectorCompat detectorScrollFlingTab = new GestureDetectorCompat(getContext(), new GestureDetector.SimpleOnGestureListener() {
+
+        @Override
+        public boolean onDown(MotionEvent e) {
+            if (!scroller.isFinished()) {
+                scroller.abortAnimation();
+            }
+            return true;
+        }
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            if (Math.abs(distanceX) > 0) {
+                int availableToScroll = effectiveWidth * (zoomLevel - 1) - getScrollX();
+                if (availableToScroll > 0) {
+                    scrollBy(Math.min(availableToScroll, (int) distanceX));
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+            fling((int) -velocityX);
+            return true;
+        }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent event) {
+            // Check if the y event is within markerHeight of the marker center
+            if (Math.abs(event.getY() - topBorder - spacer - markerHeight / 2f) < markerHeight) {
+                int minDistance = Integer.MAX_VALUE;
+                Waypoint nearestWaypoint = null;
+                synchronized (waypoints) {
+                    for (Waypoint waypoint : waypoints) {
+                        int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
+                        if (distance < minDistance) {
+                            minDistance = distance;
+                            nearestWaypoint = waypoint;
+                        }
+                    }
+                }
+                if (nearestWaypoint != null && minDistance < markerWidth) {
+                    Intent intent = IntentUtils.newIntent(getContext(), MarkerDetailActivity.class)
+                            .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestWaypoint.getId());
+                    getContext().startActivity(intent);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    });
+
+    private ScaleGestureDetector detectorZoom = new ScaleGestureDetector(getContext(), new ScaleGestureDetector.SimpleOnScaleGestureListener() {
+
+        @Override
+        public boolean onScale(ScaleGestureDetector detector) {
+            float scaleFactor = detector.getScaleFactor();
+            if (scaleFactor >= 1.1f) {
+                zoomIn();
+                return true;
+            } else if (scaleFactor <= 0.9) {
+                zoomOut();
+                return true;
+            }
+            return false;
+        }
+    });
+
+    public ChartView(Context context, boolean chartByDistance) {
        super(context);
+        this.chartByDistance = chartByDistance;

        series[ELEVATION_SERIES] = new ChartValueSeries(context,
                Integer.MIN_VALUE,
@@ -186,7 +262,7 @@ public class ChartView extends View {
        gridPaint.setAntiAlias(false);
        gridPaint.setPathEffect(new DashPathEffect(new float[]{3, 2}, 0));

-        Paint markerPaint = new Paint();
+        markerPaint = new Paint();
        markerPaint.setStyle(Style.STROKE);
        markerPaint.setColor(context.getResources().getColor(android.R.color.darker_gray));
        markerPaint.setAntiAlias(false);
@@ -194,12 +270,9 @@ public class ChartView extends View {
        pointer = context.getResources().getDrawable(R.drawable.ic_logo_color_24dp);
        pointer.setBounds(0, 0, pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight());

-        Drawable statisticsMarker = getResources().getDrawable(R.drawable.ic_marker_yellow_pushpin);
-        markerWidth = statisticsMarker.getIntrinsicWidth();
-        markerHeight = statisticsMarker.getIntrinsicHeight();
-        statisticsMarker.setBounds(0, 0, markerWidth, markerHeight);
-
-        Drawable waypointMarker = getResources().getDrawable(R.drawable.ic_marker_blue_pushpin);
+        waypointMarker = MarkerUtils.getDefaultPhoto(context);
+        markerWidth = waypointMarker.getIntrinsicWidth();
+        markerHeight = waypointMarker.getIntrinsicHeight();
        waypointMarker.setBounds(0, 0, markerWidth, markerHeight);

        scroller = new Scroller(context);
@@ -222,16 +295,6 @@ public class ChartView extends View {
        series[index].setEnabled(enabled);
    }

-    /**
-     * Sets chart by distance.
-     * It is expected that after changing this value, data will be reloaded.
-     *
-     * @param value true for by distance, false for by time
-     */
-    public void setChartByDistance(boolean value) {
-        chartByDistance = value;
-    }
-
    /**
     * Sets metric units.
     *
@@ -264,11 +327,10 @@ public class ChartView extends View {
     *
     * @param dataPoints an array of data points to be added
     */
-    public void addDataPoints(ArrayList<double[]> dataPoints) {
+    public void addDataPoints(List<double[]> dataPoints) {
        synchronized (chartData) {
            chartData.addAll(dataPoints);
-            for (int i = 0; i < dataPoints.size(); i++) {
-                double[] dataPoint = dataPoints.get(i);
+            for (double[] dataPoint : dataPoints) {
                xExtremityMonitor.update(dataPoint[0]);
                for (int j = 0; j < series.length; j++) {
                    if (!Double.isNaN(dataPoint[j + 1])) {
@@ -410,79 +472,14 @@ public class ChartView extends View {

    @Override
    public boolean onTouchEvent(MotionEvent event) {
-        if (velocityTracker == null) {
-            velocityTracker = VelocityTracker.obtain();
-        }
-        velocityTracker.addMovement(event);
-        float x = event.getX();
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                // Stop the fling
-                if (!scroller.isFinished()) {
-                    scroller.abortAnimation();
-                }
-                lastMotionEventX = x;
-                break;
-            case MotionEvent.ACTION_MOVE:
-                if (lastMotionEventX == -1) {
-                    break;
-                }
-                // Scroll to follow the motion event
-                int deltaX = (int) (lastMotionEventX - x);
-                lastMotionEventX = x;
-                if (deltaX < 0) {
-                    if (getScrollX() > 0) {
-                        scrollBy(deltaX);
-                    }
-                } else if (deltaX > 0) {
-                    int availableToScroll = effectiveWidth * (zoomLevel - 1) - getScrollX();
-                    if (availableToScroll > 0) {
-                        scrollBy(Math.min(availableToScroll, deltaX));
-                    }
-                }
-                break;
-            case MotionEvent.ACTION_UP:
-                // Check if the y event is within markerHeight of the marker center
-                if (Math.abs(event.getY() - topBorder - spacer - markerHeight / 2) < markerHeight) {
-                    int minDistance = Integer.MAX_VALUE;
-                    Waypoint nearestWaypoint = null;
-                    synchronized (waypoints) {
-                        for (int i = 0; i < waypoints.size(); i++) {
-                            Waypoint waypoint = waypoints.get(i);
-                            int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
-                            if (distance < minDistance) {
-                                minDistance = distance;
-                                nearestWaypoint = waypoint;
-                            }
-                        }
-                    }
-                    if (nearestWaypoint != null && minDistance < markerWidth) {
-                        Intent intent = IntentUtils.newIntent(getContext(), MarkerDetailActivity.class)
-                                .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestWaypoint.getId());
-                        getContext().startActivity(intent);
-                        return true;
-                    }
-                }
-
-                VelocityTracker myVelocityTracker = velocityTracker;
-                myVelocityTracker.computeCurrentVelocity(1000);
-                int initialVelocity = (int) myVelocityTracker.getXVelocity();
-                if (Math.abs(initialVelocity) > ViewConfiguration.getMinimumFlingVelocity()) {
-                    fling(-initialVelocity);
-                }
-                if (velocityTracker != null) {
-                    velocityTracker.recycle();
-                    velocityTracker = null;
-                }
-                break;
-        }
-        return true;
+        boolean isZoom = detectorZoom.onTouchEvent(event);
+        boolean isScrollTab = detectorScrollFlingTab.onTouchEvent(event);
+        return isZoom || isScrollTab;
    }

    @Override
    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        updateEffectiveDimensionsIfChanged(
-                View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec));
+        updateEffectiveDimensionsIfChanged(View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec));
        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
    }

@@ -498,6 +495,7 @@ public class ChartView extends View {

            clipToGraphArea(canvas);
            drawDataSeries(canvas);
+            drawWaypoints(canvas);
            drawGrid(canvas);

            canvas.restore();
@@ -538,6 +536,33 @@ public class ChartView extends View {
        }
    }

+    /**
+     * Draws the waypoints.
+     *
+     * @param canvas the canvas
+     */
+    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;
+                }
+                double xValue = getWaypointXValue(waypoint);
+                if (xValue > maxX) {
+                    continue;
+                }
+                canvas.save();
+                float x = getX(getWaypointXValue(waypoint));
+                canvas.drawLine(x, topBorder + spacer + markerHeight / 2, x, topBorder + effectiveHeight, markerPaint);
+                canvas.translate(x - (markerWidth * WAYPOINT_X_ANCHOR), topBorder + spacer);
+
+                waypointMarker.draw(canvas);
+                canvas.restore();
+            }
+        }
+    }
+
    /**
     * Draws the grid.
     *
@@ -545,9 +570,9 @@ public class ChartView extends View {
     */
    private void drawGrid(Canvas canvas) {
        // X axis grid
-        ArrayList<Double> xAxisMarkerPositions = getXAxisMarkerPositions(getXAxisInterval());
-        for (int i = 0; i < xAxisMarkerPositions.size(); i++) {
-            int x = getX(xAxisMarkerPositions.get(i));
+        List<Double> xAxisMarkerPositions = getXAxisMarkerPositions(getXAxisInterval());
+        for (double position : xAxisMarkerPositions) {
+            int x = getX(position);
            canvas.drawLine(x, topBorder, x, topBorder + effectiveHeight, gridPaint);
        }
        // Y axis grid
@@ -619,10 +644,10 @@ public class ChartView extends View {
        canvas.drawText(label, x + effectiveWidth + spacer, y + yOffset, axisPaint);

        double interval = getXAxisInterval();
-        ArrayList<Double> markerPositions = getXAxisMarkerPositions(interval);
        NumberFormat numberFormat = interval < 1 ? X_FRACTION_FORMAT : X_NUMBER_FORMAT;
-        for (int i = 0; i < markerPositions.size(); i++) {
-            drawXAxisMarker(canvas, markerPositions.get(i), numberFormat, spacer + yOffset);
+
+        for (double markerPosition : getXAxisMarkerPositions(interval)) {
+            drawXAxisMarker(canvas, markerPosition, numberFormat, spacer + yOffset);
        }
    }

@@ -632,8 +657,7 @@ public class ChartView extends View {
    private String getXAxisLabel() {
        Context context = getContext();
        if (chartByDistance) {
-            return metricUnits ? context.getString(R.string.unit_kilometer)
-                    : context.getString(R.string.unit_mile);
+            return metricUnits ? context.getString(R.string.unit_kilometer) : context.getString(R.string.unit_mile);
        } else {
            return context.getString(R.string.description_time);
        }
@@ -673,8 +697,8 @@ public class ChartView extends View {
    /**
     * Gets the x axis marker positions.
     */
-    private ArrayList<Double> getXAxisMarkerPositions(double interval) {
-        ArrayList<Double> markers = new ArrayList<>();
+    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);
@@ -733,8 +757,7 @@ public class ChartView extends View {
     * @param yValue           the y value
     * @return the marker width.
     */
-    private float drawYAxisMarker(
-            ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) {
+    private float drawYAxisMarker(ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) {
        String marker = chartValueSeries.formatMarker(yValue);
        Paint paint = chartValueSeries.getMarkerPaint();
        Rect rect = getRect(paint, marker);
@@ -785,8 +808,7 @@ public class ChartView extends View {
    private void drawPaths() {
        boolean[] hasMoved = new boolean[series.length];

-        for (int i = 0; i < chartData.size(); i++) {
-            double[] dataPoint = chartData.get(i);
+        for (double[] dataPoint : chartData) {
            for (int j = 0; j < series.length; j++) {
                double value = dataPoint[j + 1];
                if (Double.isNaN(value)) {
@@ -869,8 +891,7 @@ public class ChartView extends View {
        topBorder = (int) (density * BORDER + titleDimensions[0] * (titleDimensions[1] + spacer));
        Rect xAxisLabelRect = getRect(axisPaint, getXAxisLabel());
        // border + x axis marker + spacer + .5 x axis label
-        bottomBorder = (int) (density * BORDER + getRect(xAxisMarkerPaint, "1").height() + spacer
-                + (xAxisLabelRect.height() / 2));
+        bottomBorder = (int) (density * BORDER + getRect(xAxisMarkerPaint, "1").height() + spacer + (xAxisLabelRect.height() / 2));
        rightBorder = (int) (density * BORDER + xAxisLabelRect.width() + spacer);
        updateEffectiveDimensions();
    }
@@ -34,6 +34,10 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 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;
+
 /**
 * A {@link ContentProvider} that handles access to track points, tracks, and waypoints tables.
 *
@@ -25,6 +25,10 @@ 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
@@ -13,16 +13,37 @@
 * License for the specific language governing permissions and limitations under
 * the License.
 */
+
 package de.dennisguse.opentracks.content;

+import android.content.Context;
+import android.util.Pair;
+
+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.util.StringUtils;
+import de.dennisguse.opentracks.util.UnitConversions;

 /**
- * An interface for an object that can generate descriptions of track and waypoint.
+ * Generates descriptions for tracks and waypoints.
 *
- * @author Sandor Dornbush
+ * @author Jimmy Shih
 */
-public interface DescriptionGenerator {
+public class DescriptionGenerator {
+
+    private static final String HTML_LINE_BREAK = "<br>";
+    private static final String HTML_PARAGRAPH_SEPARATOR = "<p>";
+    private static final String TEXT_LINE_BREAK = "\n";
+    private static final String TEXT_PARAGRAPH_SEPARATOR = "\n\n";
+
+    private Context context;
+
+    public DescriptionGenerator(Context context) {
+        this.context = context;
+    }

    /**
     * Generates a track description.
@@ -30,12 +51,205 @@ public interface DescriptionGenerator {
     * @param track      the track
     * @param html       true to output html, false to output plain text
     */
-    String generateTrackDescription(Track track, boolean html);
+    public String generateTrackDescription(Track track, boolean html) {
+        String paragraphSeparator = html ? HTML_PARAGRAPH_SEPARATOR : TEXT_PARAGRAPH_SEPARATOR;
+        String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK;
+        StringBuilder builder = new StringBuilder();
+
+        // Created by
+        String creator = html
+                ? "<a href='" + context.getString(R.string.app_web_url) + "'>" + context.getString(R.string.app_name) + "</a>"
+                : context.getString(R.string.app_name);
+        builder.append(creator);
+
+        builder.append(paragraphSeparator);
+
+        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));
+
+        return builder.toString();
+    }

    /**
     * Generate a waypoint description from a trip statistics.
     *
     * @param tripStatistics the trip statistics
     */
-    String generateWaypointDescription(TripStatistics tripStatistics);
+    public String generateWaypointDescription(TripStatistics tripStatistics) {
+        return generateTripStatisticsDescription(tripStatistics, false);
+    }
+
+    /**
+     * Writes a string to a string builder.
+     *
+     * @param text      the string
+     * @param builder   the string builder
+     * @param resId     the resource id containing one string placeholder
+     * @param lineBreak the line break
+     */
+    private void writeString(String text, StringBuilder builder, int resId, String lineBreak) {
+        if (text == null || text.length() == 0) {
+            text = context.getString(R.string.value_unknown);
+        }
+        builder.append(context.getString(resId, text));
+        builder.append(lineBreak);
+    }
+
+    /**
+     * Generates a description for a {@link TripStatistics}.
+     *
+     * @param stats the trip statistics
+     * @param html  true to use "<br>" for line break instead of "\n"
+     */
+    private String generateTripStatisticsDescription(TripStatistics stats, boolean html) {
+        String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK;
+        StringBuilder builder = new StringBuilder();
+
+        // Total distance
+        writeDistance(stats.getTotalDistance(), builder, R.string.description_total_distance, lineBreak);
+
+        // Total time
+        writeTime(stats.getTotalTime(), builder, R.string.description_total_time, lineBreak);
+
+        // Moving time
+        writeTime(stats.getMovingTime(), builder, R.string.description_moving_time, lineBreak);
+
+        // Average speed
+        writeSpeed(stats.getAverageSpeed(), builder, R.string.description_average_speed, lineBreak);
+
+        // Average moving speed
+        writeSpeed(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_speed, lineBreak);
+
+        // Max speed
+        writeSpeed(stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak);
+
+        // Average pace
+        writePace(stats.getAverageSpeed(), builder, R.string.description_average_pace_in_minute, lineBreak);
+
+        // Average moving pace
+        writePace(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_pace_in_minute, lineBreak);
+
+        // Fastest pace
+        writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak);
+
+        // Max elevation
+        writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak);
+
+        // Min elevation
+        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(lineBreak);
+
+        return builder.toString();
+    }
+
+    /**
+     * Writes distance.
+     *
+     * @param distance  distance in meters
+     * @param builder   StringBuilder to append distance
+     * @param resId     resource id of distance string
+     * @param lineBreak line break string
+     */
+    @VisibleForTesting
+    void writeDistance(double distance, StringBuilder builder, int resId, String lineBreak) {
+        double distanceInKm = distance * UnitConversions.M_TO_KM;
+        double distanceInMi = distanceInKm * UnitConversions.KM_TO_MI;
+        builder.append(context.getString(resId, distanceInKm, distanceInMi));
+        builder.append(lineBreak);
+    }
+
+    /**
+     * Writes time.
+     *
+     * @param time      time in milliseconds.
+     * @param builder   StringBuilder to append time
+     * @param resId     resource id of time string
+     * @param lineBreak line break string
+     */
+    @VisibleForTesting
+    void writeTime(long time, StringBuilder builder, int resId, String lineBreak) {
+        builder.append(context.getString(resId, StringUtils.formatElapsedTime(time)));
+        builder.append(lineBreak);
+    }
+
+    /**
+     * Writes speed.
+     *
+     * @param speed     speed in meters per second
+     * @param builder   StringBuilder to append speed
+     * @param resId     resource id of speed string
+     * @param lineBreak line break string
+     */
+    @VisibleForTesting
+    void writeSpeed(double speed, StringBuilder builder, int resId, String lineBreak) {
+        double speedInKmHr = speed * UnitConversions.MS_TO_KMH;
+        double speedInMiHr = speedInKmHr * UnitConversions.KM_TO_MI;
+        builder.append(context.getString(resId, speedInKmHr, speedInMiHr));
+        builder.append(lineBreak);
+    }
+
+    /**
+     * Writes pace.
+     *
+     * @param speed     speed in meters per second
+     * @param builder   StringBuilder to append pace
+     * @param resId     resource id of pace string
+     * @param lineBreak line break string
+     */
+    @VisibleForTesting
+    void writePace(double speed, StringBuilder builder, int resId, String lineBreak) {
+        Pair<String, String> paceInMetrics = StringUtils.getSpeedParts(context, speed, true, false);
+        Pair<String, String> paceInImperial = StringUtils.getSpeedParts(context, speed, false, false);
+
+        String formattedPaceMetrics = paceInMetrics.first != null ? paceInMetrics.first : context.getString(R.string.value_unknown);
+        String formattedPaceImperial = paceInImperial.first != null ? paceInImperial.first : context.getString(R.string.value_unknown);
+
+        builder.append(context.getString(resId, formattedPaceMetrics, formattedPaceImperial));
+        builder.append(lineBreak);
+    }
+
+    /**
+     * Writes elevation.
+     *
+     * @param elevation elevation in meters
+     * @param builder   StringBuilder to append elevation
+     * @param resId     resource id of elevation string
+     * @param lineBreak line break string
+     */
+    @VisibleForTesting
+    void writeElevation(double elevation, StringBuilder builder, int resId, String lineBreak) {
+        long elevationInM = Math.round(elevation);
+        long elevationInFt = Math.round(elevation * UnitConversions.M_TO_FT);
+        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);
+    }
 }
@@ -1,243 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.content;
-
-import android.content.Context;
-import android.util.Pair;
-
-import androidx.annotation.VisibleForTesting;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.stats.TripStatistics;
-import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.UnitConversions;
-
-/**
- * @author Jimmy Shih
- */
-public class DescriptionGeneratorImpl implements DescriptionGenerator {
-
-    private static final String HTML_LINE_BREAK = "<br>";
-    private static final String HTML_PARAGRAPH_SEPARATOR = "<p>";
-    private static final String TEXT_LINE_BREAK = "\n";
-    private static final String TEXT_PARAGRAPH_SEPARATOR = "\n\n";
-
-    private Context context;
-
-    public DescriptionGeneratorImpl(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public String generateTrackDescription(Track track, boolean html) {
-        String paragraphSeparator = html ? HTML_PARAGRAPH_SEPARATOR : TEXT_PARAGRAPH_SEPARATOR;
-        String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK;
-        StringBuilder builder = new StringBuilder();
-
-        // Created by
-        String creator = html
-                ? "<a href='" + context.getString(R.string.app_web_url) + "'>" + context.getString(R.string.app_name) + "</a>"
-                : context.getString(R.string.app_name);
-        builder.append(creator);
-
-        builder.append(paragraphSeparator);
-
-        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));
-
-        return builder.toString();
-    }
-
-    @Override
-    public String generateWaypointDescription(TripStatistics tripStatistics) {
-        return generateTripStatisticsDescription(tripStatistics, false);
-    }
-
-    /**
-     * Writes a string to a string builder.
-     *
-     * @param text      the string
-     * @param builder   the string builder
-     * @param resId     the resource id containing one string placeholder
-     * @param lineBreak the line break
-     */
-    private void writeString(String text, StringBuilder builder, int resId, String lineBreak) {
-        if (text == null || text.length() == 0) {
-            text = context.getString(R.string.value_unknown);
-        }
-        builder.append(context.getString(resId, text));
-        builder.append(lineBreak);
-    }
-
-    /**
-     * Generates a description for a {@link TripStatistics}.
-     *
-     * @param stats the trip statistics
-     * @param html  true to use "<br>" for line break instead of "\n"
-     */
-    private String generateTripStatisticsDescription(TripStatistics stats, boolean html) {
-        String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK;
-        StringBuilder builder = new StringBuilder();
-
-        // Total distance
-        writeDistance(stats.getTotalDistance(), builder, R.string.description_total_distance, lineBreak);
-
-        // Total time
-        writeTime(stats.getTotalTime(), builder, R.string.description_total_time, lineBreak);
-
-        // Moving time
-        writeTime(stats.getMovingTime(), builder, R.string.description_moving_time, lineBreak);
-
-        // Average speed
-        writeSpeed(stats.getAverageSpeed(), builder, R.string.description_average_speed, lineBreak);
-
-        // Average moving speed
-        writeSpeed(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_speed, lineBreak);
-
-        // Max speed
-        writeSpeed(stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak);
-
-        // Average pace
-        writePace(stats.getAverageSpeed(), builder, R.string.description_average_pace_in_minute, lineBreak);
-
-        // Average moving pace
-        writePace(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_pace_in_minute, lineBreak);
-
-        // Fastest pace
-        writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak);
-
-        // Max elevation
-        writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak);
-
-        // Min elevation
-        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(lineBreak);
-
-        return builder.toString();
-    }
-
-    /**
-     * Writes distance.
-     *
-     * @param distance  distance in meters
-     * @param builder   StringBuilder to append distance
-     * @param resId     resource id of distance string
-     * @param lineBreak line break string
-     */
-    @VisibleForTesting
-    void writeDistance(double distance, StringBuilder builder, int resId, String lineBreak) {
-        double distanceInKm = distance * UnitConversions.M_TO_KM;
-        double distanceInMi = distanceInKm * UnitConversions.KM_TO_MI;
-        builder.append(context.getString(resId, distanceInKm, distanceInMi));
-        builder.append(lineBreak);
-    }
-
-    /**
-     * Writes time.
-     *
-     * @param time      time in milliseconds.
-     * @param builder   StringBuilder to append time
-     * @param resId     resource id of time string
-     * @param lineBreak line break string
-     */
-    @VisibleForTesting
-    void writeTime(long time, StringBuilder builder, int resId, String lineBreak) {
-        builder.append(context.getString(resId, StringUtils.formatElapsedTime(time)));
-        builder.append(lineBreak);
-    }
-
-    /**
-     * Writes speed.
-     *
-     * @param speed     speed in meters per second
-     * @param builder   StringBuilder to append speed
-     * @param resId     resource id of speed string
-     * @param lineBreak line break string
-     */
-    @VisibleForTesting
-    void writeSpeed(double speed, StringBuilder builder, int resId, String lineBreak) {
-        double speedInKmHr = speed * UnitConversions.MS_TO_KMH;
-        double speedInMiHr = speedInKmHr * UnitConversions.KM_TO_MI;
-        builder.append(context.getString(resId, speedInKmHr, speedInMiHr));
-        builder.append(lineBreak);
-    }
-
-    /**
-     * Writes pace.
-     *
-     * @param speed     speed in meters per second
-     * @param builder   StringBuilder to append pace
-     * @param resId     resource id of pace string
-     * @param lineBreak line break string
-     */
-    @VisibleForTesting
-    void writePace(double speed, StringBuilder builder, int resId, String lineBreak) {
-        Pair<String, String> paceInMetrics = StringUtils.getSpeedParts(context, speed, true, false);
-        Pair<String, String> paceInImperial = StringUtils.getSpeedParts(context, speed, false, false);
-
-        String formattedPaceMetrics = paceInMetrics.first != null ? paceInMetrics.first : context.getString(R.string.value_unknown);
-        String formattedPaceImperial = paceInImperial.first != null ? paceInImperial.first : context.getString(R.string.value_unknown);
-
-        builder.append(context.getString(resId, formattedPaceMetrics, formattedPaceImperial));
-        builder.append(lineBreak);
-    }
-
-    /**
-     * Writes elevation.
-     *
-     * @param elevation elevation in meters
-     * @param builder   StringBuilder to append elevation
-     * @param resId     resource id of elevation string
-     * @param lineBreak line break string
-     */
-    @VisibleForTesting
-    void writeElevation(double elevation, StringBuilder builder, int resId, String lineBreak) {
-        long elevationInM = Math.round(elevation);
-        long elevationInFt = Math.round(elevation * UnitConversions.M_TO_FT);
-        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);
-    }
-}
@@ -0,0 +1,20 @@
+package de.dennisguse.opentracks.content;
+
+import android.location.Location;
+import android.location.LocationManager;
+
+/**
+ * Creates a new {@link SensorDataSetLocation}.
+ * An implementation can create new instances or reuse existing instances for optimization.
+ */
+public class LocationFactory {
+
+    /**
+     * The default {@link LocationFactory} which creates a location each time.
+     */
+    public static LocationFactory DEFAULT_LOCATION_FACTORY = new LocationFactory();
+
+    public Location createLocation() {
+        return new SensorDataSetLocation(LocationManager.GPS_PROVIDER);
+    }
+}
@@ -0,0 +1,22 @@
+package de.dennisguse.opentracks.content;
+
+import android.database.Cursor;
+import android.location.Location;
+
+import java.util.Iterator;
+
+/**
+ * A lightweight wrapper around the original {@link Cursor} with a method to clean up.
+ */
+public interface LocationIterator extends Iterator<Location>, AutoCloseable {
+
+    /**
+     * Gets the most recently retrieved track point id by {@link #next()}.
+     */
+    long getLocationId();
+
+    /**
+     * Closes the iterator.
+     */
+    void close();
+}
@@ -28,6 +28,10 @@ import java.util.Locale;
 import java.util.SortedSet;
 import java.util.TreeSet;

+import de.dennisguse.opentracks.content.data.Track;
+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.util.LocationUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.util.Arrays;

 import de.dennisguse.opentracks.android.IContentResolver;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;

@@ -198,7 +200,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
    @Nullable
    @Override
    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
-        ContentProviderUtils contentProviderUtils = new ContentProviderUtilsImpl(this);
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);

        long[] trackIds = parseURI(uri);
        final Track[] tracks = new Track[trackIds.length];
@@ -30,7 +30,8 @@ import java.util.EnumSet;
 import java.util.Set;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;

@@ -41,17 +42,24 @@ import de.dennisguse.opentracks.util.PreferencesUtils;
 */
 public class TrackDataHub implements DataSourceListener {

+    public synchronized static TrackDataHub newInstance(Context context) {
+        return new TrackDataHub(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACK_POINTS);
+    }
+
    /**
     * Target number of track points displayed by the map overlay.
     * We may display more than this number of points.
     */
-    static final int TARGET_DISPLAYED_TRACK_POINTS = 5000;
+    @Deprecated
+    private static final int TARGET_DISPLAYED_TRACK_POINTS = 5000;

    /**
     * Maximum number of waypoints to displayed.
     */
    @VisibleForTesting
+    @Deprecated
    private static final int MAX_DISPLAYED_WAYPOINTS = 128;
+
    private static final String TAG = TrackDataHub.class.getSimpleName();

    private final Context context;
@@ -96,11 +104,6 @@ public class TrackDataHub implements DataSourceListener {
        resetSamplingState();
    }

-    public synchronized static TrackDataHub newInstance(Context context) {
-        return new TrackDataHub(context, new TrackDataManager(), ContentProviderUtils.Factory.get(
-                context), TARGET_DISPLAYED_TRACK_POINTS);
-    }
-
    public void start() {
        if (started) {
            Log.i(TAG, "TrackDataHub already started, ignoring start.");
@@ -398,8 +401,7 @@ public class TrackDataHub implements DataSourceListener {
            trackDataListener.clearWaypoints();
        }

-        try (Cursor cursor = contentProviderUtils.getWaypointCursor(
-                selectedTrackId, -1L, MAX_DISPLAYED_WAYPOINTS)) {
+        try (Cursor cursor = contentProviderUtils.getWaypointCursor(selectedTrackId, -1L, MAX_DISPLAYED_WAYPOINTS)) {
            if (cursor != null && cursor.moveToFirst()) {
                do {
                    Waypoint waypoint = contentProviderUtils.createWaypoint(cursor);
@@ -448,7 +450,7 @@ public class TrackDataHub implements DataSourceListener {
        int samplingFrequency = -1;
        boolean includeNextPoint = false;

-        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenLocationId + 1, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY)) {
+        try (LocationIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, localLastSeenLocationId + 1, false, LocationFactory.DEFAULT_LOCATION_FACTORY)) {

            while (locationIterator.hasNext()) {
                Location location = locationIterator.next();
@@ -468,12 +470,8 @@ public class TrackDataHub implements DataSourceListener {
                    samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
                }

-                if (!LocationUtils.isValidLocation(location)) {
-                    // TODO: also include the last valid point before a split
-                    for (TrackDataListener trackDataListener : sampledInListeners) {
-                        trackDataListener.onSegmentSplit(location);
-                        includeNextPoint = true;
-                    }
+                if (!LocationUtils.isValidLocation(location)) { //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())) {
@@ -18,6 +18,9 @@ package de.dennisguse.opentracks.content;

 import android.location.Location;

+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
+
 /**
 * Listener for track data changes.
 *
@@ -51,14 +54,9 @@ public interface TrackDataListener {
     */
    void onSampledOutTrackPoint(Location location);

-    /**
-     * Called when an invalid track point representing a segment split is read.
-     */
-    void onSegmentSplit(Location location);
-
    /**
     * Called when finish sending new track points.
-     * This gets called after every batch of calls to {@link #onSampledInTrackPoint(Location)}, {@link #onSampledOutTrackPoint(Location)} and {@link #onSegmentSplit(Location)}.
+     * This gets called after every batch of calls to {@link #onSampledInTrackPoint(Location)} and {@link #onSampledOutTrackPoint(Location)}.
     */
    void onNewTrackPointsDone();

@@ -1,85 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks.content;
-
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-
-/**
- * A request for the service to create a waypoint at the current location.
- *
- * @author Sandor Dornbush
- */
-public class WaypointCreationRequest {
-
-    public final static WaypointCreationRequest DEFAULT_WAYPOINT = new WaypointCreationRequest(WaypointType.WAYPOINT, false);
-
-    public final static WaypointCreationRequest DEFAULT_STATISTICS = new WaypointCreationRequest(WaypointType.STATISTICS, false);
-
-    public final static WaypointCreationRequest DEFAULT_START_TRACK = new WaypointCreationRequest(WaypointType.STATISTICS, true);
-
-    private WaypointType type;
-
-    // true if this marker contains the track statistics
-    private boolean isTrackStatistics;
-
-    private String name;
-    private String category;
-    private String description;
-    private String iconUrl;
-    private String photoUrl;
-
-    private WaypointCreationRequest(WaypointType type, boolean isTrackStatistics) {
-        this(type, isTrackStatistics, null, null, null, null, null);
-    }
-
-    public WaypointCreationRequest(WaypointType type, boolean isTrackStatistics, String name, String category, String description, String iconUrl, String photoUrl) {
-        this.type = type;
-        this.isTrackStatistics = isTrackStatistics;
-        this.name = name;
-        this.category = category;
-        this.description = description;
-        this.iconUrl = iconUrl;
-        this.photoUrl = photoUrl;
-    }
-
-    public WaypointType getType() {
-        return type;
-    }
-
-    public boolean isTrackStatistics() {
-        return isTrackStatistics;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getIconUrl() {
-        return iconUrl;
-    }
-
-    public String getPhotoUrl() {
-        return photoUrl;
-    }
-}
@@ -14,7 +14,7 @@
 * the License.
 */

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

 import android.location.Location;

@@ -14,11 +14,13 @@
 * the License.
 */

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

 import android.net.Uri;
 import android.provider.BaseColumns;

+import de.dennisguse.opentracks.content.ContentProviderUtils;
+
 /**
 * Constants for the track points table.
 *
@@ -14,11 +14,13 @@
 * the License.
 */

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

 import android.net.Uri;
 import android.provider.BaseColumns;

+import de.dennisguse.opentracks.content.ContentProviderUtils;
+
 /**
 * Constants for the tracks table.
 *
@@ -14,7 +14,7 @@
 * the License.
 */

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

 import android.location.Location;
 import android.net.Uri;
@@ -35,7 +35,6 @@ public final class Waypoint {
    private String category = "";
    private String icon = "";
    private long trackId = -1L;
-    private WaypointType type = WaypointType.WAYPOINT;
    private double length = 0.0;
    private long duration = 0;
    private long startId = -1L;
@@ -47,13 +46,12 @@ public final class Waypoint {
    public Waypoint() {
    }

-    public Waypoint(String name, String description, String category, String icon, long trackId, WaypointType type, double length, long duration, long startId, long stopId, Location location, TripStatistics tripStatistics, String photoUrl) {
+    public Waypoint(String name, String description, String category, String icon, long trackId, double length, long duration, long startId, long stopId, Location location, TripStatistics tripStatistics, String photoUrl) {
        this.name = name;
        this.description = description;
        this.category = category;
        this.icon = icon;
        this.trackId = trackId;
-        this.type = type;
        this.length = length;
        this.duration = duration;
        this.startId = startId;
@@ -111,14 +109,6 @@ public final class Waypoint {
        this.trackId = trackId;
    }

-    public WaypointType getType() {
-        return type;
-    }
-
-    public void setType(WaypointType type) {
-        this.type = type;
-    }
-
    public double getLength() {
        return length;
    }
@@ -186,8 +176,4 @@ public final class Waypoint {
    public boolean hasPhoto() {
        return photoUrl != null && !"".equals(photoUrl);
    }
-
-    public enum WaypointType {
-        WAYPOINT, STATISTICS
-    }
 }
@@ -14,11 +14,13 @@
 * the License.
 */

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

 import android.net.Uri;
 import android.provider.BaseColumns;

+import de.dennisguse.opentracks.content.ContentProviderUtils;
+
 /**
 * Constants for waypoints table.
 *
@@ -38,7 +40,8 @@ public interface WaypointsColumns extends BaseColumns {
    String CATEGORY = "category"; // waypoint category
    String ICON = "icon"; // waypoint icon
    String TRACKID = "trackid"; // track id
-    String TYPE = "type"; // type
+    @Deprecated //Unused
+            String TYPE = "type"; // type
    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
@@ -5,8 +5,8 @@ public final class SensorDataSet {
    public static final float DATA_UNAVAILABLE = Float.NaN;

    //TODO It might be necessary to consider: if sensor was connected as well.
-    public String sensorName;
-    public String sensorAddress;
+    private String sensorName;
+    private String sensorAddress;
    private float heartRate;
    private float cadence;
    private float power;
@@ -0,0 +1,10 @@
+package de.dennisguse.opentracks.fragments;
+
+public class ChartDistanceFragment extends ChartFragment {
+
+    public static final String CHART_FRAGMENT_TAG = ChartDistanceFragment.class.getSimpleName();
+
+    public ChartDistanceFragment() {
+        super(true);
+    }
+}
@@ -22,25 +22,26 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.widget.ZoomControls;

 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.ChartView;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
 import de.dennisguse.opentracks.content.TrackDataType;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+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;
@@ -54,11 +55,11 @@ import de.dennisguse.opentracks.util.UnitConversions;
 * @author Sandor Dornbush
 * @author Rodrigo Damazio
 */
-public class ChartFragment extends Fragment implements TrackDataListener {
+public abstract class ChartFragment extends Fragment implements TrackDataListener {

-    public static final String CHART_FRAGMENT_TAG = "chartFragment";
+    private static final String STATE_CHART_VIEW_BY_DISTANCE_KEY = "chartViewByDistance";

-    private final ArrayList<double[]> pendingPoints = new ArrayList<>();
+    private final List<double[]> pendingPoints = new ArrayList<>();

    private TrackDataHub trackDataHub;

@@ -68,18 +69,17 @@ public class ChartFragment extends Fragment implements TrackDataListener {

    private boolean metricUnits = true;
    private boolean reportSpeed = true;
-    private int recordingDistanceInterval = PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT;
+    private int recordingDistanceInterval;

    // Modes of operation
-    private boolean chartByDistance = true;
+    private boolean chartByDistance;
    private boolean[] chartShow = new boolean[]{true, true, true, true, true, true};

    // UI elements
    private ChartView chartView;
-    private ZoomControls zoomControls;

    /**
-     * A runnable that will enable/disable zoom controls and orange pointer as appropriate and redraw.
+     * A runnable that will set the orange pointer as appropriate and redraw.
     */
    private final Runnable updateChart = new Runnable() {
        @Override
@@ -88,46 +88,34 @@ public class ChartFragment extends Fragment implements TrackDataListener {
                return;
            }

-            zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
-            zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
            chartView.setShowPointer(isSelectedTrackRecording());
            chartView.invalidate();
        }
    };

+    public ChartFragment(boolean chartByDistance) {
+        this.chartByDistance = chartByDistance;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        /*
-         * Create a chartView here to store data thus won't need to reload all the data on every onStart or onResume.
-         */
-        chartView = new ChartView(getActivity());
+        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.
+        chartView = new ChartView(getContext(), chartByDistance);
    }

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.chart, container, false);
-        zoomControls = view.findViewById(R.id.chart_zoom_controls);
-        zoomControls.setOnZoomInClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                zoomIn();
-            }
-        });
-        zoomControls.setOnZoomOutClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                zoomOut();
-            }
-        });
-        return view;
+        return inflater.inflate(R.layout.chart, container, false);
    }

    @Override
    public void onStart() {
        super.onStart();
-        ViewGroup layout = getActivity().findViewById(R.id.chart_view_layout);
+        ViewGroup layout = getView().findViewById(R.id.chart_view_layout);
        LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
        layout.addView(chartView, layoutParams);
    }
@@ -149,10 +137,24 @@ public class ChartFragment extends Fragment implements TrackDataListener {
    @Override
    public void onStop() {
        super.onStop();
-        ViewGroup layout = getActivity().findViewById(R.id.chart_view_layout);
+        ViewGroup layout = getView().findViewById(R.id.chart_view_layout);
        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()) {
@@ -197,13 +199,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
        }
    }

-    @Override
-    public void onSegmentSplit(Location location) {
-        if (isResumed()) {
-            fillDataPoint(location, null);
-        }
-    }
-
    @Override
    public void onNewTrackPointsDone() {
        if (isResumed()) {
@@ -263,9 +258,8 @@ public class ChartFragment extends Fragment implements TrackDataListener {
            }
            reportSpeed = speed;
            chartView.setReportSpeed(reportSpeed);
-            boolean chartShowSpeed = PreferencesUtils.shouldChartShowSpeed(getActivity());
-            setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed);
-            setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed);
+            setSeriesEnabled(ChartView.SPEED_SERIES, reportSpeed);
+            setSeriesEnabled(ChartView.PACE_SERIES, !reportSpeed);
            runOnUiThread(new Runnable() {
                @Override
                public void run() {
@@ -302,32 +296,14 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     */
    private void checkChartSettings() {
        boolean needUpdate = false;
-        if (chartByDistance != PreferencesUtils.isChartByDistance(getActivity())) {
-            chartByDistance = !chartByDistance;
-            chartView.setChartByDistance(chartByDistance);
-            reloadTrackDataHub();
+
+        if (setSeriesEnabled(ChartView.SPEED_SERIES, reportSpeed)) {
            needUpdate = true;
        }
-        if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.shouldChartShowElevation(getActivity()))) {
+        if (setSeriesEnabled(ChartView.PACE_SERIES, !reportSpeed)) {
            needUpdate = true;
        }

-        boolean chartShowSpeed = PreferencesUtils.shouldChartShowSpeed(getActivity());
-        if (setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed)) {
-            needUpdate = true;
-        }
-        if (setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed)) {
-            needUpdate = true;
-        }
-        if (setSeriesEnabled(ChartView.POWER_SERIES, PreferencesUtils.shouldChartShowPower(getActivity()))) {
-            needUpdate = true;
-        }
-        if (setSeriesEnabled(ChartView.CADENCE_SERIES, PreferencesUtils.shouldChartShowCadence(getActivity()))) {
-            needUpdate = true;
-        }
-        if (setSeriesEnabled(ChartView.HEART_RATE_SERIES, PreferencesUtils.shouldChartShowHeartRate(getActivity()))) {
-            needUpdate = true;
-        }
        if (needUpdate) {
            chartView.postInvalidate();
        }
@@ -388,18 +364,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
        }
    }

-    private void zoomIn() {
-        chartView.zoomIn();
-        zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
-        zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
-    }
-
-    private void zoomOut() {
-        chartView.zoomOut();
-        zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
-        zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
-    }
-
    /**
     * Runs a runnable on the UI thread if possible.
     *
@@ -0,0 +1,10 @@
+package de.dennisguse.opentracks.fragments;
+
+public class ChartTimeFragment extends ChartFragment {
+
+    public static final String CHART_FRAGMENT_TAG = ChartTimeFragment.class.getSimpleName();
+
+    public ChartTimeFragment() {
+        super(false);
+    }
+}
@@ -28,7 +28,6 @@ import androidx.fragment.app.FragmentManager;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
 import de.dennisguse.opentracks.util.DialogUtils;

 /**
@@ -81,10 +80,9 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
                        new Thread(new Runnable() {
                            @Override
                            public void run() {
-                                ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(fragmentActivity);
+                                ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
                                for (long markerId : markerIds) {
-                                    contentProviderUtils.deleteWaypoint(fragmentActivity,
-                                            markerId, new DescriptionGeneratorImpl(fragmentActivity));
+                                    contentProviderUtils.deleteWaypoint(fragmentActivity, markerId);
                                }
                                caller.onDeleteMarkerDone();
                            }
@@ -41,12 +41,10 @@ import androidx.fragment.app.FragmentActivity;
 import de.dennisguse.opentracks.MarkerEditActivity;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
-import de.dennisguse.opentracks.util.StatsUtils;
+import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.UnitConversions;

@@ -62,7 +60,7 @@ public class MarkerDetailFragment extends Fragment {
    private static final long HIDE_TEXT_DELAY = 4 * UnitConversions.ONE_SECOND;
    private ContentProviderUtils contentProviderUtils;
    private Handler handler;
-    private ImageView photo;
+    private ImageView photoView;
    private ImageView textGradient;
    private LinearLayout waypointInfo;
    private Waypoint waypoint;
@@ -110,7 +108,7 @@ public class MarkerDetailFragment extends Fragment {
            getFragmentManager().popBackStack();
            return;
        }
-        contentProviderUtils = ContentProviderUtils.Factory.get(getActivity());
+        contentProviderUtils = new ContentProviderUtils(getActivity());
        handler = new Handler();
        setHasOptionsMenu(true);
    }
@@ -119,11 +117,11 @@ public class MarkerDetailFragment extends Fragment {
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.marker_detail_fragment, container, false);

-        photo = view.findViewById(R.id.marker_detail_waypoint_photo);
+        photoView = view.findViewById(R.id.marker_detail_waypoint_photo);
        textGradient = view.findViewById(R.id.marker_detail_waypoint_text_gradient);
        waypointInfo = view.findViewById(R.id.marker_detail_waypoint_info);

-        photo.setOnClickListener(new View.OnClickListener() {
+        photoView.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                handler.removeCallbacks(hideText);
@@ -156,11 +154,8 @@ public class MarkerDetailFragment extends Fragment {
    @Override
    public void setMenuVisibility(boolean menuVisible) {
        super.setMenuVisibility(menuVisible);
-        /*
-         * View pager caches the neighboring fragments in the resumed state. If
-         * becoming visible from the resumed state, update the UI to display the
-         * text above the image.
-         */
+        // View pager caches the neighboring fragments in the resumed state.
+        // If becoming visible from the resumed state, update the UI to display the text above the image.
        if (isResumed()) {
            if (menuVisible) {
                updateUi();
@@ -214,47 +209,25 @@ public class MarkerDetailFragment extends Fragment {
        }
    }

-    /**
-     * Updates the UI.
-     */
    private void updateUi() {
-        View waypointView = getView().findViewById(R.id.marker_detail_waypoint);
-        View statisticsView = getView().findViewById(R.id.marker_detail_statistics);
-
-        boolean isWaypoint = waypoint.getType() == WaypointType.WAYPOINT;
-        waypointView.setVisibility(isWaypoint ? View.VISIBLE : View.GONE);
-        statisticsView.setVisibility(isWaypoint ? View.GONE : View.VISIBLE);
-
-        if (isWaypoint) {
-            boolean hasPhoto = waypoint.hasPhoto();
-            photo.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
-            textGradient.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
-            waypointInfo.setVisibility(View.VISIBLE);
-
-            if (hasPhoto) {
-                handler.removeCallbacks(hideText);
-                photo.setImageURI(waypoint.getPhotoURI());
-                handler.postDelayed(hideText, HIDE_TEXT_DELAY);
-            }
-
-            setName(R.id.marker_detail_waypoint_name, hasPhoto);
-
-            TextView category = getView().findViewById(R.id.marker_detail_waypoint_category);
-            ListItemUtils.setTextView(getActivity(), category, StringUtils.getCategory(waypoint.getCategory()), hasPhoto);
-
-            TextView description = getView().findViewById(R.id.marker_detail_waypoint_description);
-            ListItemUtils.setTextView(getActivity(), description, waypoint.getDescription(), hasPhoto);
-
-            setLocation(R.id.marker_detail_waypoint_location, hasPhoto);
+        boolean hasPhoto = waypoint.hasPhoto();
+        if (hasPhoto) {
+            handler.removeCallbacks(hideText);
+            photoView.setImageURI(waypoint.getPhotoURI());
+            handler.postDelayed(hideText, HIDE_TEXT_DELAY);
        } else {
-            setName(R.id.marker_detail_statistics_name, false);
-
-            setLocation(R.id.marker_detail_statistics_location, false);
-
-            Track track = contentProviderUtils.getTrack(waypoint.getTrackId());
-            StatsUtils.setTripStatisticsValues(getActivity(), waypoint.getTripStatistics(), null);
-            StatsUtils.setLocationValues(getActivity(), waypoint.getLocation(), false);
+            photoView.setImageResource(MarkerUtils.ICON_ID);
        }
+
+        setName(R.id.marker_detail_waypoint_name, hasPhoto);
+
+        TextView category = getView().findViewById(R.id.marker_detail_waypoint_category);
+        ListItemUtils.setTextView(getActivity(), category, StringUtils.getCategory(waypoint.getCategory()), hasPhoto);
+
+        TextView description = getView().findViewById(R.id.marker_detail_waypoint_description);
+        ListItemUtils.setTextView(getActivity(), description, waypoint.getDescription(), hasPhoto);
+
+        setLocation(R.id.marker_detail_waypoint_location, hasPhoto);
    }

    private void setName(int resId, boolean addShadow) {
@@ -20,33 +20,36 @@ import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
+import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Spinner;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;

 import java.util.EnumSet;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
-import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
 import de.dennisguse.opentracks.content.TrackDataType;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.ITrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.StatsUtils;
+import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.UnitConversions;

@@ -60,37 +63,136 @@ public class StatsFragment extends Fragment implements TrackDataListener {

    public static final String STATS_FRAGMENT_TAG = StatsFragment.class.getSimpleName();

+    private static final long UI_UPDATE_INTERVAL = UnitConversions.ONE_SECOND;
+
    private TrackDataHub trackDataHub;
    private Handler handlerUpdateUI;

+    //TODO Initialize immediately and remove in onDestroy()
    private TrackRecordingServiceConnection trackRecordingServiceConnection;

    private Location lastLocation = null;
    private TripStatistics lastTripStatistics = null;

-    private final Runnable updateUIeachSecond = new Runnable() {
-        public void run() {
-            if (isResumed() && isSelectedTrackRecording()) {
-                if (!isSelectedTrackPaused() && lastTripStatistics != null) {
-                    StatsUtils.setTotalTimeValue(getActivity(), System.currentTimeMillis() - lastTripStatistics.getStopTime() + lastTripStatistics.getTotalTime());
-                    updateSensorDataUI();
-                }
-
-                handlerUpdateUI.postDelayed(this, UnitConversions.ONE_SECOND);
-            }
-        }
-    };
    private String category = "";
-    private int recordingGpsAccuracy = PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT;
+    private int recordingGpsAccuracy;

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        return inflater.inflate(R.layout.stats, container, false);
    }

+    /* Views */
+    private View sensorContainerView;
+    private TextView heartRateValueView;
+    private TextView heartRateSensorView;
+
+    private TextView totalTimeValueView;
+    private final Runnable updateUIeachSecond = new Runnable() {
+        public void run() {
+            if (isResumed() && isSelectedTrackRecording()) {
+                if (!isSelectedTrackPaused() && lastTripStatistics != null) {
+                    updateTotalTime();
+                    updateSensorDataUI();
+                }
+
+                handlerUpdateUI.postDelayed(this, UI_UPDATE_INTERVAL);
+            }
+        }
+    };
+    private TextView distanceValue;
+    private TextView distanceUnit;
+    private View activityLabel;
+    private Spinner activitySpinner;
+    private TextView movingTimeValue;
+    private TextView speedAvgLabel;
+    private TextView speedAvgValue;
+    private TextView speedAvgUnit;
+    private TextView speedMaxLabel;
+    private TextView speedMaxValue;
+    private TextView speedMaxUnit;
+    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 speedContainer;
+    private TextView speedLabel;
+    private TextView speedValue;
+    private TextView speedUnit;
+    private View elevationContainer;
+    private TextView elevationValue;
+    private TextView elevationUnit;
+    private View coordinateSeparator;
+    private View coordinateContainer;
+    private TextView latitudeValue;
+    private TextView longitudeValue;
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        sensorContainerView = view.findViewById(R.id.stats_sensor_container);
+        heartRateValueView = view.findViewById(R.id.stats_sensor_heart_rate_value);
+        heartRateSensorView = view.findViewById(R.id.stats_sensor_heart_rate_sensor_value);
+
+        totalTimeValueView = view.findViewById(R.id.stats_total_time_value);
+
+        distanceValue = view.findViewById(R.id.stats_distance_value);
+        distanceUnit = view.findViewById(R.id.stats_distance_unit);
+
+        activityLabel = view.findViewById(R.id.stats_activity_type_label);
+        activitySpinner = view.findViewById(R.id.stats_activity_type_icon);
+
+        movingTimeValue = view.findViewById(R.id.stats_moving_time_value);
+
+        speedAvgLabel = view.findViewById(R.id.stats_average_speed_label);
+        speedAvgValue = view.findViewById(R.id.stats_average_speed_value);
+        speedAvgUnit = view.findViewById(R.id.stats_average_speed_unit);
+
+        speedMaxLabel = view.findViewById(R.id.stats_max_speed_label);
+        speedMaxValue = view.findViewById(R.id.stats_max_speed_value);
+        speedMaxUnit = view.findViewById(R.id.stats_max_speed_unit);
+
+        speedMovingLabel = view.findViewById(R.id.stats_moving_speed_label);
+        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);
+
+        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);
+
+        coordinateSeparator = view.findViewById(R.id.stats_coordinate_separator);
+        coordinateContainer = view.findViewById(R.id.stats_coordinate_container);
+
+        latitudeValue = view.findViewById(R.id.stats_latitude_value);
+        longitudeValue = view.findViewById(R.id.stats_longitude_value);
+    }
+
    @Override
    public void onActivityCreated(Bundle savedInstanceState) {
        super.onActivityCreated(savedInstanceState);
+
+        recordingGpsAccuracy = Integer.parseInt(getContext().getResources().getString(R.string.recording_gps_accuracy_default));
+
        handlerUpdateUI = new Handler();

        Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
@@ -123,10 +225,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        trackRecordingServiceConnection = new TrackRecordingServiceConnection(getContext(), null);
        trackRecordingServiceConnection.startConnection(getContext());

-        updateUi(getActivity());
-        if (isSelectedTrackRecording()) {
-            handlerUpdateUI.post(updateUIeachSecond);
-        }
+        handlerUpdateUI.post(updateUIeachSecond);
    }

    @Override
@@ -139,10 +238,66 @@ public class StatsFragment extends Fragment implements TrackDataListener {
    @Override
    public void onStop() {
        super.onStop();
-        trackRecordingServiceConnection.unbind();
+        if (trackRecordingServiceConnection != null) {
+            trackRecordingServiceConnection.unbind(getContext());
+        }
        trackRecordingServiceConnection = null;
    }

+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        sensorContainerView = null;
+        heartRateValueView = null;
+        heartRateSensorView = null;
+
+        totalTimeValueView = null;
+
+        distanceValue = null;
+        distanceUnit = null;
+
+        activityLabel = null;
+        activitySpinner = null;
+
+        movingTimeValue = null;
+
+        speedAvgLabel = null;
+        speedAvgValue = null;
+        speedAvgUnit = null;
+
+        speedMaxLabel = null;
+        speedMaxValue = null;
+        speedMaxUnit = null;
+
+        speedMovingLabel = null;
+        speedMovingValue = null;
+        speedMovingUnit = null;
+
+        gradeElevationSeparator = null;
+        gradeElevationContainer = null;
+
+        elevationMinValue = null;
+        elevationMinUnit = null;
+
+        elevationMaxValue = null;
+        elevationMaxUnit = null;
+
+        speedContainer = null;
+        speedLabel = null;
+        speedValue = null;
+        speedUnit = null;
+
+        elevationContainer = null;
+        elevationValue = null;
+        elevationUnit = null;
+
+        coordinateSeparator = null;
+        coordinateContainer = null;
+
+        latitudeValue = null;
+        longitudeValue = null;
+    }
+
    @Override
    public void onTrackUpdated(final Track track) {
        if (isResumed()) {
@@ -152,7 +307,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
                    if (isResumed()) {
                        lastTripStatistics = track != null ? track.getTripStatistics() : null;
                        category = track != null ? track.getCategory() : "";
-                        updateUi(getActivity());
+                        updateUI();
                    }
                }
            });
@@ -174,11 +329,6 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        lastLocation = location;
    }

-    @Override
-    public void onSegmentSplit(Location location) {
-        // We don't care.
-    }
-
    @Override
    public void onNewTrackPointsDone() {
        if (isResumed()) {
@@ -198,7 +348,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
                                lastLocation = null;
                            }
                        }
-                        StatsUtils.setLocationValues(getActivity(), lastLocation, isSelectedTrackRecording());
+                        setLocationValues();
                    }
                }
            });
@@ -227,7 +377,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
                @Override
                public void run() {
                    if (isResumed()) {
-                        updateUi(getActivity());
+                        updateUI();
                    }
                }
            });
@@ -242,7 +392,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
                @Override
                public void run() {
                    if (isResumed()) {
-                        updateUi(getActivity());
+                        updateUI();
                    }
                }
            });
@@ -298,6 +448,12 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        return trackDataHub != null && trackDataHub.isSelectedTrackPaused();
    }

+    private void updateUI() {
+        updateStats();
+        setLocationValues();
+        updateSensorDataUI();
+    }
+
    /**
     * Tries to fetch most recent {@link SensorDataSet} {@link de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager}.
     */
@@ -312,16 +468,176 @@ public class StatsFragment extends Fragment implements TrackDataListener {
            sensorDataSet = trackRecordingService.getSensorData();
        }

-        StatsUtils.setSensorData(getActivity(), sensorDataSet, isSelectedTrackRecording());
+        setHeartRateSensorData(sensorDataSet, isSelectedTrackRecording());
    }

-    /**
-     * Updates the UI.
-     */
-    private void updateUi(FragmentActivity activity) {
-        String trackIconValue = TrackIconUtils.getIconValue(activity, category);
-        StatsUtils.setTripStatisticsValues(activity, lastTripStatistics, trackIconValue);
-        StatsUtils.setLocationValues(activity, lastLocation, isSelectedTrackRecording());
-        updateSensorDataUI();
+    private void setHeartRateSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
+        // heart rate
+        int isVisible = View.VISIBLE;
+        if (!isRecording || PreferencesUtils.isBluetoothHeartRateSensorAddressDefault(getContext())) {
+            isVisible = View.INVISIBLE;
+        }
+        sensorContainerView.setVisibility(isVisible);
+
+        if (isRecording) {
+            String heartRate = 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);
+                }
+            }
+
+            heartRateSensorView.setText(sensorName);
+            heartRateValueView.setText(heartRate);
+        }
+    }
+
+    private void updateStats() {
+        String trackIconValue = TrackIconUtils.getIconValue(getContext(), category);
+
+        boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
+        boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext());
+        boolean isRecording = isSelectedTrackRecording();
+
+        // Set total distance
+        {
+            double totalDistance = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getTotalDistance();
+            Pair<String, String> parts = StringUtils.getDistanceParts(getContext(), totalDistance, metricUnits);
+
+            distanceValue.setText(parts.first);
+            distanceUnit.setText(parts.second);
+        }
+
+        // Set activity type
+        {
+            activityLabel.setVisibility(trackIconValue != null ? View.VISIBLE : View.GONE);
+
+            activitySpinner.setVisibility(trackIconValue != null ? View.VISIBLE : View.GONE);
+            activitySpinner.setEnabled(isRecording);
+            if (trackIconValue != null) {
+                TrackIconUtils.setIconSpinner(activitySpinner, trackIconValue);
+            }
+        }
+
+        // Set time
+        if (lastTripStatistics != null) {
+            movingTimeValue.setText(StringUtils.formatElapsedTime(lastTripStatistics.getMovingTime()));
+            updateTotalTime();
+        }
+
+        // Set average speed/pace
+        {
+            double speed = lastTripStatistics != null ? lastTripStatistics.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);
+            speedAvgValue.setText(parts.first);
+            speedAvgUnit.setText(parts.second);
+        }
+
+        // Set max speed/pace
+        {
+            double speed = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getMaxSpeed();
+
+            speedMaxLabel.setText(reportSpeed ? R.string.stats_max_speed : R.string.stats_fastest_pace);
+
+            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
+            speedMaxValue.setText(parts.first);
+            speedMaxUnit.setText(parts.second);
+        }
+
+        // Set moving speed/pace
+        {
+            double speed = lastTripStatistics != null ? lastTripStatistics.getAverageMovingSpeed() : Double.NaN;
+
+            speedMovingLabel.setText(reportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace);
+
+            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
+            speedMovingValue.setText(parts.first);
+            speedMovingUnit.setText(parts.second);
+        }
+
+
+        // Set elevation
+        {
+            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);
+                }
+            }
+        }
+    }
+
+    private void updateTotalTime() {
+        long totalTime;
+        if (isSelectedTrackRecording()) {
+            totalTime = System.currentTimeMillis() - lastTripStatistics.getStopTime() + lastTripStatistics.getTotalTime();
+        } else {
+            totalTime = lastTripStatistics.getTotalTime();
+        }
+        totalTimeValueView.setText(StringUtils.formatElapsedTime(totalTime));
+    }
+
+    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);
+        }
+
+        // Set elevation
+        boolean showGradeElevation = isRecording && PreferencesUtils.isShowStatsGradeElevation(getContext());
+        elevationContainer.setVisibility(showGradeElevation ? View.VISIBLE : View.GONE);
+
+        if (showGradeElevation) {
+            double altitude = lastLocation != null && lastLocation.hasAltitude() ? lastLocation.getAltitude() : Double.NaN;
+            Pair<String, String> parts = StringUtils.formatElevation(getContext(), altitude, metricUnits);
+
+            elevationValue.setText(parts.first);
+            elevationUnit.setText(parts.second);
+        }
+
+        // Set coordinate
+        boolean showCoordinate = isRecording && PreferencesUtils.isStatsShowCoordinate(getContext());
+
+        coordinateSeparator.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
+        coordinateContainer.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
+        if (showCoordinate) {
+            double latitude = lastLocation != null ? lastLocation.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;
+            String longitudeText = Double.isNaN(longitude) || Double.isInfinite(longitude) ? getContext().getString(R.string.value_unknown) : StringUtils.formatCoordinate(longitude);
+            longitudeValue.setText(longitudeText);
+        }
    }
 }
@@ -6,7 +6,7 @@ import java.util.Locale;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.io.file.exporter.FileTrackExporter;
 import de.dennisguse.opentracks.io.file.exporter.GpxTrackWriter;
 import de.dennisguse.opentracks.io.file.exporter.KmlTrackWriter;
@@ -146,7 +146,7 @@ public enum TrackFileFormat {
        }

        public TrackExporter newTrackExporter(Context context, Track[] tracks, TrackExporterListener trackExporterListener) {
-            return newKmzTrackExporter(context, this.newTrackWriter(context, tracks.length > 1), tracks, trackExporterListener, exportPhotos);
+            return newKmzTrackExporter(context, newTrackWriter(context, tracks.length > 1), tracks, trackExporterListener, exportPhotos);
        }

        public String getExtension() {
@@ -173,10 +173,12 @@ public enum TrackFileFormat {

    private static final String MIME_KML = "application/vnd.google-earth.kml+xml";

-    public TrackExporter newTrackExporter(Context context, Track[] tracks, TrackExporterListener trackExporterListener) {
-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
-        TrackWriter trackWriter = this.newTrackWriter(context, tracks.length > 1);
-        return new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
+    private static TrackExporter newKmzTrackExporter(Context context, TrackWriter trackWriter, Track[] tracks, TrackExporterListener trackExporterListener, boolean exportPhotos) {
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
+
+        FileTrackExporter fileTrackExporter = new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
+
+        return new KmzTrackExporter(contentProviderUtils, fileTrackExporter, tracks, exportPhotos);
    }

    /**
@@ -184,12 +186,10 @@ public enum TrackFileFormat {
     */
    public abstract String getMimeType();

-    private static TrackExporter newKmzTrackExporter(Context context, TrackWriter trackWriter, Track[] tracks, TrackExporterListener trackExporterListener, boolean exportPhotos) {
-        ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
-
-        FileTrackExporter fileTrackExporter = new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
-
-        return new KmzTrackExporter(contentProviderUtils, fileTrackExporter, tracks, exportPhotos);
+    public TrackExporter newTrackExporter(Context context, Track[] tracks, TrackExporterListener trackExporterListener) {
+        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
+        TrackWriter trackWriter = newTrackWriter(context, tracks.length > 1);
+        return new FileTrackExporter(contentProviderUtils, trackWriter, tracks, trackExporterListener);
    }

    /**
@@ -103,16 +103,8 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr
        }

        directoryDisplayName = FileUtils.getPathDisplayName(trackFileFormat.getExtension());
-
-        //TODO (still needed?): getLastNonConfiguration instance returned ExportAsyncTask before
-//        Object retained = getLastNonConfigurationInstance();
-//        if (retained instanceof ExportAsyncTask) {
-//            exportAsyncTask = (ExportAsyncTask) retained;
-//            exportAsyncTask.setActivity(this);
-//        } else {
        exportAsyncTask = new ExportAsyncTask(this, trackFileFormat, directory);
        exportAsyncTask.execute();
-//        }
    }

    @Override
@@ -28,8 +28,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -68,7 +68,7 @@ public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
        this.trackFileFormat = trackFileFormat;
        this.directory = directory;
        context = exportActivity.getApplicationContext();
-        contentProviderUtils = ContentProviderUtils.Factory.get(context);
+        contentProviderUtils = new ContentProviderUtils(context);

        completed = false;
        processedTrackCount = 0;
@@ -26,10 +26,11 @@ import androidx.annotation.NonNull;
 import java.io.OutputStream;

 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.LocationFactory;
+import de.dennisguse.opentracks.content.LocationIterator;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.LocationUtils;

 /**
@@ -63,7 +64,7 @@ public class FileTrackExporter implements TrackExporter {
    }

    @Override
-    public boolean writeTrack(Context context, @NonNull OutputStream outputStream) {
+    public boolean writeTrack(@NonNull Context context, @NonNull OutputStream outputStream) {
        try {
            trackWriter.prepare(outputStream);
            trackWriter.writeHeader(tracks);
@@ -98,7 +99,6 @@ public class FileTrackExporter implements TrackExporter {
        boolean hasWaypoints = false;
        try (Cursor cursor = contentProviderUtils.getWaypointCursor(track.getId(), -1L, ContentProviderUtils.MAX_LOADED_WAYPOINTS_POINTS)) {
            if (cursor != null && cursor.moveToFirst()) {
-                // Intentionally skip first waypoint (contains statistics).
                for (int i = 0; i < cursor.getCount(); i++) {
                    if (Thread.interrupted()) {
                        throw new InterruptedException();
@@ -209,7 +209,7 @@ public class FileTrackExporter implements TrackExporter {
     *
     * @author Jimmy Shih
     */
-    private class TrackWriterLocationFactory implements ContentProviderUtils.LocationFactory {
+    private class TrackWriterLocationFactory extends LocationFactory {
        Location currentLocation;
        Location lastLocation;

@@ -23,8 +23,8 @@ import java.io.PrintWriter;
 import java.text.NumberFormat;
 import java.util.Locale;

-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.StringUtils;

 /**
@@ -119,12 +119,9 @@ public class GpxTrackWriter implements TrackWriter {
                if (location.hasAltitude()) {
                    printWriter.println("<ele>" + ELEVATION_FORMAT.format(location.getAltitude()) + "</ele>");
                }
-                printWriter.println(
-                        "<time>" + StringUtils.formatDateTimeIso8601(location.getTime()) + "</time>");
+                printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(location.getTime()) + "</time>");
                printWriter.println("<name>" + StringUtils.formatCData(waypoint.getName()) + "</name>");
-                printWriter.println("<cmt>" + StringUtils.formatCData(waypoint.getType().name()) + "</cmt>");
-                printWriter.println(
-                        "<desc>" + StringUtils.formatCData(waypoint.getDescription()) + "</desc>");
+                printWriter.println("<desc>" + StringUtils.formatCData(waypoint.getDescription()) + "</desc>");
                printWriter.println("<type>" + StringUtils.formatCData(waypoint.getCategory()) + "</type>");
                printWriter.println("</wpt>");
            }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dennis Guse	931574bc11	Release v3.2.11	2019-12-25 10:19:22 +01:00
Dennis Guse	caddbd8501	MarkerDetailActivity: removed leftover statistic functionality.	2019-12-23 21:44:22 +01:00
Dennis Guse	8ece2c8612	Removed WaypointCreationRequest.	2019-12-23 21:39:37 +01:00
Dennis Guse	3a219321d1	Removed country-specific translations that are identical.	2019-12-23 07:43:05 +01:00
Dennis Guse	35cb924a17	StatsFragment: show elevation without decimal digits.	2019-12-22 20:39:43 +01:00
Dennis Guse	b67e5bbd20	StatsFragment: left align current elevation.	2019-12-22 20:33:23 +01:00
Dennis Guse	1db275230e	Bugfix: crash on opening heart rate sensor dialog (settings).	2019-12-22 19:09:01 +01:00
Dennis Guse	5ac72092fb	Test: export and import tracks via KML and GPX; now includes waypoints. TripStatistics is not tested.	2019-12-22 18:59:23 +01:00
Dennis Guse	bdd9ded1e8	Test: export and import tracks via KML and GPX. KML now exports track icon (name; not the url).	2019-12-22 18:59:23 +01:00
Dennis Guse	759aeb6ed6	Removed DescriptionGenerator interface.	2019-12-22 18:59:23 +01:00
Dennis Guse	12023d51ae	Move data classes into separate package.	2019-12-22 18:59:23 +01:00
Dennis Guse	c426785b90	Cleanup.	2019-12-22 18:59:23 +01:00
Dennis Guse	09d960c7a1	First waypoint of a track does not store the statistics of the track.	2019-12-22 18:59:23 +01:00
Dennis Guse	f37fe4a503	Removed WaypointType.	2019-12-22 18:59:23 +01:00
Dennis Guse	013e56bef0	Replaced TabHost by Material design TabsLayout.	2019-12-22 18:59:23 +01:00
Dennis Guse	d6835ba766	TrackRecordingService does not save the context.	2019-12-22 18:59:23 +01:00
Dennis Guse	d7890cbc81	Shortened fr-FR short description. Thanks to Edern.	2019-12-17 20:35:41 +01:00
Dennis Guse	2b6886c534	Update release procedure.	2019-12-16 22:41:16 +01:00
Dennis Guse	e77590a125	Release v3.2.10	2019-12-15 22:11:19 +01:00
Dennis Guse	ca330b2d80	Cleanup.	2019-12-15 21:28:03 +01:00
Dennis Guse	20f1524701	Cleanup.	2019-12-15 17:09:44 +01:00
Dennis Guse	96b2a15643	Bugfix: import and export on Android 10 requires requesting (privacy-unfriendly) legacy behavior.	2019-12-15 16:50:13 +01:00
Dennis Guse	ad59392e02	Fix travisCI.	2019-12-14 23:58:43 +01:00
Dennis Guse	29f92b887c	Fixed TrackRecordingService.insertWaypoint() to allow deprecated behavior.	2019-12-14 23:55:04 +01:00
Dennis Guse	46328211c2	Added promotion sticker.	2019-12-14 23:55:04 +01:00
Dennis Guse	3760130d1f	Github: add donation.	2019-12-14 23:42:07 +01:00
Dennis Guse	1094827fac	TrackListActivity: fixed landscape layout.	2019-12-11 23:05:31 +01:00
Dennis Guse	36fcb44af5	TripRecordingService: removed unused trip statistics marker updater.	2019-12-11 23:05:31 +01:00
Dennis Guse	a683fbac4b	Device reboot: do not restart a not successfully ended track recording.	2019-12-11 23:05:31 +01:00
Dennis Guse	64ad9019d1	ChartView: is not configurable anymore.	2019-12-11 23:05:31 +01:00
Dennis Guse	1e80d5c8a8	ChartView: draw waypoints (again). Functionality was (accidentally) removed in `5a264c5c53`	2019-12-11 23:05:31 +01:00
Matthias Lisin	ac765b1ee8	Revert duration hint to MAY_DUCK. Pass OnAudioFocusChangeListener to abandonAudioFocus	2019-12-10 12:58:57 +01:00
Dennis Guse	850c4f0a9a	TravisCI: disabled non-functioning installation of Android emulator.	2019-12-10 06:53:22 +01:00
Dennis Guse	4c32999752	Add Google Play link.	2019-12-10 06:50:58 +01:00
Dennis Guse	76823b167a	TrackListActivity: removed delete all from action menu.	2019-12-08 13:12:15 +01:00
Dennis Guse	9994cfd260	Bugfix: NPE.	2019-12-07 13:37:06 +01:00
Dennis Guse	1750236474	Added automation for Google Play publication (using fastlane).	2019-12-06 22:26:40 +01:00
Dennis Guse	fed6e31f9e	Cleanup.	2019-12-06 08:00:20 +01:00
Dennis Guse	9bafc7d4a1	Release v3.2.9	2019-12-04 19:57:27 +01:00
Dennis Guse	be58b48d20	Bugfix: StatsFragment (onResume and track was recording) overwrote in the total time UI until next UI update.	2019-12-03 22:21:45 +01:00
Dennis Guse	303abac980	Removed READ_PHONE_STATE permission and use AudioManager.MODE_IN_CALL instead.	2019-12-03 22:01:01 +01:00
Dennis Guse	d1a459efc2	Get audio focus onStart.	2019-12-03 20:28:22 +01:00
Dennis Guse	96069e6f09	Cleanup.	2019-12-03 20:24:57 +01:00
Dennis Guse	301a721329	Settings: localize no heart rate sensor selected.	2019-12-03 19:53:14 +01:00
Dennis Guse	e8c6801a32	Refactor StatsFragment.	2019-12-03 19:19:19 +01:00
Dennis Guse	355f3ef614	Added "screen always on"-feature to TrackDetailActivity. And the "show on lockscreen"-feature is only used while recording.	2019-12-03 16:57:56 +01:00
Dennis Guse	eaa6083586	Bugfix: Heart rate was not shown in stats.	2019-12-03 07:31:29 +01:00
Dennis Guse	a0c5d02c51	Fixed and removed device features (AndroidManifest).	2019-12-03 07:31:29 +01:00
Dennis Guse	76f9f5fc82	MarkerDetailFragment now shows the blue pin as default image.	2019-12-03 07:31:29 +01:00
Dennis Guse	8e2598e93b	Removed split markers.	2019-12-03 07:31:24 +01:00
Dennis Guse	c0672c41df	Bugfix: crash if heart rate sensor was null (i.e., preference not initialized).	2019-11-29 23:18:49 +01:00
Dennis Guse	4c6601fbc5	Release v3.2.8	2019-11-29 22:58:22 +01:00
edern-appere	b99c87d1bd	Added French translation for Fdroid.	2019-11-29 22:46:43 +01:00
Dennis Guse	66ffbfe951	Fixed ChartFragment tests. Initialization of looper was missing.	2019-11-29 22:43:51 +01:00
Dennis Guse	8cb01a1027	Bugfix: sharing a track was not adding the file(s). While migrating to enable sharing multiple tracks a configuration option was missed.	2019-11-29 22:39:36 +01:00
Dennis Guse	193e5eccbb	Cleanup.	2019-11-29 22:39:36 +01:00
Dennis Guse	bf7fc28bb0	Bugfix: picture name suffixes were malformed on export and thus could not be re-imported.	2019-11-29 22:39:31 +01:00
Dennis Guse	e35cbc343a	Add pull request template.	2019-11-29 07:54:39 +01:00
Dennis Guse	1c7b053c8c	Fixed MarkerDetailActivity. The orientation of the layout was not set and thus adding the toolbar broke the UI.	2019-11-28 18:09:11 +01:00
Dennis Guse	88cdcd4b47	Use GestureDetector rather than doing it on our own.	2019-11-27 21:42:05 +01:00
Dennis Guse	1432fed8f9	Removed zoom controls for ChartFragment.	2019-11-27 21:41:53 +01:00
Dennis Guse	a14307b9a4	Moved Chart* into own package.	2019-11-27 20:19:12 +01:00
Dennis Guse	3bdce5aa08	Cleanup: use autocloseable.	2019-11-25 23:09:08 +01:00
Dennis Guse	d7526f93b8	Cleanup: removed ContentProviderUtils interface.	2019-11-25 23:02:48 +01:00
Dennis Guse	8932578b90	Release v3.2.7	2019-11-25 22:03:40 +01:00
Dennis Guse	631ac9881d	Wrap help into PreferenceCategory.	2019-11-25 22:03:02 +01:00
Dennis Guse	78334ed797	Fixed Spanish project description (short); was still German.	2019-11-24 21:12:07 +01:00
Dennis Guse	b06da89654	Show chart for distance as well as time. Also removed configuration option.	2019-11-24 19:55:00 +01:00
Dennis Guse	d6c2e78993	Cleanup.	2019-11-24 18:48:31 +01:00
Dennis Guse	67d1ac551d	Show GPS accuracy while recording in the notification of the TrackRecordingService and notify if accuracy goes beyond configured threshold.	2019-11-24 18:44:04 +01:00
Dennis Guse	dcb6be717d	Cleanup.	2019-11-23 22:46:39 +01:00
Dennis Guse	f2c04eec1a	Add help activity. Can be accessed from Settings.	2019-11-23 21:43:07 +01:00
Dennis Guse	a08311cf43	Temporary bugfix: disable landscape mode for TrackListActivity.	2019-11-22 07:44:01 +01:00
Dennis Guse	1e28f3aa86	Add TTSUtils. (required by previous commit)	2019-11-22 07:43:19 +01:00
Dennis Guse	426af41f2c	Move TTS stream definition into one place.	2019-11-20 19:27:41 +01:00
Dennis Guse	fd08a219f9	Add Spanish store description.	2019-11-20 19:13:21 +01:00
Dennis Guse	25b6aec0e9	Release v3.2.6	2019-11-19 22:09:10 +01:00
Dennis Guse	3e40209d15	Refactoring.	2019-11-19 08:00:12 +01:00
Dennis Guse	54ff94f905	Settings: renamed Bluetooth sensor to "Heart rate".	2019-11-18 17:16:50 +01:00
Dennis Guse	7a4faf6b0d	Fixed SettingsActivity.	2019-11-18 17:13:42 +01:00
Dennis Guse	8922b00a5f	README: add screenshots.	2019-11-17 18:45:29 +01:00
Dennis Guse	702efa8693	Removed shortcut to Android's Bluetooth settings.	2019-11-17 18:25:01 +01:00
Dennis Guse	e7a8c897a3	Settings: scan for Bluetooth sensors rather than using bonded devices. Bonded devices do no provide information what services (e.g., heart rate) they support.	2019-11-17 18:24:02 +01:00
Dennis Guse	c59d1d87bd	Bluetooth: move getting adapter to BluetoothUtils.	2019-11-17 18:23:08 +01:00
Dennis Guse	a706efb8b3	Bugfix.	2019-11-14 18:30:57 +01:00
Dennis Guse	e391e83a00	Build: show version and tag in about page.	2019-11-14 18:04:50 +01:00
Dennis Guse	2940bf20d8	Settings: remove all defaults from code.	2019-11-12 21:33:04 +01:00
Dennis Guse	081db5a58b	Settings: remove default setting for default activity.	2019-11-12 21:33:04 +01:00
				`@@ -0,0 +1 @@`
				`OpenTracks es un tracker deportivo que respeta tu privacidad.`
				`@@ -0,0 +1 @@`
				`OpenTracks - Suivi d'activités sportives respectueux de votre vie privée.`