Release v3.8.0

GPX import/export: speed via TrackPointExtension/v2.
Fixed data type for heartrate/speed (no decimals) allowed. Fixes #335. Fixes #181. GPXTrackWriter: set Trackpointv2 header correctly and export time in correct sequence.
2020-07-24 22:22:48 +02:00 · 2020-07-24 22:06:58 +02:00 · 2020-07-24 22:06:58 +02:00 · 2020-07-21 19:44:39 +02:00 · 2020-07-21 19:43:51 +02:00 · 2020-07-20 20:46:41 +02:00
151 changed files with 4775 additions and 2216 deletions
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
@@ -51,13 +51,19 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
 __Only required permissions:__
 * _ACCESS_FINE_LOCATION_: required to use the GPS.

+An overview of Bluetooth LE sensors that are known to work with OpenTracks is in [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md).
+
 _Please note:_
 _OpenTracks_ 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.  

-## Custom Dashboards
+## Custom Dashboards (incl. Map)
 As of v3.3.1 OpenTracks enables to use custom dashboards.
 The reference implementation is [OSMDashboard](https://github.com/OpenTracksApp/OSMDashboard), which presents an OpenStreetMap map (showing the current track, incl. updates).
+The developer documentation is in [README_API.md](README_API.md).
+
+Alternatively, recorded tracks can be shared as KMZ/GPX to installed applications (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)).
+However, this is rather slow and does not provide updates while recording.
+

 ## Screenshots
 <div>
@@ -87,7 +93,7 @@ Rework of _OpenTracks_ included:
 * removing calorie estimation and activity estimation,
 * removing support for ANT+ and Classic Bluetooth,
 * adding support for Bluetooth LE heart rate sensors,
-* removing Protobuf (store sensor data in SQLite columns directly), and
+* removing Protobuf (store sensosensorr data in SQLite columns directly), and
 * removing Android Service API for other apps.

 Artwork, logos and user interface remained more or less unchanged. 
@@ -7,14 +7,11 @@ Although this might be (mostly) sufficient, it has some limitations.
 This include limited configurability (e.g., ordering of shown elements) and the lack of Internet access.
 In fact, the later is considered a feature but severely limits the implementation presenting a map (at least in an easy way). 

-_NOTE:_ for showing a track on a map a workaround was implemented in OpenTracks.
-Data could be exported as KMZ and presented in 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)). 
-
 For the time being, the OpenTracks Data API can be used to implement mainly custom dashboards.

 ## Implementation
 OpenTracks by default does not expose any data to 3rd-party applications.
-On the request of the user (i.e., pressing a button), an Intent is created that exposes the `Track` data (it's summary) as well as the `TrackPoint`s of one or more selected tracks.
+On the request of the user (i.e., pressing a button), an Intent is created that exposes the `Track` data (it's summary), the `TrackPoint`s, and the `Waypoint`s of one or more selected tracks.
 For each, one URI is provided.
 These URIs notify observers if on content changes (e.g., a new `TrackPoint` was added).

@@ -2,7 +2,7 @@

 ## Craft new releases

-1. Get next _version code_ (master branch): `git rev-list HEAD --count master`
+1. Get next _version code_ (main): `git rev-list HEAD --count main`
 2. Decide on _version name_ (semantic versioning)
 3. Manually update _version code_ and _version name_ in `build.gradle`
 4. Create changelog (`_version code_.txt`)
@@ -0,0 +1,20 @@
+# Overview of tested Bluetooth LE sensors
+
+## HRS: Heartrate Service
+* Decathlon|Geonaute|Kalenji Dual HRM Belt
+* Polar H7
+* Polar OH1
+  Has updatable firmware that requires a user account at polar.com
+* Wahoo Tickr (Model: WFBTHR02)
+
+## CSCP: Cycling Cadence and Speed Service
+Please note that the according to the specification these sensors _may_ provide speed as well as cadence.
+However, often only one value is provided.
+
+### Speed
+* Wahoo Speed (Model: WFRPMSPD)
+
+### Cadence 
+* Wahoo Cadence (Model: WFPODCAD2)
+  This sensor reports cadence data as speed.
+  A workaround is in place. 
@@ -6,7 +6,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
    }
 }

@@ -17,20 +17,6 @@ allprojects {
    }
 }

-def getVersionCode = { ->
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'rev-list', 'HEAD', '--count'
-            standardOutput = stdout
-        }
-        return Integer.parseInt(stdout.toString().trim())
-    }
-    catch (ignored) {
-        return -1
-    }
-}
-
 def getVersionName = { ->
    try {
        def stdout = new ByteArrayOutputStream()
@@ -50,25 +36,29 @@ def getVersionName = { ->
 }

 android {
-    compileSdkVersion 29
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    compileSdkVersion 30

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
        manifestPlaceholders = [
-                applicationLogo: "@drawable/ic_logo_color_24dp",
+                applicationLogo: "@mipmap/ic_launcher",
                applicationName: "@string/app_name"
        ]

-        versionCode 3396
-        //versionCode getVersionCode() //Useful for debugging.
-        versionName "v3.7.4"
+        versionCode 3466
+        versionName "v3.8.0"

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



        minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -78,7 +68,7 @@ android {
            applicationIdSuffix ".debug"
            versionNameSuffix "-debug"
            manifestPlaceholders = [
-                    applicationLogo: "@drawable/ic_logo_black_24dp",
+                    applicationLogo: "@mipmap/ic_launcher_debug",
                    applicationName: "OpenTracks (Debug)"
            ]
        }
@@ -102,6 +92,8 @@ dependencies {
    implementation 'androidx.appcompat:appcompat:1.1.0'
    implementation 'androidx.preference:preference:1.1.1'
    implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'

    androidTestImplementation 'androidx.test:core:1.2.0'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -113,6 +105,4 @@ dependencies {

    testImplementation 'androidx.test:core:1.2.0'
    testImplementation 'org.mockito:mockito-core:3.0.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }
@@ -12,6 +12,7 @@ endlegend
 TrackListActivity --> TrackRecordingActivity : Start recording
 TrackListActivity --> SearchListActivity
 TrackListActivity --> MarkerListActivity : Show all markers
+TrackListActivity --> AggregatedStatisticsActivity : Aggregated stats
 TrackListActivity --> TrackRecordedActivity : Show track
 TrackListActivity --> TrackDeleteActivity

@@ -46,6 +47,9 @@ MarkerDetailActivity --> CoordinateOnMapIntent : URI
 SettingsActivity --> AboutActivity
 SettingsActivity --> HelpActivity
 SettingsActivity --> ExportActivity
-SettingsActivity --> ImportActivity
+SettingsActivity --> DirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity
+DirectoryChooserActivity$ImportDirectoryChooserActivity --> ImportActivity
+DirectoryChooserActivity$ExportDirectoryChooserActivity --> ExportActivity

@enduml
@@ -0,0 +1,18 @@
+@startuml
+SensorManager --> ElevationSumManager
+LocationManager --> TrackRecordingService
+ElevationSumManager --> TrackRecordingService
+
+TrackRecordingService --> TrackRecordingServiceConnection
+TrackRecordingService --> Database
+
+Database --> CustomContentProvider
+CustomContentProvider --> TrackDataHub
+CustomContentProvider --> ShareContentProvider
+TrackDataHub --> StatisticsRecordingFragment : TrackPoints, TrackStatistics, Waypoints (push)
+TrackDataHub --> StatisticsRecordedFragment : TrackPoints, TrackStatistics, Waypoints (push)
+TrackDataHub --> ChartFragment --> ChartView
+
+TrackRecordingServiceConnection --> StatisticsRecordingFragment : Sensor data (heartrate, cadence, elevation gain; pull 1s)
+TrackRecordingServiceConnection --> TrackController : Start time (pull, onStart)
+@enduml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_marker_orange_pushpin_with_shadow.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient871"
+       
+       x1="91.712517"
+       y1="266.48581"
+       x2="95.902588"
+       y2="266.72339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(22.027833,208.46275,168.26892)"
+       
+       
+       >
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop867" />
+      <stop
+         style="stop-color:#898d8d;stop-opacity:1"
+         offset="1"
+         id="stop869" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="298.98541"
+     inkscape:cy="561.0427"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="1080"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       d="m 108.52826,213.29755 a 56.035402,7.0061195 5.281088 0 0 -22.425508,2.5321 56.035402,7.0061195 5.281088 0 0 -0.233576,0.17697 l -0.206706,-0.0237 c -0.04471,0.11554 -0.07454,0.2314 -0.09612,0.34752 a 56.035402,7.0061195 5.281088 0 0 0.337963,1.58159 c 0.980726,1.70884 3.760629,3.46326 6.583579,5.2188 l -22.744347,15.50009 a 67.064653,11.556784 4.2275244 0 0 -39.967588,5.26867 67.064653,11.556784 4.2275244 0 0 -0.729154,0.57564 67.064653,11.556784 4.2275244 0 0 -2.754353,1.36358 67.064653,11.556784 4.2275244 0 0 38.908736,16.04324 l -32.176847,27.0646 52.228334,-24.74551 a 67.064653,11.556784 4.2275244 0 0 71.411147,-3.8186 67.064653,11.556784 4.2275244 0 0 0.72812,-0.57507 67.064653,11.556784 4.2275244 0 0 2.75539,-1.36415 67.064653,11.556784 4.2275244 0 0 -12.38374,-10.59818 40.033569,5.0733922 5.2502179 0 0 0.0563,-0.0369 40.033569,5.0733922 5.2502179 0 0 0.37672,-0.34325 l 22.45186,-15.30075 c 8.23597,-0.65161 17.65581,-1.47811 22.94433,-3.00957 a 56.035402,7.0061195 5.281088 0 0 2.65514,-1.03772 56.035402,7.0061195 5.281088 0 0 -46.08401,-12.26953 56.035402,7.0061195 5.281088 0 0 -41.6357,-2.54991 z"
+       style="fill:#333333;fill-opacity:0.49421525;stroke:#000000;stroke-width:0.138931px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.265501"
+       id="path839" />
+    <path
+       style="fill:url(#linearGradient871);fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.265501"
+       d="M 70.603317,174.30832 33.024148,288.94657 94.566672,183.19473 Z"
+       id="path865"
+       sodipodi:nodetypes="cccc" />
+    <ellipse
+       cx="144.42586"
+       cy="113.06232"
+       rx="70.318817"
+       ry="39.974442"
+       id="ellipse26"
+       style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       transform="rotate(22.027833)" />
+    <ellipse
+       style="fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       id="ellipse30"
+       ry="39.974442"
+       rx="70.318817"
+       cy="105.23625"
+       cx="145.017"
+       transform="rotate(22.027833)" />
+    <path
+       id="rect28"
+       style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       d="m 85.662408,24.322061 c -0.890996,8.350369 2.928035,17.133472 6.825491,25.923906 l -23.333902,57.672763 -0.730686,1.80598 0.248621,0.10059 a 42.43035,17.360788 22.027833 0 0 33.303948,30.10067 42.43035,17.360788 22.027833 0 0 44.86507,1.52585 l 0.13892,0.0562 0.24519,-0.60599 a 42.43035,17.360788 22.027833 0 0 0.59472,-1.15581 42.43035,17.360788 22.027833 0 0 0.37668,-1.24514 l 22.45185,-55.492655 c 9.28986,-2.66566 20.09069,-6.13552 24.76397,-13.17485 z" />
+    <ellipse
+       style="fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       id="path24"
+       ry="23.966745"
+       rx="59.409279"
+       cy="-10.262156"
+       cx="148.14029"
+       transform="rotate(22.027833)" />
+  </g>
+</svg>
@@ -1 +1 @@
-OpenTracks – 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,11 @@
+v3.7.5: OpenTracks
+
+Changes:
+- Added aggregated statistics summary (from main the screen's menu)
+- Dashboard API: pass "show on lock screen"- and "keep screen on"-setting
+- Updated translations
+- Import: be lenient with ISO8601 date format
+- Show track on map: file format can be selected and opening dashboard works on Android R (API 30+)
+
+Bugfix:
+- App icon now correctly implemented
@@ -0,0 +1,11 @@
+v3.7.6: OpenTracks
+
+Changes:
+- Landscape mode
+- Track deletion UI is now only a spinner
+- Speed is exported and imported (GPX/KML/KMZ)
+- Default export format is KMZ incl. all data and pictures
+
+Developer:
+- Replaced AsyncTasks with Threads
+- Synchronization: UUID is generated per track (not yet exported)
@@ -0,0 +1,16 @@
+v3.8.0: OpenTracks
+
+Breaking change:
+- GPX import/export speed, cadence, and heartrate via TrackPointExtension/v2
+
+Changes:
+- Dashboard API: provide access to markers (incl. callback to show in OpenTracks)
+- New marker icon (orange push pin, SVG)
+- Files to import can be selected via file manager
+
+Bugfixes:
+- Aggregated stats UI respects preferred rate
+- Editing a marker failed on orientation change
+
+Developer:
+- Refactored TrackRecordingService
@@ -1 +1 @@
-OpenTracks - Suivi d'activités sportives respectueux de votre vie privée.
+OpenTracks - Suivi d'activités sportives respectueux de votre vie privée.
@@ -58,7 +58,6 @@ public class SearchEngineTest {

    private final Context context = ApplicationProvider.getApplicationContext();

-
    @Before
    public void setUp() {
        providerUtils = new ContentProviderUtils(context);
@@ -39,7 +39,7 @@ public class TestDataUtil {

        TrackPoint[] trackPoints = new TrackPoint[numPoints];
        for (int i = 0; i < numPoints; i++) {
-            trackPoints[i] = (createTrackPoint(i));
+            trackPoints[i] = createTrackPoint(i);
        }

        return new Pair<>(track, trackPoints);
@@ -56,17 +56,22 @@ public class TestDataUtil {
    /**
     * Creates a location.
     *
-     * @param i the index to set the value of location.
-     * @return created location
+     * @param i the index for the TrackPoint.
     */
    public static TrackPoint createTrackPoint(int i) {
-        Location location = new Location("test");
-        location.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
-        location.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
-        location.setAccuracy((float) i / 100.0f);
-        location.setAltitude(i * ALTITUDE_INTERVAL);
-        location.setTime(i + 1);
-        return new TrackPoint(location);
+        TrackPoint trackPoint = new TrackPoint();
+        trackPoint.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
+        trackPoint.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
+        trackPoint.setAccuracy((float) i / 100.0f);
+        trackPoint.setAltitude(i * ALTITUDE_INTERVAL);
+        trackPoint.setTime(i + 1);
+        trackPoint.setSpeed(5f + (i / 10));
+
+        trackPoint.setHeartRate_bpm(100f + i);
+        trackPoint.setCyclingCadence_rpm(200f + i);
+        trackPoint.setCyclingCadence_rpm(300f + i);
+        trackPoint.setPower(400f + i);
+        return trackPoint;
    }

    /**
@@ -37,6 +37,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;

 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
@@ -47,6 +48,7 @@ import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.UUIDUtils;

 import static org.mockito.Mockito.when;

@@ -171,22 +173,26 @@ public class CustomContentProviderUtilsTest {
     */
    @Test
    public void testCreateTrack() {
-        int startColumnIndex = 1;
-        int columnIndex = startColumnIndex;
-        when(cursorMock.getColumnIndexOrThrow(TracksColumns._ID)).thenReturn(columnIndex++);
-        when(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).thenReturn(columnIndex++);
-        columnIndex = startColumnIndex;
-        // Id
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
-        // Name
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
        long trackId = System.currentTimeMillis();
-        columnIndex = startColumnIndex;
+
+        int columnIndex = 1;
        // Id
-        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns._ID)).thenReturn(columnIndex);
+        when(cursorMock.isNull(columnIndex)).thenReturn(false);
+        when(cursorMock.getLong(columnIndex)).thenReturn(trackId);
+
+        //Uuid
+        columnIndex++;
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns.UUID)).thenReturn(columnIndex);
+        when(cursorMock.isNull(columnIndex)).thenReturn(false);
+        when(cursorMock.getBlob(columnIndex)).thenReturn(UUIDUtils.toBytes(UUID.randomUUID()));
+
        // Name
+        columnIndex++;
        String name = NAME_PREFIX + trackId;
-        when(cursorMock.getString(columnIndex++)).thenReturn(name);
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).thenReturn(columnIndex);
+        when(cursorMock.isNull(columnIndex)).thenReturn(false);
+        when(cursorMock.getString(columnIndex)).thenReturn(name);

        Track track = contentProviderUtils.createTrack(cursorMock);
        Assert.assertEquals(trackId, track.getId());
@@ -200,7 +206,7 @@ public class CustomContentProviderUtilsTest {
    public void testDeleteAllTracks() {
        // Insert track, points and waypoint at first.
        long trackId = System.currentTimeMillis();
-        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
        contentProviderUtils.insertWaypoint(waypoint);
@@ -5,6 +5,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;

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

@@ -36,7 +37,8 @@ public class CustomSQLiteOpenHelperTest {
     *
     * @return Map(TableName, SQL)
     */
-    private static Map<String, String> getTableSQL(SQLiteDatabase db) {
+    @VisibleForTesting
+    public static Map<String, String> getTableSQL(SQLiteDatabase db) {
        HashMap<String, String> tableSQL = new HashMap<>();
        try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "name IN ('" + TracksColumns.TABLE_NAME + "', '" + TrackPointsColumns.TABLE_NAME + "', '" + WaypointsColumns.TABLE_NAME + "')", null, null, null, "name")) {
            if (cursor != null) {
@@ -53,6 +55,7 @@ public class CustomSQLiteOpenHelperTest {
     *
     * @return Map(tableName, SQL)
     */
+    @VisibleForTesting
    public static Map<String, String> getIndexSQL(SQLiteDatabase db) {
        HashMap<String, String> indexSQL = new HashMap<>();
        try (Cursor cursor = db.rawQuery("SELECT tbl_name, SQL FROM sqlite_master WHERE type = 'index'", null)) {
@@ -104,24 +107,7 @@ public class CustomSQLiteOpenHelperTest {

    @Test
    public void onUpgrade_FromVersion23() {
-        // Manually create database schema with version 23 (base version)
-        {
-            SQLiteDatabase dbBase = new SQLiteOpenHelper(context, DATABASE_NAME, null, 23) {
-                @Override
-                public void onCreate(SQLiteDatabase db) {
-                }
-
-                @Override
-                public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-                }
-            }.getWritableDatabase();
-
-            dbBase.execSQL(TRACKS_CREATE_TABLE_V23);
-            dbBase.execSQL(TRACKPOINTS_CREATE_TABLE_V23);
-            dbBase.execSQL(WAYPOINTS_CREATE_TABLE_V23);
-
-            dbBase.close();
-        }
+        createVersion23();

        // Open database with SQL upgrade
        Map<String, String> tableByUpgrade;
@@ -130,10 +116,9 @@ public class CustomSQLiteOpenHelperTest {
            tableByUpgrade = getTableSQL(dbUpgraded);
            indicesByUpgrade = getIndexSQL(dbUpgraded);
        }
-
-        // Open database via
        context.deleteDatabase(DATABASE_NAME);

+        // Open database via creation script
        Map<String, String> tablesByCreate;
        Map<String, String> indicesByCreate;
        try (SQLiteDatabase dbCreated = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
@@ -150,7 +135,8 @@ public class CustomSQLiteOpenHelperTest {
        Assert.assertEquals(tablesByCreate.get(WaypointsColumns.TABLE_NAME), tableByUpgrade.get(WaypointsColumns.TABLE_NAME));

        // then - verify custom indices
-        Assert.assertEquals(2, indicesByCreate.size());
+        Assert.assertEquals(3, indicesByCreate.size());
+        Assert.assertEquals(indicesByUpgrade.get(TracksColumns.TABLE_NAME), indicesByCreate.get(TracksColumns.TABLE_NAME));
        Assert.assertEquals(indicesByUpgrade.get(TrackPointsColumns.TABLE_NAME), indicesByCreate.get(TrackPointsColumns.TABLE_NAME));
        Assert.assertEquals(indicesByUpgrade.get(WaypointsColumns.TABLE_NAME), indicesByCreate.get(WaypointsColumns.TABLE_NAME));
    }
@@ -176,4 +162,23 @@ public class CustomSQLiteOpenHelperTest {
        // then - verify custom indices
        Assert.assertEquals(0, indicesByDowngrade.size());
    }
+
+    private void createVersion23() {
+        // Manually create database schema with version 23 (base version)
+        SQLiteDatabase dbBase = new SQLiteOpenHelper(context, DATABASE_NAME, null, 23) {
+            @Override
+            public void onCreate(SQLiteDatabase db) {
+            }
+
+            @Override
+            public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            }
+        }.getWritableDatabase();
+
+        dbBase.execSQL(TRACKS_CREATE_TABLE_V23);
+        dbBase.execSQL(TRACKPOINTS_CREATE_TABLE_V23);
+        dbBase.execSQL(WAYPOINTS_CREATE_TABLE_V23);
+
+        dbBase.close();
+    }
 }
@@ -11,7 +11,14 @@ import de.dennisguse.opentracks.io.file.TrackFileFormat;
 public class ShareContentProviderTest {

    @Test
-    public void testCreateandParseURI() {
+    public void testCreateandParseURI_invalid() {
+        Uri uri = Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/1");
+
+        Assert.assertArrayEquals(new long[]{}, ShareContentProvider.parseURI(uri));
+    }
+
+    @Test
+    public void testCreateandParseURI_valid() {
        long[] trackIds = {1, 3, 5};
        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "TrackName", TrackFileFormat.KML_ONLY_TRACK);

@@ -17,6 +17,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 import de.dennisguse.opentracks.content.data.TestDataUtil;
@@ -48,7 +49,10 @@ public class ExportImportTest {
    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 final List<TrackPoint> trackPoints = new ArrayList<>();
+
    private long importTrackId;
    private final long trackId = System.currentTimeMillis();

@@ -61,6 +65,9 @@ public class ExportImportTest {
        contentProviderUtils.insertTrack(track.first);
        contentProviderUtils.bulkInsertTrackPoint(track.second, track.first.getId());

+        trackPoints.clear();
+        trackPoints.addAll(Arrays.asList(track.second));
+
        for (int i = 0; i < 3; i++) {
            Waypoint waypoint = new Waypoint(track.second[i].getLocation());
            waypoint.setName("the waypoint " + i);
@@ -96,16 +103,13 @@ public class ExportImportTest {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackFileFormat trackFileFormat = TrackFileFormat.KML_WITH_TRACKDETAIL;
-        TrackExporter trackExporter = trackFileFormat.newTrackExporter(context, new Track[]{track});
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL.newTrackExporter(context, new Track[]{track});

        // 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);
@@ -115,7 +119,6 @@ public class ExportImportTest {
        // 1. track
        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
        assertNotNull(importedTrack);
-        //TODO assertEquals(track.getTrackPoints(), importedTrack.getTrackPoints());
        assertEquals(track.getCategory(), importedTrack.getCategory());
        assertEquals(track.getDescription(), importedTrack.getDescription());
        assertEquals(track.getName(), importedTrack.getName());
@@ -124,14 +127,42 @@ public class ExportImportTest {
        // 2. waypoints
        assertWaypoints();

-        //TODO Check absolute time of trackpoints
+        // 3. trackpoints
+        assertTrackpoints(false, false, false);
    }

    @LargeTest
    @Test
    public void kml_with_trackdetail_and_sensordata() {
-        // TODO
-        Log.e(TAG, "Test not implemented.");
+        // given
+        Track track = contentProviderUtils.getTrack(trackId);
+
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.newTrackExporter(context, new Track[]{track});
+
+        // when
+        // 1. export
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        trackExporter.writeTrack(context, outputStream);
+
+        // 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.getCategory(), importedTrack.getCategory());
+        assertEquals(track.getDescription(), importedTrack.getDescription());
+        assertEquals(track.getName(), importedTrack.getName());
+        assertEquals(track.getIcon(), importedTrack.getIcon());
+
+        // 2. waypoints
+        assertWaypoints();
+
+        // 3. trackpoints
+        assertTrackpoints(true, true, true);
    }

    @LargeTest
@@ -168,8 +199,7 @@ public class ExportImportTest {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackFileFormat trackFileFormat = TrackFileFormat.GPX;
-        TrackExporter trackExporter = trackFileFormat.newTrackExporter(context, new Track[]{track});
+        TrackExporter trackExporter = TrackFileFormat.GPX.newTrackExporter(context, new Track[]{track});

        // when
        // 1. export
@@ -185,7 +215,6 @@ public class ExportImportTest {
        // 1. track
        Track trackImported = contentProviderUtils.getTrack(importTrackId);
        assertNotNull(trackImported);
-        //TODO assertEquals(track.getTrackPoints(), trackImported.getTrackPoints());
        assertEquals(track.getCategory(), trackImported.getCategory());
        assertEquals(track.getDescription(), trackImported.getDescription());
        assertEquals(track.getName(), trackImported.getName());
@@ -196,7 +225,8 @@ public class ExportImportTest {
        // 2. waypoints
        assertWaypoints();

-        //TODO Check absolute time of trackpoints
+        // 3. trackpoints
+        assertTrackpoints(false, true, true);
    }

    private void assertWaypoints() {
@@ -217,4 +247,33 @@ public class ExportImportTest {
            assertEquals(waypoint.getLocation().getAltitude(), importedWaypoint.getLocation().getAltitude(), 0.001);
        }
    }
+
+    private void assertTrackpoints(boolean verifyPower, boolean verifyHeartrate, boolean verifyCadence) {
+        List<TrackPoint> importedTrackPoints = contentProviderUtils.getTrackPoints(importTrackId);
+        assertEquals(trackPoints.size(), importedTrackPoints.size());
+
+        for (int i = 0; i < trackPoints.size(); i++) {
+            TrackPoint trackPoint = trackPoints.get(i);
+            TrackPoint importedTrackPoint = importedTrackPoints.get(i);
+
+            assertEquals(trackPoint.getTime(), importedTrackPoint.getTime(), 0.01);
+
+            // TODO Not exported for GPX/KML
+            //   assertEquals(trackPoint.getAccuracy(), importedTrackPoint.getAccuracy(), 0.01);
+
+            assertEquals(trackPoint.getLatitude(), importedTrackPoint.getLatitude(), 0.001);
+            assertEquals(trackPoint.getLongitude(), importedTrackPoint.getLongitude(), 0.001);
+            assertEquals(trackPoint.getAltitude(), importedTrackPoint.getAltitude(), 0.001);
+            assertEquals(trackPoint.getSpeed(), importedTrackPoint.getSpeed(), 0.001);
+            if (verifyHeartrate) {
+                assertEquals(trackPoint.getHeartRate_bpm(), importedTrackPoint.getHeartRate_bpm(), 0.01);
+            }
+            if (verifyCadence) {
+                assertEquals(trackPoint.getCyclingCadence_rpm(), importedTrackPoint.getCyclingCadence_rpm(), 0.01);
+            }
+            if (verifyPower) {
+                assertEquals(trackPoint.getPower(), importedTrackPoint.getPower(), 0.01);
+            }
+        }
+    }
 }
@@ -21,6 +21,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

+import de.dennisguse.opentracks.services.handlers.AdaptiveLocationListenerPolicy;
+
 /**
 * Tests the {@link AdaptiveLocationListenerPolicy}.
 *
@@ -172,7 +172,7 @@ public class TrackRecordingServiceTest {
        // given
        createDummyTrack(trackId, -1L, true);
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
-        insertLocation(service);
+        newTrackPoint(service);

        // when
        service.pauseCurrentTrack();
@@ -182,7 +182,7 @@ public class TrackRecordingServiceTest {

        //when
        service.resumeTrack(trackId);
-        insertLocation(service);
+        newTrackPoint(service);

        // then
        Assert.assertTrue(service.isRecording());
@@ -201,14 +201,14 @@ public class TrackRecordingServiceTest {
        // given
        createDummyTrack(trackId, -1L, true);
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
-        insertLocation(service);
+        newTrackPoint(service);
        service.endCurrentTrack();

        Assert.assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size());

        // when
        service.resumeTrack(trackId);
-        insertLocation(service);
+        newTrackPoint(service);

        // then
        Assert.assertTrue(service.isRecording());
@@ -294,7 +294,7 @@ public class TrackRecordingServiceTest {
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
        service.startNewTrack();
        Assert.assertTrue(service.isRecording());
-        insertLocation(service);
+        newTrackPoint(service);
        long trackId = service.getRecordingTrackId();

        // when
@@ -331,18 +331,18 @@ public class TrackRecordingServiceTest {
        addTrack(dummyTrack, isRecording);
    }

-    private static void insertLocation(TrackRecordingServiceInterface trackRecordingService) throws InterruptedException {
-        insertLocation(trackRecordingService, 45.0f, 35f, 5, 10, System.currentTimeMillis());
+    private static void newTrackPoint(TrackRecordingServiceInterface trackRecordingService) throws InterruptedException {
+        newTrackPoint(trackRecordingService, 45.0f, 35f, 5, 10, System.currentTimeMillis());
    }

-    static void insertLocation(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed) throws InterruptedException {
-        insertLocation(trackRecordingService, latitude, longitude, accuracy, speed, System.currentTimeMillis());
+    static void newTrackPoint(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed) throws InterruptedException {
+        newTrackPoint(trackRecordingService, latitude, longitude, accuracy, speed, System.currentTimeMillis());
    }

    /**
     * Inserts a location and waits for 200ms.
     */
-    private static void insertLocation(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed, long time) throws InterruptedException {
+    private static void newTrackPoint(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed, long time) throws InterruptedException {
        Location location = new Location("gps");
        location.setLongitude(longitude);
        location.setLatitude(latitude);
@@ -350,7 +350,9 @@ public class TrackRecordingServiceTest {
        location.setSpeed(speed);
        location.setTime(time);
        location.setBearing(3.0f);
-        trackRecordingService.insertLocation(location);
+        TrackPoint trackPoint = new TrackPoint(location);
+        int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(ApplicationProvider.getApplicationContext());
+        trackRecordingService.newTrackPoint(trackPoint, prefAccuracy);

        //TODO Needed?
        Thread.sleep(200);
@@ -72,14 +72,11 @@ public class TrackRecordingServiceTestLocation {
        sharedPreferences.edit().clear().commit();

        service = ((TrackRecordingServiceInterface) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)));
-        //Disable executorService to not insert locations from GPS via LocationManager
-        service.enableLocationExecutor(false);
    }

    @After
    public void tearDown() {
        // Reset service (if some previous test failed)
-        service.enableLocationExecutor(true);
        if (service.isRecording() || service.isPaused()) {
            service.endCurrentTrack();
        }
@@ -95,12 +92,12 @@ public class TrackRecordingServiceTestLocation {
        long trackId = service.startNewTrack();

        // when
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.0001, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.0002, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.0003, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.0004, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.0005, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0001, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0002, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0003, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0005, 35.0, 5, 15);

        service.endCurrentTrack();

@@ -112,29 +109,6 @@ public class TrackRecordingServiceTestLocation {
        Assert.assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01);
    }

-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_movingInaccurate() throws Exception {
-        // given
-        long trackId = service.startNewTrack();
-
-        // when
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.1, 35.0, Long.MAX_VALUE, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.2, 35.0, Long.MAX_VALUE, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.3, 35.0, Long.MAX_VALUE, 15);
-        TrackRecordingServiceTest.insertLocation(service, 99.0, 35.0, Long.MAX_VALUE, 15);
-
-        service.endCurrentTrack();
-
-        // then
-        Assert.assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        Assert.assertEquals(1, trackPoints.size());
-        Assert.assertEquals(45.0, trackPoints.get(0).getLatitude(), 0.01);
-    }
-
    @MediumTest
    @Test
    public void testOnLocationChangedAsync_slowMovingAccurate() throws Exception {
@@ -142,12 +116,12 @@ public class TrackRecordingServiceTestLocation {
        long trackId = service.startNewTrack();

        // when
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.000001, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.000002, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.000003, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.000004, 35.0, 5, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.000005, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000001, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000002, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000003, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000004, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000005, 35.0, 5, 15);

        service.endCurrentTrack();

@@ -184,12 +158,12 @@ public class TrackRecordingServiceTestLocation {
        long trackId = service.startNewTrack();

        // when
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 2, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 3, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 4, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 6, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 6, 0);

        service.endCurrentTrack();

@@ -210,12 +184,12 @@ public class TrackRecordingServiceTestLocation {
        long trackId = service.startNewTrack();

        // when
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 15);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 2, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 3, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 4, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 6, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 6, 15);

        service.endCurrentTrack();

@@ -253,12 +227,12 @@ public class TrackRecordingServiceTestLocation {
        });

        // when
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 0, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 2, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 3, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 4, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 5, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 0, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 0);

        service.endCurrentTrack();

@@ -282,11 +256,11 @@ public class TrackRecordingServiceTestLocation {
        long trackId = service.startNewTrack();

        // when
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 1, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.1, 35.0, 2, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.1, 35.0, 3, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.2, 35.0, 4, 0);
-        TrackRecordingServiceTest.insertLocation(service, 45.2, 35.0, 5, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.1, 35.0, 2, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.1, 35.0, 3, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.2, 35.0, 4, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.2, 35.0, 5, 0);

        service.endCurrentTrack();

@@ -303,25 +277,4 @@ public class TrackRecordingServiceTestLocation {
        Assert.assertEquals(4, trackPoints.get(5).getAccuracy(), 0.01);
        Assert.assertEquals(5, trackPoints.get(6).getAccuracy(), 0.01);
    }
-
-    @MediumTest
-    @Test
-    public void testOnLocationChangedAsync_firstTrackPointInvalid() throws Exception {
-        // given
-        long trackId = service.startNewTrack();
-
-        // when
-        service.insertLocation(TrackPoint.createPause().getLocation());
-        TrackRecordingServiceTest.insertLocation(service, 45.0, 35.0, 0, 0);
-        service.insertLocation(TrackPoint.createPause().getLocation());
-
-        service.endCurrentTrack();
-
-        // then
-        Assert.assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        Assert.assertEquals(1, trackPoints.size());
-        Assert.assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01);
-    }
 }
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeoutException;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -215,7 +216,9 @@ public class TrackRecordingServiceTestLooper {
            location.setSpeed(10);
            location.setTime(startTime + i * 10000);
            location.setBearing(3.0f);
-            service.insertLocation(location);
+            TrackPoint trackPoint = new TrackPoint(location);
+            int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
+            service.newTrackPoint(trackPoint, prefAccuracy);

            if (i % 7 == 0) {
                service.insertWaypoint(null, null, null, null);
@@ -0,0 +1,63 @@
+package de.dennisguse.opentracks.services.handlers;
+
+import android.content.Context;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import de.dennisguse.opentracks.content.data.TrackPoint;
+
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class HandlerServerTest {
+
+    @Mock
+    private Context context;
+
+    @Mock
+    private HandlerServer.HandlerServerInterface server;
+
+    @Mock
+    private LocationHandler locationHandler;
+
+    private HandlerServer subject;
+
+    @Before
+    public void setUp() {
+        subject = new HandlerServer(locationHandler, server);
+        subject.start(context);
+    }
+
+    @After
+    public void tearDown() {
+        subject.stop(context);
+    }
+
+    @Test
+    public void onSharedPreferenceChanged() {
+        // when
+        subject.onSharedPreferenceChanged(null, null, null);
+
+        // then
+        verify(locationHandler).onSharedPreferenceChanged(null, null, null);
+    }
+
+    @Test
+    public void sendTrackPoint() throws InterruptedException {
+        // given
+        TrackPoint trackPoint = new TrackPoint();
+        int accuracy = 50;
+
+        // when
+        subject.sendTrackPoint(trackPoint, accuracy);
+
+        // then
+        Thread.sleep(10); // Wait for executor service
+        verify(server).newTrackPoint(trackPoint, accuracy);
+    }
+}
@@ -0,0 +1,117 @@
+package de.dennisguse.opentracks.services.handlers;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.location.Location;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LocationHandlerTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private HandlerServer handlerServer;
+
+    @InjectMocks
+    private LocationHandler locationHandler;
+
+    @Before
+    public void setUp() {
+        // Let's use default values.
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
+        sharedPreferences.edit().clear().commit();
+
+        locationHandler.onSharedPreferenceChanged(context, PreferencesUtils.getSharedPreferences(context), context.getString(R.string.recording_gps_accuracy_key));
+        locationHandler.onSharedPreferenceChanged(context, PreferencesUtils.getSharedPreferences(context), context.getString(R.string.min_recording_interval_key));
+        locationHandler.onStart(context);
+    }
+
+    /**
+     * When a valid location changed in LocationHandler -> newTrackPoint service method is called.
+     */
+    @Test
+    public void testOnLocationChanged_okay() {
+        // when
+        locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis()));
+
+        // then
+        verify(handlerServer, times(1)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+    }
+
+    /**
+     * When location changed in LocationHandler with bad location -> newTrackPoint service method is not called.
+     */
+    @Test
+    public void testOnLocationChanged_badLocation() {
+        // given
+        float latitude = 91f;
+
+        // when
+        // bad latitude
+        locationHandler.onLocationChanged(createLocation(latitude, 35f, 3, 5, System.currentTimeMillis()));
+
+        // then
+        verify(handlerServer, times(0)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+    }
+
+    /**
+     * When location changed in LocationHandler with poor accuracy -> newTrackPoint service method is not called.
+     */
+    @Test
+    public void testOnLocationChanged_poorAccuracy() {
+        // given
+        int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
+
+        // when
+        // poor latitude
+        locationHandler.onLocationChanged(createLocation(45f, 35f, prefAccuracy + 1, 5, System.currentTimeMillis()));
+
+        // then
+        // no newTrackPoint called
+        verify(handlerServer, times(0)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+    }
+
+    @Test
+    public void testOnLocationChanged_movingInaccurate() {
+        // when
+        locationHandler.onLocationChanged(createLocation(45.0, 35.0, 5, 15, System.currentTimeMillis()));
+        locationHandler.onLocationChanged(createLocation(45.1, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));
+        locationHandler.onLocationChanged(createLocation(45.2, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));
+        locationHandler.onLocationChanged(createLocation(45.3, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));
+        locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));
+
+        // then
+        verify(handlerServer, times(1)).sendTrackPoint(any(TrackPoint.class), any(Integer.class));
+    }
+
+    /**
+     * Creates a location with parameters and returns the Location object.
+     */
+    private static Location createLocation(double latitude, double longitude, float accuracy, long speed, long time) {
+        Location location = new Location("gps");
+        location.setLongitude(longitude);
+        location.setLatitude(latitude);
+        location.setAccuracy(accuracy);
+        location.setSpeed(speed);
+        location.setTime(time);
+        location.setBearing(3.0f);
+        return location;
+    }
+}
@@ -128,6 +128,7 @@ public class StringUtilsTest {
     */
    @Test
    public void testGetTime_timezone() {
+        assertGetTime("2010-05-04T03:02:01", 2010, 5, 4, 3, 2, 1, 0);
        assertGetTime("2010-05-04T03:02:01Z", 2010, 5, 4, 3, 2, 1, 0);
        assertGetTime("2010-05-04T03:02:01+00:00", 2010, 5, 4, 3, 2, 1, 0);
        assertGetTime("2010-05-04T03:02:01-00:00", 2010, 5, 4, 3, 2, 1, 0);
@@ -0,0 +1,23 @@
+package de.dennisguse.opentracks.util;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.UUID;
+
+@RunWith(AndroidJUnit4.class)
+public class UUIDUtilsTest {
+
+    @Test
+    public void test() {
+        UUID uuid = UUID.randomUUID();
+
+        byte[] bytes = UUIDUtils.toBytes(uuid);
+        UUID output = UUIDUtils.fromBytes(bytes);
+
+        Assert.assertEquals(uuid, output);
+    }
+}
@@ -0,0 +1,257 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+
+@RunWith(JUnit4.class)
+public class AggregatedStatisticsTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    /**
+     * Create a TrackStatistics object.
+     *
+     * @param totalDistance distance in meters.
+     * @param totalTime     total time in milliseconds.
+     * @return TrackStatistics object.
+     */
+    private static Track createTrack(Context context, long totalDistance, long totalTime, String category) {
+        TrackStatistics statistics = new TrackStatistics();
+        statistics.setStartTime_ms(1000L);  // Resulting start time
+        statistics.setStopTime_ms(1000L + totalTime);
+        statistics.setTotalTime(totalTime);
+        statistics.setMovingTime(totalTime);
+        statistics.setTotalDistance(totalDistance);
+        statistics.setTotalElevationGain(50.0);
+        statistics.setMaxSpeed(50.0);  // Resulting max speed
+        statistics.setMaxElevation(1250.0);
+        statistics.setMinElevation(1200.0);  // Resulting min elevation
+
+        Track track = new Track();
+        track.setIcon(TrackIconUtils.getIconValue(context, category));
+        track.setCategory(category);
+        track.setTrackStatistics(statistics);
+        return track;
+    }
+
+    @Test
+    public void testAggregate() {
+        // given
+        // 10km in 40 minutes.
+        long totalDistance = 10000;
+        long totalTime = 2400000;
+        String biking = context.getString(R.string.activity_type_biking);
+        Track track = createTrack(context, totalDistance, totalTime, biking);
+
+        // when
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
+        aggregatedStatistics.aggregate(track);
+
+        // then
+        Assert.assertEquals(1, aggregatedStatistics.getCount());
+        Assert.assertNotNull(aggregatedStatistics.get(biking));
+        Assert.assertEquals(1, aggregatedStatistics.get(biking).getCountTracks());
+
+        TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
+        Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+        Assert.assertEquals(totalTime, statistics2.getMovingTime());
+    }
+
+    @Test
+    public void testAggregate_mountainBiking() {
+        // given
+        // 10km in 40 minutes.
+        long totalDistance = 10000;
+        long totalTime = 2400000;
+        String mountainBiking = context.getString(R.string.activity_type_mountain_biking);
+        Track track = createTrack(context, totalDistance, totalTime, mountainBiking);
+
+        // when
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
+        aggregatedStatistics.aggregate(track);
+
+        // then
+        Assert.assertNotNull(aggregatedStatistics.get(mountainBiking));
+    }
+
+    @Test
+    public void testAggregate_trailRunning() {
+        // given
+        // 10km in 40 minutes.
+        long totalDistance = 10000;
+        long totalTime = 2400000;
+        String trailRunning = context.getString(R.string.activity_type_trail_running);
+        Track track = createTrack(context, totalDistance, totalTime, trailRunning);
+
+        // when
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
+        aggregatedStatistics.aggregate(track);
+
+        // then
+        Assert.assertNotNull(aggregatedStatistics.get(trailRunning));
+    }
+
+    @Test
+    public void testAggregate_twoBikingTracks() {
+        // given
+        // 10km in 40 minutes.
+        long totalDistance = 10000;
+        long totalTime = 2400000;
+        String biking = context.getString(R.string.activity_type_biking);
+        Track[] tracks = new Track[2];
+        for (int i = 0; i < 2; i++) {
+            tracks[i] = createTrack(context, totalDistance, totalTime, biking);
+        }
+
+        // when
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
+        aggregatedStatistics.aggregate(tracks[0]); // biking activity 1.
+        aggregatedStatistics.aggregate(tracks[1]); // biking activity 2.
+
+        // then
+        Assert.assertEquals(1, aggregatedStatistics.getCount());
+        Assert.assertNotNull(aggregatedStatistics.get(biking));
+        Assert.assertEquals(2, aggregatedStatistics.get(biking).getCountTracks());
+
+        TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
+        Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
+        Assert.assertEquals(totalTime * 2L, statistics2.getMovingTime());
+    }
+
+    @Test
+    public void testAggregate_threeDifferentTracks() {
+        // given
+        // 10km in 40 minutes.
+        long totalDistance = 10000;
+
+        String biking = context.getString(R.string.activity_type_biking);
+        String running = context.getString(R.string.activity_type_running);
+        String walking = context.getString(R.string.activity_type_walking);
+        long totalTime = 2400000;
+        Track[] tracks = new Track[]{
+                createTrack(context, totalDistance, totalTime, biking),
+                createTrack(context, totalDistance, totalTime, running),
+                createTrack(context, totalDistance, totalTime, walking)
+        };
+
+        // when
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
+        aggregatedStatistics.aggregate(tracks[0]); // biking activity 1.
+        aggregatedStatistics.aggregate(tracks[1]); // biking activity 2.
+        aggregatedStatistics.aggregate(tracks[2]); // biking activity 3.
+
+        // then
+        Assert.assertEquals(3, aggregatedStatistics.getCount());
+        Assert.assertNotNull(aggregatedStatistics.get(biking));
+        Assert.assertNotNull(aggregatedStatistics.get(running));
+        Assert.assertNotNull(aggregatedStatistics.get(walking));
+        Assert.assertEquals(1, aggregatedStatistics.get(biking).getCountTracks());
+        Assert.assertEquals(1, aggregatedStatistics.get(running).getCountTracks());
+        Assert.assertEquals(1, aggregatedStatistics.get(walking).getCountTracks());
+
+        {
+            TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
+            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+        }
+
+        {
+            TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics();
+            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+        }
+
+        {
+            TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics();
+            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+        }
+    }
+
+    @Test
+    public void testAggregate_severalTracksWithSeveralActivities() {
+        // given
+        // 10km in 40 minutes.
+        long totalDistance = 10000;
+        long totalTime = 2400000;
+        String biking = context.getString(R.string.activity_type_biking);
+        String running = context.getString(R.string.activity_type_running);
+        String walking = context.getString(R.string.activity_type_walking);
+        String driving = context.getString(R.string.activity_type_driving);
+        Track[] tracks = new Track[]{
+                createTrack(context, totalDistance, totalTime, biking),
+                createTrack(context, totalDistance, totalTime, running),
+                createTrack(context, totalDistance, totalTime, walking),
+                createTrack(context, totalDistance, totalTime, biking),
+                createTrack(context, totalDistance, totalTime, running),
+                createTrack(context, totalDistance, totalTime, walking),
+                createTrack(context, totalDistance, totalTime, biking),
+                createTrack(context, totalDistance, totalTime, biking),
+                createTrack(context, totalDistance, totalTime, biking),
+                createTrack(context, totalDistance, totalTime, driving),
+        };
+
+
+        // when
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
+        for (Track track : tracks) {
+            aggregatedStatistics.aggregate(track);
+
+        }
+
+        // then
+        // 4 sports.
+        Assert.assertEquals(4, aggregatedStatistics.getCount());
+
+        // There is a map for every sport.
+        Assert.assertNotNull(aggregatedStatistics.get(biking));
+        Assert.assertNotNull(aggregatedStatistics.get(running));
+        Assert.assertNotNull(aggregatedStatistics.get(walking));
+        Assert.assertNotNull(aggregatedStatistics.get(driving));
+
+        // Number of tracks by sport.
+        Assert.assertEquals(5, aggregatedStatistics.get(biking).getCountTracks()); // Biking.
+        Assert.assertEquals(2, aggregatedStatistics.get(running).getCountTracks()); // Running.
+        Assert.assertEquals(2, aggregatedStatistics.get(walking).getCountTracks()); // Walking.
+        Assert.assertEquals(1, aggregatedStatistics.get(driving).getCountTracks()); // Driving.
+
+        // Biking.
+        {
+            TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
+            Assert.assertEquals(totalDistance * 5, statistics2.getTotalDistance(), 0);
+            Assert.assertEquals(totalTime * 5, statistics2.getMovingTime());
+        }
+
+        // Running.
+        {
+            TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics();
+            Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
+            Assert.assertEquals(totalTime * 2, statistics2.getMovingTime());
+        }
+
+        // Walking.
+        {
+            TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics();
+            Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
+            Assert.assertEquals(totalTime * 2, statistics2.getMovingTime());
+        }
+
+        // Driving.
+        {
+            TrackStatistics statistics2 = aggregatedStatistics.get(driving).getTrackStatistics();
+            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+        }
+    }
+}
@@ -14,9 +14,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    package="de.dennisguse.opentracks"
    android:installLocation="auto">
-    <!-- Permission to initialize services -->
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
+
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.android.hardware.bluetooth_le"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.sensor.compass"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <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" />
+
    <application
        android:name=".Startup"
        android:allowBackup="false"
@@ -26,36 +56,69 @@ limitations under the License.
        android:label="${applicationName}"
        android:theme="@style/ThemeCustom">

-        <!-- Activities -->
        <activity android:name=".AboutActivity" />

        <activity
            android:name=".TrackDeleteActivity"
-            android:theme="@style/ThemeCustomTransparent" />
+            android:theme="@style/TrackDeleteActivity" />

        <activity
            android:name=".HelpActivity"
            android:label="@string/menu_help" />

+        <activity android:name=".io.file.importer.DirectoryChooserActivity$ImportDirectoryChooserActivity" />
+
        <activity
            android:name=".io.file.importer.ImportActivity"
-            android:theme="@style/ThemeCustomTransparent">
-            <intent-filter>
-                <action android:name="android.intent.action.ATTACH_DATA" />
-                <action android:name="android.intent.action.VIEW" />
+            android:theme="@style/ThemeCustomTransparentActivity">

-                <category android:name="android.intent.category.BROWSABLE" />
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />

-                <data android:mimeType="application/gpx" />
-                <data android:mimeType="application/gpx+xml" />
-                <data android:mimeType="application/vnd.google-earth.gpx" />
-                <data android:mimeType="application/vnd.google-earth.gpx+xml" />
-                <data android:scheme="file" />
+                <data
+                    android:host="*"
+                    android:mimeType="application/vnd.google-earth.kmz" />
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern="*kmz" />
            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/vnd.google-earth.kml+xml" />
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern="*kml" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/gpx+xml" />
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern="*gpx" />
+            </intent-filter>
+
        </activity>

-        <activity android:name=".MarkerDetailActivity" />
+        <activity android:name=".MarkerDetailActivity">
+            <intent-filter>
+                <action android:name="de.dennisguse.opentracks.MarkerDetails"/>
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>

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

@@ -78,13 +141,9 @@ limitations under the License.
                android:resource="@xml/searchable" />
        </activity>

-        <activity
-            android:name=".TrackRecordedActivity"
-            android:screenOrientation="userPortrait" />
+        <activity android:name=".TrackRecordedActivity" />

-        <activity
-            android:name=".TrackRecordingActivity"
-            android:screenOrientation="userPortrait" />
+        <activity android:name=".TrackRecordingActivity" />

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

@@ -98,12 +157,29 @@ limitations under the License.
                android:value=".SearchListActivity" />
        </activity>

+        <activity android:name=".AggregatedStatisticsActivity" />
+
+        <activity android:name=".io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity" />
+
        <activity
            android:name=".io.file.exporter.ExportActivity"
-            android:theme="@style/ThemeCustomTransparent" />
+            android:theme="@style/ThemeCustomTransparentActivity" />

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

+        <activity android:name=".ShowOnMapProxyActivity$KMZ">
+            <intent-filter android:label="@string/open_track_as_KMZ">
+                <action android:name="Intent.OpenTracks-Dashboard" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".ShowOnMapProxyActivity$GPX">
+            <intent-filter android:label="@string/open_track_as_GPX">
+                <action android:name="Intent.OpenTracks-Dashboard" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
        <provider
            android:name=".content.provider.ShareContentProvider"
            android:authorities="${applicationId}.content"
@@ -128,32 +204,4 @@ limitations under the License.
            android:icon="@drawable/ic_logo_color_24dp"
            android:label="@string/recording_service" />
    </application>
-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true"
-        android:xlargeScreens="true" />
-    <!-- Permissions to record locations -->
-    <uses-feature
-        android:name="android.hardware.location.gps"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.android.hardware.bluetooth_le"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.sensor.compass"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-    <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" />
 </manifest>
@@ -62,23 +62,22 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
    @Override
    public void onConfirmDeleteDone(long[] trackIds) {
        boolean stopRecording = false;
-        if (trackIds.length == 1 && trackIds[0] == -1L) {
-            stopRecording = true;
-        } else {
-            long recordingTrackId = PreferencesUtils.getRecordingTrackId(this);
-            for (long trackId : trackIds) {
-                if (trackId == recordingTrackId) {
-                    stopRecording = true;
-                    break;
-                }
+
+        long recordingTrackId = PreferencesUtils.getRecordingTrackId(this);
+        for (long trackId : trackIds) {
+            if (trackId == recordingTrackId) {
+                stopRecording = true;
+                break;
            }
        }
+
        if (stopRecording) {
            getTrackRecordingServiceConnection().stopRecording(this, false);
        }
        Intent intent = IntentUtils.newIntent(this, TrackDeleteActivity.class);
        intent.putExtra(TrackDeleteActivity.EXTRA_TRACK_IDS, trackIds);
        startActivityForResult(intent, DELETE_REQUEST_CODE);
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
    }

    /**
@@ -0,0 +1,37 @@
+package de.dennisguse.opentracks;
+
+import android.os.Bundle;
+import android.widget.ListView;
+
+import androidx.lifecycle.ViewModelProvider;
+
+import de.dennisguse.opentracks.adapters.AggregatedStatisticsAdapter;
+import de.dennisguse.opentracks.viewmodels.AggregatedStatisticsModel;
+
+public class AggregatedStatisticsActivity extends AbstractActivity {
+
+    private ListView listView;
+    private AggregatedStatisticsAdapter adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        listView = findViewById(R.id.aggregated_stats_list);
+        listView.setEmptyView(findViewById(R.id.aggregated_stats_empty_view));
+
+        final AggregatedStatisticsModel viewModel = new ViewModelProvider(this).get(AggregatedStatisticsModel.class);
+        viewModel.getAggregatedStats().observe(this, aggregatedStatistics -> {
+            if (aggregatedStatistics != null) {
+                adapter = new AggregatedStatisticsAdapter(getApplicationContext(), aggregatedStatistics);
+                listView.setAdapter(adapter);
+            }
+            adapter.notifyDataSetChanged();
+        });
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.aggregated_stats;
+    }
+}
@@ -1,94 +0,0 @@
-package de.dennisguse.opentracks;
-
-/*
- * Copyright 2013 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.
- */
-
-import android.content.Context;
-import android.os.AsyncTask;
-
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-
-/**
- * Async Task to delete tracks.
- *
- * @author Jimmy Shih
- */
-class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
-
-    private final long[] trackIds;
-    private final Context context;
-    private TrackDeleteActivity deleteActivity;
-    // true if the AsyncTask has completed
-    private boolean completed;
-
-    /**
-     * Creates an AsyncTask.
-     *
-     * @param deleteActivity the activity currently associated with this task
-     * @param trackIds       the track ids to delete. To delete all, set to size 1 with
-     *                       trackIds[0] == -1L
-     */
-    public DeleteAsyncTask(TrackDeleteActivity deleteActivity, long[] trackIds) {
-        this.deleteActivity = deleteActivity;
-        this.trackIds = trackIds;
-        context = deleteActivity.getApplicationContext();
-        completed = false;
-    }
-
-    /**
-     * Sets the current activity associated with this AyncTask.
-     *
-     * @param deleteActivity the current activity, can be null
-     */
-    public void setActivity(TrackDeleteActivity deleteActivity) {
-        this.deleteActivity = deleteActivity;
-        if (completed && deleteActivity != null) {
-            deleteActivity.onAsyncTaskCompleted();
-        }
-    }
-
-    @Override
-    protected void onPreExecute() {
-        if (deleteActivity != null) {
-            deleteActivity.showProgressDialog();
-        }
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... params) {
-        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
-
-        if (trackIds.length == 1 && trackIds[0] == -1L) {
-            contentProviderUtils.deleteAllTracks(context);
-        } else {
-            for (long id : trackIds) {
-                if (isCancelled()) {
-                    return false;
-                }
-                contentProviderUtils.deleteTrack(context, id);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        completed = true;
-        if (deleteActivity != null) {
-            deleteActivity.onAsyncTaskCompleted();
-        }
-    }
-}
@@ -109,12 +109,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark

    @Override
    public void onDeleteMarkerDone() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                finish();
-            }
-        });
+        runOnUiThread(this::finish);
    }

    /**
@@ -125,7 +120,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
    private class MarkerDetailPagerAdapter extends FragmentStatePagerAdapter {

        MarkerDetailPagerAdapter(FragmentManager fragmentManager) {
-            super(fragmentManager);
+            super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
        }

        @Override
@@ -29,7 +29,6 @@ import android.util.Pair;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -59,13 +58,14 @@ public class MarkerEditActivity extends AbstractActivity {
    public static final String EXTRA_TRACK_ID = "track_id";
    public static final String EXTRA_MARKER_ID = "marker_id";

+    private static final String BUNDLE_PHOTO_URI = "photo_uri";
+
    private static final int CAMERA_REQUEST_CODE = 5;
    private static final int GALLERY_IMG_REQUEST_CODE = 7;

    private static final String TAG = MarkerEditActivity.class.getSimpleName();
    private long trackId;
-    private long markerId;
-    private TrackRecordingServiceConnection trackRecordingServiceConnection;
+    private TrackRecordingServiceConnection trackRecordingServiceConnection = new TrackRecordingServiceConnection();
    private Waypoint waypoint;

    private MenuItem insertPhotoMenuItem;
@@ -80,15 +80,13 @@ public class MarkerEditActivity extends AbstractActivity {
    private EditText waypointDescription;
    private ImageView waypointPhoto;
    private ImageView waypointDeletePhotoBtn;
-    private Button done;

    @Override
-    protected void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);

        trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
-        markerId = getIntent().getLongExtra(EXTRA_MARKER_ID, -1L);
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
+        long markerId = getIntent().getLongExtra(EXTRA_MARKER_ID, -1L);

        hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);

@@ -101,26 +99,64 @@ public class MarkerEditActivity extends AbstractActivity {
        waypointPhoto = findViewById(R.id.marker_edit_waypoint_photo);

        waypointDeletePhotoBtn = findViewById(R.id.marker_edit_waypoint_photo_delete);
-        waypointDeletePhotoBtn.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (waypoint != null && waypoint.hasPhoto())
-                    waypoint.setPhotoUrl(null);
-                waypointPhoto.setImageBitmap(null);
-                photoUri = null;
-                hideAndShowOptions();
+        waypointDeletePhotoBtn.setOnClickListener(v -> {
+            if (waypoint != null && waypoint.hasPhoto()) {
+                waypoint.setPhotoUrl(null);
            }
+            waypointPhoto.setImageBitmap(null);
+            photoUri = null;
+            hideAndShowOptions();
        });

        Button cancel = findViewById(R.id.marker_edit_cancel);
-        cancel.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
+        cancel.setOnClickListener(v -> finish());
+
+        final boolean isNewMarker = markerId == -1L;
+
+        setTitle(isNewMarker ? R.string.menu_insert_marker : R.string.menu_edit);
+        Button done = findViewById(R.id.marker_edit_done);
+        done.setText(isNewMarker ? R.string.generic_add : R.string.generic_save);
+        done.setOnClickListener(v -> {
+            if (isNewMarker) {
+                addMarker();
+            } else {
+                saveMarker();
            }
+            finish();
        });
-        done = findViewById(R.id.marker_edit_done);
-        updateUiByMarkerId();
+
+        if (isNewMarker) {
+            int nextWaypointNumber = trackId == -1L ? -1 : new ContentProviderUtils(this).getNextWaypointNumber(trackId);
+            if (nextWaypointNumber == -1) {
+                nextWaypointNumber = 0;
+            }
+            waypointName.setText(getString(R.string.marker_name_format, nextWaypointNumber));
+            waypointName.selectAll();
+            waypointMarkerType.setText("");
+            waypointDescription.setText("");
+        } else {
+            waypoint = new ContentProviderUtils(this).getWaypoint(markerId);
+            if (waypoint == null) {
+                Log.d(TAG, "waypoint is null");
+                finish();
+                return;
+            }
+            waypointName.setText(waypoint.getName());
+            waypointMarkerType.setText(waypoint.getCategory());
+            waypointDescription.setText(waypoint.getDescription());
+            if (waypoint.hasPhoto()) {
+                photoUri = waypoint.getPhotoURI();
+            }
+        }
+
+        if (savedInstanceState != null) {
+            photoUri = savedInstanceState.getParcelable(BUNDLE_PHOTO_URI);
+        }
+        if (photoUri != null) {
+            setWaypointImageView(photoUri);
+        }
+
+        hideAndShowOptions();
    }

    @Override
@@ -129,6 +165,12 @@ public class MarkerEditActivity extends AbstractActivity {
        trackRecordingServiceConnection.startConnection(this);
    }

+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(BUNDLE_PHOTO_URI, photoUri);
+    }
+
    @Override
    protected void onStop() {
        super.onStop();
@@ -198,54 +240,6 @@ public class MarkerEditActivity extends AbstractActivity {
        super.onActivityResult(requestCode, resultCode, data);
    }

-    /**
-     * Updates the UI based on the marker id.
-     */
-    private void updateUiByMarkerId() {
-        final boolean newMarker = markerId == -1L;
-
-        setTitle(newMarker ? R.string.menu_insert_marker : R.string.menu_edit);
-        done.setText(newMarker ? R.string.generic_add : R.string.generic_save);
-        done.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (newMarker) {
-                    addMarker();
-                } else {
-                    saveMarker();
-                }
-                finish();
-            }
-        });
-
-        if (newMarker) {
-            int nextWaypointNumber = trackId == -1L ? -1 : new ContentProviderUtils(this).getNextWaypointNumber(trackId);
-            if (nextWaypointNumber == -1) {
-                nextWaypointNumber = 0;
-            }
-            waypointName.setText(getString(R.string.marker_name_format, nextWaypointNumber));
-            waypointName.selectAll();
-            waypointMarkerType.setText("");
-            waypointDescription.setText("");
-        } else {
-            waypoint = new ContentProviderUtils(this).getWaypoint(markerId);
-            if (waypoint == null) {
-                Log.d(TAG, "waypoint is null");
-                finish();
-                return;
-            }
-            waypointName.setText(waypoint.getName());
-            waypointMarkerType.setText(waypoint.getCategory());
-            waypointDescription.setText(waypoint.getDescription());
-            if (waypoint.hasPhoto()) {
-                photoUri = waypoint.getPhotoURI();
-                setWaypointImageView(photoUri);
-            }
-        }
-
-        hideAndShowOptions();
-    }
-
    /**
     * Checks and hide/shows all buttons/options about marker photo options.
     *
@@ -272,13 +266,13 @@ public class MarkerEditActivity extends AbstractActivity {
     *
     * @param uri the uri photo.
     */
-    private void setWaypointImageView(Uri uri) {
+    private void setWaypointImageView(@NonNull Uri uri) {
        try (ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r")) {
            FileDescriptor fd = pfd.getFileDescriptor();
            Bitmap bitmap = BitmapFactory.decodeFileDescriptor(fd);
            waypointPhoto.setImageBitmap(bitmap);
            hideAndShowOptions();
-        } catch(IOException e) {
+        } catch (IOException e) {
            Log.e(TAG, e.getMessage());
            Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
        }
@@ -295,9 +289,6 @@ public class MarkerEditActivity extends AbstractActivity {
        startActivityForResult(intent, GALLERY_IMG_REQUEST_CODE);
    }

-    /**
-     * Adds a marker.
-     */
    private void addMarker() {
        trackRecordingServiceConnection.addMarker(this,
                waypointName.getText().toString(),
@@ -306,9 +297,6 @@ public class MarkerEditActivity extends AbstractActivity {
                photoUri != null ? photoUri.toString() : null);
    }

-    /**
-     * Saves a marker.
-     */
    private void saveMarker() {
        waypoint.setName(waypointName.getText().toString());
        waypoint.setCategory(waypointMarkerType.getText().toString());
@@ -26,8 +26,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;

 import androidx.annotation.NonNull;
@@ -82,12 +80,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(MarkerListActivity.this);
            }
            if (key != null) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        MarkerListActivity.this.invalidateOptionsMenu();
-                    }
-                });
+                runOnUiThread(MarkerListActivity.this::invalidateOptionsMenu);
            }
        }
    };
@@ -134,13 +127,10 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker

        listView = findViewById(R.id.marker_list);
        listView.setEmptyView(findViewById(R.id.marker_list_empty));
-        listView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Intent intent = IntentUtils.newIntent(MarkerListActivity.this, MarkerDetailActivity.class)
-                        .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, id);
-                startActivity(intent);
-            }
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            Intent intent = IntentUtils.newIntent(MarkerListActivity.this, MarkerDetailActivity.class)
+                    .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, id);
+            startActivity(intent);
        });
        resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) {
            @Override
@@ -277,8 +267,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
                return true;
            case R.id.list_context_menu_select_all:
-                int size = listView.getCount();
-                for (int i = 0; i < size; i++) {
+                for (int i = 0; i < listView.getCount(); i++) {
                    listView.setItemChecked(i, true);
                }
                return false;
@@ -26,8 +26,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;

@@ -153,12 +151,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(SearchListActivity.this);
            }
            if (key != null) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        arrayAdapter.notifyDataSetChanged();
-                    }
-                });
+                runOnUiThread(() -> arrayAdapter.notifyDataSetChanged());
            }
        }
    };
@@ -208,20 +201,17 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
        ListView listView = findViewById(R.id.search_list);
        listView.setAdapter(arrayAdapter);
        listView.setEmptyView(findViewById(R.id.search_list_empty));
-        listView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Map<String, Object> item = arrayAdapter.getItem(position);
-                Long trackId = (Long) item.get(TRACK_ID_FIELD);
-                Long markerId = (Long) item.get(MARKER_ID_FIELD);
-                Intent intent = IntentUtils.newIntent(SearchListActivity.this, TrackRecordedActivity.class);
-                if (markerId != null) {
-                    intent = intent.putExtra(TrackRecordedActivity.EXTRA_MARKER_ID, markerId);
-                } else {
-                    intent = intent.putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-                }
-                startActivity(intent);
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            Map<String, Object> item = arrayAdapter.getItem(position);
+            Long trackId = (Long) item.get(TRACK_ID_FIELD);
+            Long markerId = (Long) item.get(MARKER_ID_FIELD);
+            Intent intent = IntentUtils.newIntent(SearchListActivity.this, TrackRecordedActivity.class);
+            if (markerId != null) {
+                intent = intent.putExtra(TrackRecordedActivity.EXTRA_MARKER_ID, markerId);
+            } else {
+                intent = intent.putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
            }
+            startActivity(intent);
        });
        ActivityUtils.configureListViewContextualMenu(listView, contextualActionModeCallback);
        handleIntent(getIntent());
@@ -346,12 +336,9 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
        final List<Map<String, Object>> displayResults = prepareResultsforDisplay(scoredResults);

        // Use the UI thread to display the results
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                arrayAdapter.clear();
-                arrayAdapter.addAll(displayResults);
-            }
+        runOnUiThread(() -> {
+            arrayAdapter.clear();
+            arrayAdapter.addAll(displayResults);
        });
    }

@@ -448,12 +435,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa

    @Override
    public void onDeleteMarkerDone() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                handleIntent(getIntent());
-            }
-        });
+        runOnUiThread(() -> handleIntent(getIntent()));
    }

    @Override
@@ -463,11 +445,6 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa

    @Override
    protected void onDeleted() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                handleIntent(getIntent());
-            }
-        });
+        runOnUiThread(() -> handleIntent(getIntent()));
    }
 }
@@ -0,0 +1,69 @@
+package de.dennisguse.opentracks;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Pair;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.provider.ShareContentProvider;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.util.IntentDashboardUtils;
+
+/**
+ * Used to convert IntentDashboardUtils.startDashboard-requests into {@link TrackFileFormat}.
+ */
+public abstract class ShowOnMapProxyActivity extends AppCompatActivity {
+
+    private final TrackFileFormat trackFileFormat;
+
+    protected ShowOnMapProxyActivity(TrackFileFormat trackFileFormat) {
+        this.trackFileFormat = trackFileFormat;
+    }
+
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        long[] trackIds = IntentDashboardUtils.extractTrackIdsFromIntent(getIntent());
+
+        showTrackTrackfileFormat(this, trackFileFormat, trackIds);
+
+        finish();
+    }
+
+    /**
+     * Send intent to show tracks on a map (needs an another app) as KMZ.
+     *
+     * @param context  the context
+     * @param trackIds the track ids
+     */
+    private static void showTrackTrackfileFormat(Context context, TrackFileFormat trackFileFormat, long[] trackIds) {
+        if (trackIds.length == 0) {
+            return;
+        }
+
+        Intent intent = new Intent(android.content.Intent.ACTION_VIEW);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(TrackPointsColumns.TRACKID, trackIds[0]);
+        Pair<Uri, String> uriAndMime = ShareContentProvider.createURI(trackIds, "SharingTrack", trackFileFormat);
+        intent.setDataAndType(uriAndMime.first, uriAndMime.second);
+
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+        context.startActivity(Intent.createChooser(intent, context.getString(R.string.open_track_as_trackfileformat, trackFileFormat.getExtension())));
+    }
+
+    public static class KMZ extends ShowOnMapProxyActivity {
+        public KMZ() {
+            super(TrackFileFormat.KMZ_WITH_TRACKDETAIL);
+        }
+    }
+
+    public static class GPX extends ShowOnMapProxyActivity {
+        public GPX() {
+            super(TrackFileFormat.GPX);
+        }
+    }
+}
@@ -4,6 +4,8 @@ import android.app.Application;
 import android.os.StrictMode;
 import android.util.Log;

+import java.util.Locale;
+
 import de.dennisguse.opentracks.util.PreferencesUtils;

 /**
@@ -25,6 +27,10 @@ public class Startup extends Application {

        //Set default values of preferences on first start.
        PreferencesUtils.resetPreferences(this, false);
+        if (PreferencesUtils.getString(this, R.string.stats_units_key, "").equals("")) {
+            String statsUnits = getString(Locale.US.equals(Locale.getDefault()) ? R.string.stats_units_imperial : R.string.stats_units_metric);
+            PreferencesUtils.setString(this, R.string.stats_units_key, statsUnits);
+        }


        //In debug builds: show thread and VM warnings.
@@ -51,7 +51,6 @@ public class TrackController {
    private boolean isPaused;
    private long totalTime = 0;

-    // the timestamp for the toal time
    private long totalTimeTimestamp = 0;

    private boolean isResumed = false;
@@ -16,26 +16,26 @@

 package de.dennisguse.opentracks;

-import android.app.Activity;
-import android.app.Dialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.view.View;

-import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.util.SystemUtils;

 /**
- * An activity for delete tracks.
+ * An activity for deleting tracks.
 *
 * @author Jimmy Shih
 */
-public class TrackDeleteActivity extends Activity {
+public class TrackDeleteActivity extends AbstractActivity {

    public static final String EXTRA_TRACK_IDS = "track_ids";

-    private static final int DIALOG_PROGRESS_ID = 0;
+    private long[] trackIds;

-    private DeleteAsyncTask deleteAsyncTask;
+    private Thread deleteThread;

    @Override
    public void onCreate(Bundle savedInstanceState) {
@@ -44,53 +44,48 @@ public class TrackDeleteActivity extends Activity {
        setResult(RESULT_CANCELED);

        Intent intent = getIntent();
-        long[] trackIds = intent.getLongArrayExtra(EXTRA_TRACK_IDS);
+        trackIds = intent.getLongArrayExtra(EXTRA_TRACK_IDS);
+        deleteThread = new Thread(() -> {
+            ContentProviderUtils contentProviderUtils = new ContentProviderUtils(TrackDeleteActivity.this);

-        Object retained = getLastNonConfigurationInstance();
-        if (retained instanceof DeleteAsyncTask) {
-            deleteAsyncTask = (DeleteAsyncTask) retained;
-            deleteAsyncTask.setActivity(this);
-        } else {
-            deleteAsyncTask = new DeleteAsyncTask(this, trackIds);
-            deleteAsyncTask.execute();
-        }
+            PowerManager.WakeLock wakeLock = SystemUtils.acquireWakeLock(TrackDeleteActivity.this, null);
+
+            for (long id : trackIds) {
+                if (Thread.interrupted()) {
+                    break;
+                }
+                contentProviderUtils.deleteTrack(TrackDeleteActivity.this, id);
+            }
+
+            wakeLock = SystemUtils.releaseWakeLock(wakeLock);
+            if (Thread.interrupted()) {
+                return;
+            }
+
+            runOnUiThread(TrackDeleteActivity.this::onAsyncTaskCompleted);
+        });
    }

    @Override
-    public Object onRetainNonConfigurationInstance() {
-        deleteAsyncTask.setActivity(null);
-        return deleteAsyncTask;
+    protected void onStart() {
+        super.onStart();
+        deleteThread.start();
    }

    @Override
-    protected Dialog onCreateDialog(int id) {
-        if (id != DIALOG_PROGRESS_ID) {
-            return null;
-        }
-        return DialogUtils.createSpinnerProgressDialog(
-                this, R.string.track_delete_progress_message, new DialogInterface.OnCancelListener() {
-                    @Override
-                    public void onCancel(DialogInterface dialog) {
-                        deleteAsyncTask.cancel(true);
-                        dialog.dismiss();
-                        finish();
-                    }
-                });
+    protected void onStop() {
+        super.onStop();
+        deleteThread.interrupt();
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.track_delete;
    }

-    /**
-     * Invokes when the associated AsyncTask completes.
-     */
    public void onAsyncTaskCompleted() {
-        removeDialog(DIALOG_PROGRESS_ID);
+        findViewById(R.id.progressbar).setVisibility(View.INVISIBLE);
        setResult(RESULT_OK);
        finish();
    }
-
-    /**
-     * Shows the progress dialog.
-     */
-    public void showProgressDialog() {
-        showDialog(DIALOG_PROGRESS_ID);
-    }
 }
@@ -21,7 +21,6 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -89,20 +88,12 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit

        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
        activityType.setAdapter(adapter);
-        activityType.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        activityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(
+                TrackEditActivity.this, (String) activityType.getAdapter().getItem(position))));
+        activityType.setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus) {
                setActivityTypeIcon(TrackIconUtils.getIconValue(
-                        TrackEditActivity.this, (String) activityType.getAdapter().getItem(position)));
-            }
-        });
-        activityType.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (!hasFocus) {
-                    setActivityTypeIcon(TrackIconUtils.getIconValue(
-                            TrackEditActivity.this, activityType.getText().toString()));
-                }
+                        TrackEditActivity.this, activityType.getText().toString()));
            }
        });

@@ -116,37 +107,28 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit

        activityTypeIcon = findViewById(R.id.track_edit_activity_type_icon);
        activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue));
-        activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
-                }
-                return true;
+        activityTypeIcon.setOnTouchListener((v, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
            }
+            return true;
        });
-        activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
-                }
-                return true;
+        activityTypeIcon.setOnKeyListener((v, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+                ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
            }
+            return true;
        });

        description = findViewById(R.id.track_edit_description);
        description.setText(track.getDescription());

        Button saveButton = findViewById(R.id.track_edit_save);
-        saveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                TrackUtils.updateTrack(TrackEditActivity.this, track, nameEditText.getText().toString(),
-                        activityType.getText().toString(), description.getText().toString(),
-                        contentProviderUtils);
-                finish();
-            }
+        saveButton.setOnClickListener(v -> {
+            TrackUtils.updateTrack(TrackEditActivity.this, track, nameEditText.getText().toString(),
+                    activityType.getText().toString(), description.getText().toString(),
+                    contentProviderUtils);
+            finish();
        });

        Button cancel = findViewById(R.id.track_edit_cancel);
@@ -155,12 +137,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
            cancel.setVisibility(View.GONE);
        } else {
            setTitle(R.string.menu_edit);
-            cancel.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish();
-                }
-            });
+            cancel.setOnClickListener(v -> finish());
            cancel.setVisibility(View.VISIBLE);
        }
    }
@@ -33,8 +33,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.Toast;

@@ -47,8 +45,6 @@ import androidx.loader.app.LoaderManager.LoaderCallbacks;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;

-import java.util.Locale;
-
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
@@ -56,6 +52,7 @@ import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.util.ActivityUtils;
+import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -143,14 +140,11 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackListActivity.this);
            }
            if (key != null) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        TrackListActivity.this.invalidateOptionsMenu();
-                        LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
-                        boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
-                        trackController.update(isRecording, recordingTrackPaused);
-                    }
+                runOnUiThread(() -> {
+                    TrackListActivity.this.invalidateOptionsMenu();
+                    LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
+                    boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
+                    trackController.update(isRecording, recordingTrackPaused);
                });
            }
        }
@@ -174,15 +168,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
    private final Runnable bindChangedCallback = new Runnable() {
        @Override
        public void run() {
-            /*
-             * After binding changes (e.g., becomes available), update the total time in trackController.
-             */
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    trackController.update(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused);
-                }
-            });
+            // After binding changes (e.g., becomes available), update the total time in trackController.
+            runOnUiThread(() -> trackController.update(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused));

            if (!startGps) {
                return;
@@ -238,31 +225,23 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        // Show trackController when search dialog is dismissed
        SearchManager searchManager = (SearchManager) getSystemService(SEARCH_SERVICE);
        if (searchManager != null) {
-            searchManager.setOnDismissListener(new SearchManager.OnDismissListener() {
-                @Override
-                public void onDismiss() {
-                    trackController.show();
-                }
-            });
+            searchManager.setOnDismissListener(() -> trackController.show());
        }

        listView = findViewById(R.id.track_list);
        listView.setEmptyView(findViewById(R.id.track_list_empty_view));
-        listView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long trackId) {
-                Intent newIntent;
-                if (trackId == recordingTrackId) {
-                    // Is recording -> open record activity.
-                    newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class)
-                            .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-                } else {
-                    // Not recording -> open detail activity.
-                    newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordedActivity.class)
-                            .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-                }
-                startActivity(newIntent);
+        listView.setOnItemClickListener((parent, view, position, trackId) -> {
+            Intent newIntent;
+            if (trackId == recordingTrackId) {
+                // Is recording -> open record activity.
+                newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class)
+                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
+            } else {
+                // Not recording -> open detail activity.
+                newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordedActivity.class)
+                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
            }
+            startActivity(newIntent);
        });

        resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) {
@@ -299,7 +278,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        ActivityUtils.configureListViewContextualMenu(listView, contextualActionModeCallback);

        LoaderManager.getInstance(this).initLoader(0, null, loaderCallbacks);
-        showStartupDialogs();
+
+        requestGPSPermissions();
    }

    @Override
@@ -404,6 +384,10 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                    this.invalidateOptionsMenu();
                }
                return true;
+            case R.id.track_list_aggregated_stats:
+                intent = IntentUtils.newIntent(this, AggregatedStatisticsActivity.class);
+                startActivity(intent);
+                return true;
            case R.id.track_list_markers:
                intent = IntentUtils.newIntent(this, MarkerListActivity.class);
                startActivity(intent);
@@ -441,19 +425,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        // Do nothing
    }

-    /**
-     * Shows start up dialogs.
-     */
-    private void showStartupDialogs() {
-        // If stats_units_key is undefined, set it
-        if (PreferencesUtils.getString(this, R.string.stats_units_key, "").equals("")) {
-            String statsUnits = getString(Locale.US.equals(Locale.getDefault()) ? R.string.stats_units_imperial : R.string.stats_units_metric);
-            PreferencesUtils.setString(this, R.string.stats_units_key, statsUnits);
-        }
-
-        requestGPSPermissions();
-    }
-
    private void requestGPSPermissions() {
        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, GPS_REQUEST_CODE);
@@ -487,7 +458,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        Intent intent;
        switch (itemId) {
            case R.id.list_context_menu_show_on_map:
-                IntentUtils.showTrackOnMap(this, trackIds);
+                IntentDashboardUtils.startDashboard(this, trackIds);
                return true;
            case R.id.list_context_menu_share:
                intent = IntentUtils.newShareFileIntent(this, trackIds);
@@ -500,9 +471,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                startActivity(intent);
                return true;
            case R.id.list_context_menu_delete:
-                if (trackIds.length > 1 && trackIds.length == listView.getCount()) {
-                    trackIds = new long[]{-1L};
-                }
                deleteTracks(trackIds);
                return true;
            case R.id.list_context_menu_select_all:
@@ -16,7 +16,6 @@

 package de.dennisguse.opentracks;

-import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -40,6 +39,7 @@ import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -187,7 +187,7 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
                startActivity(intent);
                return true;
            case R.id.track_detail_menu_show_on_map:
-                IntentUtils.showTrackOnMap(this, new long[]{trackId});
+                IntentDashboardUtils.startDashboard(this, trackId);
                return true;
            case R.id.track_detail_markers:
                intent = IntentUtils.newIntent(this, MarkerListActivity.class)
@@ -226,12 +226,7 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos

    @Override
    protected void onDeleted() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                finish();
-            }
-        });
+        runOnUiThread(this::finish);
    }

    /**
@@ -259,7 +254,6 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
        if (trackId == -1L) {
            Log.e(TAG, "TrackDetailActivity needs EXTRA_TRACK_ID.");
            finish();
-            return;
        }
    }

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

-import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -12,10 +11,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
-import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;

@@ -30,6 +29,7 @@ import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
 import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -41,6 +41,8 @@ import de.dennisguse.opentracks.util.TrackUtils;
 * @author Leif Hendrik Wilden
 * @author Rodrigo Damazio
 */
+//NOTE: This activity does NOT react to preference changes of R.string.recording_track_id_key.
+//This mode of communication should be removed anyhow.
 public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface {

    public static final String EXTRA_TRACK_ID = "track_id";
@@ -57,47 +59,34 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
    private ViewPager pager;
    private TrackController trackController;

-    // From intent
+    // Initialized from Intent; if a new track recording is started, a new TrackId will be provided by TrackRecordingService
    private long trackId;

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

    private final Runnable bindChangedCallback = new Runnable() {
        @Override
        public void run() {
            // After binding changes (is available), update the total time in trackController.
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    trackController.update(true, recordingTrackPaused);
-                }
-            });
-
-            if (recordingTrackId == -1L) {
-                TrackRecordingServiceInterface service = trackRecordingServiceConnection.getServiceIfBound();
-                if (service == null) {
-                    Log.d(TAG, "could not get TrackRecordingService");
-                    return;
-                }
+            runOnUiThread(() -> trackController.update(true, recordingTrackPaused));

+            TrackRecordingServiceInterface service = trackRecordingServiceConnection.getServiceIfBound();
+            if (service == null) {
+                Log.d(TAG, "could not get TrackRecordingService");
+                return;
+            }
+            if (!service.isRecording()) {
                // Starts or resumes a track.
-                int msg;
                if (trackId == -1L) {
                    // trackId isn't initialized -> leads a new recording.
                    trackId = service.startNewTrack();
-                    recordingTrackId = trackId;
-                    msg = R.string.track_detail_record_success;
                } else {
                    // trackId is initialized -> resumes the track.
-                    recordingTrackId = trackId;
                    service.resumeTrack(trackId);
-                    msg = R.string.track_detail_resume_success;
                }

                // A recording track is on.
-                Toast.makeText(TrackRecordingActivity.this, msg, Toast.LENGTH_SHORT).show();
                trackDataHub.loadTrack(trackId);
                trackController.update(true, false);
                trackController.onResume(true, recordingTrackPaused);
@@ -108,12 +97,6 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
        @Override
        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (PreferencesUtils.isKey(TrackRecordingActivity.this, R.string.recording_track_id_key, key)) {
-                recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackRecordingActivity.this);
-                setLockscreenPolicy();
-                setScreenOnPolicy();
-            }
-
            if (PreferencesUtils.isKey(TrackRecordingActivity.this, R.string.recording_track_paused_key, key)) {
                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackRecordingActivity.this);
                setLockscreenPolicy();
@@ -130,12 +113,9 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc

            if (key == null) return;

-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    TrackRecordingActivity.this.invalidateOptionsMenu();
-                    trackController.update(true, recordingTrackPaused);
-                }
+            runOnUiThread(() -> {
+                TrackRecordingActivity.this.invalidateOptionsMenu();
+                trackController.update(true, recordingTrackPaused);
            });
        }
    };
@@ -176,52 +156,27 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
-
        contentProviderUtils = new ContentProviderUtils(this);
-        handleIntent(getIntent());

+        trackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+        if (savedInstanceState != null) {
+            //Activity was recreated.
+            trackId = savedInstanceState.getLong(EXTRA_TRACK_ID, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
+        } else {
+            trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
+            if (trackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT && contentProviderUtils.getTrack(trackId) == null) {
+                finish();
+            }
+        }
+
+        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
        sharedPreferences = PreferencesUtils.getSharedPreferences(this);

        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
        trackDataHub = new TrackDataHub(this);

-        FragmentPagerAdapter adapter = new FragmentPagerAdapter(getSupportFragmentManager(), 1) {
-            @Override
-            public int getCount() {
-                return 3;
-            }
-
-            @NonNull
-            @Override
-            public Fragment getItem(int position) {
-                switch (position) {
-                    case 0:
-                        return new StatisticsRecordingFragment();
-                    case 1:
-                        return ChartFragment.newInstance(false);
-                    case 2:
-                        return ChartFragment.newInstance(true);
-                    default:
-                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-                }
-            }
-
-            @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);
+        pager.setAdapter(new CustomFragmentPagerAdapter(getSupportFragmentManager(), 1));
        TabLayout tabs = findViewById(R.id.track_detail_activity_tablayout);
        tabs.setupWithViewPager(pager);
        if (savedInstanceState != null) {
@@ -285,7 +240,20 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
            trackController.onResume(true, recordingTrackPaused);
        }

-        startRecording();
+        /*
+         * If the binding has happened, then invoke the callback to start a new recording.
+         * If the binding hasn't happened, then invoking the callback will have no effect.
+         * But when the binding occurs, the callback will get invoked.
+         */
+        trackRecordingServiceConnection.startAndBind(this);
+        bindChangedCallback.run();
+    }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(CURRENT_TAB_TAG_KEY, pager.getCurrentItem());
+        outState.putLong(EXTRA_TRACK_ID, trackId);
    }

    @Override
@@ -302,24 +270,11 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        trackDataHub.stop();
    }

-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(CURRENT_TAB_TAG_KEY, pager.getCurrentItem());
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.track_record;
    }

-    @Override
-    public void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        setIntent(intent);
-        handleIntent(intent);
-    }
-
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.track_record, menu);
@@ -347,7 +302,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
                startActivity(intent);
                return true;
            case R.id.track_detail_menu_show_on_map:
-                IntentUtils.showTrackOnMap(this, new long[]{trackId});
+                IntentDashboardUtils.startDashboard(this, trackId);
                return true;
            case R.id.track_detail_markers:
                intent = IntentUtils.newIntent(this, MarkerListActivity.class)
@@ -376,22 +331,6 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        return trackDataHub;
    }

-    private void handleIntent(Intent intent) {
-        trackId = intent.getLongExtra(EXTRA_TRACK_ID, -1L);
-        if (trackId == -1L) {
-            return;
-        }
-        Track track = contentProviderUtils.getTrack(trackId);
-        if (track == null) {
-            track = contentProviderUtils.getLastTrack();
-            if (track != null) {
-                trackId = track.getId();
-                return;
-            }
-            finish();
-        }
-    }
-
    /**
     * Updates the menu items.
     */
@@ -412,14 +351,44 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
    }

-    private void startRecording() {
-        trackRecordingServiceConnection.startAndBind(this);
+    private class CustomFragmentPagerAdapter extends FragmentPagerAdapter {

-        /*
-         * If the binding has happened, then invoke the callback to start a new recording.
-         * If the binding hasn't happened, then invoking the callback will have no effect.
-         * But when the binding occurs, the callback will get invoked.
-         */
-        bindChangedCallback.run();
+        public CustomFragmentPagerAdapter(@NonNull FragmentManager fm, int behavior) {
+            super(fm, behavior);
+        }
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+
+        @NonNull
+        @Override
+        public Fragment getItem(int position) {
+            switch (position) {
+                case 0:
+                    return new StatisticsRecordingFragment();
+                case 1:
+                    return ChartFragment.newInstance(false);
+                case 2:
+                    return ChartFragment.newInstance(true);
+                default:
+                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            }
+        }
+
+        @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);
+                default:
+                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            }
+        }
    }
 }
@@ -0,0 +1,181 @@
+package de.dennisguse.opentracks.adapters;
+
+import android.content.Context;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.viewmodels.AggregatedStatistics;
+
+public class AggregatedStatisticsAdapter extends BaseAdapter {
+
+    private final AggregatedStatistics aggregatedStatistics;
+    private final Context context;
+
+    public AggregatedStatisticsAdapter(Context context, AggregatedStatistics aggregatedStatistics) {
+        this.context = context;
+        this.aggregatedStatistics = aggregatedStatistics;
+    }
+
+    @Override
+    public int getCount() {
+        if (aggregatedStatistics != null) {
+            return aggregatedStatistics.getCount();
+        }
+        return 0;
+    }
+
+    @Override
+    public AggregatedStatistics.AggregatedStatistic getItem(int position) {
+        return aggregatedStatistics.getItem(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        // Not important because data are not database register but cooked data.
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        AggregatedStatistics.AggregatedStatistic aggregatedStats = getItem(position);
+        ViewHolder viewHolder;
+
+        if (isSpeedSport(position)) {
+            viewHolder = new ViewSpeedHolder();
+        } else {
+            viewHolder = new ViewPaceHolder();
+        }
+
+        convertView = LayoutInflater.from(context).inflate(R.layout.aggregated_stats_list_item, parent, false);
+        viewHolder.setValues(convertView, getIcon(position), getName(position), aggregatedStats);
+
+        return convertView;
+    }
+
+    private boolean isSpeedSport(int position) {
+        String category = aggregatedStatistics.getSportName(position);
+        return TrackIconUtils.isSpeedIcon(context, category);
+    }
+
+    private int getIcon(int position) {
+        String iconValue = TrackIconUtils.getIconValue(context, aggregatedStatistics.getSportName(position));
+        return TrackIconUtils.getIconDrawable(iconValue);
+    }
+
+    private String getName(int position) {
+        return aggregatedStatistics.getSportName(position);
+    }
+
+    private class ViewHolder {
+        protected ImageView sportIcon;
+        protected TextView typeLabel;
+        protected TextView numTracks;
+        protected TextView distance;
+        protected TextView distanceUnit;
+        protected TextView time;
+        protected boolean metricsUnits;
+        protected boolean reportSpeed;
+
+        public void setValues(View view, int iconDrawable, String name, AggregatedStatistics.AggregatedStatistic aggregatedStats) {
+            reportSpeed = PreferencesUtils.isReportSpeed(context, name);
+            metricsUnits = PreferencesUtils.isMetricUnits(context);
+
+            sportIcon = view.findViewById(R.id.aggregated_stats_sport_icon);
+            typeLabel = view.findViewById(R.id.aggregated_stats_type_label);
+            numTracks = view.findViewById(R.id.aggregated_stats_num_tracks);
+            distance = view.findViewById(R.id.aggregated_stats_distance);
+            distanceUnit = view.findViewById(R.id.aggregated_stats_distance_unit);
+            time = view.findViewById(R.id.aggregated_stats_time);
+
+            sportIcon.setImageResource(iconDrawable);
+            typeLabel.setText(name);
+            numTracks.setText(StringUtils.valueInParentheses(String.valueOf(aggregatedStats.getCountTracks())));
+
+            Pair<String, String> parts = StringUtils.getDistanceParts(context, aggregatedStats.getTrackStatistics().getTotalDistance(), metricsUnits);
+            distance.setText(parts.first);
+            distanceUnit.setText(parts.second);
+
+            time.setText(StringUtils.formatElapsedTime(aggregatedStats.getTrackStatistics().getMovingTime()));
+        }
+    }
+
+    private class ViewSpeedHolder extends ViewHolder {
+        private TextView avgSpeed;
+        private TextView avgSpeedUnit;
+        private TextView avgSpeedLabel;
+        private TextView maxSpeed;
+        private TextView maxSpeedUnit;
+        private TextView maxSpeedLabel;
+
+        @Override
+        public void setValues(View view, int iconDrawable, String name, AggregatedStatistics.AggregatedStatistic aggregatedStats) {
+            super.setValues(view, iconDrawable, name, aggregatedStats);
+
+            avgSpeed = view.findViewById(R.id.aggregated_stats_avg_rate);
+            avgSpeedUnit = view.findViewById(R.id.aggregated_stats_avg_rate_unit);
+            avgSpeedLabel = view.findViewById(R.id.aggregated_stats_avg_rate_label);
+            maxSpeed = view.findViewById(R.id.aggregated_stats_max_rate);
+            maxSpeedUnit = view.findViewById(R.id.aggregated_stats_max_rate_unit);
+            maxSpeedLabel = view.findViewById(R.id.aggregated_stats_max_rate_label);
+
+            {
+                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStats.getTrackStatistics().getAverageMovingSpeed(), metricsUnits, reportSpeed);
+                avgSpeed.setText(parts.first);
+                avgSpeedUnit.setText(parts.second);
+                avgSpeedLabel.setText(context.getString(R.string.stats_average_moving_speed));
+            }
+
+            {
+                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStats.getTrackStatistics().getMaxSpeed(), metricsUnits, reportSpeed);
+                maxSpeed.setText(parts.first);
+                maxSpeedUnit.setText(parts.second);
+                maxSpeedLabel.setText(context.getString(R.string.stats_max_speed));
+            }
+        }
+    }
+
+    private class ViewPaceHolder extends ViewHolder {
+        private TextView avgPace;
+        private TextView avgPaceUnit;
+        private TextView avgPaceLabel;
+        private TextView maxPace;
+        private TextView maxPaceUnit;
+        private TextView maxPaceLabel;
+
+        @Override
+        public void setValues(View view, int iconDrawable, String name, AggregatedStatistics.AggregatedStatistic aggregatedStats) {
+            super.setValues(view, iconDrawable, name, aggregatedStats);
+
+            avgPace = view.findViewById(R.id.aggregated_stats_avg_rate);
+            avgPaceUnit = view.findViewById(R.id.aggregated_stats_avg_rate_unit);
+            avgPaceLabel = view.findViewById(R.id.aggregated_stats_avg_rate_label);
+
+            maxPace = view.findViewById(R.id.aggregated_stats_max_rate);
+            maxPaceUnit = view.findViewById(R.id.aggregated_stats_max_rate_unit);
+            maxPaceLabel = view.findViewById(R.id.aggregated_stats_max_rate_label);
+
+            {
+                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStats.getTrackStatistics().getAverageMovingSpeed(), metricsUnits, reportSpeed);
+                avgPace.setText(parts.first);
+                avgPaceUnit.setText(parts.second);
+                avgPaceLabel.setText(R.string.stats_average_moving_pace);
+            }
+
+            {
+                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStats.getTrackStatistics().getMaxSpeed(), metricsUnits, reportSpeed);
+                maxPace.setText(parts.first);
+                maxPaceUnit.setText(parts.second);
+                maxPaceLabel.setText(R.string.stats_fastest_pace);
+            }
+        }
+    }
+}
@@ -108,28 +108,25 @@ public class SearchEngine {
    /**
     * Comparator for scored results.
     */
-    private static final Comparator<ScoredResult> SCORED_RESULT_COMPARATOR = new Comparator<ScoredResult>() {
-        @Override
-        public int compare(ScoredResult r1, ScoredResult r2) {
-            // Score ordering.
-            int scoreDiff = Double.compare(r2.score, r1.score);
-            if (scoreDiff != 0) {
-                return scoreDiff;
-            }
-
-            // Make tracks come before waypoints.
-            if (r1.waypoint != null && r2.track != null) {
-                return 1;
-            } else if (r1.track != null && r2.waypoint != null) {
-                return -1;
-            }
-
-            // Finally, use arbitrary ordering, by ID.
-            long id1 = r1.track != null ? r1.track.getId() : r1.waypoint.getId();
-            long id2 = r2.track != null ? r2.track.getId() : r2.waypoint.getId();
-            long idDiff = id2 - id1;
-            return Long.signum(idDiff);
+    private static final Comparator<ScoredResult> SCORED_RESULT_COMPARATOR = (r1, r2) -> {
+        // Score ordering.
+        int scoreDiff = Double.compare(r2.score, r1.score);
+        if (scoreDiff != 0) {
+            return scoreDiff;
        }
+
+        // Make tracks come before waypoints.
+        if (r1.waypoint != null && r2.track != null) {
+            return 1;
+        } else if (r1.track != null && r2.waypoint != null) {
+            return -1;
+        }
+
+        // Finally, use arbitrary ordering, by ID.
+        long id1 = r1.track != null ? r1.track.getId() : r1.waypoint.getId();
+        long id2 = r2.track != null ? r2.track.getId() : r2.waypoint.getId();
+        long idDiff = id2 - id1;
+        return Long.signum(idDiff);
    };

    private final ContentProviderUtils providerUtils;
@@ -144,12 +144,9 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL

        PreferencesUtils.register(context, this);
        onSharedPreferenceChanged(null, null);
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                if (started) {
-                    loadDataForAll();
-                }
+        runInHandlerThread(() -> {
+            if (started) {
+                loadDataForAll();
            }
        });
    }
@@ -178,16 +175,13 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
    }

    public void loadTrack(final long trackId) {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                if (trackId == selectedTrackId) {
-                    Log.i(TAG, "Not reloading track " + trackId);
-                    return;
-                }
-                selectedTrackId = trackId;
-                loadDataForAll();
+        runInHandlerThread(() -> {
+            if (trackId == selectedTrackId) {
+                Log.i(TAG, "Not reloading track " + trackId);
+                return;
            }
+            selectedTrackId = trackId;
+            loadDataForAll();
        });
    }

@@ -197,13 +191,10 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
     * @param trackDataListener the track data listener
     */
    public void registerTrackDataListener(final TrackDataListener trackDataListener, final boolean tracksTable, final boolean waypointsTable, final boolean trackPointsTable_SampleIn, final boolean trackPointsTable_SampleOut) {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                trackDataManager.registerTrackDataListener(trackDataListener, tracksTable, waypointsTable, trackPointsTable_SampleIn, trackPointsTable_SampleOut);
-                if (started) {
-                    loadDataForListener(trackDataListener);
-                }
+        runInHandlerThread(() -> {
+            trackDataManager.registerTrackDataListener(trackDataListener, tracksTable, waypointsTable, trackPointsTable_SampleIn, trackPointsTable_SampleOut);
+            if (started) {
+                loadDataForListener(trackDataListener);
            }
        });
    }
@@ -214,12 +205,7 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
     * @param trackDataListener the track data listener
     */
    public void unregisterTrackDataListener(final TrackDataListener trackDataListener) {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                trackDataManager.unregisterTrackDataListener(trackDataListener);
-            }
-        });
+        runInHandlerThread(() -> trackDataManager.unregisterTrackDataListener(trackDataListener));
    }

    /**
@@ -238,15 +224,12 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL

    @Override
    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, final String key) {
-        runInHandlerThread(new Runnable() {
-            @Override
-            public void run() {
-                if (PreferencesUtils.isKey(context, R.string.recording_track_id_key, key)) {
-                    recordingTrackId = PreferencesUtils.getRecordingTrackId(context);
-                }
-                if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
-                    recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
-                }
+        runInHandlerThread(() -> {
+            if (PreferencesUtils.isKey(context, R.string.recording_track_id_key, key)) {
+                recordingTrackId = PreferencesUtils.getRecordingTrackId(context);
+            }
+            if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
+                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
            }
        });
    }
@@ -289,7 +272,7 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
            if (isOnlyListener) {
                resetSamplingState();
            }
-            Set<TrackDataListener> sampledOutListeners = hasSampledOut ? trackDataListeners : Collections.<TrackDataListener>emptySet();
+            Set<TrackDataListener> sampledOutListeners = hasSampledOut ? trackDataListeners : Collections.emptySet();
            notifyTrackPointsTableUpdate(isOnlyListener, trackDataListeners, sampledOutListeners);
        }

@@ -16,6 +16,8 @@

 package de.dennisguse.opentracks.content.data;

+import java.util.UUID;
+
 import de.dennisguse.opentracks.stats.TrackStatistics;

 /**
@@ -27,6 +29,8 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 public class Track {

    private long id = -1L;
+    private UUID uuid = UUID.randomUUID();
+
    private String name = "";
    private String description = "";
    private String category = "";
@@ -46,6 +50,14 @@ public class Track {
        this.id = id;
    }

+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
    public String getName() {
        return name;
    }
@@ -35,6 +35,7 @@ public interface TracksColumns extends BaseColumns {
    String DEFAULT_SORT_ORDER = "_id";

    // Columns
+    String UUID = "uuid";
    String NAME = "name"; // track name
    String DESCRIPTION = "description"; // track description
    String CATEGORY = "category"; // track activity type
@@ -71,5 +72,9 @@ public interface TracksColumns extends BaseColumns {
            + MINELEVATION + " FLOAT, " // min elevation
            + MAXELEVATION + " FLOAT, " // max elevation
            + ELEVATIONGAIN + " FLOAT, " // elevation gain
-            + ICON + " TEXT)"; // icon
+            + ICON + " TEXT, " // icon
+            + UUID + " BLOB)"; // UUID
+
+    String CREATE_TABLE_INDEX = "CREATE UNIQUE INDEX " + TABLE_NAME + "_" + UUID + "_index ON " + TABLE_NAME + "(" + UUID + ")";
+
 }
@@ -39,6 +39,7 @@ public final class Waypoint {
    private double length = 0.0;
    private long duration = 0;
    private Location location;
+    @Deprecated //TODO Make an URI instead of String
    private String photoUrl = "";

    @VisibleForTesting
@@ -30,6 +30,7 @@ public interface WaypointsColumns extends BaseColumns {

    String TABLE_NAME = "waypoints";
    Uri CONTENT_URI = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/" + TABLE_NAME);
+    Uri CONTENT_URI_BY_TRACKID = Uri.parse(ContentProviderUtils.CONTENT_BASE_URI + "/" + TABLE_NAME + "/trackid");
    String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.de.dennisguse.waypoint";
    String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.de.dennisguse.waypoint";
    String DEFAULT_SORT_ORDER = "_id";
@@ -42,6 +42,7 @@ import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.UUIDUtils;

 /**
 * {@link ContentProviderUtils} implementation.
@@ -99,6 +100,7 @@ public class ContentProviderUtils {
     */
    public Track createTrack(Cursor cursor) {
        int idIndex = cursor.getColumnIndexOrThrow(TracksColumns._ID);
+        int uuidIndex = cursor.getColumnIndexOrThrow(TracksColumns.UUID);
        int nameIndex = cursor.getColumnIndexOrThrow(TracksColumns.NAME);
        int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
        int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
@@ -118,6 +120,9 @@ public class ContentProviderUtils {
        if (!cursor.isNull(idIndex)) {
            track.setId(cursor.getLong(idIndex));
        }
+        if (!cursor.isNull(uuidIndex)) {
+            track.setUuid(UUIDUtils.fromBytes(cursor.getBlob(uuidIndex)));
+        }
        if (!cursor.isNull(nameIndex)) {
            track.setName(cursor.getString(nameIndex));
        }
@@ -160,9 +165,7 @@ public class ContentProviderUtils {
        return track;
    }

-    /**
-     * Deletes all tracks (including waypoints and trackPoints).
-     */
+    @VisibleForTesting
    public void deleteAllTracks(Context context) {
        contentResolver.delete(TrackPointsColumns.CONTENT_URI_BY_ID, null, null);
        contentResolver.delete(WaypointsColumns.CONTENT_URI, null, null);
@@ -287,6 +290,7 @@ public class ContentProviderUtils {
        if (track.getId() >= 0) {
            values.put(TracksColumns._ID, track.getId());
        }
+        values.put(TracksColumns.UUID, UUIDUtils.toBytes(track.getUuid()));
        values.put(TracksColumns.NAME, track.getName());
        values.put(TracksColumns.DESCRIPTION, track.getDescription());
        values.put(TracksColumns.CATEGORY, track.getCategory());
@@ -910,5 +914,4 @@ public class ContentProviderUtils {
    public static String[] parseTrackIdsFromUri(Uri url) {
        return TextUtils.split(url.getLastPathSegment(), ID_SEPARATOR);
    }
-
 }
@@ -63,6 +63,7 @@ public abstract class CustomContentProvider extends ContentProvider {

        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.CONTENT_URI.getPath(), UrlType.WAYPOINTS.ordinal());
        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.CONTENT_URI.getPath() + "/#", UrlType.WAYPOINTS_BY_ID.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.CONTENT_URI_BY_TRACKID.getPath() + "/*", UrlType.WAYPOINTS_BY_TRACKID.ordinal());
    }

    @Override
@@ -140,6 +141,7 @@ public abstract class CustomContentProvider extends ContentProvider {
            case WAYPOINTS:
                return WaypointsColumns.CONTENT_TYPE;
            case WAYPOINTS_BY_ID:
+            case WAYPOINTS_BY_TRACKID:
                return WaypointsColumns.CONTENT_ITEMTYPE;
            default:
                throw new IllegalArgumentException("Unknown URL " + url);
@@ -219,6 +221,10 @@ public abstract class CustomContentProvider extends ContentProvider {
                queryBuilder.setTables(WaypointsColumns.TABLE_NAME);
                queryBuilder.appendWhere(WaypointsColumns._ID + "=" + ContentUris.parseId(url));
                break;
+            case WAYPOINTS_BY_TRACKID:
+                queryBuilder.setTables(WaypointsColumns.TABLE_NAME);
+                queryBuilder.appendWhere(WaypointsColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
+                break;
            default:
                throw new IllegalArgumentException("Unknown url " + url);
        }
@@ -382,6 +388,7 @@ public abstract class CustomContentProvider extends ContentProvider {
        TRACKS,
        TRACKS_BY_ID,
        WAYPOINTS,
-        WAYPOINTS_BY_ID
+        WAYPOINTS_BY_ID,
+        WAYPOINTS_BY_TRACKID
    }
 }
@@ -1,15 +1,20 @@
 package de.dennisguse.opentracks.content.provider;

+import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;

 import androidx.annotation.VisibleForTesting;

+import java.util.UUID;
+
 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
+import de.dennisguse.opentracks.util.UUIDUtils;

 /**
 * Database helper for creating and upgrading the database.
@@ -17,13 +22,11 @@ import de.dennisguse.opentracks.content.data.WaypointsColumns;
@VisibleForTesting
 class CustomSQLiteOpenHelper extends SQLiteOpenHelper {

-    @VisibleForTesting
-    private static final int DATABASE_VERSION = 25;
    private static final String TAG = CustomSQLiteOpenHelper.class.getSimpleName();

-    @VisibleForTesting
-    private static final String DATABASE_NAME = "database.db";
+    private static final int DATABASE_VERSION = 26;

+    private static final String DATABASE_NAME = "database.db";

    public CustomSQLiteOpenHelper(Context context) {
        this(context, DATABASE_NAME);
@@ -45,6 +48,7 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
        db.execSQL(TrackPointsColumns.CREATE_TABLE_INDEX);

        db.execSQL(TracksColumns.CREATE_TABLE);
+        db.execSQL(TracksColumns.CREATE_TABLE_INDEX);

        db.execSQL(WaypointsColumns.CREATE_TABLE);
        db.execSQL(WaypointsColumns.CREATE_TABLE_INDEX);
@@ -61,6 +65,9 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                case 25:
                    upgradeFrom24to25(db);
                    break;
+                case 26:
+                    upgradeFrom25to26(db);
+                    break;

                default:
                    throw new RuntimeException("Not implemented: upgrade to " + toVersion);
@@ -79,6 +86,9 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                case 24:
                    downgradeFrom25to24(db);
                    break;
+                case 25:
+                    downgradeFrom26to25(db);
+                    break;

                default:
                    throw new RuntimeException("Not implemented: downgrade to " + toVersion);
@@ -107,7 +117,7 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
    }

    private void downgradeFrom24to23(SQLiteDatabase db) {
-        //Not needed as the delete columns did not contain any data
+        //Not needed as the deleted columns did not contain any data
        db.beginTransaction();
        db.execSQL("ALTER TABLE tracks RENAME TO tracks_old");
        db.execSQL("CREATE TABLE tracks (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, starttime INTEGER, stoptime INTEGER, numpoints INTEGER, totaldistance FLOAT, totaltime INTEGER, movingtime INTEGER, avgspeed FLOAT, avgmovingspeed FLOAT, maxspeed FLOAT, minelevation FLOAT, maxelevation FLOAT, elevationgain FLOAT, mingrade FLOAT, maxgrade FLOAT, icon TEXT)");
@@ -142,4 +152,40 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
        db.setTransactionSuccessful();
        db.endTransaction();
    }
+
+    private void upgradeFrom25to26(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE tracks ADD COLUMN uuid BLOB");
+        try (Cursor cursor = db.query("tracks", new String[]{"_id"}, null, null, null, null, null)) {
+            if (cursor.moveToFirst()) {
+                int trackIdIndex = cursor.getColumnIndexOrThrow("_id");
+                do {
+                    long trackId = cursor.getLong(trackIdIndex);
+                    ContentValues cv = new ContentValues();
+                    cv.put("uuid", UUIDUtils.toBytes(UUID.randomUUID()));
+                    db.update("tracks", cv, "_id = ?", new String[]{String.valueOf(trackId)});
+                } while (cursor.moveToNext());
+            }
+        }
+
+        db.execSQL("CREATE UNIQUE INDEX tracks_uuid_index ON tracks(uuid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom26to25(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("DROP INDEX tracks_uuid_index");
+
+        db.execSQL("ALTER TABLE tracks RENAME TO tracks_old");
+        db.execSQL("CREATE TABLE tracks (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, starttime INTEGER, stoptime INTEGER, numpoints INTEGER, totaldistance FLOAT, totaltime INTEGER, movingtime INTEGER, avgspeed FLOAT, avgmovingspeed FLOAT, maxspeed FLOAT, minelevation FLOAT, maxelevation FLOAT, elevationgain FLOAT, mingrade FLOAT, maxgrade FLOAT, icon TEXT)");
+        db.execSQL("INSERT INTO tracks SELECT _id, name, description, category, starttime, stoptime, numpoints, totaldistance, totaltime, movingtime, avgspeed, avgmovingspeed, maxspeed, minelevation, maxelevation, elevationgain, 0, 0, icon FROM tracks_old");
+        db.execSQL("DROP TABLE tracks_old");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
 }
@@ -6,7 +6,6 @@ import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
-import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
 import android.util.Log;
@@ -92,7 +91,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont

    static long[] parseURI(Uri uri) {
        List<String> uriPaths = uri.getPathSegments();
-        if (uriPaths == null || uriPaths.size() < 2) {
+        if (uriPaths == null || uriPaths.size() < 3) {
            Log.d(TAG, "URI does not contain any trackIds.");
            return new long[]{};
        }
@@ -211,14 +210,11 @@ public class ShareContentProvider extends CustomContentProvider implements ICont

        final TrackExporter trackExporter = getTrackFileFormat(uri).newTrackExporter(getContext(), tracks);

-        PipeDataWriter pipeDataWriter = new PipeDataWriter<String>() {
-            @Override
-            public void writeDataToPipe(@NonNull ParcelFileDescriptor output, @NonNull Uri uri, @NonNull String mimeType, @Nullable Bundle opts, @Nullable String args) {
-                try (FileOutputStream fileOutputStream = new FileOutputStream(output.getFileDescriptor())) {
-                    trackExporter.writeTrack(getContext(), fileOutputStream);
-                } catch (IOException e) {
-                    Log.w(TAG, "there occurred an error while sharing a file: " + e);
-                }
+        PipeDataWriter<String> pipeDataWriter = (PipeDataWriter<String>) (output, uri1, mimeType, opts, args) -> {
+            try (FileOutputStream fileOutputStream = new FileOutputStream(output.getFileDescriptor())) {
+                trackExporter.writeTrack(getContext(), fileOutputStream);
+            } catch (IOException e) {
+                Log.w(TAG, "there occurred an error while sharing a file: " + e);
            }
        };

@@ -100,13 +100,4 @@ public class TrackPointIterator implements Iterator<TrackPoint>, AutoCloseable {
    public void remove() {
        throw new UnsupportedOperationException();
    }
-
-    public int getCount() {
-        if (cursor == null) {
-            return -1;
-        }
-
-        return cursor.getCount();
-    }
-
 }
@@ -6,10 +6,10 @@ import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;

 public class SensorData {

-    private String sensorAddress;
-    private String sensorName;
+    private final String sensorAddress;
+    private final String sensorName;

-    private long timestamp_ms;
+    private final long timestamp_ms;

    SensorData(String sensorAddress, String sensorName) {
        this(sensorAddress, sensorName, System.currentTimeMillis());
@@ -25,8 +25,8 @@ public final class SensorDataCycling {

    public static class Cadence extends SensorData {

-        private long crankRevolutionsCount; // UINT32
-        private int crankRevolutionsTime; // UINT16; 1/1024s
+        private final long crankRevolutionsCount; // UINT32
+        private final int crankRevolutionsTime; // UINT16; 1/1024s
        private float cadence_rpm = INVALID_VALUE_FLOAT;

        public Cadence(String sensorAddress, String sensorName, long crankRevolutionsCount, int crankRevolutionsTime) {
@@ -93,8 +93,8 @@ public final class SensorDataCycling {

    public static class Speed extends SensorData {

-        private int wheelRevolutionsCount; // UINT16
-        private int wheelRevolutionsTime; // UINT16; 1/1024s
+        private final int wheelRevolutionsCount; // UINT16
+        private final int wheelRevolutionsTime; // UINT16; 1/1024s
        private float speed_mps = INVALID_VALUE_FLOAT;

        public Speed(String sensorAddress, String sensorName, int wheelRevolutionsCount, int wheelRevolutionsTime) {
@@ -154,8 +154,8 @@ public final class SensorDataCycling {

    public static class CadenceAndSpeed extends SensorData {

-        private Cadence cadence;
-        private Speed speed;
+        private final Cadence cadence;
+        private final Speed speed;

        public CadenceAndSpeed(String sensorAddress, String sensorName, @NonNull Cadence cadence, @NonNull Speed speed) {
            super(sensorAddress, sensorName);
@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;

 public class SensorDataHeartRate extends SensorData {

-    private float heartRate_bpm;
+    private final float heartRate_bpm;

    public SensorDataHeartRate(String name, String address, float heartRate_bpm) {
        super(name, address);
@@ -90,12 +90,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
                boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
                if (metricUnits != chartView.getMetricUnits()) {
                    chartView.setMetricUnits(metricUnits);
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (isResumed()) {
-                                chartView.requestLayout();
-                            }
+                    runOnUiThread(() -> {
+                        if (isResumed()) {
+                            chartView.requestLayout();
                        }
                    });
                }
@@ -106,12 +103,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
                    chartView.setReportSpeed(reportSpeed);
                    chartView.applyReportSpeed();

-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (isResumed()) {
-                                chartView.requestLayout();
-                            }
+                    runOnUiThread(() -> {
+                        if (isResumed()) {
+                            chartView.requestLayout();
                        }
                    });
                }
@@ -214,12 +208,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
            trackStatisticsUpdater = startTime != -1L ? new TrackStatisticsUpdater(startTime) : null;
            pendingPoints.clear();
            chartView.reset();
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    if (isResumed()) {
-                        chartView.resetScroll();
-                    }
+            runOnUiThread(() -> {
+                if (isResumed()) {
+                    chartView.resetScroll();
                }
            });
        }
@@ -18,7 +18,6 @@ package de.dennisguse.opentracks.fragments;

 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;

 import androidx.annotation.NonNull;
@@ -43,7 +42,7 @@ public class ConfirmDeleteDialogFragment extends DialogFragment {
    /**
     * Create a new instance.
     *
-     * @param trackIds list of track ids to delete. To delete all, set to size 1 with trackIds[0] == -1L
+     * @param trackIds list of track ids to delete.
     */
    public static void showDialog(FragmentManager fragmentManager, long[] trackIds) {
        Bundle bundle = new Bundle();
@@ -69,17 +68,14 @@ public class ConfirmDeleteDialogFragment extends DialogFragment {
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        final long[] trackIds = getArguments().getLongArray(KEY_TRACK_IDS);

-        int titleId;
-        int messageId;
-        titleId = trackIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.track_delete_one_confirm_title;
-        messageId = trackIds.length > 1 ? R.string.track_delete_multiple_confirm_message : R.string.track_delete_one_confirm_message;
+        int titleId = trackIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.track_delete_one_confirm_title;
+        int messageId = trackIds.length > 1 ? R.string.track_delete_multiple_confirm_message : R.string.track_delete_one_confirm_message;
        return DialogUtils.createConfirmationDialog(
-                getActivity(), titleId, getString(messageId), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        caller.onConfirmDeleteDone(trackIds);
-                    }
-                });
+                getActivity(),
+                titleId,
+                getString(messageId),
+                (dialog, which) -> caller.onConfirmDeleteDone(trackIds)
+        );
    }

    /**
@@ -89,12 +85,6 @@ public class ConfirmDeleteDialogFragment extends DialogFragment {
     */
    public interface ConfirmDeleteCaller {

-        /**
-         * Called when confirm delete is done.
-         *
-         * @param trackIds list of track ids to delete. To delete all, set to size 1
-         *                 with trackIds[0] == -1L
-         */
        void onConfirmDeleteDone(long[] trackIds);
    }
 }
@@ -18,7 +18,6 @@ package de.dennisguse.opentracks.fragments;

 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;

 import androidx.annotation.NonNull;
@@ -77,21 +76,13 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
            messageId = markerIds.length > 1 ? R.string.marker_delete_multiple_confirm_message : R.string.marker_delete_one_confirm_message;
        }
        return DialogUtils.createConfirmationDialog(
-                fragmentActivity, titleId, getString(messageId), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
-                                for (long markerId : markerIds) {
-                                    contentProviderUtils.deleteWaypoint(getContext(), markerId);
-                                }
-                                caller.onDeleteMarkerDone();
-                            }
-                        }).start();
+                fragmentActivity, titleId, getString(messageId), (dialog, which) -> new Thread(() -> {
+                    ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
+                    for (long markerId : markerIds) {
+                        contentProviderUtils.deleteWaypoint(getContext(), markerId);
                    }
-                });
+                    caller.onDeleteMarkerDone();
+                }).start());
    }

    /**
@@ -0,0 +1,105 @@
+/*
+ * 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.fragments;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
+import de.dennisguse.opentracks.R;
+
+public class ExportFinishedDialogFragment extends DialogFragment {
+
+    private static final String TAG = ExportFinishedDialogFragment.class.getSimpleName();
+
+    private static final String EXTRA_DIRECTORY_NAME_KEY = "directory_name";
+    private static final String EXTRA_EXPORTED_TRACK_COUNT = "exported_track_count";
+    private static final String EXTRA_TOTAL_TRACK_COUNT = "";
+
+    private static final String FINISHED_DIALOG_TAG = "finished_dialog_tag";
+
+    private DismissCallback caller;
+
+    public static void showDialog(FragmentManager fragmentManager, String directoryDisplayName, int successCount, int fileCount) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EXTRA_DIRECTORY_NAME_KEY, directoryDisplayName);
+        bundle.putInt(EXTRA_EXPORTED_TRACK_COUNT, successCount);
+        bundle.putInt(EXTRA_TOTAL_TRACK_COUNT, fileCount);
+
+        ExportFinishedDialogFragment dialogFragment = new ExportFinishedDialogFragment();
+        dialogFragment.setArguments(bundle);
+        dialogFragment.show(fragmentManager, FINISHED_DIALOG_TAG);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            caller = (DismissCallback) context;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(context + " must implement " + DismissCallback.class.getSimpleName());
+        }
+    }
+
+    @Override
+    @NonNull
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        String directoryDisplayName = getArguments().getString(EXTRA_DIRECTORY_NAME_KEY);
+        int exportedTracksCount = getArguments().getInt(EXTRA_EXPORTED_TRACK_COUNT);
+        int totalTracksCount = getArguments().getInt(EXTRA_TOTAL_TRACK_COUNT);
+
+        int iconId;
+        int titleId;
+        String message;
+        String totalTracks = getResources().getQuantityString(R.plurals.tracks, totalTracksCount, totalTracksCount);
+        if (exportedTracksCount == totalTracksCount) {
+            iconId = R.drawable.ic_dialog_success_24dp;
+            titleId = R.string.generic_success_title;
+            message = getString(
+                    R.string.export_success, totalTracks, directoryDisplayName);
+        } else {
+            iconId = R.drawable.ic_dialog_error_24dp;
+            titleId = R.string.generic_error_title;
+            message = getString(R.string.export_error, exportedTracksCount, totalTracks, directoryDisplayName);
+        }
+        Dialog alertDialog = new AlertDialog.Builder(getContext()).setCancelable(true)
+                .setIcon(iconId).setMessage(message)
+                .setPositiveButton(R.string.generic_ok, (dialog, arg1) -> {
+                    dialog.dismiss();
+                    caller.onDismissed();
+                }).setTitle(titleId)
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        caller = null;
+    }
+
+    public interface DismissCallback {
+        void onDismissed();
+    }
+}
@@ -0,0 +1,245 @@
+/*
+ * 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.fragments;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.documentfile.provider.DocumentFile;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.FileUtils;
+
+public class ExportProgressDialogFragment extends DialogFragment {
+
+    private static final String EXTRA_DIRECTORY_URI_KEY = "directory_uri";
+    private static final String EXTRA_TRACKFILEFORMAT_KEY = "trackfileformat";
+
+    private static final String TAG = ExportProgressDialogFragment.class.getSimpleName();
+
+    public static final String EXPORT_DIALOG_TAG = "export_dialog_tag";
+
+    private DismissCallback caller;
+
+    private ExportThread exportThread;
+
+    private String directoryDisplayName;
+
+    private int trackExportSuccessCount;
+    private int trackCount;
+
+    /**
+     * Create a new instance.
+     */
+    public static void showDialog(FragmentManager fragmentManager, TrackFileFormat trackFileFormat, Uri documentFileUri) {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(EXTRA_DIRECTORY_URI_KEY, documentFileUri);
+        bundle.putSerializable(EXTRA_TRACKFILEFORMAT_KEY, trackFileFormat);
+
+        ExportProgressDialogFragment dialogFragment = new ExportProgressDialogFragment();
+        dialogFragment.setArguments(bundle);
+        dialogFragment.setRetainInstance(true);
+        dialogFragment.show(fragmentManager, EXPORT_DIALOG_TAG);
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // This fragment uses a background thread, so it should not be recreated during activity re-creation.
+        setRetainInstance(true);
+
+        Uri directoryUri = getArguments().getParcelable(EXTRA_DIRECTORY_URI_KEY);
+        TrackFileFormat trackFileFormat = (TrackFileFormat) getArguments().getSerializable(EXTRA_TRACKFILEFORMAT_KEY);
+        DocumentFile documentFile = DocumentFile.fromTreeUri(getContext(), directoryUri);
+
+        directoryDisplayName = FileUtils.getPath(documentFile);
+
+        exportThread = new ExportThread(trackFileFormat, documentFile);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            caller = (DismissCallback) context;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(context + " must implement " + DismissCallback.class.getSimpleName());
+        }
+    }
+
+    @Override
+    @NonNull
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        ProgressDialog progressDialog = DialogUtils.createHorizontalProgressDialog(getContext(),
+                R.string.export_progress_message,
+                dialog -> {
+                    exportThread.interrupt();
+                    dialog.dismiss();
+                    caller.onExportCanceled(directoryDisplayName, trackExportSuccessCount, trackCount);
+                }, directoryDisplayName);
+
+        progressDialog.setIndeterminate(false);
+        progressDialog.setMax(trackCount);
+        progressDialog.setProgress(Math.min(trackExportSuccessCount, trackCount));
+
+        return progressDialog;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        setProgress();
+        if (!exportThread.isAlive()) {
+            exportThread.start();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (!exportThread.isAlive()) {
+            exportThread.interrupt();
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        caller = null;
+    }
+
+    private void onProgress(int trackImportSuccessCount, int fileCount) {
+        this.trackExportSuccessCount = trackImportSuccessCount;
+        this.trackCount = fileCount;
+        setProgress();
+    }
+
+    private void setProgress() {
+        ProgressDialog dialog = (ProgressDialog) getDialog();
+        if (dialog != null) {
+            dialog.setIndeterminate(false);
+            dialog.setMax(trackCount);
+            dialog.setProgress(Math.min(trackExportSuccessCount, trackCount));
+        }
+    }
+
+    private void onExportCompleted(int successCount, int fileCount) {
+        if (caller != null && !isDetached()) {
+            caller.onExportFinished(directoryDisplayName, successCount, fileCount);
+        }
+        dismissAllowingStateLoss();
+    }
+
+    private class ExportThread extends Thread {
+
+        private final TrackFileFormat trackFileFormat;
+
+        private final DocumentFile directory;
+
+        ExportThread(TrackFileFormat trackFileFormat, DocumentFile directory) {
+            this.directory = directory;
+            this.trackFileFormat = trackFileFormat;
+        }
+
+        @Override
+        public void run() {
+            Context context = ExportProgressDialogFragment.this.getContext();
+
+            ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
+
+            try (Cursor cursor = contentProviderUtils.getTrackCursor(null, null, TracksColumns._ID)) {
+                if (cursor == null) {
+                    onExportCompleted(0, 0);
+                    return;
+                }
+
+                trackCount = cursor.getCount();
+                for (int i = 0; i < trackCount; i++) {
+                    onProgress(i, trackCount);
+                    if (Thread.interrupted()) {
+                        return;
+                    }
+
+                    cursor.moveToPosition(i);
+                    Track track = contentProviderUtils.createTrack(cursor);
+                    if (track != null && exportTrack(context, track)) {
+                        trackExportSuccessCount++;
+                    }
+                }
+
+                onExportCompleted(trackExportSuccessCount, trackCount);
+            }
+        }
+
+        private Boolean exportTrack(Context context, Track track) {
+            TrackExporter trackExporter = trackFileFormat.newTrackExporter(context, new Track[]{track});
+
+            //TODO Move to helper function
+            String fileName = track.getId() + "." + trackFileFormat.getExtension();
+
+            // Overwrite a file if it exists; DocumentFile.createFile() creates a new file appending a suffix if the displayname already exists.
+            DocumentFile file = directory.findFile(fileName);
+            if (file == null) {
+                file = directory.createFile(trackFileFormat.getMimeType(), fileName);
+            }
+
+            try (OutputStream outputStream = context.getContentResolver().openOutputStream(file.getUri())) {
+                if (trackExporter.writeTrack(context, outputStream)) {
+                    return true;
+                } else {
+                    if (!file.delete()) {
+                        Log.e(TAG, "Unable to delete file");
+                    }
+                    Log.e(TAG, "Unable to export track");
+                    return false;
+                }
+            } catch (FileNotFoundException e) {
+                Log.e(TAG, "Unable to open file " + file.getName(), e);
+                return false;
+            } catch (IOException e) {
+                Log.e(TAG, "Unable to close file output stream", e);
+                return false;
+            }
+        }
+    }
+
+    public interface DismissCallback {
+        void onExportCanceled(String directoryDisplayName, int successCount, int fileCount);
+
+        void onExportFinished(String directoryDisplayName, int successCount, int fileCount);
+    }
+}
@@ -0,0 +1,111 @@
+/*
+ * 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.fragments;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
+import de.dennisguse.opentracks.R;
+
+public class ImportFinishedDialogFragment extends DialogFragment {
+
+    private static final String TAG = ImportFinishedDialogFragment.class.getSimpleName();
+
+    private static final String EXTRA_DIRECTORY_NAME_KEY = "directory_name";
+    private static final String EXTRA_IMPORTED_TRACK_COUNT = "imported_track_count";
+    private static final String EXTRA_FILE_COUNT = "file_count";
+
+    private static final String FINISHED_DIALOG_TAG = "finished_dialog_tag";
+
+    private DismissCallback caller;
+
+    public static void showDialog(FragmentManager fragmentManager, String directoryDisplayName, int successCount, int fileCount) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EXTRA_DIRECTORY_NAME_KEY, directoryDisplayName);
+        bundle.putInt(EXTRA_IMPORTED_TRACK_COUNT, successCount);
+        bundle.putInt(EXTRA_FILE_COUNT, fileCount);
+
+        ImportFinishedDialogFragment dialogFragment = new ImportFinishedDialogFragment();
+        dialogFragment.setArguments(bundle);
+        dialogFragment.show(fragmentManager, FINISHED_DIALOG_TAG);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            caller = (DismissCallback) context;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(context + " must implement " + DismissCallback.class.getSimpleName());
+        }
+    }
+
+    @Override
+    @NonNull
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        String directoryDisplayName = getArguments().getString(EXTRA_DIRECTORY_NAME_KEY);
+        int importedTrackCount = getArguments().getInt(EXTRA_IMPORTED_TRACK_COUNT);
+        int totalTrackCount = getArguments().getInt(EXTRA_FILE_COUNT);
+
+        int iconId;
+        int titleId;
+        String message;
+        String totalFiles = getResources().getQuantityString(R.plurals.files, totalTrackCount, totalTrackCount);
+        if (importedTrackCount == totalTrackCount) {
+            if (totalTrackCount == 0) {
+                iconId = R.drawable.ic_dialog_info_24dp;
+                titleId = R.string.import_no_file_title;
+                message = getString(R.string.import_no_file, directoryDisplayName);
+            } else {
+                iconId = R.drawable.ic_dialog_success_24dp;
+                titleId = R.string.generic_success_title;
+                message = getString(R.string.import_success, totalFiles, directoryDisplayName);
+            }
+        } else {
+            iconId = R.drawable.ic_dialog_error_24dp;
+            titleId = R.string.generic_error_title;
+            message = getString(R.string.import_error, importedTrackCount, totalFiles, directoryDisplayName);
+        }
+        Dialog dialog = new AlertDialog.Builder(getContext())
+                .setCancelable(true).setIcon(iconId)
+                .setMessage(message)
+                .setPositiveButton(R.string.generic_ok, (dialogInterface, which) -> {
+                    dialogInterface.dismiss();
+                    caller.onDismissed();
+                })
+                .setTitle(titleId)
+                .create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        caller = null;
+    }
+
+    public interface DismissCallback {
+        void onDismissed();
+    }
+}
@@ -0,0 +1,230 @@
+/*
+ * 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.fragments;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.documentfile.provider.DocumentFile;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.io.file.importer.GpxFileTrackImporter;
+import de.dennisguse.opentracks.io.file.importer.KmlFileTrackImporter;
+import de.dennisguse.opentracks.io.file.importer.KmzTrackImporter;
+import de.dennisguse.opentracks.io.file.importer.TrackImporter;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.FileUtils;
+
+public class ImportProgressDialogFragment extends DialogFragment {
+
+    private static final String EXTRA_IS_TREE_KEY = "tree_uri";
+
+    private static final String EXTRA_DATA_URI_KEY = "data_uri";
+
+    private static final String TAG = ImportProgressDialogFragment.class.getSimpleName();
+
+    public static final String IMPORT_DIALOG_TAG = "import_dialog_tag";
+
+    private DismissCallback caller;
+
+    private ImportThread importThread;
+
+    private String directoryDisplayName;
+
+    private int trackImportSuccessCount;
+    private int fileCount;
+
+    public static void showDialog(FragmentManager fragmentManager, Uri documentFileUri, boolean isDirectory) {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(EXTRA_DATA_URI_KEY, documentFileUri);
+        bundle.putBoolean(EXTRA_IS_TREE_KEY, isDirectory);
+
+        ImportProgressDialogFragment dialogFragment = new ImportProgressDialogFragment();
+        dialogFragment.setArguments(bundle);
+        dialogFragment.setRetainInstance(true);
+        dialogFragment.show(fragmentManager, IMPORT_DIALOG_TAG);
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // This fragment uses a background thread, so it should not be recreated during activity re-creation.
+        setRetainInstance(true);
+
+        Uri directoryUri = getArguments().getParcelable(EXTRA_DATA_URI_KEY);
+        DocumentFile documentFile;
+        if (getArguments().getBoolean(EXTRA_IS_TREE_KEY)) {
+            documentFile = DocumentFile.fromTreeUri(getContext(), directoryUri);
+        } else {
+            documentFile = DocumentFile.fromSingleUri(getContext(), directoryUri);
+        }
+        directoryDisplayName = FileUtils.getPath(documentFile);
+
+        importThread = new ImportThread(documentFile);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            caller = (DismissCallback) context;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(context + " must implement " + DismissCallback.class.getSimpleName());
+        }
+    }
+
+    @Override
+    @NonNull
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        ProgressDialog progressDialog = DialogUtils.createHorizontalProgressDialog(
+                getContext(), R.string.import_progress_message,
+                dialogInterface -> {
+                    importThread.interrupt();
+                    dialogInterface.dismiss();
+                    caller.onImportCanceled(directoryDisplayName, trackImportSuccessCount, fileCount);
+                }, directoryDisplayName);
+
+        progressDialog.setIndeterminate(false);
+        progressDialog.setMax(fileCount);
+        progressDialog.setProgress(Math.min(trackImportSuccessCount, fileCount));
+
+        return progressDialog;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        setProgress();
+        if (!importThread.isAlive()) {
+            importThread.start();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (!importThread.isAlive()) {
+            importThread.interrupt();
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        caller = null;
+    }
+
+    private void onProgress(int trackImportSuccessCount, int fileCount) {
+        this.trackImportSuccessCount = trackImportSuccessCount;
+        this.fileCount = fileCount;
+        setProgress();
+    }
+
+    private void setProgress() {
+        ProgressDialog dialog = (ProgressDialog) getDialog();
+        if (dialog != null) {
+            dialog.setIndeterminate(false);
+            dialog.setMax(fileCount);
+            dialog.setProgress(Math.min(trackImportSuccessCount, fileCount));
+        }
+    }
+
+    private void onImportCompleted(int successCount, int fileCount) {
+        if (caller != null && !isDetached()) {
+            caller.onImportFinished(directoryDisplayName, successCount, fileCount);
+        }
+        dismissAllowingStateLoss();
+    }
+
+    private class ImportThread extends Thread {
+
+        private final DocumentFile file;
+
+        ImportThread(DocumentFile file) {
+            this.file = file;
+        }
+
+        @Override
+        public void run() {
+            Context context = ImportProgressDialogFragment.this.getContext();
+
+            List<DocumentFile> files = FileUtils.getFiles(file);
+
+            int importedTrackCount = 0;
+            for (int i = 0; i < files.size(); i++) {
+                onProgress(i, files.size());
+
+                if (Thread.interrupted()) {
+                    return;
+                }
+                if (importFile(context, files.get(i))) {
+                    importedTrackCount++;
+                }
+            }
+
+            onImportCompleted(importedTrackCount, files.size());
+        }
+
+        /**
+         * Imports a file.
+         *
+         * @param file the file
+         */
+        private boolean importFile(final Context context, final DocumentFile file) {
+            TrackImporter trackImporter;
+            String fileExtension = FileUtils.getExtension(file);
+
+            if (TrackFileFormat.GPX.getExtension().equals(fileExtension)) {
+                trackImporter = new GpxFileTrackImporter(context);
+            } else if (TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.getExtension().equals(fileExtension)) {
+                trackImporter = new KmlFileTrackImporter(ImportProgressDialogFragment.this.getContext(), -1L);
+            } else if (TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES.getExtension().equals(fileExtension)) {
+                trackImporter = new KmzTrackImporter(context, -1L, file.getUri());
+            } else {
+                Log.i(TAG, "Unsupported file format.");
+                return false;
+            }
+
+            try (InputStream inputStream = context.getContentResolver().openInputStream(file.getUri())) {
+                return trackImporter.importFile(inputStream) != -1L;
+            } catch (IOException e) {
+                Log.e(TAG, "Unable to import file", e);
+                return false;
+            }
+        }
+    }
+
+    public interface DismissCallback {
+        void onImportCanceled(String directoryDisplayName, int successCount, int fileCount);
+
+        void onImportFinished(String directoryDisplayName, int successCount, int fileCount);
+    }
+}
@@ -109,7 +109,7 @@ public class MarkerDetailFragment extends Fragment {
        long markerId = getArguments().getLong(KEY_MARKER_ID);
        if (markerId == -1L) {
            Log.d(TAG, "invalid marker id");
-            getFragmentManager().popBackStack();
+            getParentFragmentManager().popBackStack();
            return;
        }
        contentProviderUtils = new ContentProviderUtils(getActivity());
@@ -125,16 +125,13 @@ public class MarkerDetailFragment extends Fragment {
        textGradient = view.findViewById(R.id.marker_detail_waypoint_text_gradient);
        waypointInfo = view.findViewById(R.id.marker_detail_waypoint_info);

-        photoView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                handler.removeCallbacks(hideText);
-                int visibility = waypointInfo.getVisibility() == View.GONE ? View.VISIBLE : View.GONE;
-                textGradient.setVisibility(visibility);
-                waypointInfo.setVisibility(visibility);
-                if (visibility == View.VISIBLE) {
-                    handler.postDelayed(hideText, HIDE_TEXT_DELAY);
-                }
+        photoView.setOnClickListener(v -> {
+            handler.removeCallbacks(hideText);
+            int visibility = waypointInfo.getVisibility() == View.GONE ? View.VISIBLE : View.GONE;
+            textGradient.setVisibility(visibility);
+            waypointInfo.setVisibility(visibility);
+            if (visibility == View.VISIBLE) {
+                handler.postDelayed(hideText, HIDE_TEXT_DELAY);
            }
        });
        return view;
@@ -222,7 +219,7 @@ public class MarkerDetailFragment extends Fragment {
            waypoint = contentProviderUtils.getWaypoint(getArguments().getLong(KEY_MARKER_ID));
            if (waypoint == null) {
                Log.d(TAG, "waypoint is null");
-                getFragmentManager().popBackStack();
+                getParentFragmentManager().popBackStack();
            }
        }
    }
@@ -54,20 +54,14 @@ public class StatisticsRecordedFragment extends Fragment implements TrackDataLis
    private TrackStatistics trackStatistics = null;
    private String category = "";

-    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) {
-                if (isResumed()) {
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (isResumed()) {
-                                updateUI();
-                            }
-                        }
-                    });
-                }
+    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (preferences, key) -> {
+        if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) {
+            if (isResumed()) {
+                getActivity().runOnUiThread(() -> {
+                    if (isResumed()) {
+                        updateUI();
+                    }
+                });
            }
        }
    };
@@ -127,23 +121,17 @@ public class StatisticsRecordedFragment extends Fragment implements TrackDataLis

        Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
        activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
-        activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    ((TrackRecordedActivity) getActivity()).chooseActivityType(category);
-                }
-                return true;
+        activityTypeIcon.setOnTouchListener((v, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                ((TrackRecordedActivity) getActivity()).chooseActivityType(category);
            }
+            return true;
        });
-        activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    ((TrackRecordedActivity) getActivity()).chooseActivityType(category);
-                }
-                return true;
+        activityTypeIcon.setOnKeyListener((v, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+                ((TrackRecordedActivity) getActivity()).chooseActivityType(category);
            }
+            return true;
        });
    }

@@ -195,14 +183,11 @@ public class StatisticsRecordedFragment extends Fragment implements TrackDataLis
    @Override
    public void onTrackUpdated(final Track track) {
        if (isResumed()) {
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    if (isResumed()) {
-                        trackStatistics = track != null ? track.getTrackStatistics() : null;
-                        category = track != null ? track.getCategory() : "";
-                        updateUI();
-                    }
+            getActivity().runOnUiThread(() -> {
+                if (isResumed()) {
+                    trackStatistics = track != null ? track.getTrackStatistics() : null;
+                    category = track != null ? track.getCategory() : "";
+                    updateUI();
                }
            });
        }
@@ -68,12 +68,9 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
            if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) {
                if (isResumed()) {
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (isResumed()) {
-                                updateUI();
-                            }
+                    getActivity().runOnUiThread(() -> {
+                        if (isResumed()) {
+                            updateUI();
                        }
                    });
                }
@@ -206,23 +203,17 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi

        Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
        activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
-        activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
-                }
-                return true;
+        activityTypeIcon.setOnTouchListener((v, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
            }
+            return true;
        });
-        activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
-                }
-                return true;
+        activityTypeIcon.setOnKeyListener((v, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+                ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
            }
+            return true;
        });
    }

@@ -308,14 +299,11 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
    @Override
    public void onTrackUpdated(final Track track) {
        if (isResumed()) {
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    if (isResumed()) {
-                        lastTrackStatistics = track != null ? track.getTrackStatistics() : null;
-                        category = track != null ? track.getCategory() : "";
-                        updateUI();
-                    }
+            getActivity().runOnUiThread(() -> {
+                if (isResumed()) {
+                    lastTrackStatistics = track != null ? track.getTrackStatistics() : null;
+                    category = track != null ? track.getCategory() : "";
+                    updateUI();
                }
            });
        }
@@ -339,24 +327,21 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
    @Override
    public void onNewTrackPointsDone() {
        if (isResumed()) {
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    if (isResumed()) {
-                        if (!isSelectedTrackRecording() || isSelectedTrackPaused()) {
+            getActivity().runOnUiThread(() -> {
+                if (isResumed()) {
+                    if (!isSelectedTrackRecording() || isSelectedTrackPaused()) {
+                        lastTrackPoint = null;
+                    }
+
+                    if (lastTrackPoint != null) {
+                        boolean hasFix = !LocationUtils.isLocationOld(lastTrackPoint.getLocation());
+                        boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(lastTrackPoint, recordingGpsAccuracy);
+
+                        if (!hasFix || !hasGoodFix) {
                            lastTrackPoint = null;
                        }
-
-                        if (lastTrackPoint != null) {
-                            boolean hasFix = !LocationUtils.isLocationOld(lastTrackPoint.getLocation());
-                            boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(lastTrackPoint, recordingGpsAccuracy);
-
-                            if (!hasFix || !hasGoodFix) {
-                                lastTrackPoint = null;
-                            }
-                        }
-                        setLocationValues();
                    }
+                    setLocationValues();
                }
            });
        }
@@ -16,160 +16,58 @@

 package de.dennisguse.opentracks.io.file.exporter;

-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;

-import androidx.annotation.Nullable;
-import androidx.documentfile.provider.DocumentFile;
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;

-import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.fragments.ExportFinishedDialogFragment;
+import de.dennisguse.opentracks.fragments.ExportProgressDialogFragment;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
-import de.dennisguse.opentracks.util.DialogUtils;
-import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.PreferencesUtils;

 /**
 * An activity for saving tracks to the external storage.
 *
 * @author Rodrigo Damazio
 */
-public class ExportActivity extends FragmentActivity {
+public class ExportActivity extends FragmentActivity implements ExportProgressDialogFragment.DismissCallback, ExportFinishedDialogFragment.DismissCallback {

-    private static final int DIRECTORY_PICKER_REQUEST_CODE = 6;
+    public static final String EXTRA_DIRECTORY_URI_KEY = "directory_uri";

-    private static final int DIALOG_PROGRESS_ID = 0;
-    private static final int DIALOG_RESULT_ID = 1;
+    public static final String EXTRA_TRACKFILEFORMAT_KEY = "trackfileformat";

-    private String directoryDisplayName;
-
-    private ExportAsyncTask exportAsyncTask;
-    private ProgressDialog progressDialog;
-
-    private int processedTrackCount;
-    private int totalTrackCount;
+    private static final String BUNDLE_ACTIVITY_RECREATED = "activity_recreated";

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);

-        startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
-        super.onActivityResult(requestCode, resultCode, resultData);
-        if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                Uri directoryUri = resultData.getData();
-                DocumentFile pickedDirectory = DocumentFile.fromTreeUri(this, directoryUri);
-                DocumentFile exportDirectory = pickedDirectory.findFile(FileUtils.EXPORT_DIR);
-                if (exportDirectory == null) {
-                    exportDirectory = pickedDirectory.createDirectory(FileUtils.EXPORT_DIR);
-                }
-
-                TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(this);
-
-                directoryDisplayName = FileUtils.getPath(exportDirectory);
-                exportAsyncTask = new ExportAsyncTask(this, trackFileFormat, exportDirectory);
-                exportAsyncTask.execute();
-            } else {
-                finish();
-            }
+        if (savedInstanceState == null || !savedInstanceState.getBoolean(BUNDLE_ACTIVITY_RECREATED, false)) {
+            Uri directoryUri = getIntent().getParcelableExtra(EXTRA_DIRECTORY_URI_KEY);
+            TrackFileFormat trackfileformat = (TrackFileFormat) getIntent().getSerializableExtra(EXTRA_TRACKFILEFORMAT_KEY);
+            ExportProgressDialogFragment.showDialog(getSupportFragmentManager(), trackfileformat, directoryUri);
        }
    }

    @Override
-    protected Dialog onCreateDialog(int id) {
-        switch (id) {
-            case DIALOG_PROGRESS_ID:
-                progressDialog = DialogUtils.createHorizontalProgressDialog(this,
-                        R.string.export_progress_message,
-                        new DialogInterface.OnCancelListener() {
-                            @Override
-                            public void onCancel(DialogInterface dialog) {
-                                exportAsyncTask.cancel(true);
-                                dialog.dismiss();
-                                finish();
-                            }
-                        }, directoryDisplayName);
-                return progressDialog;
-            case DIALOG_RESULT_ID:
-                int iconId;
-                int titleId;
-                String message;
-                String totalTracks = getResources()
-                        .getQuantityString(R.plurals.tracks, totalTrackCount, totalTrackCount);
-                if (processedTrackCount == totalTrackCount) {
-                    iconId = R.drawable.ic_dialog_success_24dp;
-                    titleId = R.string.generic_success_title;
-                    message = getString(
-                            R.string.export_success, totalTracks, directoryDisplayName);
-                } else {
-                    iconId = R.drawable.ic_dialog_error_24dp;
-                    titleId = R.string.generic_error_title;
-                    message = getString(R.string.export_error, processedTrackCount, totalTracks, directoryDisplayName);
-                }
-                AlertDialog.Builder builder = new AlertDialog.Builder(this).setCancelable(true)
-                        .setIcon(iconId).setMessage(message)
-                        .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                            @Override
-                            public void onCancel(DialogInterface dialog) {
-                                dialog.dismiss();
-                                finish();
-                            }
-                        }).setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int arg1) {
-                                dialog.dismiss();
-                                finish();
-                            }
-                        }).setTitle(titleId);
-                return builder.create();
-            default:
-                return null;
-        }
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(BUNDLE_ACTIVITY_RECREATED, true);
    }

-    /**
-     * Invokes when the associated AsyncTask completes.
-     *
-     * @param aSuccessCount the number of tracks successfully saved
-     * @param aTotalCount   the number of tracks to save
-     */
-    public void onAsyncTaskCompleted(int aSuccessCount, int aTotalCount) {
-        processedTrackCount = aSuccessCount;
-        totalTrackCount = aTotalCount;
-        removeDialog(DIALOG_PROGRESS_ID);
-        showDialog(DIALOG_RESULT_ID);
+    @Override
+    public void onExportCanceled(String directoryDisplayName, int successCount, int fileCount) {
+        onExportFinished(directoryDisplayName, successCount, fileCount);
    }

-    /**
-     * Shows the progress dialog.
-     */
-    public void showProgressDialog() {
-        showDialog(DIALOG_PROGRESS_ID);
+    @Override
+    public void onExportFinished(final String directoryDisplayName, final int successCount, final int fileCount) {
+        runOnUiThread(() -> ExportFinishedDialogFragment.showDialog(getSupportFragmentManager(), directoryDisplayName, successCount, fileCount));
    }

-    /**
-     * Sets the progress dialog value.
-     *
-     * @param number the number of points saved
-     * @param max    the maximum number of points
-     */
-    public void setProgressDialogValue(int number, int max) {
-        if (progressDialog != null) {
-            progressDialog.setIndeterminate(false);
-            progressDialog.setMax(max);
-            progressDialog.setProgress(Math.min(number, max));
-        }
+    @Override
+    public void onDismissed() {
+        finish();
    }
 }
@@ -1,168 +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.io.file.exporter;
-
-import android.database.Cursor;
-import android.os.AsyncTask;
-import android.os.PowerManager.WakeLock;
-import android.util.Log;
-
-import androidx.documentfile.provider.DocumentFile;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
-import de.dennisguse.opentracks.util.SystemUtils;
-
-/**
- * Async Task to save tracks to the external storage.
- *
- * @author Jimmy Shih
- */
-//TODO Make independent from ExportActivity?
-class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
-
-    private static final String TAG = ExportAsyncTask.class.getSimpleName();
-    private final TrackFileFormat trackFileFormat;
-    private final DocumentFile directory;
-    private final ContentProviderUtils contentProviderUtils;
-    private ExportActivity exportActivity;
-    private WakeLock wakeLock;
-
-    private int processedTrackCount = 0;
-    private int totalTrackCount = 0;
-
-    /**
-     * Creates an AsyncTask.
-     *
-     * @param exportActivity  the activity currently associated with this task
-     * @param trackFileFormat the track file format
-     * @param directory       the directory to write the file
-     */
-    public ExportAsyncTask(ExportActivity exportActivity, TrackFileFormat trackFileFormat, DocumentFile directory) {
-        this.exportActivity = exportActivity;
-        this.trackFileFormat = trackFileFormat;
-        this.directory = directory;
-        contentProviderUtils = new ContentProviderUtils(exportActivity);
-    }
-
-    @Override
-    protected void onPreExecute() {
-        if (exportActivity != null) {
-            exportActivity.showProgressDialog();
-        }
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... params) {
-        try {
-            Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
-
-            wakeLock = SystemUtils.acquireWakeLock(exportActivity, wakeLock);
-
-            return exportAllTracks();
-        } finally {
-            wakeLock = SystemUtils.releaseWakeLock(wakeLock);
-        }
-    }
-
-    @Override
-    protected void onProgressUpdate(Integer... values) {
-        if (exportActivity != null) {
-            exportActivity.setProgressDialogValue(values[0], values[1]);
-        }
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (exportActivity != null) {
-            exportActivity.onAsyncTaskCompleted(processedTrackCount, totalTrackCount);
-        }
-    }
-
-    @Override
-    protected void onCancelled() {
-        if (exportActivity != null) {
-            exportActivity.onAsyncTaskCompleted(processedTrackCount, totalTrackCount);
-        }
-    }
-
-    /**
-     * Export the track to one file.
-     *
-     * @param track the track
-     */
-    private Boolean exportTrack(Track track) {
-        TrackExporter trackExporter = trackFileFormat.newTrackExporter(exportActivity, new Track[]{track});
-
-        String fileName = track.getId() + "." + trackFileFormat.getExtension();
-
-        // Overwrite a file if it exists; DocumentFile.createFile() creates a new file appending a suffix if the displayname already exists.
-        DocumentFile file = directory.findFile(fileName);
-        if (file == null) {
-            file = directory.createFile(trackFileFormat.getMimeType(), fileName);
-        }
-
-        try (OutputStream outputStream = exportActivity.getContentResolver().openOutputStream(file.getUri())) {
-            if (trackExporter.writeTrack(exportActivity, outputStream)) {
-                return true;
-            } else {
-                if (!file.delete()) {
-                    Log.d(TAG, "Unable to delete file");
-                }
-                Log.e(TAG, "Unable to export track");
-                return false;
-            }
-        } catch (FileNotFoundException e) {
-            Log.e(TAG, "Unable to open file " + file.getName(), e);
-            return false;
-        } catch (IOException e) {
-            Log.e(TAG, "Unable to close file output stream", e);
-            return false;
-        }
-    }
-
-    /**
-     * Saves all the tracks.
-     */
-    private Boolean exportAllTracks() {
-        try (Cursor cursor = contentProviderUtils.getTrackCursor(null, null, TracksColumns._ID)) {
-            if (cursor == null) {
-                return false;
-            }
-            totalTrackCount = cursor.getCount();
-
-            for (int i = 0; i < totalTrackCount; i++) {
-                if (isCancelled()) {
-                    return false;
-                }
-                cursor.moveToPosition(i);
-                Track track = contentProviderUtils.createTrack(cursor);
-                if (track != null && exportTrack(track)) {
-                    processedTrackCount++;
-                }
-                publishProgress(i + 1, totalTrackCount);
-            }
-            return true;
-        }
-    }
-}
@@ -33,11 +33,13 @@ import de.dennisguse.opentracks.util.StringUtils;
 *
 * @author Sandor Dornbush
 */
-//TODO Can we export SensorData in GPX?
 public class GpxTrackWriter implements TrackWriter {

    private static final NumberFormat ELEVATION_FORMAT = NumberFormat.getInstance(Locale.US);
    private static final NumberFormat COORDINATE_FORMAT = NumberFormat.getInstance(Locale.US);
+    private static final NumberFormat SPEED_FORMAT = NumberFormat.getInstance(Locale.US);
+    private static final NumberFormat HEARTRATE_FORMAT = NumberFormat.getInstance(Locale.US);
+    private static final NumberFormat CADENCE_FORMAT = NumberFormat.getInstance(Locale.US);

    static {
        /*
@@ -50,6 +52,15 @@ public class GpxTrackWriter implements TrackWriter {
        COORDINATE_FORMAT.setMaximumFractionDigits(6);
        COORDINATE_FORMAT.setMaximumIntegerDigits(3);
        COORDINATE_FORMAT.setGroupingUsed(false);
+
+        SPEED_FORMAT.setMaximumFractionDigits(2);
+        SPEED_FORMAT.setGroupingUsed(false);
+
+        HEARTRATE_FORMAT.setMaximumFractionDigits(0);
+        HEARTRATE_FORMAT.setGroupingUsed(false);
+
+        CADENCE_FORMAT.setMaximumFractionDigits(0);
+        CADENCE_FORMAT.setGroupingUsed(false);
    }

    private final String creator;
@@ -82,11 +93,12 @@ public class GpxTrackWriter implements TrackWriter {
            printWriter.println("xmlns=\"http://www.topografix.com/GPX/1/1\"");
            printWriter.println("xmlns:topografix=\"http://www.topografix.com/GPX/Private/TopoGrafix/0/1\"");
            printWriter.println("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
-            printWriter.println("xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1"
-                    + " http://www.topografix.com/GPX/1/1/gpx.xsd"
-                    + " http://www.topografix.com/GPX/Private/TopoGrafix/0/1"
-                    + " http://www.topografix.com/GPX/Private/TopoGrafix/0/1/topografix.xsd\">");
+            printWriter.println("xmlns:gpxtpx=\"http://www.garmin.com/xmlschemes/TrackPointExtension/v2\"");
+            printWriter.println("xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
+                    + " http://www.topografix.com/GPX/Private/TopoGrafix/0/1 http://www.topografix.com/GPX/Private/TopoGrafix/0/1/topografix.xsd"
+                    + " http://www.garmin.com/xmlschemas/TrackPointExtension/v2 https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd\">");
            printWriter.println("<metadata>");
+
            Track track = tracks[0];
            printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
            printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
@@ -174,8 +186,28 @@ public class GpxTrackWriter implements TrackWriter {
            if (trackPoint.hasAltitude()) {
                printWriter.println("<ele>" + ELEVATION_FORMAT.format(trackPoint.getAltitude()) + "</ele>");
            }
-            printWriter.println(
-                    "<time>" + StringUtils.formatDateTimeIso8601(trackPoint.getTime()) + "</time>");
+
+            printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(trackPoint.getTime()) + "</time>");
+
+            if (trackPoint.hasSpeed() || trackPoint.hasHeartRate() || trackPoint.hasCyclingCadence()) {
+                printWriter.println("<extensions><gpxtpx:TrackPointExtension>");
+
+
+                if (trackPoint.hasSpeed()) {
+                    printWriter.println("<gpxtpx:speed>" + SPEED_FORMAT.format(trackPoint.getSpeed()) + "</gpxtpx:speed>");
+                }
+
+                if (trackPoint.hasHeartRate()) {
+                    printWriter.println("<gpxtpx:hr>" + HEARTRATE_FORMAT.format(trackPoint.getHeartRate_bpm()) + "</gpxtpx:hr>");
+                }
+
+                if (trackPoint.hasCyclingCadence()) {
+                    printWriter.println("<gpxtpx:cad>" + HEARTRATE_FORMAT.format(trackPoint.getCyclingCadence_rpm()) + "</gpxtpx:cad>");
+                }
+
+                printWriter.println("</gpxtpx:TrackPointExtension></extensions>");
+            }
+
            printWriter.println("</trkpt>");
        }
    }
@@ -46,9 +46,10 @@ public class KmlTrackWriter implements TrackWriter {
    private static final String TRACK_STYLE = "track";
    private static final String SCHEMA_ID = "schema";

-    public static final String SENSOR_TYPE_CADENCE = "cadence";
-    public static final String SENSOR_TYPE_HEART_RATE = "heart_rate";
-    public static final String SENSOR_TYPE_POWER = "power";
+    public static final String EXTENDED_DATA_TYPE_SPEED = "speed";
+    public static final String EXTENDED_DATA_TYPE_CADENCE = "cadence";
+    public static final String EXTENDED_DATA_TYPE_HEART_RATE = "heart_rate";
+    public static final String EXTENDED_DATA_TYPE_POWER = "power";

    private static final String WAYPOINT_ICON = "http://maps.google.com/mapfiles/kml/pushpin/blue-pushpin.png";
    private static final String START_ICON = "http://maps.google.com/mapfiles/kml/paddle/grn-circle.png";
@@ -64,6 +65,7 @@ public class KmlTrackWriter implements TrackWriter {
    private final ContentProviderUtils contentProviderUtils;

    private PrintWriter printWriter;
+    private final List<Float> speedList = new ArrayList<>();
    private final List<Float> powerList = new ArrayList<>();
    private final List<Float> cadenceList = new ArrayList<>();
    private final List<Float> heartRateList = new ArrayList<>();
@@ -123,10 +125,12 @@ public class KmlTrackWriter implements TrackWriter {
            writePlacemarkerStyle(WAYPOINT_STYLE, WAYPOINT_ICON, 20, 2);
            printWriter.println("<Schema id=\"" + SCHEMA_ID + "\">");

+            writeSimpleArrayStyle(EXTENDED_DATA_TYPE_SPEED, context.getString(R.string.description_speed_ms));
+
            if (exportSensorData) {
-                writeSensorStyle(SENSOR_TYPE_POWER, context.getString(R.string.description_sensor_power));
-                writeSensorStyle(SENSOR_TYPE_CADENCE, context.getString(R.string.description_sensor_cadence));
-                writeSensorStyle(SENSOR_TYPE_HEART_RATE, context.getString(R.string.description_sensor_heart_rate));
+                writeSimpleArrayStyle(EXTENDED_DATA_TYPE_POWER, context.getString(R.string.description_sensor_power));
+                writeSimpleArrayStyle(EXTENDED_DATA_TYPE_CADENCE, context.getString(R.string.description_sensor_cadence));
+                writeSimpleArrayStyle(EXTENDED_DATA_TYPE_HEART_RATE, context.getString(R.string.description_sensor_heart_rate));
            }
            printWriter.println("</Schema>");
        }
@@ -229,6 +233,7 @@ public class KmlTrackWriter implements TrackWriter {
    public void writeOpenSegment() {
        if (printWriter != null) {
            printWriter.println("<gx:Track>");
+            speedList.clear();
            powerList.clear();
            cadenceList.clear();
            heartRateList.clear();
@@ -240,15 +245,18 @@ public class KmlTrackWriter implements TrackWriter {
        if (printWriter != null) {
            printWriter.println("<ExtendedData>");
            printWriter.println("<SchemaData schemaUrl=\"#" + SCHEMA_ID + "\">");
+            if (speedList.size() > 0) {
+                writeSimpleArrayData(speedList, EXTENDED_DATA_TYPE_SPEED);
+            }
            if (exportSensorData) {
                if (powerList.size() > 0) {
-                    writeSensorData(powerList, SENSOR_TYPE_POWER);
+                    writeSimpleArrayData(powerList, EXTENDED_DATA_TYPE_POWER);
                }
                if (cadenceList.size() > 0) {
-                    writeSensorData(cadenceList, SENSOR_TYPE_CADENCE);
+                    writeSimpleArrayData(cadenceList, EXTENDED_DATA_TYPE_CADENCE);
                }
                if (heartRateList.size() > 0) {
-                    writeSensorData(heartRateList, SENSOR_TYPE_HEART_RATE);
+                    writeSimpleArrayData(heartRateList, EXTENDED_DATA_TYPE_HEART_RATE);
                }
            }
            printWriter.println("</SchemaData>");
@@ -266,6 +274,10 @@ public class KmlTrackWriter implements TrackWriter {

            printWriter.println("<gx:coord>" + getCoordinates(trackPoint.getLocation(), " ") + "</gx:coord>");

+            if (trackPoint.hasSpeed()) {
+                speedList.add(trackPoint.getSpeed());
+            }
+
            if (exportSensorData) {
                if (trackPoint.hasHeartRate()) {
                    heartRateList.add(trackPoint.getHeartRate_bpm());
@@ -281,12 +293,12 @@ public class KmlTrackWriter implements TrackWriter {
    }

    /**
-     * Writes the sensor data.
+     * Writes the simple array data.
     *
-     * @param list a list of sensor data
-     * @param name the name of the sensor data
+     * @param list a list of simple array data
+     * @param name the name of the simple array data
     */
-    private void writeSensorData(List<Float> list, String name) {
+    private void writeSimpleArrayData(List<Float> list, String name) {
        printWriter.println("<gx:SimpleArrayData name=\"" + name + "\">");
        for (int i = 0; i < list.size(); i++) {
            printWriter.println("<gx:value>" + list.get(i) + "</gx:value>");
@@ -446,14 +458,14 @@ public class KmlTrackWriter implements TrackWriter {
    }

    /**
-     * Writes a sensor style.
+     * Writes a simple array style.
     *
-     * @param name       the name of the sesnor
-     * @param sensorType the sensor display name
+     * @param name       the name of the simple array.
+     * @param extendedDataType the extended data display name
     */
-    private void writeSensorStyle(String name, String sensorType) {
+    private void writeSimpleArrayStyle(String name, String extendedDataType) {
        printWriter.println("<gx:SimpleArrayField name=\"" + name + "\" type=\"float\">");
-        printWriter.println("<displayName>" + StringUtils.formatCData(sensorType) + "</displayName>");
+        printWriter.println("<displayName>" + StringUtils.formatCData(extendedDataType) + "</displayName>");
        printWriter.println("</gx:SimpleArrayField>");
    }
 }
@@ -31,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.UUID;

 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
@@ -72,6 +73,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
    // The current element content
    //TODO Should be made private and getter be used by child classes.
    protected String content;
+
    protected String icon;
    protected String name;
    protected String description;
@@ -80,8 +82,13 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
    protected String longitude;
    protected String altitude;
    protected String time;
+    protected String speed;
+    protected String heartrate;
+    protected String cadence;
+    protected String power;
    protected String waypointType;
    protected String photoUrl;
+    protected String uuid;

    // The current track data
    private TrackData trackData;
@@ -90,11 +97,11 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
    private Locator locator;

    /**
-     * Constructor.
-     *
     * @param context       the context
     * @param importTrackId the track id to import to. -1L to import to a new track.
     */
+    @Deprecated
+    // Remove importTrackId
    AbstractFileTrackImporter(Context context, long importTrackId, ContentProviderUtils contentProviderUtils) {
        this.context = context;
        this.importTrackId = importTrackId;
@@ -243,6 +250,14 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        if (name != null) {
            trackData.track.setName(name);
        }
+
+        try {
+            trackData.track.setUuid(UUID.fromString(uuid));
+        } catch (IllegalArgumentException | NullPointerException e) {
+            Log.w(TAG, "could not parse Track UUID, generating a new one.");
+            trackData.track.setUuid(UUID.randomUUID());
+        }
+
        if (description != null) {
            trackData.track.setDescription(description);
        }
@@ -319,20 +334,22 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track

        // Calculate derived attributes from the previous point
        if (trackData.lastLocationInCurrentSegment != null && trackData.lastLocationInCurrentSegment.getTime() != 0) {
-            long timeDifference = trackPoint.getTime() - trackData.lastLocationInCurrentSegment.getTime();
+            if (!trackPoint.hasSpeed()) {
+                long timeDifference = trackPoint.getTime() - trackData.lastLocationInCurrentSegment.getTime();

-            // Check for negative time change
-            if (timeDifference <= 0) {
-                Log.w(TAG, "Time difference not postive.");
-            } else {
+                // Check for negative time change
+                if (timeDifference <= 0) {
+                    Log.w(TAG, "Time difference not positive.");
+                } else {

-                /*
-                 * We don't have a speed and bearing in GPX, make something up from the last two points.
-                 * GPS points tend to have some inherent imprecision, speed and bearing will likely be off, so the statistics for things like max speed will also be off.
-                 */
-                double duration = timeDifference * UnitConversions.MS_TO_S;
-                double speed = trackData.lastLocationInCurrentSegment.distanceTo(trackPoint) / duration;
-                trackPoint.setSpeed((float) speed);
+                    /*
+                     * We don't have a speed and bearing in GPX, make something up from the last two points.
+                     * GPS points tend to have some inherent imprecision, speed and bearing will likely be off, so the statistics for things like max speed will also be off.
+                     */
+                    double duration = timeDifference * UnitConversions.MS_TO_S;
+                    double speed = trackData.lastLocationInCurrentSegment.distanceTo(trackPoint) / duration;
+                    trackPoint.setSpeed((float) speed);
+                }
            }
            trackPoint.setBearing(trackData.lastLocationInCurrentSegment.bearingTo(trackPoint));
        }
@@ -389,9 +406,8 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
            Uri photoUri = FileUtils.getUriForFile(context, file);
            return "" + photoUri;
        }
-        else {
-            return null;
-        }
+
+        return null;
    }

    /**
@@ -401,34 +417,58 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        if (latitude == null || longitude == null) {
            return null;
        }
-        double latitudeValue;
-        double longitudeValue;
+
+        TrackPoint trackPoint = new TrackPoint();
+
        try {
-            latitudeValue = Double.parseDouble(latitude);
-            longitudeValue = Double.parseDouble(longitude);
+            trackPoint.setLatitude(Double.parseDouble(latitude));
+            trackPoint.setLongitude(Double.parseDouble(longitude));
        } catch (NumberFormatException e) {
            throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse latitude longitude: %s %s", latitude, longitude)), e);
        }
-        Double altitudeValue = null;
+
+        if (time == null) {
+            trackPoint.setTime(trackData.importTime);
+        } else {
+            try {
+                trackPoint.setTime(StringUtils.parseTime(time));
+            } catch (Exception e) {
+                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse time: %s", time)), e);
+            }
+        }
+
        if (altitude != null) {
            try {
-                altitudeValue = Double.parseDouble(altitude);
+                trackPoint.setAltitude(Double.parseDouble(altitude));
            } catch (NumberFormatException e) {
                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse altitude: %s", altitude)), e);
            }
        }

-        long timeValue;
-        if (time == null) {
-            timeValue = trackData.importTime;
-        } else {
+        if (speed != null) {
            try {
-                timeValue = StringUtils.parseTime(time);
-            } catch (IllegalArgumentException e) {
-                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse time: %s", time)), e);
+                trackPoint.setSpeed(Float.parseFloat(speed));
+            } catch (Exception e) {
+                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse speed: %s", speed)), e);
            }
        }
-        return new TrackPoint(latitudeValue, longitudeValue, altitudeValue, timeValue);
+        if (heartrate != null) {
+            try {
+                trackPoint.setHeartRate_bpm(Float.parseFloat(heartrate));
+            } catch (Exception e) {
+                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse heart rate: %s", heartrate)), e);
+            }
+        }
+
+        if (cadence != null) {
+            try {
+                trackPoint.setCyclingCadence_rpm(Float.parseFloat(cadence));
+            } catch (Exception e) {
+                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse cadence: %s", cadence)), e);
+            }
+        }
+
+        return trackPoint;
    }

    /**
@@ -0,0 +1,65 @@
+package de.dennisguse.opentracks.io.file.importer;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import de.dennisguse.opentracks.io.file.exporter.ExportActivity;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+
+public abstract class DirectoryChooserActivity extends AppCompatActivity {
+
+    private static final int DIRECTORY_PICKER_REQUEST_CODE = 6;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+        startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
+        super.onActivityResult(requestCode, resultCode, resultData);
+        if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK) {
+                Uri directoryUri = resultData.getData();
+
+                startActivity(createIntent(directoryUri));
+            }
+            finish();
+        }
+    }
+
+    protected abstract Intent createIntent(Uri directoryUri);
+
+
+    public static class ImportDirectoryChooserActivity extends DirectoryChooserActivity {
+
+        @Override
+        protected Intent createIntent(Uri directoryUri) {
+            Intent intent = IntentUtils.newIntent(this, ImportActivity.class);
+            intent.putExtra(ImportActivity.EXTRA_DIRECTORY_URI_KEY, directoryUri);
+            return intent;
+        }
+    }
+
+    public static class ExportDirectoryChooserActivity extends DirectoryChooserActivity {
+
+        @Override
+        protected Intent createIntent(Uri directoryUri) {
+            Intent intent = IntentUtils.newIntent(this, ExportActivity.class);
+            intent.putExtra(ExportActivity.EXTRA_DIRECTORY_URI_KEY, directoryUri);
+            intent.putExtra(ExportActivity.EXTRA_TRACKFILEFORMAT_KEY, PreferencesUtils.getExportTrackFileFormat(this));
+            return intent;
+        }
+    }
+}
@@ -28,6 +28,7 @@ import de.dennisguse.opentracks.content.provider.ContentProviderUtils;

 /**
 * Imports a GPX file.
+ * Uses https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd
 *
 * @author Jimmy Shih
 */
@@ -48,6 +49,10 @@ public class GpxFileTrackImporter extends AbstractFileTrackImporter {
    private static final String ATTRIBUTE_LAT = "lat";
    private static final String ATTRIBUTE_LON = "lon";

+    private static final String TAG_EXTENSION_SPEED = "gpxtpx:speed";
+    private static final String TAG_EXTENSION_HEARTRATE = "gpxtpx:hr";
+    private static final String TAG_EXTENSION_CADENCE = "gpxtpx:cad";
+
    /**
     * Constructor.
     *
@@ -125,6 +130,20 @@ public class GpxFileTrackImporter extends AbstractFileTrackImporter {
                    waypointType = content.trim();
                }
                break;
+            case TAG_EXTENSION_SPEED:
+                if (content != null) {
+                    speed = content.trim();
+                }
+            case TAG_EXTENSION_HEARTRATE:
+                if (content != null) {
+                    heartrate = content.trim();
+                }
+                break;
+            case TAG_EXTENSION_CADENCE:
+                if (content != null) {
+                    cadence = content.trim();
+                }
+                break;
        }

        // Reset element content
@@ -149,6 +168,7 @@ public class GpxFileTrackImporter extends AbstractFileTrackImporter {
        longitude = attributes.getValue(ATTRIBUTE_LON);
        altitude = null;
        time = null;
+        speed = null;
    }

    /**
@@ -16,159 +16,59 @@

 package de.dennisguse.opentracks.io.file.importer;

-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;

-import androidx.annotation.Nullable;
-import androidx.documentfile.provider.DocumentFile;
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;

-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
-import de.dennisguse.opentracks.util.DialogUtils;
-import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.fragments.ImportFinishedDialogFragment;
+import de.dennisguse.opentracks.fragments.ImportProgressDialogFragment;

 /**
 * An activity to import files from the external storage.
 *
 * @author Rodrigo Damazio
 */
-public class ImportActivity extends FragmentActivity {
+public class ImportActivity extends FragmentActivity implements ImportProgressDialogFragment.DismissCallback, ImportFinishedDialogFragment.DismissCallback {

-    private static final int DIRECTORY_PICKER_REQUEST_CODE = 6;
+    private static final String TAG = ImportActivity.class.getSimpleName();

-    private static final int DIALOG_PROGRESS_ID = 0;
-    private static final int DIALOG_RESULT_ID = 1;
+    public static final String EXTRA_DIRECTORY_URI_KEY = "directory_uri";

-    private String directoryDisplayName;
-
-    private ImportAsyncTask importAsyncTask;
-    private ProgressDialog progressDialog;
-
-    private int importedTrackCount;
-    private int totalTrackCount;
+    private static final String BUNDLE_ACTIVITY_RECREATED = "activity_recreated";

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-        startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
-        super.onActivityResult(requestCode, resultCode, resultData);
-        if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                Uri directoryUri = resultData.getData();
-                DocumentFile pickedDirectory = DocumentFile.fromTreeUri(this, directoryUri);
-
-                directoryDisplayName = FileUtils.getPath(pickedDirectory);
-                TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(this);
-
-                importAsyncTask = new ImportAsyncTask(this, trackFileFormat, pickedDirectory);
-                importAsyncTask.execute();
+        if (savedInstanceState == null || !savedInstanceState.getBoolean(BUNDLE_ACTIVITY_RECREATED, false)) {
+            if (getIntent().getData() != null) {
+                ImportProgressDialogFragment.showDialog(getSupportFragmentManager(), getIntent().getData(), false);
            } else {
-                finish();
+                // Started from DirectoryChooserActivity
+                ImportProgressDialogFragment.showDialog(getSupportFragmentManager(), getIntent().getParcelableExtra(EXTRA_DIRECTORY_URI_KEY), true);
            }
        }
    }

    @Override
-    protected Dialog onCreateDialog(int id) {
-        switch (id) {
-            case DIALOG_PROGRESS_ID:
-                progressDialog = DialogUtils.createHorizontalProgressDialog(
-                        this, R.string.import_progress_message, new DialogInterface.OnCancelListener() {
-                            @Override
-                            public void onCancel(DialogInterface dialog) {
-                                importAsyncTask.cancel(true);
-                                dialog.dismiss();
-                                finish();
-                            }
-                        }, directoryDisplayName);
-                return progressDialog;
-            case DIALOG_RESULT_ID:
-                int iconId;
-                int titleId;
-                String message;
-                String totalFiles = getResources()
-                        .getQuantityString(R.plurals.files, totalTrackCount, totalTrackCount);
-                if (importedTrackCount == totalTrackCount) {
-                    if (totalTrackCount == 0) {
-                        iconId = R.drawable.ic_dialog_info_24dp;
-                        titleId = R.string.import_no_file_title;
-                        message = getString(R.string.import_no_file, directoryDisplayName);
-                    } else {
-                        iconId = R.drawable.ic_dialog_success_24dp;
-                        titleId = R.string.generic_success_title;
-                        message = getString(R.string.import_success, totalFiles, directoryDisplayName);
-                    }
-                } else {
-                    iconId = R.drawable.ic_dialog_error_24dp;
-                    titleId = R.string.generic_error_title;
-                    message = getString(R.string.import_error, importedTrackCount, totalFiles, directoryDisplayName);
-                }
-                return new AlertDialog.Builder(this).setCancelable(true).setIcon(iconId)
-                        .setMessage(message).setOnCancelListener(new DialogInterface.OnCancelListener() {
-                            @Override
-                            public void onCancel(DialogInterface dialogInterface) {
-                                dialogInterface.dismiss();
-                                finish();
-                            }
-                        }).setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialogInterface, int which) {
-                                dialogInterface.dismiss();
-                                finish();
-                            }
-                        }).setTitle(titleId).create();
-            default:
-                return null;
-        }
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(BUNDLE_ACTIVITY_RECREATED, true);
    }

-    /**
-     * Invokes when the associated AsyncTask completes.
-     *
-     * @param aSuccessCount the number of files successfully imported
-     * @param aTotalCount   the number of files to import
-     */
-    public void onAsyncTaskCompleted(int aSuccessCount, int aTotalCount) {
-        importedTrackCount = aSuccessCount;
-        totalTrackCount = aTotalCount;
-        removeDialog(DIALOG_PROGRESS_ID);
-        showDialog(DIALOG_RESULT_ID);
+    @Override
+    public void onImportCanceled(String directoryDisplayName, int successCount, int fileCount) {
+        onImportFinished(directoryDisplayName, successCount, fileCount);
    }

-    /**
-     * Shows the progress dialog.
-     */
-    public void showProgressDialog() {
-        showDialog(DIALOG_PROGRESS_ID);
+    @Override
+    public void onImportFinished(final String directoryDisplayName, final int successCount, final int fileCount) {
+        runOnUiThread(() -> ImportFinishedDialogFragment.showDialog(getSupportFragmentManager(), directoryDisplayName, successCount, fileCount));
    }

-    /**
-     * Sets the progress dialog value.
-     *
-     * @param number the number of files imported
-     * @param max    the maximum number of files
-     */
-    public void setProgressDialogValue(int number, int max) {
-        if (progressDialog != null) {
-            progressDialog.setIndeterminate(false);
-            progressDialog.setMax(max);
-            progressDialog.setProgress(Math.min(number, max));
-        }
+    @Override
+    public void onDismissed() {
+        finish();
    }
 }
@@ -1,179 +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.io.file.importer;
-
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.PowerManager.WakeLock;
-import android.util.Log;
-
-import androidx.documentfile.provider.DocumentFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
-import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.SystemUtils;
-
-/**
- * AsyncTask to import files from the external storage.
- *
- * @author Jimmy Shih
- */
-class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
-
-    private static final String TAG = ImportAsyncTask.class.getSimpleName();
-    private final TrackFileFormat trackFileFormat;
-    private final DocumentFile directory;
-
-    // TODO Use weak reference
-    private ImportActivity importActivity;
-    private WakeLock wakeLock;
-
-    private int importTrackCount;
-    private int totalTrackCount;
-    private long lastSuccessfulTrackId;
-
-    public ImportAsyncTask(ImportActivity importActivity, TrackFileFormat trackFileFormat, DocumentFile directory) {
-        this.importActivity = importActivity;
-        this.trackFileFormat = trackFileFormat;
-        this.directory = directory;
-
-        importTrackCount = 0;
-        totalTrackCount = 0;
-        lastSuccessfulTrackId = -1L;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        if (importActivity != null) {
-            importActivity.showProgressDialog();
-        }
-    }
-
-    /**
-     * Gets a list of files.
-     */
-    private static List<DocumentFile> getFiles(DocumentFile file, TrackFileFormat trackFileFormat) {
-        List<DocumentFile> files = new ArrayList<>();
-
-        for (DocumentFile candidate : file.listFiles()) {
-            if (!candidate.isDirectory()) {
-                String extension = FileUtils.getExtension(candidate.getName());
-                if (extension != null && trackFileFormat.getExtension().equals(extension)) {
-                    files.add(candidate);
-                }
-            } else {
-                files.addAll(getFiles(candidate, trackFileFormat));
-            }
-        }
-
-        return files;
-    }
-
-    @Override
-    protected void onProgressUpdate(Integer... values) {
-        if (importActivity != null) {
-            importActivity.setProgressDialogValue(values[0], values[1]);
-        }
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (importActivity != null) {
-            importActivity.onAsyncTaskCompleted(importTrackCount, totalTrackCount);
-        }
-    }
-
-    @Override
-    protected void onCancelled() {
-        if (importActivity != null) {
-            importActivity.onAsyncTaskCompleted(importTrackCount, totalTrackCount);
-            importActivity = null;
-        }
-    }
-
-    @Override
-    protected Boolean doInBackground(Void... params) {
-        try {
-            Thread.currentThread().setPriority(Thread.MAX_PRIORITY); // TODO Should be set to previous level at the end of this method.
-            // Get the wake lock if not recording or paused
-            boolean isRecording = PreferencesUtils.isRecording(importActivity);
-            boolean isPaused = PreferencesUtils.isRecordingTrackPaused(importActivity);
-            if (!isRecording || isPaused) {
-                wakeLock = SystemUtils.acquireWakeLock(importActivity, wakeLock);
-            }
-
-            List<DocumentFile> files = getFiles(directory, trackFileFormat);
-            totalTrackCount = files.size();
-
-            for (int i = 0; i < totalTrackCount; i++) {
-                if (isCancelled()) {
-                    // If cancelled, return true to show the number of files imported
-                    return true;
-                }
-                if (importFile(files.get(i))) {
-                    importTrackCount++;
-                }
-                publishProgress(i + 1, totalTrackCount);
-            }
-            return true;
-        } finally {
-            if (wakeLock != null && wakeLock.isHeld()) {
-                wakeLock.release();
-            }
-        }
-    }
-
-    /**
-     * Imports a file.
-     *
-     * @param file the file
-     */
-    private boolean importFile(final DocumentFile file) {
-        TrackImporter trackImporter;
-        if (trackFileFormat == TrackFileFormat.GPX) {
-            trackImporter = new GpxFileTrackImporter(importActivity);
-        } else {
-            //KML or KMZ
-            String extension = FileUtils.getExtension(file.getName());
-            if (TrackFileFormat.KML_ONLY_TRACK.getExtension().equals(extension)) {
-                trackImporter = new KmlFileTrackImporter(importActivity, -1L);
-            } else {
-                ContentProviderUtils contentProviderUtils = new ContentProviderUtils(importActivity);
-                Uri uri = contentProviderUtils.insertTrack(new Track());
-                long newId = Long.parseLong(uri.getLastPathSegment());
-
-                trackImporter = new KmzTrackImporter(importActivity, newId, file.getUri());
-            }
-        }
-
-        try (InputStream inputStream = importActivity.getContentResolver().openInputStream(file.getUri())) {
-            lastSuccessfulTrackId = trackImporter.importFile(inputStream);
-            return lastSuccessfulTrackId != -1L;
-        } catch (IOException e) {
-            Log.e(TAG, "Unable to import file", e);
-            return false;
-        }
-    }
-}
@@ -61,18 +61,18 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
    private static final String ATTRIBUTE_NAME = "name";

    private boolean trackStarted = false;
-    private String sensorType;
+    private String extendedDataType;
    private ArrayList<TrackPoint> trackPoints;
+    private ArrayList<Float> speedList;
    private ArrayList<Float> cadenceList;
    private ArrayList<Float> heartRateList;
    private ArrayList<Float> powerList;

    /**
-     * Constructor.
-     *
     * @param context       the context
-     * @param importTrackId track id to import to. -1L to import to a new track.
+     * @param importTrackId track id to import to. This should not be -1L so that images in the kmz file can be imported.
     */
+    @Deprecated //TODO Do not pass importTrackId here; get it from somewhere else
    public KmlFileTrackImporter(Context context, long importTrackId) {
        this(context, importTrackId, new ContentProviderUtils(context));
    }
@@ -102,7 +102,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
                onTrackSegmentStart();
                break;
            case TAG_GX_SIMPLE_ARRAY_DATA:
-                onSensorDataStart(attributes);
+                onExtendedDataStart(attributes);
                break;
        }
    }
@@ -124,7 +124,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
        } else if (tag.equals(TAG_GX_COORD)) {
            onTrackPointEnd();
        } else if (tag.equals(TAG_GX_VALUE)) {
-            onSensorValueEnd();
+            onExtendedDataValueEnd();
        } else if (tag.equals(TAG_NAME)) {
            if (content != null) {
                name = content.trim();
@@ -209,6 +209,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
    protected void onTrackSegmentStart() {
        super.onTrackSegmentStart();
        trackPoints = new ArrayList<>();
+        speedList = new ArrayList<>();
        heartRateList = new ArrayList<>();
        cadenceList = new ArrayList<>();
        powerList = new ArrayList<>();
@@ -222,6 +223,9 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
        for (int i = 0; i < trackPoints.size(); i++) {
            TrackPoint trackPoint = trackPoints.get(i);

+            if (i < speedList.size()) {
+                trackPoint.setSpeed(speedList.get(i));
+            }
            if (i < heartRateList.size()) {
                trackPoint.setHeartRate_bpm(heartRateList.get(i));
            }
@@ -229,7 +233,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
                trackPoint.setCyclingCadence_rpm(cadenceList.get(i));
            }
            if (i < powerList.size()) {
-                trackPoint.setPower(cadenceList.get(i));
+                trackPoint.setPower(powerList.get(i));
            }

            insertTrackPoint(trackPoint);
@@ -261,16 +265,16 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
    }

    /**
-     * On sensor data start. gx:SimpleArrayData start tag.
+     * On extended data start. gx:SimpleArrayData start tag.
     */
-    private void onSensorDataStart(Attributes attributes) {
-        sensorType = attributes.getValue(ATTRIBUTE_NAME);
+    private void onExtendedDataStart(Attributes attributes) {
+        extendedDataType = attributes.getValue(ATTRIBUTE_NAME);
    }

    /**
-     * On sensor value end. gx:value end tag.
+     * On extended data value end. gx:value end tag.
     */
-    private void onSensorValueEnd() throws SAXException {
+    private void onExtendedDataValueEnd() throws SAXException {
        if (content == null) {
            return;
        }
@@ -284,18 +288,21 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
        } catch (NumberFormatException e) {
            throw new SAXException(createErrorMessage("Unable to parse gx:value:" + content), e);
        }
-        switch (sensorType) {
-            case KmlTrackWriter.SENSOR_TYPE_POWER:
+        switch (extendedDataType) {
+            case KmlTrackWriter.EXTENDED_DATA_TYPE_SPEED:
+                speedList.add(value);
+                break;
+            case KmlTrackWriter.EXTENDED_DATA_TYPE_POWER:
                powerList.add(value);
                break;
-            case KmlTrackWriter.SENSOR_TYPE_HEART_RATE:
+            case KmlTrackWriter.EXTENDED_DATA_TYPE_HEART_RATE:
                heartRateList.add(value);
                break;
-            case KmlTrackWriter.SENSOR_TYPE_CADENCE:
+            case KmlTrackWriter.EXTENDED_DATA_TYPE_CADENCE:
                cadenceList.add(value);
                break;
            default:
-                Log.w(TAG, "Data from sensor " + sensorType + " is not (yet) supported.");
+                Log.w(TAG, "Data from extended data " + extendedDataType + " is not (yet) supported.");
        }
    }
 }
@@ -53,16 +53,15 @@ public class KmzTrackImporter implements TrackImporter {

    private final Context context;
    private final long importTrackId;
-    private Uri uriKmzFile;
+    private final Uri uriKmzFile;

    /**
-     * Constructor.
-     *
     * @param context       the context
     * @param importTrackId track id to import to. This should not be -1L so that images in the kmz file can be imported.
     * @param uriFile       URI of the kmz file.
     */
-    KmzTrackImporter(Context context, long importTrackId, Uri uriFile) {
+    @Deprecated //TODO Do not pass importTrackId here; get it from somewhere else
+    public KmzTrackImporter(Context context, long importTrackId, Uri uriFile) {
        this.context = context;
        this.importTrackId = importTrackId;
        this.uriKmzFile = uriFile;
@@ -22,7 +22,7 @@ import java.io.InputStream;
 *
 * @author Jimmy Shih
 */
-interface TrackImporter {
+public interface TrackImporter {

    /**
     * Import a file.
@@ -30,5 +30,6 @@ interface TrackImporter {
     * @param inputStream the file's input stream
     * @return the imported track id or RECORDING_TRACK_ID_DEFAULT.
     */
+    //TODO Figure out how can make the import an atomic operation (incl. database transaction rollback).
    long importFile(InputStream inputStream);
 }
@@ -24,11 +24,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.database.sqlite.SQLiteException;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
 import android.net.Uri;
-import android.os.Bundle;
 import android.os.IBinder;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
@@ -37,9 +33,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.app.TaskStackBuilder;

-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackListActivity;
 import de.dennisguse.opentracks.TrackRecordingActivity;
@@ -50,6 +43,7 @@ import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 import de.dennisguse.opentracks.content.provider.TrackPointIterator;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.services.handlers.HandlerServer;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTaskFactory;
 import de.dennisguse.opentracks.services.tasks.PeriodicTaskExecutor;
@@ -62,7 +56,6 @@ import de.dennisguse.opentracks.util.SystemUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackNameUtils;
 import de.dennisguse.opentracks.util.TrackPointUtils;
-import de.dennisguse.opentracks.util.UnitConversions;

 /**
 * A background service that registers a location listener and records track points.
@@ -70,25 +63,19 @@ import de.dennisguse.opentracks.util.UnitConversions;
 *
 * @author Leif Hendrik Wilden
 */
-public class TrackRecordingService extends Service {
+public class TrackRecordingService extends Service implements HandlerServer.HandlerServerInterface {

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

    // The following variables are set in onCreate:
-    @Deprecated //TODO Should not be necessary
-    private ExecutorService locationExecutorService; // Enforces order of location changes.
    private ContentProviderUtils contentProviderUtils;
-    private LocationManager locationManager;
    private PeriodicTaskExecutor voiceExecutor;
    private TrackRecordingServiceNotificationManager notificationManager;
-    private LocationListenerPolicy locationListenerPolicy;

    private long recordingTrackId;
    private boolean recordingTrackPaused;
    private int recordingDistanceInterval;
    private int maxRecordingDistance;
-    private int recordingGpsAccuracy;
-    private long currentRecordingInterval;

    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
        @Override
@@ -110,27 +97,14 @@ public class TrackRecordingService extends Service {
            if (PreferencesUtils.isKey(context, R.string.voice_frequency_key, key)) {
                voiceExecutor.setTaskFrequency(PreferencesUtils.getVoiceFrequency(context));
            }
-            if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
-                int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(context);
-                if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) {
-                    // Choose battery life over moving time accuracy.
-                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(30 * UnitConversions.ONE_SECOND_MS, 5 * UnitConversions.ONE_MINUTE_MS, 5);
-                } else if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) {
-                    // Get all the updates.
-                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(UnitConversions.ONE_SECOND_MS, 30 * UnitConversions.ONE_SECOND_MS, 0);
-                } else {
-                    locationListenerPolicy = new AbsoluteLocationListenerPolicy(minRecordingInterval * UnitConversions.ONE_SECOND_MS);
-                }
-            }
            if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
                recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(context);
            }
            if (PreferencesUtils.isKey(context, R.string.max_recording_distance_key, key)) {
                maxRecordingDistance = PreferencesUtils.getMaxRecordingDistance(context);
            }
-            if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
-                recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
-            }
+
+            handlerServer.onSharedPreferenceChanged(context, preferences, key);
        }
    };

@@ -143,43 +117,16 @@ public class TrackRecordingService extends Service {
    private boolean isIdle;

    private TrackRecordingServiceBinder binder = new TrackRecordingServiceBinder(this);
-    private final LocationListener locationListener = new LocationListener() {

-        @Override
-        public void onLocationChanged(final Location location) {
-            if (locationExecutorService == null || locationExecutorService.isShutdown() || locationExecutorService.isTerminated()) {
-                return;
-            }
-            locationExecutorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    onLocationChangedAsync(location);
-                }
-            });
-        }
-
-        @Override
-        public void onStatusChanged(String provider, int status, Bundle extras) {
-            Log.w(TAG, "LocationListener.onStatusChanged(): is not implemented.");
-        }
-
-        @Override
-        public void onProviderEnabled(String provider) {
-            Log.w(TAG, "LocationListener.onProviderEnabled(): is not implemented.");
-        }
-
-        @Override
-        public void onProviderDisabled(String provider) {
-            Log.w(TAG, "LocationListener.onProviderDisabled(): is not implemented.");
-        }
-    };
+    private HandlerServer handlerServer;

    @Override
    public void onCreate() {
        super.onCreate();
-        locationExecutorService = Executors.newSingleThreadExecutor();
+
+        handlerServer = new HandlerServer(this);
+
        contentProviderUtils = new ContentProviderUtils(this);
-        locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
        voiceExecutor = new PeriodicTaskExecutor(this, new AnnouncementPeriodicTaskFactory());

        notificationManager = new TrackRecordingServiceNotificationManager(this);
@@ -205,6 +152,8 @@ public class TrackRecordingService extends Service {

    @Override
    public void onDestroy() {
+        handlerServer.stop(this);
+
        if (remoteSensorManager != null) {
            remoteSensorManager.stop();
            remoteSensorManager = null;
@@ -213,9 +162,6 @@ public class TrackRecordingService extends Service {
        // Reverse order from onCreate
        showNotification(false); //TODO Why?

-        unregisterLocationListener();
-        locationManager = null;
-
        PreferencesUtils.unregister(this, sharedPreferenceChangeListener);

        try {
@@ -232,8 +178,6 @@ public class TrackRecordingService extends Service {
        // This should be the next to last operation
        wakeLock = SystemUtils.releaseWakeLock(wakeLock);

-        // Shutdown the executorService last to avoid sending events to a dead executor.
-        locationExecutorService.shutdown();
        super.onDestroy();
    }

@@ -433,7 +377,7 @@ public class TrackRecordingService extends Service {

    private void startGps() {
        wakeLock = SystemUtils.acquireWakeLock(this, wakeLock);
-        registerLocationListener();
+        handlerServer.start(this);
        showNotification(true);
    }

@@ -503,6 +447,8 @@ public class TrackRecordingService extends Service {
        }
        lastTrackPoint = null;

+        handlerServer.stop(this);
+
        stopGps(trackStopped);
    }

@@ -514,7 +460,7 @@ public class TrackRecordingService extends Service {
    void stopGps(boolean shutdown) {
        if (!isRecording()) return;

-        unregisterLocationListener();
+        handlerServer.stop(this);
        showNotification(false);
        wakeLock = SystemUtils.releaseWakeLock(wakeLock);
        if (shutdown) {
@@ -553,46 +499,27 @@ public class TrackRecordingService extends Service {
        PreferencesUtils.setBoolean(this, R.string.recording_track_paused_key, recordingTrackPaused);
    }

-    void onLocationChangedAsync(Location location) {
+    @Override
+    public void newTrackPoint(TrackPoint trackPoint, int recordingGpsAccuracy) {
        if (!isRecording() || isPaused()) {
-            Log.w(TAG, "Ignore onLocationChangedAsync. Not recording or paused.");
+            Log.w(TAG, "Ignore newTrackPoint. Not recording or paused.");
            return;
        }

        Track track = contentProviderUtils.getTrack(recordingTrackId);
        if (track == null) {
-            Log.w(TAG, "Ignore onLocationChangedAsync. No track.");
+            Log.w(TAG, "Ignore newTrackPoint. No track.");
            return;
        }

-        if (!LocationUtils.isValidLocation(location)) {
-            Log.w(TAG, "Ignore onLocationChangedAsync. location is invalid.");
-            return;
-        }
-
-        TrackPoint trackPoint = new TrackPoint(location);
        fillWithSensorDataSet(trackPoint);

        notificationManager.updateTrackPoint(this, trackPoint, recordingGpsAccuracy);

-        if (!TrackPointUtils.fulfillsAccuracy(trackPoint, recordingGpsAccuracy)) {
-            Log.d(TAG, "Ignore onLocationChangedAsync. Poor accuracy.");
-            return;
-        }
-
        TrackPointUtils.fixTime(trackPoint);

        //TODO Figure out how to avoid loading the lastValidTrackPoint from the database
        TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(track.getId());
-        long idleTime = 0L;
-        if (TrackPointUtils.after(trackPoint, lastValidTrackPoint)) {
-            idleTime = trackPoint.getTime() - lastValidTrackPoint.getTime();
-        }
-
-        locationListenerPolicy.updateIdleTime(idleTime);
-        if (currentRecordingInterval != locationListenerPolicy.getDesiredPollingInterval()) {
-            registerLocationListener();
-        }

        //Storing trackPoint

@@ -603,7 +530,7 @@ public class TrackRecordingService extends Service {
            return;
        }

-        if (!LocationUtils.isValidLocation(lastValidTrackPoint.getLocation())) {
+        if (lastValidTrackPoint == null || !LocationUtils.isValidLocation(lastValidTrackPoint.getLocation())) {
            // For some reason the previous first trackPoint was not stored, but currentSegmentHasLocation set true.
            // Should not happen. The current segment should have a location. Just insert the current location.
            insertTrackPoint(track, trackPoint);
@@ -719,28 +646,6 @@ public class TrackRecordingService extends Service {
        }
    }

-    private void registerLocationListener() {
-        if (locationManager == null) {
-            Log.e(TAG, "locationManager is null.");
-            return;
-        }
-        try {
-            long interval = locationListenerPolicy.getDesiredPollingInterval();
-            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, interval, locationListenerPolicy.getMinDistance_m(), locationListener);
-            currentRecordingInterval = interval;
-        } catch (SecurityException e) {
-            Log.e(TAG, "Could not register location listener; permissions not granted.", e);
-        }
-    }
-
-    private void unregisterLocationListener() {
-        if (locationManager == null) {
-            Log.e(TAG, "locationManager is null.");
-            return;
-        }
-        locationManager.removeUpdates(locationListener);
-    }
-
    private void showNotification(boolean isGpsStarted) {
        if (isRecording()) {
            Intent intent = IntentUtils.newIntent(this, TrackRecordingActivity.class)
@@ -770,19 +675,6 @@ public class TrackRecordingService extends Service {
        }
    }

-    /**
-     * Disables processing of location updates from {@link android.location.LocationManager}.
-     */
-    @VisibleForTesting
-    public void enableLocationExecutor(boolean enable) {
-        if (enable) {
-            locationExecutorService = Executors.newSingleThreadExecutor();
-        } else {
-            locationExecutorService.shutdownNow();
-            locationExecutorService = null;
-        }
-    }
-
    @VisibleForTesting
    public void setRemoteSensorManager(BluetoothRemoteSensorManager remoteSensorManager) {
        this.remoteSensorManager = remoteSensorManager;
@@ -1,9 +1,8 @@
 package de.dennisguse.opentracks.services;

-import android.location.Location;
-
 import androidx.annotation.VisibleForTesting;

+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;

@@ -82,23 +81,11 @@ class TrackRecordingServiceBinder extends android.os.Binder implements TrackReco
        return trackRecordingService.insertWaypoint(name, category, description, photoUrl);
    }

-    @VisibleForTesting
-    @Override
-    public void insertLocation(Location location) {
-        trackRecordingService.onLocationChangedAsync(location);
-    }
-
    @Override
    public SensorDataSet getSensorData() {
        return trackRecordingService.getSensorDataSet();
    }

-    @VisibleForTesting
-    @Override
-    public void enableLocationExecutor(boolean enable) {
-        trackRecordingService.enableLocationExecutor(enable);
-    }
-
    @VisibleForTesting
    @Override
    public void setRemoteSensorManager(BluetoothRemoteSensorManager remoteSensorManager) {
@@ -112,4 +99,10 @@ class TrackRecordingServiceBinder extends android.os.Binder implements TrackReco
    void detachFromService() {
        trackRecordingService = null;
    }
+
+    @VisibleForTesting
+    @Override
+    public void newTrackPoint(TrackPoint trackPoint, int recordingGpsAccuracy) {
+        trackRecordingService.newTrackPoint(trackPoint, recordingGpsAccuracy);
+    }
 }
@@ -33,7 +33,6 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackEditActivity;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.ServiceUtils;

 /**
 * Wrapper for the track recording service.
@@ -66,14 +65,43 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
     * Starts and binds the service.
     */
    public void startAndBind(Context context) {
-        bindService(context, true);
+        if (trackRecordingService != null) {
+            // Service is already started and bound.
+            return;
+        }
+
+        Log.i(TAG, "Starting the service.");
+        context.startService(new Intent(context, TrackRecordingService.class));
+
+        startConnection(context);
    }

    /**
-     * Binds the service if it is started.
+     * Resumes the track recording service connection.
+     *
+     * @param context the context
     */
-    private void bindIfStarted(Context context) {
-        bindService(context, false);
+    public void startConnection(@NonNull Context context) {
+        if (trackRecordingService != null) {
+            // Service is already started and bound.
+            return;
+        }
+
+        Log.i(TAG, "Binding the service.");
+        int flags = BuildConfig.DEBUG ? Context.BIND_DEBUG_UNBIND : 0;
+        context.bindService(new Intent(context, TrackRecordingService.class), this, flags);
+    }
+
+    /**
+     * Unbinds the service (but leave it running).
+     */
+    public void unbind(Context context) {
+        try {
+            context.unbindService(this);
+        } catch (IllegalArgumentException e) {
+            // Means not bound to the service. OK to ignore.
+        }
+        setTrackRecordingService(null);
    }

    /**
@@ -91,7 +119,6 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
        return trackRecordingService;
    }

-
    /**
     * Sets the trackRecordingService.
     *
@@ -104,18 +131,6 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
        }
    }

-    /**
-     * Unbinds the service (but leave it running).
-     */
-    public void unbind(Context context) {
-        try {
-            context.unbindService(this);
-        } catch (IllegalArgumentException e) {
-            // Means not bound to the service. OK to ignore.
-        }
-        setTrackRecordingService(null);
-    }
-
    @Override
    public void onServiceConnected(ComponentName className, IBinder service) {
        Log.i(TAG, "Connected to the service.");
@@ -139,44 +154,6 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
        setTrackRecordingService(null);
    }

-    /**
-     * Binds the service if it is started.
-     *
-     * @param startIfNeeded start the service if needed
-     */
-    private void bindService(Context context, boolean startIfNeeded) {
-        if (trackRecordingService != null) {
-            // Service is already started and bound.
-            return;
-        }
-
-        if (!startIfNeeded && !ServiceUtils.isTrackRecordingServiceRunning(context)) {
-            Log.d(TAG, "Service is not started. Not binding it.");
-            return;
-        }
-
-        if (startIfNeeded) {
-            Log.i(TAG, "Starting the service.");
-            context.startService(new Intent(context, TrackRecordingService.class));
-        }
-
-        Log.i(TAG, "Binding the service.");
-        int flags = BuildConfig.DEBUG ? Context.BIND_DEBUG_UNBIND : 0;
-        context.bindService(new Intent(context, TrackRecordingService.class), this, flags);
-    }
-
-    /**
-     * Resumes the track recording service connection.
-     *
-     * @param context the context
-     */
-    public void startConnection(@NonNull Context context) {
-        bindIfStarted(context);
-        if (!ServiceUtils.isTrackRecordingServiceRunning(context)) {
-            resetRecordingState(context);
-        }
-    }
-
    /**
     * Resumes the recording track.
     */
@@ -197,16 +174,6 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
        }
    }

-    private static void resetRecordingState(Context context) {
-        if (PreferencesUtils.isRecording(context)) {
-            PreferencesUtils.setLong(context, R.string.recording_track_id_key, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
-        }
-        boolean recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
-        if (!recordingTrackPaused) {
-            PreferencesUtils.defaultRecordingTrackPaused(context);
-        }
-    }
-
    /**
     * Adds a marker.
     *
@@ -241,7 +208,7 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
    public void stopRecording(@NonNull Context context, boolean showEditor) {
        TrackRecordingServiceInterface trackRecordingService = getServiceIfBound();
        if (trackRecordingService == null) {
-            resetRecordingState(context);
+            Log.e(TAG, "TrackRecordingService not connected.");
        } else {
            try {
                if (showEditor) {
@@ -15,10 +15,9 @@
 */
 package de.dennisguse.opentracks.services;

-import android.location.Location;
-
 import androidx.annotation.VisibleForTesting;

+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;

@@ -99,23 +98,16 @@ public interface TrackRecordingServiceInterface {
     */
    SensorDataSet getSensorData();

-    /**
-     * Inserts a location in the current recording track.
-     * <p>
-     * When recording a track, GPS locations are automatically inserted.
-     * This is used for inserting special track points or for testing.
-     *
-     * @param location the location to be inserted
-     */
-    @VisibleForTesting
-    void insertLocation(Location location);
-
-    /**
-     * Disables processing of location updates from {@link android.location.LocationManager}.
-     */
-    @VisibleForTesting
-    void enableLocationExecutor(boolean enable);
-
    @VisibleForTesting
    void setRemoteSensorManager(BluetoothRemoteSensorManager remoteSensorManager);
+
+    /**
+     * Inserts a track point in the current recording track.
+     * This is used for inserting special track points or for testing.
+     *
+     * @param trackPoint           the track point object to be inserted.
+     * @param recordingGpsAccuracy recording GPS accuracy.
+     */
+    @VisibleForTesting
+    void newTrackPoint(TrackPoint trackPoint, int recordingGpsAccuracy);
 }
@@ -14,7 +14,7 @@
 * the License.
 */

-package de.dennisguse.opentracks.services;
+package de.dennisguse.opentracks.services.handlers;

 /**
 * This is a simple location listener policy that will always dictate the same polling interval.
@@ -14,7 +14,7 @@
 * the License.
 */

-package de.dennisguse.opentracks.services;
+package de.dennisguse.opentracks.services.handlers;

 /**
 * A {@link LocationListenerPolicy} that will change based on how long the user has been stationary.
@@ -0,0 +1,70 @@
+package de.dennisguse.opentracks.services.handlers;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.VisibleForTesting;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import de.dennisguse.opentracks.content.data.TrackPoint;
+
+public class HandlerServer {
+
+    private static String TAG = HandlerServer.class.getSimpleName();
+
+    private final LocationHandler locationHandler;
+    private final HandlerServerInterface service;
+    private ExecutorService serviceExecutor;
+
+    public HandlerServer(HandlerServerInterface service) {
+        this.locationHandler = new LocationHandler(this);
+        this.service = service;
+    }
+
+    @VisibleForTesting
+    HandlerServer(LocationHandler locationHandler, HandlerServerInterface service) {
+        this.locationHandler = locationHandler;
+        this.service = service;
+    }
+
+    public void start(Context context) {
+        serviceExecutor = Executors.newSingleThreadExecutor();
+
+        locationHandler.onStart(context);
+        locationHandler.onSharedPreferenceChanged(context, null, null);
+    }
+
+    public void stop(Context context) {
+        locationHandler.onStop(context);
+
+        if (serviceExecutor != null) {
+            serviceExecutor.shutdownNow();
+        }
+        serviceExecutor = null;
+    }
+
+    public void onSharedPreferenceChanged(Context context, SharedPreferences preferences, String key) {
+        locationHandler.onSharedPreferenceChanged(context, preferences, key);
+    }
+
+    public void sendTrackPoint(TrackPoint trackPoint, int recordingGpsAccuracy) {
+        if (serviceExecutor == null || serviceExecutor.isTerminated() || serviceExecutor.isShutdown()) {
+            return;
+        }
+        serviceExecutor.execute(() -> service.newTrackPoint(trackPoint, recordingGpsAccuracy));
+    }
+
+    public interface HandlerServerInterface {
+        void newTrackPoint(TrackPoint trackPoint, int gpsAccuracy);
+    }
+
+    public interface Handler {
+        void onStart(Context context);
+
+        void onStop(Context context);
+
+        void onSharedPreferenceChanged(Context context, SharedPreferences preferences, String key);
+    }
+}
@@ -0,0 +1,137 @@
+package de.dennisguse.opentracks.services.handlers;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.TrackPointUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+
+class LocationHandler implements HandlerServer.Handler, LocationListener {
+
+    private final String TAG = LocationHandler.class.getSimpleName();
+
+    private LocationManager locationManager;
+    private final HandlerServer handlerServer;
+    private LocationListenerPolicy locationListenerPolicy;
+    private long currentRecordingInterval;
+    private int recordingGpsAccuracy;
+    private TrackPoint lastValidTrackPoint;
+
+    public LocationHandler(HandlerServer handlerServer) {
+        this.handlerServer = handlerServer;
+    }
+
+    @Override
+    public void onStart(Context context) {
+        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        registerLocationListener();
+    }
+
+    @Override
+    public void onStop(Context context) {
+        locationManager = null;
+        unregisterLocationListener();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(Context context, SharedPreferences preferences, String key) {
+        if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
+            int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(context);
+            if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) {
+                // Choose battery life over moving time accuracy.
+                locationListenerPolicy = new AdaptiveLocationListenerPolicy(30 * UnitConversions.ONE_SECOND_MS, 5 * UnitConversions.ONE_MINUTE_MS, 5);
+            } else if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) {
+                // Get all the updates.
+                locationListenerPolicy = new AdaptiveLocationListenerPolicy(UnitConversions.ONE_SECOND_MS, 30 * UnitConversions.ONE_SECOND_MS, 0);
+            } else {
+                locationListenerPolicy = new AbsoluteLocationListenerPolicy(minRecordingInterval * UnitConversions.ONE_SECOND_MS);
+            }
+
+            if (locationManager != null) {
+                registerLocationListener();
+            }
+        }
+        if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) {
+            recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
+        }
+    }
+
+    /**
+     * Checks if location is valid and builds a track point that will be send through HandlerServer.
+     *
+     * @param location {@link Location} object.
+     */
+    @Override
+    public void onLocationChanged(@NonNull Location location) {
+        if (!LocationUtils.isValidLocation(location)) {
+            Log.w(TAG, "Ignore newTrackPoint. location is invalid.");
+            return;
+        }
+
+        TrackPoint trackPoint = new TrackPoint(location);
+
+        if (!TrackPointUtils.fulfillsAccuracy(trackPoint, recordingGpsAccuracy)) {
+            Log.d(TAG, "Ignore newTrackPoint. Poor accuracy.");
+            return;
+        }
+
+        long idleTime = 0L;
+        if (TrackPointUtils.after(trackPoint, lastValidTrackPoint)) {
+            idleTime = trackPoint.getTime() - lastValidTrackPoint.getTime();
+        }
+
+        locationListenerPolicy.updateIdleTime(idleTime);
+        if (currentRecordingInterval != locationListenerPolicy.getDesiredPollingInterval()) {
+            registerLocationListener();
+        }
+
+        lastValidTrackPoint = trackPoint;
+        handlerServer.sendTrackPoint(trackPoint, recordingGpsAccuracy);
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+    }
+
+    @Override
+    public void onProviderEnabled(@NonNull String provider) {
+    }
+
+    @Override
+    public void onProviderDisabled(@NonNull String provider) {
+    }
+
+    private void registerLocationListener() {
+        if (locationManager == null) {
+            Log.e(TAG, "locationManager is null.");
+            return;
+        }
+        try {
+            long interval = locationListenerPolicy.getDesiredPollingInterval();
+            currentRecordingInterval = interval;
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, interval, locationListenerPolicy.getMinDistance_m(), this);
+        } catch (SecurityException e) {
+            Log.e(TAG, "Could not register location listener; permissions not granted.", e);
+        }
+    }
+
+    private void unregisterLocationListener() {
+        if (locationManager == null) {
+            Log.e(TAG, "locationManager is null.");
+            return;
+        }
+        locationManager.removeUpdates(this);
+        locationManager = null;
+    }
+}
@@ -14,7 +14,7 @@
 * the License.
 */

-package de.dennisguse.opentracks.services;
+package de.dennisguse.opentracks.services.handlers;

 /**
 * This is an interface for classes that will manage the location listener policy.
@@ -19,7 +19,6 @@ package de.dennisguse.opentracks.services.tasks;
 import android.content.Context;
 import android.media.AudioManager;
 import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;
 import android.speech.tts.UtteranceProgressListener;
 import android.util.Log;

@@ -50,7 +49,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask {

    private final AudioManager audioManager;

-    private ContentProviderUtils contentProviderUtils;
+    private final ContentProviderUtils contentProviderUtils;

    private final AudioManager.OnAudioFocusChangeListener audioFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {
        @Override
@@ -116,12 +115,9 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
        Log.d(TAG, "Start");

        if (tts == null) {
-            tts = new TextToSpeech(context, new OnInitListener() {
-                @Override
-                public void onInit(int status) {
-                    Log.i(TAG, "TextToSpeech initialized with status " + status);
-                    ttsInitStatus = status;
-                }
+            tts = new TextToSpeech(context, status -> {
+                Log.i(TAG, "TextToSpeech initialized with status " + status);
+                ttsInitStatus = status;
            });
        }
    }
@@ -22,7 +22,6 @@ import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Spinner;
@@ -51,12 +50,7 @@ public class ActivityTypePreference extends DialogPreference {
        setDialogIcon(null);
        setPersistent(true);

-        SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
-            @Override
-            public CharSequence provideSummary(DialogPreference preference) {
-                return PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
-            }
-        };
+        SummaryProvider<DialogPreference> summaryProvider = preference -> PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
        setSummaryProvider(summaryProvider);
    }

@@ -90,43 +84,31 @@ public class ActivityTypePreference extends DialogPreference {
            textView.setText(category);
            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(context, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
            textView.setAdapter(adapter);
-            textView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                @Override
-                public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-                    String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));
-                    TrackIconUtils.setIconSpinner(spinner, iconValue);
-                }
+            textView.setOnItemClickListener((parent, v, position, id) -> {
+                String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));
+                TrackIconUtils.setIconSpinner(spinner, iconValue);
            });
-            textView.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-                @Override
-                public void onFocusChange(View v, boolean hasFocus) {
-                    if (!hasFocus) {
-                        String iconValue = TrackIconUtils.getIconValue(context, textView.getText().toString());
-                        TrackIconUtils.setIconSpinner(spinner, iconValue);
-                    }
+            textView.setOnFocusChangeListener((v, hasFocus) -> {
+                if (!hasFocus) {
+                    String iconValue = TrackIconUtils.getIconValue(context, textView.getText().toString());
+                    TrackIconUtils.setIconSpinner(spinner, iconValue);
                }
            });

            String iconValue = TrackIconUtils.getIconValue(context, category);
            spinner = view.findViewById(R.id.activity_type_preference_spinner);
            spinner.setAdapter(TrackIconUtils.getIconSpinnerAdapter(context, iconValue));
-            spinner.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    if (event.getAction() == MotionEvent.ACTION_UP) {
-                        showIconSelectDialog();
-                    }
-                    return true;
+            spinner.setOnTouchListener((v, event) -> {
+                if (event.getAction() == MotionEvent.ACTION_UP) {
+                    showIconSelectDialog();
                }
+                return true;
            });
-            spinner.setOnKeyListener(new View.OnKeyListener() {
-                @Override
-                public boolean onKey(View v, int keyCode, KeyEvent event) {
-                    if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                        showIconSelectDialog();
-                    }
-                    return true;
+            spinner.setOnKeyListener((v, keyCode, event) -> {
+                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+                    showIconSelectDialog();
                }
+                return true;
            });
        }

@@ -56,25 +56,12 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit

    public static class PrefsFragment extends PreferenceFragmentCompat {

-        private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-            @Override
-            public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-                if (PreferencesUtils.isKey(getActivity(), R.string.recording_track_id_key, key)) {
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            updateReset();
-                        }
-                    });
-                }
-                if (PreferencesUtils.isKey(getActivity(), R.string.stats_units_key, key)) {
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            updateUnits();
-                        }
-                    });
-                }
+        private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (preferences, key) -> {
+            if (PreferencesUtils.isKey(getActivity(), R.string.recording_track_id_key, key)) {
+                getActivity().runOnUiThread(this::updateReset);
+            }
+            if (PreferencesUtils.isKey(getActivity(), R.string.stats_units_key, key)) {
+                getActivity().runOnUiThread(this::updateUnits);
            }
        };

@@ -127,7 +114,7 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit

            if (dialogFragment != null) {
                dialogFragment.setTargetFragment(this, 0);
-                dialogFragment.show(getFragmentManager(), getClass().getSimpleName());
+                dialogFragment.show(getParentFragmentManager(), getClass().getSimpleName());
                return;
            }

@@ -183,14 +183,11 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
            super.onPrepareDialogBuilder(builder);

            builder.setSingleChoiceItems(listAdapter, selectedEntryIndex,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            selectedEntryIndex = which;
+                    (dialog, which) -> {
+                        selectedEntryIndex = which;

-                            BluetoothLeSensorPreferenceDialog.this.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
-                            dialog.dismiss();
-                        }
+                        BluetoothLeSensorPreferenceDialog.this.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+                        dialog.dismiss();
                    });
            builder.setIcon(android.R.drawable.stat_sys_data_bluetooth);
            builder.setPositiveButton(null, null);
@@ -9,7 +9,6 @@ import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.AbsListView;
 import android.widget.ListView;

@@ -94,17 +93,13 @@ public class ActivityUtils {
        }
        searchView.setQueryRefinementEnabled(true);
        searchView.setSubmitButtonEnabled(true);
-        searchView.setOnQueryTextFocusChangeListener(new View.OnFocusChangeListener() {
-
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                // Hide and show trackController when searchable widget has focus/no focus
-                if (trackController != null) {
-                    if (hasFocus) {
-                        trackController.hide();
-                    } else {
-                        trackController.show();
-                    }
+        searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> {
+            // Hide and show trackController when searchable widget has focus/no focus
+            if (trackController != null) {
+                if (hasFocus) {
+                    trackController.hide();
+                } else {
+                    trackController.show();
                }
            }
        });
@@ -61,13 +61,10 @@ public class BluetoothUtils {
        final Object mutex = new Object();

        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                adapters.add(BluetoothAdapter.getDefaultAdapter());
-                synchronized (mutex) {
-                    mutex.notify();
-                }
+        handler.post(() -> {
+            adapters.add(BluetoothAdapter.getDefaultAdapter());
+            synchronized (mutex) {
+                mutex.notify();
            }
        });

@@ -52,17 +52,6 @@ public class DialogUtils {
                .setTitle(titleId).create();
    }

-    /**
-     * Creates a spinner progress dialog.
-     *
-     * @param context          the context
-     * @param messageId        the progress message id
-     * @param onCancelListener the cancel listener
-     */
-    public static ProgressDialog createSpinnerProgressDialog(Context context, int messageId, DialogInterface.OnCancelListener onCancelListener) {
-        return createProgressDialog(true, context, messageId, onCancelListener);
-    }
-
    /**
     * Creates a horizontal progress dialog.
     *
@@ -72,27 +61,26 @@ public class DialogUtils {
     * @param formatArgs       the format arguments for the messageId
     */
    public static ProgressDialog createHorizontalProgressDialog(Context context, int messageId, DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) {
-        return createProgressDialog(false, context, messageId, onCancelListener, formatArgs);
+        return createProgressDialog(context, messageId, onCancelListener, formatArgs);
    }

    /**
     * Creates a progress dialog.
     *
-     * @param spinner          true to use the spinner style
     * @param context          the context
     * @param messageId        the progress message id
     * @param onCancelListener the cancel listener
     * @param formatArgs       the format arguments for the message id
     */
-    private static ProgressDialog createProgressDialog(boolean spinner, final Context context, int messageId, DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) {
-        final ProgressDialog progressDialog = new ProgressDialog(context, R.style.ThemeCustomNotTransparent);
+    private static ProgressDialog createProgressDialog(final Context context, int messageId, DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) {
+        final ProgressDialog progressDialog = new ProgressDialog(context, R.style.ThemeCustomNotTransparentDialog);
        progressDialog.setCancelable(true);
        progressDialog.setCanceledOnTouchOutside(false);
        progressDialog.setIcon(R.drawable.ic_dialog_info_24dp);
        progressDialog.setIndeterminate(true);
        progressDialog.setMessage(context.getString(messageId, formatArgs));
        progressDialog.setOnCancelListener(onCancelListener);
-        progressDialog.setProgressStyle(spinner ? ProgressDialog.STYLE_SPINNER : ProgressDialog.STYLE_HORIZONTAL);
+        progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
        progressDialog.setTitle(R.string.generic_progress_title);
        return progressDialog;
    }
@@ -29,6 +29,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;

 import de.dennisguse.opentracks.BuildConfig;
@@ -47,8 +48,6 @@ public class FileUtils {
     */
    static final String FILEPROVIDER = BuildConfig.APPLICATION_ID + ".fileprovider";

-    public static final String EXPORT_DIR = "OpenTracks";
-
    private static final String JPEG_EXTENSION = "jpeg";

    /**
@@ -111,6 +110,10 @@ public class FileUtils {
        return fileName.substring(index + 1);
    }

+    public static String getExtension(DocumentFile file) {
+        return getExtension(file.getName());
+    }
+
    /**
     * Builds a filename with the given base and the given extension, possibly adding a suffix to ensure the file doesn't exist.
     *
@@ -229,13 +232,13 @@ public class FileUtils {
        return file.getAbsolutePath();
    }

-        /**
+    /**
     * Copy a File (src) to a File (dst).
     *
     * @param src source file.
     * @param dst destination file.
-         */
-        public static void copy(FileDescriptor src, File dst) {
+     */
+    public static void copy(FileDescriptor src, File dst) {
        try (FileChannel in = new FileInputStream(src).getChannel();
             FileChannel out = new FileOutputStream(dst).getChannel()) {
            in.transferTo(0, in.size(), out);
@@ -262,7 +265,7 @@ public class FileUtils {
     * @param context the Context.
     * @param trackId the id of the Track.
     * @param uri     the uri to check.
-     * @return        File object or null.
+     * @return File object or null.
     */
    public static File getPhotoFileIfExists(Context context, long trackId, Uri uri) {
        if (uri == null) {
@@ -300,4 +303,23 @@ public class FileUtils {
            file.delete();
        }
    }
+
+    public static ArrayList<DocumentFile> getFiles(DocumentFile file) {
+        ArrayList<DocumentFile> files = new ArrayList<>();
+
+        if (!file.isDirectory()) {
+            files.add(file);
+            return files;
+        }
+
+        for (DocumentFile candidate : file.listFiles()) {
+            if (!candidate.isDirectory()) {
+                files.add(candidate);
+            } else {
+                files.addAll(getFiles(candidate));
+            }
+        }
+
+        return files;
+    }
 }
@@ -5,10 +5,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;

+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;

 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;

 /**
@@ -21,32 +24,64 @@ public class IntentDashboardUtils {

    private static final String ACTION_DASHBOARD_PAYLOAD = ACTION_DASHBOARD + ".Payload";

+    private static final String EXTRAS_SHOULD_KEEP_SCREEN_ON = "EXTRAS_SHOULD_KEEP_SCREEN_ON";
+    private static final String EXTRAS_SHOW_WHEN_LOCKED = "EXTRAS_SHOULD_KEEP_SCREEN_ON";
+
+    private static final int TRACK_URI_INDEX = 0;
+    private static final int TRACKPOINTS_URI_INDEX = 1;
+    private static final int WAYPOINTS_URI_INDEX = 2;
+
    private IntentDashboardUtils() {
    }

-    public static boolean startDashboard(Context context, long[] trackIds) {
-        ArrayList<Uri> uris = new ArrayList<>();
+    /**
+     * Send intent to show tracks on a map (needs an another app) as resource URIs.
+     *
+     * @param context  the context
+     * @param trackIds the track ids
+     */
+    public static void startDashboard(Context context, long[] trackIds) {
+        if (trackIds.length == 0) {
+            return;
+        }
+
        String trackIdList = ContentProviderUtils.formatIdListForUri(trackIds);

-        uris.add(0, Uri.withAppendedPath(TracksColumns.CONTENT_URI, trackIdList));
-        uris.add(1, Uri.withAppendedPath(TrackPointsColumns.CONTENT_URI_BY_TRACKID, trackIdList));
+        ArrayList<Uri> uris = new ArrayList<>();
+        uris.add(TRACK_URI_INDEX, Uri.withAppendedPath(TracksColumns.CONTENT_URI, trackIdList));
+        uris.add(TRACKPOINTS_URI_INDEX, Uri.withAppendedPath(TrackPointsColumns.CONTENT_URI_BY_TRACKID, trackIdList));
+        uris.add(WAYPOINTS_URI_INDEX, Uri.withAppendedPath(WaypointsColumns.CONTENT_URI_BY_TRACKID, trackIdList));

        Intent intent = new Intent(ACTION_DASHBOARD);
        intent.putParcelableArrayListExtra(ACTION_DASHBOARD_PAYLOAD, uris);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(EXTRAS_SHOULD_KEEP_SCREEN_ON, PreferencesUtils.shouldKeepScreenOn(context));
+        intent.putExtra(EXTRAS_SHOW_WHEN_LOCKED, PreferencesUtils.shouldShowStatsOnLockscreen(context));

        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        ClipData clipData = ClipData.newRawUri(null, uris.get(0));
-        clipData.addItem(new ClipData.Item(uris.get(1)));
+        ClipData clipData = ClipData.newRawUri(null, uris.get(TRACK_URI_INDEX));
+        clipData.addItem(new ClipData.Item(uris.get(TRACKPOINTS_URI_INDEX)));
+        clipData.addItem(new ClipData.Item(uris.get(WAYPOINTS_URI_INDEX)));
        intent.setClipData(clipData);

-        if (intent.resolveActivity(context.getPackageManager()) != null) {
-            context.startActivity(Intent.createChooser(intent, null));
-            return true;
-        }
-
-        return false;
+        context.startActivity(intent);
    }

+    public static void startDashboard(Context context, long trackId) {
+        startDashboard(context, new long[]{trackId});
+    }
+
+    public static long[] extractTrackIdsFromIntent(@NonNull Intent intent) {
+        final ArrayList<Uri> uris = intent.getParcelableArrayListExtra(ACTION_DASHBOARD_PAYLOAD);
+        final Uri tracksUri = uris.get(TRACK_URI_INDEX);
+
+        String[] trackIdsString = ContentProviderUtils.parseTrackIdsFromUri(tracksUri);
+        long[] trackIds = new long[trackIdsString.length];
+        for (int i = 0; i < trackIdsString.length; i++) {
+            trackIds[i] = Long.parseLong(trackIdsString[i]);
+        }
+
+        return trackIds;
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dennis Guse	81a7aca4a0	Release v3.8.0	2020-07-24 22:22:48 +02:00
Dennis Guse	065f42fbef	GPX import/export: speed via TrackPointExtension/v2. Fixed data type for heartrate/speed (no decimals) allowed. Fixes #335. Fixes #181. GPXTrackWriter: set Trackpointv2 header correctly and export time in correct sequence.	2020-07-24 22:06:58 +02:00
ronajon	c92371b36a	GPX import/export: add heartrate and cadence via TrackPointExtension/v1.	2020-07-24 22:06:58 +02:00
Dennis Guse	97c46183c3	TrackRecordingServiceConnection: always bind (and start) the TrackRecordingService. Seemed to be a memory optimization.	2020-07-21 19:44:39 +02:00
Dennis Guse	c02b8fab53	HandlerServer: use executor service to send data to TrackRecordingService. Fixes #329.	2020-07-21 19:43:51 +02:00
Dennis Guse	6540913d59	Moved R.string.stats_unit_key initialization into Startup.	2020-07-20 20:46:41 +02:00
Dennis Guse	b70c3be5af	Cleanup: static code analysis using AndroidStudio.	2020-07-20 20:05:45 +02:00
Dennis Guse	461f1c246b	MarkerEditActivity: do not overwrite new photoUri with previous one. (#332 ) Fixes #330. Tested and it works 👍	2020-07-20 19:30:23 +02:00
Dennis Guse	6d091dfa81	Fixes NPE on MarkerEditActivity when taking a photo and trigger an orientation change. (#327 ) Fixes #325.	2020-07-18 22:52:19 +02:00
Peter Storch	97ad6bc2f8	expose waypoints to dashboard Necessary for https://github.com/OpenTracksApp/OSMDashboard/issues/48	2020-07-18 18:56:53 +02:00
Dennis Guse	93ee8a53ed	Import from intent: also match file suffix as fallback.	2020-07-18 18:55:30 +02:00
Dennis Guse	bf9b6d6627	Import: individual files chosen by an external app.	2020-07-18 18:55:30 +02:00
Dennis Guse	5f637952aa	Replaced blue pushpin icon (png) with with orange icon (svg). Fixes #115.	2020-07-18 18:51:34 +02:00
Román Martínez	17de8cea6f	Service refactoring: move location management to the LocationHandle. Tests refactoring: location and service tests re-worked.	2020-07-17 12:29:30 +02:00
Deus Figendi	afea79476f	united the gradiants in ic_marker_orange_pushpin	2020-07-16 22:57:44 +02:00
Deus Figendi	7215a2def0	Added an orange version of the ic_marker pushpin	2020-07-16 22:57:44 +02:00
Román	b8d2d14d68	Preferred rate is used for aggregated stats. Fixes #321 . Lambda expression for Observer.	2020-07-15 21:43:55 +02:00
Dennis Guse	a2b53c75f4	Release v3.7.6	2020-07-13 18:47:50 +02:00
Dennis Guse	7a5f69d3a5	Settings: default export format is now KMZ incl. data and pictures.	2020-07-13 18:19:34 +02:00
Dennis Guse	7fd9893560	TrackDeleteActivity: keep a wakelock while deletion is ongoing.	2020-07-13 18:19:34 +02:00
Román	f209031df0	Pass extra TrackFileFormat enum like a Serializable instead of String (with String resulted in Null after get extra).	2020-07-13 18:19:34 +02:00
Dennis Guse	2dbab929ac	Export: replaced async task with thread. Almost identical to the import.	2020-07-13 18:19:34 +02:00
Dennis Guse	e9eb764d12	Import: split ImportActivity into fragments. The fragements keep the state while the activity is re-created (e.g., orientation change).	2020-07-13 18:19:34 +02:00
Dennis Guse	41a4a5527a	Import: replaced async task with thread. Extracted directory chooser into a separate activity.	2020-07-13 18:19:34 +02:00
Dennis Guse	4ded3c6bc8	TrackDelete: use a Thread and always require TrackIds.	2020-07-08 08:25:36 +02:00
Dennis Guse	51e573e475	TrackDelete: hide progress bar before finishing and add custom animations.	2020-07-08 08:25:36 +02:00
Dennis Guse	98c3169929	Track deletion UI: code cleanup.	2020-07-08 08:25:36 +02:00
Dennis Guse	ff65a4d04f	Track deletion shows an infinite progressbar. Fixes #242.	2020-07-08 08:25:36 +02:00
Dennis Guse	278f49dec8	TrackRecordingActivity: removed start/resume toast message.	2020-07-07 18:13:37 +02:00
Dennis Guse	d444e1ca3c	TrackRecordingActivity: recreate activity properly.	2020-07-07 18:13:37 +02:00
Dennis Guse	13e07696b9	Re-implemented landscape mode. Fixes #32.	2020-07-07 18:13:37 +02:00
Román Martínez	23c3a4d651	Import/Export speed in GPX and KML files. (#306 ) Import/Export speed in GPX and KML files. Fixes #300.	2020-06-30 14:39:44 +02:00
Dennis Guse	c9869bab0e	Generate UUID for each track (necessary for synchronization). Fixes #294.	2020-06-30 12:39:30 +02:00
Dennis Guse	ecdb509371	Export/import test now verifies the TrackPoints.	2020-06-22 21:56:22 +02:00
transifex-integration[bot]	de376a84f8	Apply translations in fr translation completed for the source file '/fastlane/metadata/android/en-US/short_description.txt' on the 'fr' language.	2020-06-21 18:19:11 +02:00
transifex-integration[bot]	9abd8bcaa6	Apply translations in de translation completed for the source file '/fastlane/metadata/android/en-US/short_description.txt' on the 'de' language.	2020-06-21 18:18:58 +02:00
Román Martínez	8ddadb8e6d	Aggregated statistics: updated PlantUML and handle empty list. (#296 )	2020-06-20 19:02:02 +02:00
transifex-integration[bot]	924ef3313e	Translate /src/main/res/values/strings.xml in nl translation completed for the source file '/src/main/res/values/strings.xml' on the 'nl' language.	2020-06-16 19:33:52 +02:00
Dennis Guse	8cb68a6e64	Migrate to default branch main.	2020-06-15 12:10:26 +02:00
Dennis Guse	23f47f10f8	Release v3.7.5	2020-06-14 20:09:27 +02:00
Román Martínez	251fa17487	Merge pull request #271 from OpenTracksApp/all_statistics#112 Aggregated statistics by activity type.	2020-06-14 20:03:29 +02:00
Román	bae3373fe9	Aggregated statistics by activity type. Fixes #112 .	2020-06-14 19:57:07 +02:00
Dennis Guse	0a685a66e3	Added list of tested Bluetooth LE sensors. Fixes #202.	2020-06-14 11:58:45 +02:00
Dennis Guse	5ca9ca857a	Cleanup.	2020-06-13 23:07:58 +02:00
Dennis Guse	d9dfa6d746	Dashboard API: add data transfer as GPX and removed unnecessary IntentChooser.	2020-06-13 17:56:59 +02:00
Dennis Guse	3a5220546e	Dashboard API: fallback to "open as KMZ" implemented as proxy activity. We are not allowed to query for installed packages as of Android R (API 30).	2020-06-13 17:56:59 +02:00
Dennis Guse	047d5c2340	Manifest reordered to fix warning.	2020-06-13 17:56:59 +02:00
Dennis Guse	725c21c0a1	Bugfix: parse URI with trackIds correctly.	2020-06-13 17:56:59 +02:00
Dennis Guse	7939e39fc1	Go for Android R (API level 30).	2020-06-13 17:56:59 +02:00
Dennis Guse	a133bd8f9e	Bugfix: adaptive icon was too large. We now use the same as OSMDashboard. Thanks Peter.	2020-06-13 00:08:00 +02:00
transifex-integration[bot]	1f9790cba8	Translate /src/main/res/values/strings.xml in gl translation completed for the source file '/src/main/res/values/strings.xml' on the 'gl' language.	2020-06-10 22:20:23 +02:00
Dennis Guse	a3ba1e1490	Cleanup: use lambda instead of runnable.	2020-06-09 23:01:09 +02:00
Dennis Guse	accb30152f	Translations fixed.	2020-06-09 19:58:23 +02:00
Dennis Guse	dc7daa6e8c	App icon: be complaint with Android requirements. (#253 ) Fixes #121.	2020-06-09 19:37:47 +02:00
Dennis Guse	1d8e788d53	Documentation: add internal data flow.	2020-06-09 19:36:54 +02:00
Dennis Guse	568b908b26	Removed unused strings.	2020-06-09 19:35:57 +02:00
transifex-integration[bot]	3ab63adb34	Translate '/src/main/res/values/strings.xml' in 'de' [manual sync] (#269 ) * Translate /src/main/res/values/strings.xml in de at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'de' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>	2020-06-08 23:42:16 +02:00
transifex-integration[bot]	91692f345e	Translate /src/main/res/values/strings.xml in fr at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'fr' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format	2020-06-08 23:32:34 +02:00
transifex-integration[bot]	dbdb98a682	Translate /src/main/res/values/strings.xml in eu at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'eu' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format	2020-06-08 23:32:21 +02:00
transifex-integration[bot]	df66cd5753	Translate /src/main/res/values/strings.xml in cs at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'cs' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format	2020-06-08 23:31:19 +02:00
transifex-integration[bot]	6e39dd37f8	Translate /src/main/res/values/strings.xml in da at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'da' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format	2020-06-08 23:31:08 +02:00
transifex-integration[bot]	7212f7be94	Translate /src/main/res/values/strings.xml in nl at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'nl' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format	2020-06-08 23:31:00 +02:00
transifex-integration[bot]	77fe494e6c	Translate /src/main/res/values/strings.xml in et at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'et' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format	2020-06-08 23:30:55 +02:00
transifex-integration[bot]	2f491e8c10	Translate /src/main/res/values/strings.xml in es at least 95% translated for the source file '/src/main/res/values/strings.xml' on the 'es' language. Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format	2020-06-08 23:30:48 +02:00
Dennis Guse	f4fe7b1ab3	Import: convert all failed date parsing into SAXExceptions.	2020-06-08 22:51:01 +02:00
Peter Storch	7e444cbf31	Merge pull request #248 from OpenTracksApp/keep_screen_on_dashboard forward keep screen on while recording preference to dashboard	2020-06-06 23:12:24 +02:00
Dennis Guse	ed6ab9c53c	Import: be lenient with missing timezone information. Fixes #249.	2020-06-06 22:58:02 +02:00
Peter Storch	f91ca3154c	forward show on lockscreen to dashboard	2020-06-05 20:52:00 +02:00
Peter Storch	bbfab1b201	forward keep screen on while recording preference to dashboard	2020-06-05 20:17:24 +02:00
Dennis Guse	1f2e3bcf70	Upgrade to Android Gradle plugin 4.0.0	2020-05-30 20:25:36 +02:00