Release: v3.14.1

Translated using Weblate (Czech)
Currently translated at 100.0% (516 of 516 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/cs/
2026-10-02 09:33:06 +02:00 · 2021-01-03 13:25:19 +01:00 · 2020-12-31 12:34:58 +01:00 · 2020-12-31 12:34:58 +01:00 · 2020-12-31 12:34:38 +01:00 · 2020-12-26 20:30:10 +01:00
166 changed files with 4137 additions and 4070 deletions
@@ -19,9 +19,6 @@ jobs:
      with:
        fetch-depth: 2

-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
    - name: Initialize CodeQL
      uses: github/codeql-action/init@v1
      with:
@@ -1,10 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[opentracks.src-main-res-values-strings-xml--main]
-file_filter = src/main/res/values-<lang>/strings.xml
-minimum_perc = 0
-source_file = src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
-
@@ -2,6 +2,8 @@

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

+[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
+
 <table>
    <tr>
        <th>Free</th>
@@ -20,8 +22,8 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
            </a>
        </td>
        <td align="center">
-            <a href="https://www.transifex.com/opentracks/opentracks/">
-                Transifex
+            <a href="https://weblate.bubu1.eu/engage/OpenTracks/">
+                <img src="https://weblate.bubu1.eu/widgets/OpenTracks/-/opentracks/svg-badge.svg" alt="Translation status" />
            </a>
        </td>
    </tr>
@@ -53,6 +55,7 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
 * __Bluetooth LE sensors:__
  * heart rate
  * cycling: speed and cadence
+  * cycling: power meter
 * __Export data:__ export tracks either as KMZ (incl. photos), KML or GPX
 * __No Internet access:__ Internet is not used
 * __Voice announcements__
@@ -68,7 +71,7 @@ __Only required permissions:__
 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).
+_OpenTracks_ does not contain a _map_ (as this would require internet access).

 ## Custom Dashboards (incl. Map)
 As of v3.3.1 OpenTracks enables to use custom dashboards.
@@ -34,4 +34,4 @@ Requirement: `gem install fastlane`

 ## Translations (localization)

-Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).
+Translations of the OpenTracks are handled in Weblate: [https://weblate.bubu1.eu/projects/OpenTracks/](https://weblate.bubu1.eu/projects/OpenTracks/).
@@ -1,21 +1,44 @@
 # Overview of tested Bluetooth LE sensors

 ## HRS: Heartrate Service
+
 * Decathlon|Geonaute|Kalenji Dual HRM Belt
 * moofit heart rate monitor
 * Polar H7
+* Polar H10
 * Polar OH1
  Has updatable firmware that requires a user account at polar.com
 * Wahoo Tickr (Model: WFBTHR02)
+* Mi Band 3, Amazfit Band 5, Amazfit Bip. These devices are manufactured by Huami, and other Huami devices will very likely work. Theoretically, this sensor must be enabled, but testing reveals that it works even without enabling. For details on how to enable see [Gadgetbridge wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Huami-Heartrate-measurement#bluetooth-heart-rate-sensor)

 ## 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
+
+* Garmin Speed Sensor 2
 * Wahoo Speed (Model: WFRPMSPD)

-### Cadence 
+### Cadence
+
+* Garmin Cadence Sensor 2
 * Wahoo Cadence (Model: WFPODCAD2)
  This sensor reports cadence data as speed.
-  A workaround is in place. 
+  A workaround is in place.
+
+## Cycling Power Measurement
+
+We only support _Instantaneous Power_.
+
+_WARNING_: we only support physically movements with valid GPS coordinates.
+Using a device indoors (no GPS available) will only show the current power values, but won't store anything.
+Also the distance is not computed.
+
+* Assioma Duo Powermeter
+* Elite drivo II
+* QUARQ Red DZero Powermeter
+* Tacx Satori Smart
+* Wahoo Kickr v4.0
+
@@ -27,7 +27,7 @@ cp "$CHANGELOG_DIR/next_release.txt" "$CHANGELOG_FILE"
 sed -i "s/(versionName)/$VERSIONNAME/" "$CHANGELOG_FILE"

 echo -e "\nGit commit since last release\n------------"
-git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline
+git log "$(git describe --tags --abbrev=0)..HEAD" --no-merges --oneline

 echo -e "\nPlease edit the changelog for the new release"
 gedit -w "$CHANGELOG_FILE"
@@ -6,7 +6,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
    }
 }

@@ -51,8 +51,8 @@ android {

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 3704
-        versionName "v3.12.0"
+        versionCode 3799
+        versionName "v3.14.1"

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

@@ -86,7 +86,8 @@ android {
 }

 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha02'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'

    implementation 'androidx.appcompat:appcompat:1.2.0'
    implementation 'androidx.preference:preference:1.1.1'
@@ -98,5 +99,5 @@ dependencies {
    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
    androidTestImplementation 'androidx.test:rules:1.3.0'
    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'org.mockito:mockito-android:3.6.0'
+    androidTestImplementation 'org.mockito:mockito-android:3.6.28'
 }
@@ -10,15 +10,11 @@ endlegend

 [*] --> TrackListActivity
 TrackListActivity --> TrackRecordingActivity : Start recording
-TrackListActivity --> SearchListActivity
+TrackListActivity --> TrackRecordedActivity : Show track
 TrackListActivity --> MarkerListActivity : Show all markers
 TrackListActivity --> AggregatedStatisticsActivity : Aggregated stats
-TrackListActivity --> TrackRecordedActivity : Show track
 TrackListActivity --> TrackDeleteActivity

-SearchListActivity --> MarkerDetailActivity : Search result
-SearchListActivity --> TrackRecordedActivity : Search result
-
 TrackRecordedActivity --> TrackDeleteActivity
 TrackRecordedActivity --> TrackEditActivity
 TrackRecordedActivity --> MarkerListActivity
@@ -46,11 +42,14 @@ MarkerDetailActivity --> CoordinateOnMapIntent : URI

 SettingsActivity --> AboutActivity
 SettingsActivity --> HelpActivity
+SettingsActivity --> ImportActivity
 SettingsActivity --> ExportActivity
-SettingsActivity --> DirectoryChooserActivity$ImportDirectoryChooserActivity
-SettingsActivity --> DirectoryChooserActivity$ExportDirectoryChooserActivity
-SettingsActivity --> DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity
-DirectoryChooserActivity$ImportDirectoryChooserActivity --> ImportActivity
-DirectoryChooserActivity$ExportDirectoryChooserActivity --> ExportActivity
+SettingsActivity --> DirectoryChooserActivity.ImportDirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity.ExportDirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity.DefaultTrackExportDirectoryChooserActivity
+DirectoryChooserActivity.ImportDirectoryChooserActivity --> ImportActivity
+DirectoryChooserActivity.ExportDirectoryChooserActivity --> ExportActivity
+
+FileImportIntent --> ImportActivity

@enduml
@@ -5,6 +5,6 @@ Funktionen & Features:
 * zeichnet Sport und andere Outdooraktivitäten auf
 * unterstützt das Markieren interessanter Orte, inkl. Foto-Funktion
 * zeichnet deine Herzfrequenz auf (Bluetooth LE)
-* nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren (Bluetooth LE)
+* nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren sowie Leistungsmesser (Bluetooth LE)
 * exportiert deine Daten als KML oder GPX
 * funktioniert ganz ohne Internet
@@ -0,0 +1,10 @@
+v3.13.0: OpenTracks
+
+Changes:
+- Sensor: support for powermeter (BLE)
+- Search by track and marker (in lists)
+- Combined search removed
+
+Bugfix:
+- Import crashed in UI
+- Images of markers were not imported
@@ -0,0 +1,5 @@
+v3.13.1: OpenTracks
+
+Bugfix:
+- Crash on record start: minify/shrink removed a drawable
+- Automatic export failed silently (mainly remote destinations)
@@ -0,0 +1,5 @@
+v3.13.2: OpenTracks
+
+Bugfix:
+- Crash in landscape mode
+
@@ -0,0 +1,10 @@
+v3.14.0: OpenTracks
+
+Changes:
+- Properly support for right-to-left
+- Import: faster cleanup after import failure
+- Text in charts scales according to Android settings
+- Heart rate: support for Huami devices (requires Gadgetbridge)
+
+Developer:
+- Import is now handled in-memory
@@ -0,0 +1,14 @@
+v3.14.1: OpenTracks
+
+Changes:
+- Added elevation loss (via barometer)
+- Updated translations (cz, gl, it, nb, pl, pt, sp)
+- Markers can be shared from list
+- Actionbar icon (top left) to go back
+- 
+Bugfix:
+- Potential crash on import
+
+Developer:
+- Implemented basic EspressoUI test
+- Reference resourceIds via if rather than switch/case
@@ -6,5 +6,6 @@ Features:
 * Supports Bluetooth LE sensors:
  * heart rate
  * cycling: speed and cadence
+  * cycling: power meter
 * Export data: export tracks either as KML or GPX
 * No Internet access: Internet is not used
@@ -0,0 +1,168 @@
+package de.dennisguse.opentracks;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.action.MotionEvents;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.GrantPermissionRule;
+
+import com.google.android.material.tabs.TabLayout;
+
+import org.hamcrest.Matcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class EspressoUITest {
+
+    @Rule
+    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
+
+    @Rule
+    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant("android.permission.ACCESS_FINE_LOCATION");
+
+    @LargeTest
+    @Test
+    public void record_pause_resume_stop() {
+        {
+            // TrackListActivity: start recording
+            ViewInteraction trackControllerRecordButton = onView(withId(R.id.track_controller_record));
+            trackControllerRecordButton.perform(click());
+        }
+        {
+            // TrackRecordingActivity
+            ViewInteraction trackControllerRecordButton = onView(withId(R.id.track_controller_record));
+            ViewInteraction trackControllerStopButton = onView(withId(R.id.track_controller_stop));
+
+            // wait; stay recording
+            trackControllerRecordButton.perform(waitFor(5000));
+
+            //pause
+            trackControllerRecordButton.perform(veryLongTouch(1600));
+
+            // wait; stay paused
+            trackControllerRecordButton.perform(waitFor(1000));
+
+            // resume
+            trackControllerRecordButton.perform(click());
+
+            // wait; stay recording
+            trackControllerRecordButton.perform(waitFor(1000));
+
+            // stop;
+            trackControllerStopButton.perform(veryLongTouch(1600));
+        }
+    }
+
+    @LargeTest
+    @Test
+    public void record_move_through_tabs() {
+        {
+            // TrackListActivity: start recording
+            ViewInteraction trackControllerRecordButton = onView(withId(R.id.track_controller_record));
+            trackControllerRecordButton.perform(click());
+        }
+        {
+            // TrackRecordingActivity
+            ViewInteraction tabLayout = onView(withId(R.id.track_detail_activity_tablayout));
+            ViewInteraction trackControllerStopButton = onView(withId(R.id.track_controller_stop));
+
+            tabLayout.perform(selectTabAtIndex(1));
+            tabLayout.perform(waitFor(1000));
+
+            tabLayout.perform(selectTabAtIndex(2));
+            tabLayout.perform(waitFor(1000));
+
+            tabLayout.perform(selectTabAtIndex(3));
+            tabLayout.perform(waitFor(1000));
+
+            tabLayout.perform(selectTabAtIndex(0));
+            tabLayout.perform(waitFor(1000));
+
+            // stop
+            trackControllerStopButton.perform(veryLongTouch(1600));
+        }
+    }
+
+    private static ViewAction veryLongTouch(final int duration_ms) {
+        return new ViewAction() {
+            @Override
+            public String getDescription() {
+                return "Perform long touch.";
+            }
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return isDisplayed();
+            }
+
+            @Override
+            public void perform(UiController uiController, final View view) {
+                // Get view absolute position
+                int[] location = new int[2];
+                view.getLocationOnScreen(location);
+
+                // Offset coordinates by view position
+                float[] coordinates = new float[]{location[0] + 1, location[1] + 1};
+
+                // Send down event, pause, and send up
+                MotionEvent down = MotionEvents.sendDown(uiController, coordinates, new float[]{1f, 1f}).down;
+                uiController.loopMainThreadForAtLeast(duration_ms);
+                MotionEvents.sendUp(uiController, down, coordinates);
+            }
+        };
+    }
+
+    private static ViewAction waitFor(final long duration_ms) {
+        return new ViewAction() {
+
+            @Override
+            public String getDescription() {
+                return "Wait for milliseconds.";
+            }
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return isDisplayed();
+            }
+
+            @Override
+            public void perform(UiController uiController, final View view) {
+                uiController.loopMainThreadForAtLeast(duration_ms);
+            }
+        };
+    }
+
+    private static ViewAction selectTabAtIndex(final int index) {
+        return new ViewAction() {
+            @Override
+            public String getDescription() {
+                return "Selecting tab.";
+            }
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return isDisplayed();
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                TabLayout tabLayout = (TabLayout) view;
+                tabLayout.getTabAt(index).select();
+            }
+        };
+    }
+}
@@ -48,7 +48,9 @@ public class ChartValueSeriesTest {
                R.string.description_elevation_metric,
                R.string.description_elevation_imperial,
                R.color.chart_elevation_fill,
-                R.color.chart_elevation_border) {
+                R.color.chart_elevation_border,
+                15,
+                18) {
            @Override
            double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                return chartPoint.getElevation();
@@ -64,6 +64,7 @@ public class DescriptionGeneratorTest {
        stats.setMaxElevation(550);
        stats.setMinElevation(-500);
        stats.setTotalElevationGain(6000);
+        stats.setTotalElevationLoss(6000);
        stats.setStartTime_ms(START_TIME);
        track.setTrackStatistics(stats);
        track.setCategory("hiking");
@@ -84,6 +85,7 @@ public class DescriptionGeneratorTest {
                + "Max elevation: 550 m (1804 ft)<br>"
                + "Min elevation: -500 m (-1640 ft)<br>"
                + "Elevation gain: 6000 m (19685 ft)<br>"
+                + "Elevation loss: 6000 m (19685 ft)<br>"
                + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";

        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
@@ -100,6 +102,7 @@ public class DescriptionGeneratorTest {
        stats.setMaxElevation(Double.POSITIVE_INFINITY);
        stats.setMinElevation(Double.NEGATIVE_INFINITY);
        stats.setTotalElevationGain(6000);
+        stats.setTotalElevationLoss(6000);
        stats.setStartTime_ms(START_TIME);
        track.setTrackStatistics(stats);
        track.setCategory("hiking");
@@ -118,6 +121,7 @@ public class DescriptionGeneratorTest {
                        + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
                        + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
                        + "Elevation gain: 6000 m (19685 ft)<br>"
+                        + "Elevation loss: 6000 m (19685 ft)<br>"
                        + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";

        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
@@ -1,323 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.content;
-
-import android.content.ContentUris;
-import android.location.Location;
-import android.net.Uri;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.provider.ProviderTestRule;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
-import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.CustomContentProvider;
-import de.dennisguse.opentracks.content.provider.CustomSQLiteOpenHelper;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-/**
- * Tests for {@link SearchEngine}.
- * These are not meant to be quality tests, but instead feature-by-feature tests.
- * In other words, they don't test the mixing of different score boostings, just each boosting separately.
- *
- * @author Rodrigo Damazio
- */
-public class SearchEngineTest {
-
-    private static final String TAG = SearchEngineTest.class.getSimpleName();
-
-    private static final Location HERE = new Location("gps");
-    private static final long NOW = SearchEngine.OLDEST_ALLOWED_TIMESTAMP + 1000;
-
-    @Rule
-    public ProviderTestRule sqliteContentProviderRule = new ProviderTestRule.Builder(CustomContentProvider.class, ContentProviderUtils.AUTHORITY_PACKAGE).setPrefix(TAG).build();
-
-    private ContentProviderUtils providerUtils;
-    private SearchEngine engine;
-
-    @Before
-    public void setUp() {
-        providerUtils = new ContentProviderUtils(sqliteContentProviderRule.getResolver());
-
-        engine = new SearchEngine(providerUtils);
-    }
-
-    @After
-    public void tearDown() {
-        InstrumentationRegistry.getInstrumentation().getTargetContext().deleteDatabase(TAG + CustomSQLiteOpenHelper.DATABASE_NAME);
-    }
-
-    private Track.Id insertTrack(String title, String description, String category, long hoursAgo) {
-        Track track = new Track();
-        track.setName(title);
-        track.setDescription(description);
-        track.setCategory(category);
-
-        TrackStatistics stats = track.getTrackStatistics();
-        if (hoursAgo > 0) {
-            // Started twice hoursAgo, so the average time is hoursAgo.
-            stats.setStartTime_ms(NOW - hoursAgo * 1000L * 60L * 60L * 2);
-            stats.setStopTime_ms(NOW);
-        }
-
-        Uri uri = providerUtils.insertTrack(track);
-        return new Track.Id(ContentUris.parseId(uri));
-    }
-
-    private Track.Id insertTrack(String title, String description, String category) {
-        return insertTrack(title, description, category, -1);
-    }
-
-    private Track.Id insertTrack(String title, long hoursAgo) {
-        return insertTrack(title, "", "", hoursAgo);
-    }
-
-    private Marker.Id insertWaypoint(String title, String description, String category, double distance, long hoursAgo, Track.Id trackId) {
-        Location location = new Location(HERE);
-        location.setLatitude(location.getLatitude() + distance);
-        location.setLongitude(location.getLongitude() + distance);
-        if (hoursAgo >= 0) {
-            location.setTime(NOW - hoursAgo * 1000L * 60L * 60L);
-        }
-        Marker waypoint = new Marker(trackId, location);
-        waypoint.setName(title);
-        waypoint.setDescription(description);
-        waypoint.setCategory(category);
-
-        Uri uri = providerUtils.insertMarker(waypoint);
-        return new Marker.Id(ContentUris.parseId(uri));
-    }
-
-    private Marker.Id insertWaypoint(String title, String description, String category, Track.Id trackId) {
-        return insertWaypoint(title, description, category, 0.0, -1, trackId);
-    }
-
-    private Marker.Id insertWaypoint(String title, double distance, Track.Id trackId) {
-        return insertWaypoint(title, "", "", distance, -1, trackId);
-    }
-
-    private Marker.Id insertWaypoint(String title, long hoursAgo, Track.Id trackId) {
-        return insertWaypoint(title, "", "", 0.0, hoursAgo, trackId);
-    }
-
-    @Test
-    public void testSearchText() {
-        // Insert 7 tracks (purposefully out of result order):
-        // - one which won't match
-        // - one which will match the description
-        // - one which will match the category
-        // - one which will match the title
-        // - one which will match in title and category
-        // - one which will match in title and description
-        // - one which will match in all fields
-        insertTrack("bb", "cc", "dd");
-        Track.Id descriptionMatchId = insertTrack("bb", "aa", "cc");
-        Track.Id categoryMatchId = insertTrack("bb", "cc", "aa");
-        Track.Id titleMatchId = insertTrack("aa", "bb", "cc");
-        Track.Id titleCategoryMatchId = insertTrack("aa", "bb", "ca");
-        Track.Id titleDescriptionMatchId = insertTrack("aa", "ba", "cc");
-        Track.Id allMatchId = insertTrack("aa", "ba", "ca");
-
-        SearchQuery query = new SearchQuery("a", null, null, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Title > Description > Category.
-        assertTrackResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
-    }
-
-    @Test
-    public void testSearchWaypointText() {
-        // Insert 7 waypoints (purposefully out of result order):
-        // - one which won't match
-        // - one which will match the description
-        // - one which will match the category
-        // - one which will match the title
-        // - one which will match in title and category
-        // - one which will match in title and description
-        // - one which will match in all fields
-        Track.Id trackId = insertTrack("", "", "");
-        insertWaypoint("bb", "cc", "dd", trackId);
-        Marker.Id descriptionMatchId = insertWaypoint("bb", "aa", "cc", trackId);
-        Marker.Id categoryMatchId = insertWaypoint("bb", "cc", "aa", trackId);
-        Marker.Id titleMatchId = insertWaypoint("aa", "bb", "cc", trackId);
-        Marker.Id titleCategoryMatchId = insertWaypoint("aa", "bb", "ca", trackId);
-        Marker.Id titleDescriptionMatchId = insertWaypoint("aa", "ba", "cc", trackId);
-        Marker.Id allMatchId = insertWaypoint("aa", "ba", "ca", trackId);
-
-        SearchQuery query = new SearchQuery("a", null, null, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Title > Description > Category.
-        assertWaypointResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
-    }
-
-    @Test
-    public void testSearchMixedText() {
-        // Insert 5 entries (purposefully out of result order):
-        // - one waypoint which will match by description
-        // - one waypoint which won't match
-        // - one waypoint which will match by title
-        // - one track which won't match
-        // - one track which will match by title
-        Track.Id trackId = insertTrack("aa", "bb", "cc");
-        Marker.Id descriptionWaypointId = insertWaypoint("bb", "aa", "cc", trackId);
-        insertWaypoint("bb", "cc", "dd", trackId);
-        Marker.Id titleWaypointId = insertWaypoint("aa", "bb", "cc", trackId);
-        insertTrack("bb", "cc", "dd");
-
-        SearchQuery query = new SearchQuery("a", null, null, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Title > Description > Category.
-        assertEquals(results.toString(), 3, results.size());
-        assertTrackResult(trackId, results.get(0));
-        assertWaypointResult(titleWaypointId, results.get(1));
-        assertWaypointResult(descriptionWaypointId, results.get(2));
-    }
-
-    @Test
-    public void testSearchWaypointDistance() {
-        // All results match text, but they're at difference distances from the user.
-        Track.Id trackId = insertTrack("", "", "");
-        Marker.Id farFarAwayId = insertWaypoint("aa", 0.3, trackId);
-        Marker.Id nearId = insertWaypoint("ab", 0.1, trackId);
-        Marker.Id farId = insertWaypoint("ac", 0.2, trackId);
-
-        SearchQuery query = new SearchQuery("a", HERE, null, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Distance order.
-        assertWaypointResults(results, nearId, farId, farFarAwayId);
-    }
-
-    public void testSearchTrackRecent() {
-        // All results match text, but they're were recorded at different times.
-        Track.Id oldestId = insertTrack("aa", 3);
-        Track.Id recentId = insertTrack("ab", 1);
-        Track.Id oldId = insertTrack("ac", 2);
-
-        SearchQuery query = new SearchQuery("a", null, null, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Reverse time order.
-        assertTrackResults(results, recentId, oldId, oldestId);
-    }
-
-    @Test
-    public void testSearchWaypointRecent() {
-        // All results match text, but they're were recorded at different times.
-        Track.Id trackId = insertTrack("", "", "");
-        Marker.Id oldestId = insertWaypoint("aa", 2, trackId);
-        Marker.Id recentId = insertWaypoint("ab", 0, trackId);
-        Marker.Id oldId = insertWaypoint("ac", 1, trackId);
-
-        SearchQuery query = new SearchQuery("a", null, null, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Reverse time order.
-        assertWaypointResults(results, recentId, oldId, oldestId);
-    }
-
-    @Test
-    public void testSearchCurrentTrack() {
-        // All results match text, but one of them is the current track.
-        Track.Id currentId = insertTrack("ab", 1);
-        Track.Id otherId = insertTrack("aa", 1);
-
-        SearchQuery query = new SearchQuery("a", null, currentId, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Current track should be demoted.
-        assertTrackResults(results, otherId, currentId);
-    }
-
-    @Test
-    public void testSearchCurrentTrackWaypoint() {
-        // All results match text, but one of them is in the current track.
-        Track.Id trackId1 = insertTrack("", "", "");
-        Track.Id trackId2 = insertTrack("", "", "");
-
-        Marker.Id otherId = insertWaypoint("aa", 1, trackId2);
-        Marker.Id currentId = insertWaypoint("ab", 1, trackId1);
-
-        SearchQuery query = new SearchQuery("a", null, trackId1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
-
-        // Waypoint in current track should be promoted.
-        assertWaypointResults(results, currentId, otherId);
-    }
-
-    private void assertTrackResult(Track.Id trackId, ScoredResult result) {
-        assertNotNull("Not a track", result.track);
-        assertNull("Ambiguous result", result.marker);
-        assertEquals(trackId, result.track.getId());
-    }
-
-    private void assertTrackResults(List<ScoredResult> results, Track.Id... trackIds) {
-        long[] longTrackIds = new long[trackIds.length];
-        for (int i = 0; i < trackIds.length; i++) {
-            longTrackIds[i] = trackIds[i].getId();
-        }
-
-        String errMsg = "Expected IDs=" + Arrays.toString(longTrackIds) + "; results=" + results;
-        assertEquals(results.size(), trackIds.length);
-        for (int i = 0; i < results.size(); i++) {
-            ScoredResult result = results.get(i);
-            assertNotNull(errMsg, result.track);
-            assertNull(errMsg, result.marker);
-            assertEquals(errMsg, trackIds[i], result.track.getId());
-        }
-    }
-
-    private void assertWaypointResult(Marker.Id waypointId, ScoredResult result) {
-        assertNotNull("Not a waypoint", result.marker);
-        assertNull("Ambiguous result", result.track);
-        assertEquals(waypointId, result.marker.getId());
-    }
-
-    private void assertWaypointResults(List<ScoredResult> results, Marker.Id... waypointIds) {
-        long[] longWaypointIds = new long[waypointIds.length];
-        for (int i = 0; i < waypointIds.length; i++) {
-            longWaypointIds[i] = waypointIds[i].getId();
-        }
-
-        String errMsg = "Expected IDs=" + Arrays.toString(longWaypointIds) + "; results=" + results;
-        assertEquals(results.size(), waypointIds.length);
-        for (int i = 0; i < results.size(); i++) {
-            ScoredResult result = results.get(i);
-            assertNotNull(errMsg, result.marker);
-            assertNull(errMsg, result.track);
-            assertEquals(errMsg, waypointIds[i].getId(), result.marker.getId().getId());
-        }
-    }
-}
@@ -17,6 +17,7 @@ public class TestDataUtil {
    public static final double INITIAL_LONGITUDE = -57.0;
    public static final double ALTITUDE_INTERVAL = 2.5;
    public static final float ELEVATION_GAIN = 3;
+    public static final float ELEVATION_LOSS = 3;

    /**
     * Create a track without any trackPoints.
@@ -66,12 +67,13 @@ public class TestDataUtil {
        trackPoint.setAccuracy((float) i / 100.0f);
        trackPoint.setAltitude(i * ALTITUDE_INTERVAL);
        trackPoint.setTime(i + 1);
-        trackPoint.setSpeed(5f + (i / 10));
+        trackPoint.setSpeed(5f + (i / 10f));

        trackPoint.setHeartRate_bpm(100f + i);
        trackPoint.setCyclingCadence_rpm(300f + i);
        trackPoint.setPower(400f + i);
        trackPoint.setElevationGain(ELEVATION_GAIN);
+        trackPoint.setElevationLoss(ELEVATION_LOSS);
        return trackPoint;
    }

@@ -87,19 +89,19 @@ public class TestDataUtil {
    }

    /**
-     * Creates a Waypoint with a photo.
+     * Creates a Marker with a photo.
     *
     * @param context  The context.
     * @param trackId  The track id.
     * @param location The location.
-     * @return the Waypoint created.
+     * @return the Marker created.
     */
-    public static Marker createWaypointWithPhoto(Context context, Track.Id trackId, Location location) throws IOException {
+    public static Marker createMarkerWithPhoto(Context context, Track.Id trackId, Location location) throws IOException {
        File dstFile = new File(FileUtils.getImageUrl(context, trackId));
        dstFile.createNewFile();
        Uri photoUri = FileUtils.getUriForFile(context, dstFile);
        String photoUrl = photoUri.toString();

-        return new Marker("Waypoint name", "Waypoint description", "Waypoint category", "", trackId, 0.0, 0, location, photoUrl);
+        return new Marker("Marker name", "Marker description", "Marker category", "", trackId, 0.0, 0, location, photoUrl);
    }
 }
@@ -65,7 +65,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
 public class CustomContentProviderUtilsTest {
    private static final String NAME_PREFIX = "test name";
-    private static final String MOCK_DESC = "Mock Next Waypoint Desc!";
+    private static final String MOCK_DESC = "Mock Next Marker Desc!";
    private static final String TEST_DESC = "Test Desc!";
    private static final String TEST_DESC_NEW = "Test Desc new!";
    private static final String TEST_NAME_NEW = "Test Name new!";
@@ -198,7 +198,7 @@ public class CustomContentProviderUtilsTest {
        when(cursorMock.isNull(columnIndex)).thenReturn(false);
        when(cursorMock.getString(columnIndex)).thenReturn(name);

-        Track track = contentProviderUtils.createTrack(cursorMock);
+        Track track = ContentProviderUtils.createTrack(cursorMock);
        assertEquals(trackId, track.getId());
        assertEquals(name, track.getName());
    }
@@ -208,20 +208,20 @@ public class CustomContentProviderUtilsTest {
     */
    @Test
    public void testDeleteAllTracks() {
-        // Insert track, points and waypoint at first.
+        // Insert track, points and marker at first.
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

-        Marker waypoint = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        contentProviderUtils.insertMarker(waypoint);
+        Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        contentProviderUtils.insertMarker(marker);

        ContentResolver contentResolver = context.getContentResolver();
        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
        assertEquals(1, tracksCursor.getCount());
        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
        assertEquals(10, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(1, waypointCursor.getCount());
+        Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(1, markerCursor.getCount());
        // Delete all.
        contentProviderUtils.deleteAllTracks(context);
        // Check whether all have been deleted.
@@ -229,32 +229,32 @@ public class CustomContentProviderUtilsTest {
        assertEquals(0, tracksCursor.getCount());
        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
        assertEquals(0, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(0, waypointCursor.getCount());
+        markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(0, markerCursor.getCount());
    }

    /**
     * Tests the method {@link ContentProviderUtils#deleteAllTracks(Context)}
     */
    @Test
-    public void testDeleteAllTracks_withWaypointAndPhoto() throws IOException {
-        // Insert track, points and waypoint with photo at first.
+    public void testDeleteAllTracks_withMarkerAndPhoto() throws IOException {
+        // Insert track, points and marker with photo at first.
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        contentProviderUtils.insertMarker(waypoint);
+        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint.getLocation());
+        contentProviderUtils.insertMarker(marker);

        ContentResolver contentResolver = context.getContentResolver();
        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
        assertEquals(1, tracksCursor.getCount());
        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
        assertEquals(10, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(1, waypointCursor.getCount());
-        // Check waypoint has photo and it's in the external storage.
-        assertTrue(waypoint.hasPhoto());
+        Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(1, markerCursor.getCount());
+        // Check marker has photo and it's in the external storage.
+        assertTrue(marker.hasPhoto());
        File dir = FileUtils.getPhotoDir(context, trackId);
        assertTrue(dir.isDirectory());
        assertEquals(1, dir.list().length);
@@ -266,8 +266,8 @@ public class CustomContentProviderUtilsTest {
        assertEquals(0, tracksCursor.getCount());
        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
        assertEquals(0, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(0, waypointCursor.getCount());
+        markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(0, markerCursor.getCount());
        assertFalse(dir.exists());
    }

@@ -287,16 +287,16 @@ public class CustomContentProviderUtilsTest {
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId2, 10);
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId3, 10);

-        Marker waypoint = new Marker(trackId1, contentProviderUtils.getLastValidTrackPoint(trackId2));
-        contentProviderUtils.insertMarker(waypoint);
+        Marker marker = new Marker(trackId1, contentProviderUtils.getLastValidTrackPoint(trackId2));
+        contentProviderUtils.insertMarker(marker);

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

    /**
     * Tests the method {@link ContentProviderUtils#deleteTrack(Context, Track.Id)}.
     */
    @Test
-    public void testDeleteTrack_withWaypointPhoto() throws IOException {
+    public void testDeleteTrack_withMarkerPhoto() throws IOException {
        // Insert three tracks.
        long random = System.currentTimeMillis();
        Track.Id trackId1 = new Track.Id(random);
@@ -323,15 +323,15 @@ public class CustomContentProviderUtilsTest {
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId2, 10);
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId3, 10);

-        // Insert a waypoint in tracks trackId and trackId + 1.
+        // Insert a marker in tracks trackId and trackId + 1.
        TrackPoint trackPoint1 = contentProviderUtils.getLastValidTrackPoint(trackId1);
-        Marker waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId1, trackPoint1.getLocation());
-        contentProviderUtils.insertMarker(waypoint1);
+        Marker marker1 = TestDataUtil.createMarkerWithPhoto(context, trackId1, trackPoint1.getLocation());
+        contentProviderUtils.insertMarker(marker1);
        File dir1 = FileUtils.getPhotoDir(context, trackId1);

        TrackPoint trackPoint2 = contentProviderUtils.getLastValidTrackPoint(trackId2);
-        Marker waypoint2 = TestDataUtil.createWaypointWithPhoto(context, trackId2, trackPoint2.getLocation());
-        contentProviderUtils.insertMarker(waypoint2);
+        Marker marker2 = TestDataUtil.createMarkerWithPhoto(context, trackId2, trackPoint2.getLocation());
+        contentProviderUtils.insertMarker(marker2);
        File dir2 = FileUtils.getPhotoDir(context, trackId2);

        // Check.
@@ -340,9 +340,9 @@ public class CustomContentProviderUtilsTest {
        assertEquals(3, tracksCursor.getCount());
        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
        assertEquals(30, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(2, waypointCursor.getCount());
-        assertTrue(waypoint1.hasPhoto());
+        Cursor markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(2, markerCursor.getCount());
+        assertTrue(marker1.hasPhoto());
        assertTrue(dir1.isDirectory());
        assertEquals(1, dir1.list().length);
        assertTrue(dir1.exists());
@@ -356,8 +356,8 @@ public class CustomContentProviderUtilsTest {
        assertEquals(2, tracksCursor.getCount());
        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
        assertEquals(20, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
-        assertEquals(1, waypointCursor.getCount());
+        markerCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(1, markerCursor.getCount());
        assertFalse(dir1.exists());
        assertTrue(dir2.exists());
    }
@@ -380,16 +380,6 @@ public class CustomContentProviderUtilsTest {
        assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
    }

-    /**
-     * Tests the method {@link ContentProviderUtils#getLastTrack()}
-     */
-    @Test
-    public void testGetLastTrack() {
-        Track.Id trackId = new Track.Id(System.currentTimeMillis());
-        contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId));
-        assertEquals(trackId, contentProviderUtils.getLastTrack().getId());
-    }
-
    /**
     * Tests the method {@link ContentProviderUtils#getTrack(Track.Id)}
     */
@@ -441,7 +431,7 @@ public class CustomContentProviderUtilsTest {
     * Tests the method {@link ContentProviderUtils#createContentValues(Marker)}.
     */
    @Test
-    public void testCreateContentValues_waypoint() {
+    public void testCreateContentValues_marker() {
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);

@@ -462,16 +452,16 @@ public class CustomContentProviderUtilsTest {
        track.first.setTrackStatistics(statistics);
        contentProviderUtils.insertTrack(track.first);

-        Marker waypoint = new Marker(trackId, track.second[0]);
-        waypoint.setDescription(TEST_DESC);
-        contentProviderUtils.insertMarker(waypoint);
+        Marker marker = new Marker(trackId, track.second[0]);
+        marker.setDescription(TEST_DESC);
+        contentProviderUtils.insertMarker(marker);

        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(contentResolverMock);

-        Marker.Id waypointId = new Marker.Id(System.currentTimeMillis());
-        waypoint.setId(waypointId);
-        ContentValues contentValues = contentProviderUtils.createContentValues(waypoint);
-        assertEquals(waypointId.getId(), contentValues.get(MarkerColumns._ID));
+        Marker.Id markerId = new Marker.Id(System.currentTimeMillis());
+        marker.setId(markerId);
+        ContentValues contentValues = contentProviderUtils.createContentValues(marker);
+        assertEquals(markerId.getId(), contentValues.get(MarkerColumns._ID));
        assertEquals((int) (TestDataUtil.INITIAL_LONGITUDE * 1000000), contentValues.get(MarkerColumns.LONGITUDE));
        assertEquals(TEST_DESC, contentValues.get(MarkerColumns.DESCRIPTION));
    }
@@ -480,7 +470,7 @@ public class CustomContentProviderUtilsTest {
     * Tests the method {@link ContentProviderUtils#createMarker(Cursor)}.
     */
    @Test
-    public void testCreateWaypoint() {
+    public void testCreateMarker() {
        int startColumnIndex = 1;
        int columnIndex = startColumnIndex;
        when(cursorMock.getColumnIndexOrThrow(MarkerColumns._ID)).thenReturn(columnIndex++);
@@ -504,80 +494,80 @@ public class CustomContentProviderUtilsTest {
        long trackId = 11L;
        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);

-        Marker waypoint = contentProviderUtils.createMarker(cursorMock);
-        assertEquals(id, waypoint.getId().getId());
-        assertEquals(name, waypoint.getName());
-        assertEquals(trackId, waypoint.getTrackId().getId());
+        Marker marker = contentProviderUtils.createMarker(cursorMock);
+        assertEquals(id, marker.getId().getId());
+        assertEquals(name, marker.getName());
+        assertEquals(trackId, marker.getTrackId().getId());
    }

    /**
     * Tests the method
     * {@link ContentProviderUtils#deleteMarker(Context, Marker.Id)}
-     * when there is only one waypoint in the track.
+     * when there is only one marker in the track.
     */
    @Test
-    public void testDeleteWaypoint_onlyOneWayPoint() {
+    public void testDeleteMarker_onlyOneMarker() {
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        // Insert at first.
-        Marker waypoint1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint1.setDescription(TEST_DESC);
-        contentProviderUtils.insertMarker(waypoint1);
+        Marker marker1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        marker1.setDescription(TEST_DESC);
+        contentProviderUtils.insertMarker(marker1);

        // Check insert was done.
        assertEquals(contentProviderUtils.getMarkerCount(trackId), 1);

-        // Get waypoint id that needs to delete.
-        Marker.Id waypoint1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint1)));
+        // Get marker id that needs to delete.
+        Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1)));

        // Delete
-        contentProviderUtils.deleteMarker(context, waypoint1Id);
+        contentProviderUtils.deleteMarker(context, marker1Id);

-        assertNull(contentProviderUtils.getMarker(waypoint1Id));
+        assertNull(contentProviderUtils.getMarker(marker1Id));
    }

    /**
     * Tests the method
     * {@link ContentProviderUtils#deleteMarker(Context, Marker.Id)}
-     * when there is only one waypoint in the track.
+     * when there is only one marker in the track.
     */
    @Test
-    public void testDeleteWaypoint_onlyOneWayPointWithPhotoUrl() throws IOException {
+    public void testDeleteMarker_onlyOneMarkerWithPhotoUrl() throws IOException {
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        // Insert at first.
        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Marker waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        contentProviderUtils.insertMarker(waypoint1);
+        Marker marker1 = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint.getLocation());
+        contentProviderUtils.insertMarker(marker1);

        // Check insert was done.
        assertEquals(contentProviderUtils.getMarkerCount(trackId), 1);

-        // Get waypoint id that needs to delete.
-        Marker.Id waypoint1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint1)));
+        // Get marker id that needs to delete.
+        Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1)));

-        // Check waypoint has photo and it's in the external storage.
-        assertTrue(waypoint1.hasPhoto());
+        // Check marker has photo and it's in the external storage.
+        assertTrue(marker1.hasPhoto());
        File dir = FileUtils.getPhotoDir(context, trackId);
        assertTrue(dir.isDirectory());
        assertEquals(1, dir.list().length);
        assertTrue(dir.exists());

        // Delete
-        contentProviderUtils.deleteMarker(context, waypoint1Id);
+        contentProviderUtils.deleteMarker(context, marker1Id);

-        // Check waypoint doesn't exists and photo folder was deleted.
-        assertNull(contentProviderUtils.getMarker(waypoint1Id));
+        // Check marker doesn't exists and photo folder was deleted.
+        assertNull(contentProviderUtils.getMarker(marker1Id));
        assertFalse(dir.exists());
    }

    /**
-     * Tests the method {@link ContentProviderUtils#deleteMarker(Context, Marker.Id)} when there is more than one waypoint in the track.
+     * Tests the method {@link ContentProviderUtils#deleteMarker(Context, Marker.Id)} when there is more than one marker in the track.
     */
    @Test
-    public void testDeleteWaypoint_hasNextWayPoint() {
+    public void testDeleteMarker_hasNextMarker() {
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

@@ -598,38 +588,38 @@ public class CustomContentProviderUtilsTest {
 //        TestDataUtil.insertTrackWithLocations(contentProviderUtils, track);

        // Insert at first.
-        Marker waypoint1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint1.setDescription(MOCK_DESC);
-        Marker.Id waypoint1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint1)));
+        Marker marker1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        marker1.setDescription(MOCK_DESC);
+        Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1)));

-        Marker waypoint2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint2.setDescription(MOCK_DESC);
-        Marker.Id waypoint2Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint2)));
+        Marker marker2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        marker2.setDescription(MOCK_DESC);
+        Marker.Id marker2Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker2)));

        // Delete
-        assertNotNull(contentProviderUtils.getMarker(waypoint1Id));
-        contentProviderUtils.deleteMarker(context, waypoint1Id);
-        assertNull(contentProviderUtils.getMarker(waypoint1Id));
+        assertNotNull(contentProviderUtils.getMarker(marker1Id));
+        contentProviderUtils.deleteMarker(context, marker1Id);
+        assertNull(contentProviderUtils.getMarker(marker1Id));

-        assertEquals(MOCK_DESC, contentProviderUtils.getMarker(waypoint2Id).getDescription());
+        assertEquals(MOCK_DESC, contentProviderUtils.getMarker(marker2Id).getDescription());
    }

    /**
     * Tests the method {@link ContentProviderUtils#getNextMarkerNumber(Track.Id)}.
     */
    @Test
-    public void testGetNextWaypointNumber() {
+    public void testGetNextMarkerNumber() {
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

-        Marker waypoint1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        Marker waypoint2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        Marker waypoint3 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        Marker waypoint4 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        contentProviderUtils.insertMarker(waypoint1);
-        contentProviderUtils.insertMarker(waypoint2);
-        contentProviderUtils.insertMarker(waypoint3);
-        contentProviderUtils.insertMarker(waypoint4);
+        Marker marker1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker marker2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker marker3 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker marker4 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        contentProviderUtils.insertMarker(marker1);
+        contentProviderUtils.insertMarker(marker2);
+        contentProviderUtils.insertMarker(marker3);
+        contentProviderUtils.insertMarker(marker4);

        assertEquals(4, contentProviderUtils.getNextMarkerNumber(trackId));
    }
@@ -639,53 +629,53 @@ public class CustomContentProviderUtilsTest {
     * {@link ContentProviderUtils#getMarker(Marker.Id)}.
     */
    @Test
-    public void testInsertAndGetWaypoint() {
+    public void testInsertAndGetMarker() {
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

-        Marker waypoint = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint.setDescription(TEST_DESC);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
+        Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        marker.setDescription(TEST_DESC);
+        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));

-        assertEquals(TEST_DESC, contentProviderUtils.getMarker(waypointId).getDescription());
+        assertEquals(TEST_DESC, contentProviderUtils.getMarker(markerId).getDescription());
    }

    /**
     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
     */
    @Test
-    public void testUpdateWaypoint() {
+    public void testUpdateMarker() {
        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        // Insert at first.
-        Marker waypoint = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint.setDescription(TEST_DESC);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
+        Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        marker.setDescription(TEST_DESC);
+        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));

        // Update
-        waypoint = contentProviderUtils.getMarker(waypointId);
-        waypoint.setDescription(TEST_DESC_NEW);
-        contentProviderUtils.updateMarker(context, waypoint);
+        marker = contentProviderUtils.getMarker(markerId);
+        marker.setDescription(TEST_DESC_NEW);
+        contentProviderUtils.updateMarker(context, marker);

-        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(waypointId).getDescription());
+        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(markerId).getDescription());
    }

    /**
     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
     */
    @Test
-    public void testUpdateWaypoint_withPhoto() throws IOException {
-        // tests after update waypoint with photo the photo remains in the storage.
+    public void testUpdateMarker_withPhoto() throws IOException {
+        // tests after update marker with photo the photo remains in the storage.

        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        // Insert at first.
        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        waypoint.setDescription(TEST_DESC);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
+        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint.getLocation());
+        marker.setDescription(TEST_DESC);
+        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));

        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
        assertTrue(dir.exists());
@@ -693,14 +683,14 @@ public class CustomContentProviderUtilsTest {
        assertEquals(1, dir.list().length);

        // Update
-        waypoint = contentProviderUtils.getMarker(waypointId);
-        waypoint.setName(TEST_NAME_NEW);
-        waypoint.setDescription(TEST_DESC_NEW);
-        contentProviderUtils.updateMarker(context, waypoint);
+        marker = contentProviderUtils.getMarker(markerId);
+        marker.setName(TEST_NAME_NEW);
+        marker.setDescription(TEST_DESC_NEW);
+        contentProviderUtils.updateMarker(context, marker);

-        assertEquals(TEST_NAME_NEW, contentProviderUtils.getMarker(waypointId).getName());
-        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(waypointId).getDescription());
-        assertTrue(waypoint.hasPhoto());
+        assertEquals(TEST_NAME_NEW, contentProviderUtils.getMarker(markerId).getName());
+        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(markerId).getDescription());
+        assertTrue(marker.hasPhoto());
        assertTrue(dir.exists());
        assertTrue(dir.isDirectory());
        assertEquals(1, dir.list().length);
@@ -710,17 +700,17 @@ public class CustomContentProviderUtilsTest {
     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
     */
    @Test
-    public void testUpdateWaypoint_delPhotoAndDir() throws IOException {
-        // tests after update waypoint if user deletes the photo then file photo is deleted from the storage. Also empty directory is deleted.
+    public void testUpdateMarker_delPhotoAndDir() throws IOException {
+        // tests after update marker if user deletes the photo then file photo is deleted from the storage. Also empty directory is deleted.

        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

        // Insert at first.
        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        waypoint.setDescription(TEST_DESC);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
+        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint.getLocation());
+        marker.setDescription(TEST_DESC);
+        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));

        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
        assertTrue(dir.exists());
@@ -728,15 +718,15 @@ public class CustomContentProviderUtilsTest {
        assertEquals(1, dir.list().length);

        // Update
-        waypoint = contentProviderUtils.getMarker(waypointId);
-        waypoint.setName(TEST_NAME_NEW);
-        waypoint.setDescription(TEST_DESC_NEW);
-        waypoint.setPhotoUrl(null);
-        contentProviderUtils.updateMarker(context, waypoint);
+        marker = contentProviderUtils.getMarker(markerId);
+        marker.setName(TEST_NAME_NEW);
+        marker.setDescription(TEST_DESC_NEW);
+        marker.setPhotoUrl(null);
+        contentProviderUtils.updateMarker(context, marker);

-        assertEquals(TEST_NAME_NEW, contentProviderUtils.getMarker(waypointId).getName());
-        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(waypointId).getDescription());
-        assertFalse(waypoint.hasPhoto());
+        assertEquals(TEST_NAME_NEW, contentProviderUtils.getMarker(markerId).getName());
+        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(markerId).getDescription());
+        assertFalse(marker.hasPhoto());
        assertFalse(dir.exists());
    }

@@ -744,33 +734,33 @@ public class CustomContentProviderUtilsTest {
     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
     */
    @Test
-    public void testUpdateWaypoint_delPhotoNotDir() throws IOException {
-        // tests after update waypoint if user deletes the photo then file photo is deleted from the storage. Directory remains if there are more photos from other waypoints.
+    public void testUpdateMarker_delPhotoNotDir() throws IOException {
+        // tests after update marker if user deletes the photo then file photo is deleted from the storage. Directory remains if there are more photos from other markers.

        Track.Id trackId = new Track.Id(System.currentTimeMillis());
        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);

-        // Insert two waypoints with photos.
+        // Insert two markers with photos.
        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        waypoint.setDescription(TEST_DESC);
-        Marker otherWaypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        otherWaypoint.setDescription(TEST_DESC);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
-        contentProviderUtils.insertMarker(otherWaypoint);
+        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint.getLocation());
+        marker.setDescription(TEST_DESC);
+        Marker otherMarker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint.getLocation());
+        otherMarker.setDescription(TEST_DESC);
+        Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker)));
+        contentProviderUtils.insertMarker(otherMarker);

        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
        assertTrue(dir.exists());
        assertTrue(dir.isDirectory());
        assertEquals(2, dir.list().length);

-        // Update one waypoint deleting photo.
-        waypoint = contentProviderUtils.getMarker(waypointId);
-        waypoint.setPhotoUrl(null);
-        contentProviderUtils.updateMarker(context, waypoint);
+        // Update one marker deleting photo.
+        marker = contentProviderUtils.getMarker(markerId);
+        marker.setPhotoUrl(null);
+        contentProviderUtils.updateMarker(context, marker);

-        assertEquals(TEST_DESC, contentProviderUtils.getMarker(waypointId).getDescription());
-        assertFalse(waypoint.hasPhoto());
+        assertEquals(TEST_DESC, contentProviderUtils.getMarker(markerId).getDescription());
+        assertFalse(marker.hasPhoto());
        assertTrue(dir.exists());
        assertTrue(dir.isDirectory());
        assertEquals(1, dir.list().length);
@@ -9,6 +9,7 @@ import de.dennisguse.opentracks.util.UintUtils;

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;

@RunWith(AndroidJUnit4.class)
 public class SensorDataCyclingTest {
@@ -117,4 +118,32 @@ public class SensorDataCyclingTest {
        // then
        assertEquals(2, current.getSpeed_mps(), 0.01);
    }
+
+    @Test
+    public void equals_speed_with_no_data() {
+        // given
+        SensorDataCycling.Speed previous = new SensorDataCycling.Speed("sensorAddress");
+        SensorDataCycling.Speed current = new SensorDataCycling.Speed("sensorAddress", "sensorName", 0, 2048);
+
+        // when
+        previous.toString();
+
+        // then
+        assertNotEquals(previous, current);
+        assertNotEquals(previous, previous);
+    }
+
+    @Test
+    public void equals_cadence_with_no_data() {
+        // given
+        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress");
+        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 0, 2048);
+
+        // when
+        previous.toString();
+
+        // then
+        assertNotEquals(previous, current);
+        assertNotEquals(previous, previous);
+    }
 }
@@ -28,7 +28,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import de.dennisguse.opentracks.TrackStubUtils;
 import de.dennisguse.opentracks.chart.ChartPoint;
 import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.data.TrackPoint;
@@ -14,7 +14,7 @@
 * the License.
 */

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

 import android.location.Location;

@@ -1,131 +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.content.ContentUris;
-import android.content.Context;
-import android.location.Location;
-import android.location.LocationManager;
-import android.net.Uri;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-
-import java.text.SimpleDateFormat;
-import java.time.ZoneOffset;
-import java.util.Locale;
-import java.util.SimpleTimeZone;
-import java.util.TimeZone;
-
-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.when;
-
-/**
- * Abstract class for testing file track importers.
- *
- * @author Jimmy Shih.
- */
-public abstract class AbstractTestFileTrackImporter {
-
-    static final String TRACK_NAME_0 = "blablub";
-    static final String TRACK_DESCRIPTION_0 = "s'Laebe isch koi Schlotzer";
-
-    static final double TRACK_LATITUDE = 48.768364;
-    static final double TRACK_LONGITUDE = 9.177886;
-    static final double TRACK_ELEVATION = 324.0;
-
-    static final String TRACK_TIME_0 = "2010-04-22T18:21:00Z";
-    static final String TRACK_TIME_1 = "2010-04-22T18:21:50.123Z";
-    static final String TRACK_TIME_2 = "2010-04-22T18:23:00.123Z";
-    static final String TRACK_TIME_3 = "2010-04-22T18:24:50.123Z";
-
-    static final SimpleDateFormat DATE_FORMAT_0 = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss'Z'", Locale.US);
-    static final SimpleDateFormat DATE_FORMAT_1 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
-
-    static final long TRACK_POINT_ID_0 = 1;
-    static final long TRACK_POINT_ID_1 = 2;
-    static final long TRACK_POINT_ID_3 = 4;
-
-    private static final long WAYPOINT_ID_0 = 1;
-    private static final Uri WAYPOINT_ID_O_URI = ContentUris.appendId(MarkerColumns.CONTENT_URI.buildUpon(), WAYPOINT_ID_0).build();
-
-    protected final Context context = ApplicationProvider.getApplicationContext();
-
-    static {
-        // We can't omit the timezones in the test, otherwise it'll use the local timezone and fail depending on where the test runner is.
-        TimeZone utc = SimpleTimeZone.getTimeZone(ZoneOffset.UTC);
-        DATE_FORMAT_0.setTimeZone(utc);
-        DATE_FORMAT_1.setTimeZone(utc);
-    }
-
-    @Mock
-    public ContentProviderUtils contentProviderUtils;
-
-    TrackPoint createTrackPoint(int index, long time) {
-        Location trackPoint = new Location(LocationManager.GPS_PROVIDER);
-        trackPoint.setLatitude(TRACK_LATITUDE + index);
-        trackPoint.setLongitude(TRACK_LONGITUDE + index);
-        trackPoint.setAltitude(TRACK_ELEVATION + index);
-        trackPoint.setTime(time);
-        return new TrackPoint(trackPoint);
-    }
-
-    /**
-     * Expects the first track point to be added.
-     *
-     * @param trackPoint   the trackPoint
-     * @param trackId      the track id
-     * @param trackPointId the track point id
-     */
-    protected void expectFirstTrackPoint(TrackPoint trackPoint, Track.Id trackId, long trackPointId) {
-        when(contentProviderUtils.bulkInsertTrackPoint(trackPoint != null ? (TrackPoint[]) any() : (TrackPoint[]) any(), eq(trackId))).thenReturn(1);
-    }
-
-    /**
-     * Expects the track to be updated.
-     *
-     * @param trackCaptor the track
-     * @param lastTrack   true if it is the last track in the gpx
-     * @param trackId     the track id
-     */
-    protected void expectTrackUpdate(ArgumentCaptor<Track> trackCaptor, boolean lastTrack, Track.Id trackId) {
-        contentProviderUtils.updateTrack(trackCaptor.capture());
-
-        when(contentProviderUtils.insertMarker(any())).thenReturn(WAYPOINT_ID_O_URI);
-        if (lastTrack) {
-            // Return null to not add waypoints
-            when(contentProviderUtils.getTrack(trackId)).thenReturn(null);
-        }
-    }
-
-    protected void verifyTrack(Track track, String name, String description, long time) {
-        assertEquals(name, track.getName());
-        assertEquals(description, track.getDescription());
-        if (time != -1L) {
-            assertEquals(time, track.getTrackStatistics().getStartTime_ms());
-        }
-    }
-}
@@ -9,6 +9,7 @@ import androidx.test.filters.LargeTest;

 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -134,7 +135,7 @@ public class ExportImportTest {
        assertMarkers();

        // 3. trackpoints
-        assertTrackpoints(false, false, false, false);
+        assertTrackpoints(false, false, false, false, false);
    }

    @LargeTest
@@ -169,7 +170,7 @@ public class ExportImportTest {
        assertMarkers();

        // 3. trackpoints
-        assertTrackpoints(true, true, true, true);
+        assertTrackpoints(true, true, true, true, true);
    }

    @LargeTest
@@ -196,6 +197,7 @@ public class ExportImportTest {
        assertNull(importedTrack);
    }

+    @Ignore
    @LargeTest
    @Test
    public void kmz_only_track() {
@@ -203,6 +205,7 @@ public class ExportImportTest {
        Log.e(TAG, "Test not implemented.");
    }

+    @Ignore
    @LargeTest
    @Test
    public void kmz_with_trackdetail() {
@@ -210,6 +213,7 @@ public class ExportImportTest {
        Log.e(TAG, "Test not implemented.");
    }

+    @Ignore
    @LargeTest
    @Test
    public void kmz_with_trackdetail_and_sensordata() {
@@ -217,6 +221,7 @@ public class ExportImportTest {
        Log.e(TAG, "Test not implemented.");
    }

+    @Ignore
    @LargeTest
    @Test
    public void kmz_with_trackdetail_and_sensordata_and_pictures() {
@@ -258,7 +263,7 @@ public class ExportImportTest {
        assertMarkers();

        // 3. trackpoints
-        assertTrackpoints(false, true, true, false);
+        assertTrackpoints(false, true, true, true, true);
    }

    @LargeTest
@@ -305,7 +310,7 @@ public class ExportImportTest {
        }
    }

-    private void assertTrackpoints(boolean verifyPower, boolean verifyHeartrate, boolean verifyCadence, boolean verifyElevationGain) {
+    private void assertTrackpoints(boolean verifyPower, boolean verifyHeartrate, boolean verifyCadence, boolean verifyElevationGain, boolean verifyElevationLoss) {
        List<TrackPoint> importedTrackPoints = contentProviderUtils.getTrackPoints(importTrackId);
        assertEquals(trackPoints.size(), importedTrackPoints.size());

@@ -334,6 +339,9 @@ public class ExportImportTest {
            if (verifyElevationGain) {
                assertEquals(trackPoint.getElevationGain(), importedTrackPoint.getElevationGain(), 0.01);
            }
+            if (verifyElevationLoss) {
+                assertEquals(trackPoint.getElevationLoss(), importedTrackPoint.getElevationLoss(), 0.01);
+            }
        }
    }
 }
@@ -0,0 +1,93 @@
+package de.dennisguse.opentracks.io.file.importer;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.InputStream;
+import java.util.List;
+
+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.util.StringUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Imports a legacy kml file with a statistics marker at the beginning
+ */
+@RunWith(JUnit4.class)
+public class LegacyKmlImportTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+    private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
+
+    private Track.Id importTrackId;
+
+    @After
+    public void tearDown() {
+        if (importTrackId != null) {
+            contentProviderUtils.deleteTrack(context, importTrackId);
+        }
+    }
+
+    @LargeTest
+    @Test
+    public void kml_legacy_track_import() {
+        // given
+        KmlFileTrackImporter trackImporter = new KmlFileTrackImporter(context);
+        InputStream inputStream  = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_track);
+
+        // when
+        // 1. import
+        importTrackId = trackImporter.importFile(inputStream);
+
+        // then
+        // 1. track
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+        assertNotNull(importedTrack);
+        assertEquals("unknown", importedTrack.getCategory());
+        assertEquals("Test Track", importedTrack.getDescription());
+        assertEquals("2020-11-28 18:06", importedTrack.getName());
+        assertEquals("UNKNOWN", importedTrack.getIcon());
+
+        // 2. markers
+        assertEquals(0, contentProviderUtils.getMarkerCount(importTrackId));
+
+        // 3. trackpoints
+        List<TrackPoint> importedTrackPoints = contentProviderUtils.getTrackPoints(importTrackId);
+        assertEquals(8, importedTrackPoints.size()); // 6 trackpoints + pause and resume
+
+        // first 3 trackpoints
+        assertTrackpoint(importedTrackPoints.get(0), "2020-11-28T17:06:22.401Z", 1.234156, 12.340097, 469.286376953125);
+        assertTrackpoint(importedTrackPoints.get(1), "2020-11-28T17:06:25.448Z", 1.23415, 12.340036, 439.1626281738281);
+        assertTrackpoint(importedTrackPoints.get(2), "2020-11-28T17:06:47.888Z", 1.23405, 12.340057, 421.8070983886719);
+
+        // created pause trackpoint with time of previous valid trackpoint
+        assertTrackpoint(importedTrackPoints.get(3), "2020-11-28T17:06:47.888Z", 0.0, 100, 0.0);
+        // created resume trackpoint with time of next valid trackpoint
+        assertTrackpoint(importedTrackPoints.get(4), "2020-11-28T17:06:55.861Z", 0.0, 200, 0.0);
+
+        // last 3 trackpoints
+        assertTrackpoint(importedTrackPoints.get(5), "2020-11-28T17:06:55.861Z", 1.23405, 12.340057, 419.93902587890625);
+        assertTrackpoint(importedTrackPoints.get(6), "2020-11-28T17:06:56.905Z", 1.23405, 12.340057, 419.9036560058594);
+        assertTrackpoint(importedTrackPoints.get(7), "2020-11-28T17:07:20.870Z", 1.234046, 12.340082, 417.99432373046875);
+    }
+
+    private void assertTrackpoint(final TrackPoint trackPoint, final String when, final double longitude, final double latitude, final double altitude) {
+        assertEquals(StringUtils.parseTime(when), trackPoint.getTime());
+        assertEquals(latitude, trackPoint.getLatitude(), 0.001d);
+        assertEquals(longitude, trackPoint.getLongitude(), 0.001d);
+        assertEquals(altitude, trackPoint.getAltitude(), 0.001d);
+    }
+
+}
@@ -138,7 +138,7 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testRecording_noTracks() throws Exception {
+    public void testRecording_noTracks() throws TimeoutException {
        // given
        List<Track> tracks = contentProviderUtils.getTracks();
        assertTrue(tracks.isEmpty());
@@ -156,7 +156,7 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testRecording_oldTracks() throws Exception {
+    public void testRecording_oldTracks() throws TimeoutException {
        // given
        createDummyTrack(trackId, -1L, false);

@@ -170,7 +170,7 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testRecording_serviceRestart_whileRecording() throws Exception {
+    public void testRecording_serviceRestart_whileRecording() throws TimeoutException {
        // given
        createDummyTrack(trackId, -1L, true);

@@ -183,7 +183,7 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testRecording_pauseAndResume() throws Exception {
+    public void testRecording_pauseAndResume() throws TimeoutException, InterruptedException {
        // given
        createDummyTrack(trackId, -1L, true);
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
@@ -212,7 +212,7 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testRecording_resumeStoppedTrack() throws Exception {
+    public void testRecording_resumeStoppedTrack() throws TimeoutException, InterruptedException {
        // given
        createDummyTrack(trackId, -1L, true);
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
@@ -238,7 +238,7 @@ public class TrackRecordingServiceTest {
    @Ignore("Sometimes fails on CI.")
    @MediumTest
    @Test
-    public void testRecording_orphanedRecordingTrack() throws Exception {
+    public void testRecording_orphanedRecordingTrack() throws TimeoutException {
        // given
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));

@@ -254,7 +254,7 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testStartNewTrack_alreadyRecording() throws Exception {
+    public void testStartNewTrack_alreadyRecording() throws TimeoutException {
        // given
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
        service.startNewTrack();
@@ -274,7 +274,7 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testEndCurrentTrack_noRecording() throws Exception {
+    public void testEndCurrentTrack_noRecording() throws TimeoutException {
        // given
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
        assertFalse(service.isRecording());
@@ -290,21 +290,21 @@ public class TrackRecordingServiceTest {

    @MediumTest
    @Test
-    public void testInsertWaypointMarker_noRecordingTrack() throws Exception {
+    public void testInsertWaypointMarker_noRecordingTrack() throws TimeoutException {
        // given
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
        assertFalse(service.isRecording());

        // when
-        Marker.Id waypointId = service.insertMarker(null, null, null, null);
+        Marker.Id markerId = service.insertMarker(null, null, null, null);

        // then
-        assertNull(waypointId);
+        assertNull(markerId);
    }

    @MediumTest
    @Test
-    public void testInsertWaypointMarker_validWaypoint() throws Exception {
+    public void testInsertWaypointMarker_validWaypoint() throws TimeoutException, InterruptedException {
        // given
        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
        service.startNewTrack();
@@ -313,11 +313,11 @@ public class TrackRecordingServiceTest {
        Track.Id trackId = service.getRecordingTrackId();

        // when
-        Marker.Id waypointId = service.insertMarker(null, null, null, null);
+        Marker.Id markerId = service.insertMarker(null, null, null, null);

        // then
-        assertNotEquals(-1L, waypointId);
-        Marker wpt = contentProviderUtils.getMarker(waypointId);
+        assertNotEquals(-1L, markerId);
+        Marker wpt = contentProviderUtils.getMarker(markerId);
        assertEquals(context.getString(R.string.marker_icon_url), wpt.getIcon());
        assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName());
        assertEquals(trackId, wpt.getTrackId());
@@ -9,7 +9,7 @@ import org.junit.Test;
 */
 public class ElevationSumManagerTest {

-    private ElevationSumManager elevationSumManager = new ElevationSumManager();
+    private final ElevationSumManager elevationSumManager = new ElevationSumManager();

    private static void addSensorValue(ElevationSumManager elevationSumManager, float[] values) {
        for (float f : values) {
@@ -32,7 +32,7 @@ public class ElevationSumManagerTest {

        // then
        Assert.assertEquals(0f, elevationSumManager.getElevationGain_m(), 0.01);
-        Assert.assertEquals(-48.0, elevationSumManager.getElevationLoss_m(), 0.01);
+        Assert.assertEquals(48.0, elevationSumManager.getElevationLoss_m(), 0.01);
    }

    @Test
@@ -50,9 +50,8 @@ public class AnnouncementUtilsTest {
        stats.setMaxSpeed(100);
        stats.setTotalElevationGain(6000);

-        IntervalStatistics intervalStatistics = new IntervalStatistics();
        List<TrackPoint> trackPoints = Arrays.asList(TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 10).second);
-        intervalStatistics.build(trackPoints, 1000);
+        IntervalStatistics intervalStatistics = new IntervalStatistics(trackPoints, 1000);
        IntervalStatistics.Interval lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);

        int speedId = R.plurals.voiceSpeedKilometersPerHour;
@@ -75,4 +75,16 @@ public class BluetoothUtilsTest {
        assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
        assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
    }
+
+    @Test
+    public void parseCyclingPower_power() {
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER_MEASUREMENT_CHAR_UUID, 0, 0);
+        characteristic.setValue(new byte[]{0, 0, 40, 0});
+
+        // when
+        int power_w = BluetoothUtils.parseCyclingPower(characteristic);
+
+        // then
+        assertEquals(40, power_w);
+    }
 }
@@ -43,7 +43,7 @@ public class PressureSensorUtilsTest {

        // then
        assertEquals(0f, elevationGain_m, 0.01);
-        assertEquals(-15.0f, elevationLoss_m, 0.01);
+        assertEquals(15.0f, elevationLoss_m, 0.01);
        assertEquals(1016.80f, lastUsedPressureValue_hPa, 0.01); //Expect exponential smoothing
    }
 }
@@ -226,4 +226,13 @@ public class StringUtilsTest {
        assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second);
        assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second);
    }
+
+    @Test
+    public void testFormatSpeed() {
+        assertEquals("4:59 min/km", StringUtils.formatSpeed(context, 3.34, true, false));
+        assertEquals("8:02 min/mi", StringUtils.formatSpeed(context, 3.34, false, false));
+
+        assertEquals("12.02 km/h", StringUtils.formatSpeed(context, 3.34, true, true));
+        assertEquals("7.47 mph", StringUtils.formatSpeed(context, 3.34, false, true));
+    }
 }
@@ -8,6 +8,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

+import java.util.List;
+
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -57,8 +59,7 @@ public class AggregatedStatisticsTest {
        Track track = createTrack(context, totalDistance, totalTime, biking);

        // when
-        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
-        aggregatedStatistics.aggregate(track);
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics(List.of(track));

        // then
        assertEquals(1, aggregatedStatistics.getCount());
@@ -80,8 +81,7 @@ public class AggregatedStatisticsTest {
        Track track = createTrack(context, totalDistance, totalTime, mountainBiking);

        // when
-        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
-        aggregatedStatistics.aggregate(track);
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics(List.of(track));

        // then
        assertNotNull(aggregatedStatistics.get(mountainBiking));
@@ -97,8 +97,7 @@ public class AggregatedStatisticsTest {
        Track track = createTrack(context, totalDistance, totalTime, trailRunning);

        // when
-        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
-        aggregatedStatistics.aggregate(track);
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics(List.of(track));

        // then
        assertNotNull(aggregatedStatistics.get(trailRunning));
@@ -111,15 +110,10 @@ public class AggregatedStatisticsTest {
        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);
-        }
+        List<Track> tracks = List.of(createTrack(context, totalDistance, totalTime, biking), createTrack(context, totalDistance, totalTime, biking));

        // when
-        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
-        aggregatedStatistics.aggregate(tracks[0]); // biking activity 1.
-        aggregatedStatistics.aggregate(tracks[1]); // biking activity 2.
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics(tracks);

        // then
        assertEquals(1, aggregatedStatistics.getCount());
@@ -141,17 +135,14 @@ public class AggregatedStatisticsTest {
        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[]{
+        List<Track> tracks = List.of(
                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.
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics(tracks);

        // then
        assertEquals(3, aggregatedStatistics.getCount());
@@ -191,7 +182,7 @@ public class AggregatedStatisticsTest {
        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[]{
+        List<Track> tracks = List.of(
                createTrack(context, totalDistance, totalTime, biking),
                createTrack(context, totalDistance, totalTime, running),
                createTrack(context, totalDistance, totalTime, walking),
@@ -201,16 +192,12 @@ public class AggregatedStatisticsTest {
                createTrack(context, totalDistance, totalTime, biking),
                createTrack(context, totalDistance, totalTime, biking),
                createTrack(context, totalDistance, totalTime, biking),
-                createTrack(context, totalDistance, totalTime, driving),
-        };
+                createTrack(context, totalDistance, totalTime, driving)
+        );


        // when
-        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics();
-        for (Track track : tracks) {
-            aggregatedStatistics.aggregate(track);
-
-        }
+        AggregatedStatistics aggregatedStatistics = new AggregatedStatistics(tracks);

        // then
        // 4 sports.
@@ -255,5 +242,12 @@ public class AggregatedStatisticsTest {
            assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
            assertEquals(totalTime, statistics2.getMovingTime());
        }
+
+        // Check order
+
+        {
+            assertEquals(biking, aggregatedStatistics.getItem(0).getCategory());
+            assertEquals(driving, aggregatedStatistics.getItem(3).getCategory());
+        }
    }
 }
@@ -47,10 +47,9 @@ public class IntervalStatisticsTest {
 		List<TrackPoint> trackPoints = buildTrackPoints(50);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
 		float distanceInterval = 1000f;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();

 		// when and then
-		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+		whenAndThen(trackPoints, trackStatistics, distanceInterval);
 	}

 	/**
@@ -64,10 +63,9 @@ public class IntervalStatisticsTest {
 		List<TrackPoint> trackPoints = buildTrackPoints(200);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
 		float distanceInterval = 1000f;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();

 		// when and then
-		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+		whenAndThen(trackPoints, trackStatistics, distanceInterval);
 	}

 	/**
@@ -81,10 +79,9 @@ public class IntervalStatisticsTest {
 		List<TrackPoint> trackPoints = buildTrackPoints(200);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
 		float distanceInterval = 3000f;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();

 		// when and then
-		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+		whenAndThen(trackPoints, trackStatistics, distanceInterval);
 	}

 	/**
@@ -98,10 +95,9 @@ public class IntervalStatisticsTest {
 		List<TrackPoint> trackPoints = buildTrackPoints(1000);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
 		float distanceInterval = 3000f;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();

 		// when and then
-		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+		whenAndThen(trackPoints, trackStatistics, distanceInterval);
 	}

 	/**
@@ -115,14 +111,13 @@ public class IntervalStatisticsTest {
 		List<TrackPoint> trackPoints = buildTrackPoints(10000);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
 		float distanceInterval = 1000f;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();

 		// when and then
-		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+		whenAndThen(trackPoints, trackStatistics, distanceInterval);
 	}

-	private void whenAndThen(List<TrackPoint> trackPoints, TrackStatistics trackStatistics, float distanceInterval, IntervalStatistics intervalStatistics) {
-		intervalStatistics.build(trackPoints, distanceInterval);
+	private void whenAndThen(List<TrackPoint> trackPoints, TrackStatistics trackStatistics, float distanceInterval) {
+		IntervalStatistics intervalStatistics = new IntervalStatistics(trackPoints, distanceInterval);
 		List<IntervalStatistics.Interval> intervalList = intervalStatistics.getIntervalList();
 		double totalDistance = 0d;
 		long totalTime = 0L;
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2"
+xmlns:gx="http://www.google.com/kml/ext/2.2"
+xmlns:atom="http://www.w3.org/2005/Atom"
+xmlns:opentracks="http://opentracksapp.com/xmlschemas/v1">
+<Document>
+<open>1</open>
+<visibility>1</visibility>
+<name><![CDATA[2020-11-28 18:06]]></name>
+<atom:generator><![CDATA[OpenTracks (Debug)]]></atom:generator>
+<Style id="track">
+<LineStyle><color>7f0000ff</color><width>4</width></LineStyle>
+<IconStyle>
+<scale>1.3</scale>
+<Icon><href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href></Icon>
+</IconStyle>
+</Style>
+<Style id="start"><IconStyle>
+<scale>1.3</scale>
+<Icon><href>http://maps.google.com/mapfiles/kml/paddle/grn-circle.png</href></Icon>
+<hotSpot x="32" y="1" xunits="pixels" yunits="pixels"/>
+</IconStyle></Style>
+<Style id="end"><IconStyle>
+<scale>1.3</scale>
+<Icon><href>http://maps.google.com/mapfiles/kml/paddle/red-circle.png</href></Icon>
+<hotSpot x="32" y="1" xunits="pixels" yunits="pixels"/>
+</IconStyle></Style>
+<Style id="waypoint"><IconStyle>
+<scale>1.3</scale>
+<Icon><href>http://maps.google.com/mapfiles/kml/pushpin/blue-pushpin.png</href></Icon>
+<hotSpot x="20" y="2" xunits="pixels" yunits="pixels"/>
+</IconStyle></Style>
+<Schema id="schema">
+<gx:SimpleArrayField name="speed" type="float">
+<displayName><![CDATA[Speed (m/s)]]></displayName>
+</gx:SimpleArrayField>
+<gx:SimpleArrayField name="power" type="float">
+<displayName><![CDATA[Power (W)]]></displayName>
+</gx:SimpleArrayField>
+<gx:SimpleArrayField name="cadence" type="float">
+<displayName><![CDATA[Cadence (rpm)]]></displayName>
+</gx:SimpleArrayField>
+<gx:SimpleArrayField name="heart_rate" type="float">
+<displayName><![CDATA[Heart rate (bpm)]]></displayName>
+</gx:SimpleArrayField>
+</Schema>
+<Folder>
+<name><![CDATA[Sun, 28 Nov 2020 18:06 Markers]]></name>
+<open>1</open>
+<Placemark>
+<name><![CDATA[Split 0]]></name>
+<description><![CDATA[Total distance: 0.00 km (0.0 mi)
+Total time: 00:00
+Moving time: 00:00
+Average speed: 0.00 km/h (0.0 mi/h)
+Average moving speed: 0.00 km/h (0.0 mi/h)
+Max speed: 0.00 km/h (0.0 mi/h)
+Average pace: 0:00 min/km (0:00 min/mi)
+Average moving pace: 0:00 min/km (0:00 min/mi)
+Fastest pace: 0:00 min/km (0:00 min/mi)
+Max elevation: -9223372036854775808 m (-9223372036854775808 ft)
+Min elevation: 9223372036854775807 m (9223372036854775807 ft)
+Elevation gain: 0 m (0 ft)
+Max grade: 0 %
+Min grade: 0 %
+Recorded: 6/23 11:29
+]]></description>
+<TimeStamp><when>1970-01-01T00:00:00Z</when></TimeStamp>
+<styleUrl>#waypoint</styleUrl>
+<Point>
+<coordinates>180.0,100.0</coordinates>
+</Point>
+</Placemark>
+</Folder>
+<Placemark>
+<name><![CDATA[2020-11-28 18:06 (Start)]]></name>
+<description><![CDATA[]]></description>
+<TimeStamp><when>2020-11-28T17:06:22.401Z</when></TimeStamp>
+<styleUrl>#start</styleUrl>
+<Point>
+<coordinates>1.234156,12.340097,469.286376953125</coordinates>
+</Point>
+</Placemark>
+<Placemark>
+<name><![CDATA[2020-11-28 18:06]]></name>
+<description><![CDATA[Test Track]]></description>
+<icon><![CDATA[UNKNOWN]]></icon>
+<opentracks:trackid>2f170875-55d7-445d-b2b8-22a573c81dbc</opentracks:trackid>
+<styleUrl>#track</styleUrl>
+<ExtendedData>
+<Data name="type"><value><![CDATA[unknown]]></value></Data>
+</ExtendedData>
+<gx:MultiTrack>
+<altitudeMode>absolute</altitudeMode>
+<gx:interpolate>1</gx:interpolate>
+<gx:Track>
+<when>2020-11-28T17:06:22.401Z</when>
+<gx:coord>1.234156 12.340097 469.286376953125</gx:coord>
+<when>2020-11-28T17:06:25.448Z</when>
+<gx:coord>1.23415 12.340036 439.1626281738281</gx:coord>
+<when>2020-11-28T17:06:47.888Z</when>
+<gx:coord>1.23405 12.340057 421.8070983886719</gx:coord>
+<ExtendedData>
+<SchemaData schemaUrl="#schema">
+<gx:SimpleArrayData name="speed">
+<gx:value>0.5391469</gx:value>
+<gx:value>0.15777911</gx:value>
+<gx:value>0.0</gx:value>
+</gx:SimpleArrayData>
+<gx:SimpleArrayData name="elevation_gain">
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+</gx:SimpleArrayData>
+</SchemaData>
+</ExtendedData>
+</gx:Track>
+<gx:Track>
+<when>2020-11-28T17:06:55.861Z</when>
+<gx:coord>1.23405 12.340057 419.93902587890625</gx:coord>
+<when>2020-11-28T17:06:56.905Z</when>
+<gx:coord>1.23405 12.340057 419.9036560058594</gx:coord>
+<when>2020-11-28T17:07:20.870Z</when>
+<gx:coord>1.234046 12.340082 417.99432373046875</gx:coord>
+<ExtendedData>
+<SchemaData schemaUrl="#schema">
+<gx:SimpleArrayData name="speed">
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+</gx:SimpleArrayData>
+<gx:SimpleArrayData name="elevation_gain">
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+<gx:value>0.0</gx:value>
+</gx:SimpleArrayData>
+</SchemaData>
+</ExtendedData>
+</gx:Track>
+</gx:MultiTrack>
+</Placemark>
+<Placemark>
+<name><![CDATA[2020-11-28 18:06 (End)]]></name>
+<description><![CDATA[OpenTracks (Debug)
+
+Name: 2020-11-28 18:06
+Activity type: unknown
+Description: -
+Total distance: 0.01 km (0.0 mi)
+Total time: 01:04
+Moving time: 00:00
+Average speed: 0.49 km/h (0.3 mi/h)
+Average moving speed: 0.00 km/h (0.0 mi/h)
+Max speed: 0.00 km/h (0.0 mi/h)
+Average pace: 122:30 min/km (197:08 min/mi)
+Average moving pace: 0:00 min/km (0:00 min/mi)
+Fastest pace: 0:00 min/km (0:00 min/mi)
+Max elevation: 469 m (1540 ft)
+Min elevation: 419 m (1376 ft)
+Elevation gain: 0 m (0 ft)
+Recorded: 11/28 18:06
+]]></description>
+<TimeStamp><when>2020-11-28T17:07:20.870Z</when></TimeStamp>
+<styleUrl>#end</styleUrl>
+<Point>
+<coordinates>1.234046,12.340082,417.99432373046875</coordinates>
+</Point>
+</Placemark>
+</Document>
+</kml>
@@ -50,10 +50,11 @@ limitations under the License.
    <application
        android:name=".Startup"
        android:allowBackup="false"
-        android:hasFragileUserData="true"
        android:hardwareAccelerated="true"
+        android:hasFragileUserData="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
+        android:supportsRtl="true"
        android:theme="@style/ThemeCustom">

        <activity android:name=".AboutActivity" />
@@ -71,14 +72,14 @@ limitations under the License.
        <activity android:name=".io.file.importer.ImportActivity">

            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/gpx+xml"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/gpx+xml" />
            </intent-filter>
            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/gpx"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/gpx" />
            </intent-filter>

            <intent-filter
@@ -86,13 +87,15 @@ limitations under the License.
                android:priority="50">
                <action android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.SEND" />
+
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
-                <data android:mimeType="*/*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
                <data android:pathPattern=".*\\.gpx" />
                <data android:pathPattern=".*\\..*\\.gpx" />
                <data android:pathPattern=".*\\..*\\..*\\.gpx" />
@@ -110,12 +113,14 @@ limitations under the License.
                android:priority="50">
                <action android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.SEND" />
+
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
                <data android:pathPattern=".*\\.gpx" />
                <data android:pathPattern=".*\\..*\\.gpx" />
                <data android:pathPattern=".*\\..*\\..*\\.gpx" />
@@ -129,9 +134,9 @@ limitations under the License.
            </intent-filter>

            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/vnd.google-earth.kmz"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/vnd.google-earth.kmz" />
            </intent-filter>

            <intent-filter
@@ -139,13 +144,15 @@ limitations under the License.
                android:priority="50">
                <action android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.SEND" />
+
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
-                <data android:mimeType="*/*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
                <data android:pathPattern=".*\\.kmz" />
                <data android:pathPattern=".*\\..*\\.kmz" />
                <data android:pathPattern=".*\\..*\\..*\\.kmz" />
@@ -163,12 +170,14 @@ limitations under the License.
                android:priority="50">
                <action android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.SEND" />
+
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
                <data android:pathPattern=".*\\.kmz" />
                <data android:pathPattern=".*\\..*\\.kmz" />
                <data android:pathPattern=".*\\..*\\..*\\.kmz" />
@@ -182,9 +191,9 @@ limitations under the License.
            </intent-filter>

            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/vnd.google-earth.kml+xml"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/vnd.google-earth.kml+xml" />
            </intent-filter>

            <intent-filter
@@ -192,13 +201,15 @@ limitations under the License.
                android:priority="50">
                <action android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.SEND" />
+
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
-                <data android:mimeType="*/*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
                <data android:pathPattern=".*\\.kml" />
                <data android:pathPattern=".*\\..*\\.kml" />
                <data android:pathPattern=".*\\..*\\..*\\.kml" />
@@ -216,12 +227,14 @@ limitations under the License.
                android:priority="50">
                <action android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.SEND" />
+
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
                <data android:pathPattern=".*\\.kml" />
                <data android:pathPattern=".*\\..*\\.kml" />
                <data android:pathPattern=".*\\..*\\..*\\.kml" />
@@ -237,7 +250,7 @@ limitations under the License.

        <activity android:name=".MarkerDetailActivity">
            <intent-filter>
-                <action android:name="de.dennisguse.opentracks.MarkerDetails"/>
+                <action android:name="de.dennisguse.opentracks.MarkerDetails" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
@@ -246,16 +259,24 @@ limitations under the License.

        <activity
            android:name=".MarkerListActivity"
-            android:label="@string/menu_markers">
+            android:label="@string/menu_markers"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
            <meta-data
-                android:name="android.app.default_searchable"
-                android:value=".SearchListActivity" />
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
        </activity>

        <activity
-            android:name=".SearchListActivity"
-            android:launchMode="singleTop">
+            android:name=".TrackListActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/SplashTheme">
            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+
                <action android:name="android.intent.action.SEARCH" />
            </intent-filter>
            <meta-data
@@ -269,18 +290,6 @@ limitations under the License.

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

-        <activity
-            android:name=".TrackListActivity"
-            android:theme="@style/SplashTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:value=".SearchListActivity" />
-        </activity>
-
        <activity android:name=".AggregatedStatisticsActivity" />

        <activity android:name=".io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity" />
@@ -19,6 +19,7 @@ package de.dennisguse.opentracks;
 import android.os.Bundle;
 import android.view.View;

+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;

@@ -39,8 +40,22 @@ public abstract class AbstractActivity extends AppCompatActivity {
        setContentView(getRootView());

        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        setupActionBarBack(toolbar);
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
    }

    protected abstract View getRootView();
+
+    protected void setupActionBarBack(@Nullable Toolbar toolbar) {
+        setSupportActionBar(toolbar);
+        if (toolbar != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+    }
 }
@@ -30,8 +30,7 @@ import de.dennisguse.opentracks.util.PreferencesUtils;

 /**
 * An abstract class for the following common tasks across
- * {@link TrackListActivity}, {@link TrackRecordedActivity}, and
- * {@link SearchListActivity}:
+ * {@link TrackListActivity}, {@link TrackRecordedActivity}, and {@link TrackRecordedActivity}:
 * <p>
 * - share track <br>
 * - delete tracks <br>
@@ -48,7 +47,7 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        if (requestCode == DELETE_REQUEST_CODE) {
-            onDeleted();
+            onTrackDeleted();
        } else {
            super.onActivityResult(requestCode, resultCode, data);
        }
@@ -93,5 +92,5 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
    /**
     * Called after {@link TrackDeleteActivity} returns its result.
     */
-    abstract protected void onDeleted();
+    abstract protected void onTrackDeleted();
 }
@@ -113,7 +113,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
    }

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

@@ -33,18 +33,16 @@ import android.widget.ArrayAdapter;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModelProvider;

-import java.io.File;
 import java.io.FileDescriptor;
 import java.io.IOException;

 import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.databinding.MarkerEditBinding;
-import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.viewmodels.MarkerEditViewModel;

 /**
 * An activity to add/edit a marker.
@@ -56,21 +54,20 @@ 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 Track.Id trackId;
-    private final TrackRecordingServiceConnection trackRecordingServiceConnection = new TrackRecordingServiceConnection();
    private Marker marker;

    private MenuItem insertPhotoMenuItem;
    private MenuItem insertGalleryImgMenuItem;

-    private Uri photoUri;
    private boolean hasCamera;
+    private Uri cameraPhotoUri;
+
+    private MarkerEditViewModel viewModel;

    // UI elements
    private MarkerEditBinding viewBinding;
@@ -88,82 +85,40 @@ public class MarkerEditActivity extends AbstractActivity {
        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.marker_types, android.R.layout.simple_dropdown_item_1line);
        viewBinding.markerEditMarkerType.setAdapter(adapter);
        viewBinding.markerEditPhotoDelete.setOnClickListener(v -> {
-            if (marker != null && marker.hasPhoto()) {
-                marker.setPhotoUrl(null);
-            }
-            viewBinding.markerEditPhoto.setImageBitmap(null);
-            photoUri = null;
-            hideAndShowOptions();
+            viewModel.onPhotoDelete(viewBinding.markerEditName.getText().toString(),
+                    viewBinding.markerEditMarkerType.getText().toString(),
+                    viewBinding.markerEditDescription.getText().toString());
        });

-        viewBinding.markerEditCancel.setOnClickListener(v -> finish());
-
-        final boolean isNewMarker = markerId == null;
-
-        setTitle(isNewMarker ? R.string.menu_insert_marker : R.string.menu_edit);
-        viewBinding.markerEditDone.setText(isNewMarker ? R.string.generic_add : R.string.generic_save);
-        viewBinding.markerEditDone.setOnClickListener(v -> {
-            if (isNewMarker) {
-                addMarker();
-            } else {
-                saveMarker();
-            }
+        viewBinding.markerEditCancel.setOnClickListener(v -> {
+            viewModel.onCancel();
            finish();
        });

-        if (isNewMarker) {
-            int nextMarkerNumber = trackId == null ? -1 : new ContentProviderUtils(this).getNextMarkerNumber(trackId);
-            if (nextMarkerNumber == -1) {
-                nextMarkerNumber = 0;
-            }
-            viewBinding.markerEditName.setText(getString(R.string.marker_name_format, nextMarkerNumber));
-            viewBinding.markerEditName.selectAll();
-            viewBinding.markerEditMarkerType.setText("");
-            viewBinding.markerEditDescription.setText("");
-        } else {
-            marker = new ContentProviderUtils(this).getMarker(markerId);
-            if (marker == null) {
-                Log.d(TAG, "marker is null");
-                finish();
-                return;
-            }
+        boolean isNewMarker = markerId == null;
+        setTitle(isNewMarker ? R.string.menu_insert_marker : R.string.menu_edit);
+        viewBinding.markerEditDone.setText(isNewMarker ? R.string.generic_add : R.string.generic_save);
+        viewBinding.markerEditDone.setOnClickListener(v -> {
+            viewModel.onDone(viewBinding.markerEditName.getText().toString(),
+                        viewBinding.markerEditMarkerType.getText().toString(),
+                        viewBinding.markerEditDescription.getText().toString());
+            finish();
+        });
+
+        viewModel = new ViewModelProvider(this).get(MarkerEditViewModel.class);
+        viewModel.getMarkerData(trackId, markerId).observe(this, data -> {
+            marker = data;
            viewBinding.markerEditName.setText(marker.getName());
            viewBinding.markerEditMarkerType.setText(marker.getCategory());
            viewBinding.markerEditDescription.setText(marker.getDescription());
            if (marker.hasPhoto()) {
-                photoUri = marker.getPhotoURI();
+                setMarkerImageView(marker.getPhotoURI());
+            } else {
+                viewBinding.markerEditPhoto.setImageDrawable(null);
            }
-        }

-        if (savedInstanceState != null) {
-            photoUri = savedInstanceState.getParcelable(BUNDLE_PHOTO_URI);
-            if (marker != null) {
-                marker.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
-            }
-        }
-        if (photoUri != null) {
-            setMarkerImageView(photoUri);
-        }
-
-        hideAndShowOptions();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        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();
-        trackRecordingServiceConnection.unbind(this);
+            hideAndShowOptions();
+        });
    }

    @Override
@@ -186,16 +141,17 @@ public class MarkerEditActivity extends AbstractActivity {

    @Override
    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.marker_edit_insert_photo:
-                createMarkerWithPicture();
-                return true;
-            case R.id.marker_edit_insert_gallery_img:
-                createMarkerWithGalleryImage();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == R.id.marker_edit_insert_photo) {
+            createMarkerWithPicture();
+            return true;
        }
+
+        if (item.getItemId() == R.id.marker_edit_insert_gallery_img) {
+            createMarkerWithGalleryImage();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
    }

    @Override
@@ -205,26 +161,20 @@ public class MarkerEditActivity extends AbstractActivity {
                Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
                return;
            } else if (resultCode == RESULT_OK) {
-                setMarkerImageView(photoUri);
+                viewModel.onNewCameraPhoto(cameraPhotoUri,
+                        viewBinding.markerEditName.getText().toString(),
+                        viewBinding.markerEditMarkerType.getText().toString(),
+                        viewBinding.markerEditDescription.getText().toString());
            }
        } else if (requestCode == GALLERY_IMG_REQUEST_CODE) {
            if (resultCode == RESULT_CANCELED) {
                Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
                return;
-            } else if (resultCode == RESULT_OK)  {
-                Uri srcUri = data.getData();
-                try (ParcelFileDescriptor parcelFd = getContentResolver().openFileDescriptor(srcUri, "r")) {
-                    FileDescriptor srcFd = parcelFd.getFileDescriptor();
-                    File dstFile = new File(FileUtils.getImageUrl(this, getTrackId()));
-                    FileUtils.copy(srcFd, dstFile);
-
-                    photoUri = FileUtils.getUriForFile(this, dstFile);
-                    setMarkerImageView(photoUri);
-                } catch(Exception e) {
-                    Log.e(TAG, e.getMessage());
-                    Toast.makeText(this, R.string.marker_add_canceled, Toast.LENGTH_LONG).show();
-                    return;
-                }
+            } else if (resultCode == RESULT_OK) {
+                viewModel.onNewGalleryPhoto(data.getData(),
+                        viewBinding.markerEditName.getText().toString(),
+                        viewBinding.markerEditMarkerType.getText().toString(),
+                        viewBinding.markerEditDescription.getText().toString());
            }
        }
        super.onActivityResult(requestCode, resultCode, data);
@@ -232,11 +182,11 @@ public class MarkerEditActivity extends AbstractActivity {

    /**
     * Checks and hide/shows all buttons/options about marker photo options.
-     *
+     * <p>
     * If a photo is set then one's options are shown, otherwise another ones are shown.
     */
    private void hideAndShowOptions() {
-        boolean isPhotoSet = (marker != null && marker.hasPhoto()) || photoUri != null;
+        boolean isPhotoSet = (marker != null && marker.hasPhoto());
        if (insertPhotoMenuItem != null && insertGalleryImgMenuItem != null) {
            insertPhotoMenuItem.setVisible(!isPhotoSet);
            insertGalleryImgMenuItem.setVisible(!isPhotoSet);
@@ -265,7 +215,7 @@ public class MarkerEditActivity extends AbstractActivity {

    private void createMarkerWithPicture() {
        Pair<Intent, Uri> intentAndPhotoUri = IntentUtils.createTakePictureIntent(this, getTrackId());
-        photoUri = intentAndPhotoUri.second;
+        cameraPhotoUri = intentAndPhotoUri.second;
        startActivityForResult(intentAndPhotoUri.first, CAMERA_REQUEST_CODE);
    }

@@ -273,21 +223,4 @@ public class MarkerEditActivity extends AbstractActivity {
        Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
        startActivityForResult(intent, GALLERY_IMG_REQUEST_CODE);
    }
-
-    private void addMarker() {
-        trackRecordingServiceConnection.addMarker(this,
-                viewBinding.markerEditName.getText().toString(),
-                viewBinding.markerEditMarkerType.getText().toString(),
-                viewBinding.markerEditDescription.getText().toString(),
-                photoUri != null ? photoUri.toString() : null);
-    }
-
-    private void saveMarker() {
-        marker.setName(viewBinding.markerEditName.getText().toString());
-        marker.setCategory(viewBinding.markerEditMarkerType.getText().toString());
-        marker.setDescription(viewBinding.markerEditDescription.getText().toString());
-        marker.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
-
-        new ContentProviderUtils(this).updateMarker(this, marker);
-    }
 }
@@ -16,6 +16,7 @@

 package de.dennisguse.opentracks;

+import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -28,9 +29,10 @@ import android.view.MenuItem;
 import android.view.View;

 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import androidx.loader.app.LoaderManager;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;

 import de.dennisguse.opentracks.content.data.Marker;
@@ -67,7 +69,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
        @Override
        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            // Note that the key can be null
            if (PreferencesUtils.isKey(MarkerListActivity.this, R.string.recording_track_id_key, key)) {
                recordingTrackId = PreferencesUtils.getRecordingTrackId(MarkerListActivity.this);
            }
@@ -84,20 +85,19 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker

    private MarkerListBinding viewBinding;

+    private final MarkerLoaderCallback loaderCallbacks = new MarkerLoaderCallback();
+
    // Callback when an item is selected in the contextual action mode
    private final ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
        @Override
        public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
            boolean isSingleSelection = ids.length == 1;

-            menu.findItem(R.id.list_context_menu_share).setVisible(false);
            menu.findItem(R.id.list_context_menu_show_on_map).setVisible(isSingleSelection);
            menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection);
            menu.findItem(R.id.list_context_menu_delete).setVisible(true);
-            /*
-             * Set select all to the same visibility as delete since delete is the
-             * only action that can be applied to multiple markers.
-             */
+
+            // Set select all to the same visibility as delete since delete is the only action that can be applied to multiple markers.
            menu.findItem(R.id.list_context_menu_select_all).setVisible(showSelectAll);
        }

@@ -135,8 +135,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                int categoryIndex = cursor.getColumnIndex(MarkerColumns.CATEGORY);
                int descriptionIndex = cursor.getColumnIndex(MarkerColumns.DESCRIPTION);
                int photoUrlIndex = cursor.getColumnIndex(MarkerColumns.PHOTOURL);
-                int latitudeIndex = cursor.getColumnIndex(MarkerColumns.LATITUDE);
-                int longitudeIndex = cursor.getColumnIndex(MarkerColumns.LONGITUDE);

                int iconId = MarkerUtils.ICON_ID;
                String name = cursor.getString(nameIndex);
@@ -144,9 +142,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                String category = cursor.getString(categoryIndex);
                String description = cursor.getString(descriptionIndex);
                String photoUrl = cursor.getString(photoUrlIndex);
-                //TODO also show latitude and longitude in list
-                double latitude = cursor.getDouble(latitudeIndex);
-                double longitude = cursor.getDouble(longitudeIndex);

                ListItemUtils.setListItem(MarkerListActivity.this, view, false, true, iconId, R.string.image_marker, name, null, null, 0, time, false, category, description, photoUrl);
            }
@@ -154,23 +149,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
        viewBinding.markerList.setAdapter(resourceCursorAdapter);
        ActivityUtils.configureListViewContextualMenu(viewBinding.markerList, contextualActionModeCallback);

-        LoaderManager.getInstance(this).initLoader(0, null, new LoaderCallbacks<Cursor>() {
-            @NonNull
-            @Override
-            public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-                return ContentProviderUtils.getMarkersLoader(MarkerListActivity.this, track != null ? track.getId() : null);
-            }
-
-            @Override
-            public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-                resourceCursorAdapter.swapCursor(cursor);
-            }
-
-            @Override
-            public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-                resourceCursorAdapter.swapCursor(null);
-            }
-        });
+        loadData(getIntent());
    }

    @Override
@@ -230,44 +209,54 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    /**
     * Handles a context item selection.
     *
-     * @param itemId       the menu item id
-     * @param longMarkerds the marker ids
+     * @param itemId        the menu item id
+     * @param longMarkerIds the marker ids
     * @return true if handled.
     */
-    private boolean handleContextItem(int itemId, long... longMarkerds) {
-        Marker.Id[] markerIds = new Marker.Id[longMarkerds.length];
-        for (int i = 0; i < longMarkerds.length; i++) {
-            markerIds[i] = new Marker.Id(longMarkerds[i]);
+    private boolean handleContextItem(int itemId, long... longMarkerIds) {
+        Marker.Id[] markerIds = new Marker.Id[longMarkerIds.length];
+        for (int i = 0; i < longMarkerIds.length; i++) {
+            markerIds[i] = new Marker.Id(longMarkerIds[i]);
        }

-        Intent intent;
-        switch (itemId) {
-            case R.id.list_context_menu_show_on_map:
-                if (markerIds.length == 1) {
-                    IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getMarker(markerIds[0]));
-                }
-                return true;
-            case R.id.list_context_menu_edit:
-                if (markerIds.length == 1) {
-                    intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
-                            .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
-                    startActivity(intent);
-                }
-                return true;
-            case R.id.list_context_menu_delete:
-                if (markerIds.length > 1 && markerIds.length == viewBinding.markerList.getCount()) {
-                    markerIds = null;
-                }
-                DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
-                return true;
-            case R.id.list_context_menu_select_all:
-                for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
-                    viewBinding.markerList.setItemChecked(i, true);
-                }
-                return false;
-            default:
-                return false;
+        if (itemId == R.id.list_context_menu_show_on_map) {
+            if (markerIds.length == 1) {
+                IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getMarker(markerIds[0]));
+            }
+            return true;
        }
+
+        if (itemId == R.id.list_context_menu_share) {
+            Intent intent = IntentUtils.newShareFileIntent(this, markerIds);
+            if (intent != null) {
+                intent = Intent.createChooser(intent, null);
+                startActivity(intent);
+            }
+            return true;
+        }
+
+        if (itemId == R.id.list_context_menu_edit) {
+            if (markerIds.length == 1) {
+                Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
+                        .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
+                startActivity(intent);
+            }
+            return true;
+        }
+
+        if (itemId == R.id.list_context_menu_delete) {
+            DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
+            return true;
+        }
+
+        if (itemId == R.id.list_context_menu_select_all) {
+            for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
+                viewBinding.markerList.setItemChecked(i, true);
+            }
+            return false;
+        }
+
+        return false;
    }

    @Override
@@ -279,7 +268,92 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    }

    @Override
-    public void onDeleteMarkerDone() {
+    public void onBackPressed() {
+        if (loaderCallbacks.getSearchQuery() != null) {
+            loaderCallbacks.setSearch(null);
+            return;
+        }
+        SearchView searchView = (SearchView) searchMenuItem.getActionView();
+        if (!searchView.isIconified()) {
+            searchView.setIconified(true);
+            return;
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        loadData(intent);
+    }
+
+    private void loadData(Intent intent) {
+        String searchQuery = null;
+        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+            searchQuery = intent.getStringExtra(SearchManager.QUERY);
+        }
+
+        loaderCallbacks.setSearch(searchQuery);
+    }
+
+    @Override
+    public void onMarkerDeleted() {
        // Do nothing
    }
+
+    private class MarkerLoaderCallback implements LoaderManager.LoaderCallbacks<Cursor> {
+
+        private String searchQuery = null;
+
+        public String getSearchQuery() {
+            return searchQuery;
+        }
+
+        public void setSearch(String searchQuery) {
+            this.searchQuery = searchQuery;
+            restart();
+            if (searchQuery != null) {
+                setTitle(searchQuery);
+            } else {
+                setTitle(R.string.menu_markers);
+            }
+        }
+
+        public void restart() {
+            LoaderManager.getInstance(MarkerListActivity.this).restartLoader(0, null, loaderCallbacks);
+        }
+
+        @NonNull
+        @Override
+        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
+            final String[] PROJECTION = new String[]{MarkerColumns._ID,
+                    MarkerColumns.NAME, MarkerColumns.DESCRIPTION, MarkerColumns.CATEGORY,
+                    MarkerColumns.TIME, MarkerColumns.PHOTOURL};
+
+            if (searchQuery == null) {
+                if (track != null) {
+                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, MarkerColumns.TRACKID + "=?", new String[]{String.valueOf(track.getId().getId())}, null);
+                } else {
+                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, null, null, null);
+                }
+            } else {
+                final String SEARCH_QUERY = MarkerColumns.NAME + " LIKE ? OR " +
+                        MarkerColumns.DESCRIPTION + " LIKE ? OR " +
+                        MarkerColumns.CATEGORY + " LIKE ?";
+                final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
+                return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, MarkerColumns.DEFAULT_SORT_ORDER + " DESC");
+            }
+        }
+
+        @Override
+        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
+            resourceCursorAdapter.swapCursor(cursor);
+        }
+
+        @Override
+        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+            resourceCursorAdapter.swapCursor(null);
+        }
+    }
 }
@@ -1,446 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks;
-
-import android.app.SearchManager;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ArrayAdapter;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedSet;
-
-import de.dennisguse.opentracks.content.SearchEngine;
-import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
-import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.databinding.SearchListBinding;
-import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
-import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
-import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
-import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.util.ActivityUtils;
-import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.ListItemUtils;
-import de.dennisguse.opentracks.util.MarkerUtils;
-import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
-
-/**
- * An activity to display a list of searchable results.
- *
- * @author Rodrigo Damazio
- * <p>
- * TODO: allow to refine searchable (present searchable in context menu)
- */
-public class SearchListActivity extends AbstractListActivity implements DeleteMarkerCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
-
-    private static final String TAG = SearchListActivity.class.getSimpleName();
-
-    private static final String IS_RECORDING_FIELD = "isRecording";
-    private static final String IS_PAUSED_FIELD = "isPaused";
-    private static final String ICON_ID_FIELD = "icon";
-    private static final String ICON_CONTENT_DESCRIPTION_ID_FIELD = "iconContentDescription";
-    private static final String NAME_FIELD = "name";
-    private static final String TOTAL_TIME_FIELD = "totalTime";
-    private static final String TOTAL_DISTANCE_FIELD = "totalDistance";
-    private static final String MARKER_COUNT_FIELD = "markerCount";
-    private static final String START_TIME_FIELD = "startTime";
-    private static final String CATEGORY_FIELD = "category";
-    private static final String DESCRIPTION_FIELD = "description";
-    private static final String PHOTO_URL_FIELD = "photoUrl";
-    private static final String MARKER_LATITUDE_FIELD = "latitude";
-    private static final String MARKER_LONGITUDE_FIELD = "longitude";
-    private static final String TRACK_ID_FIELD = "trackId";
-    private static final String MARKER_ID_FIELD = "markerId";
-
-    private ContentProviderUtils contentProviderUtils;
-
-    private SharedPreferences sharedPreferences;
-
-    private TrackRecordingServiceConnection trackRecordingServiceConnection;
-
-    private SearchEngine searchEngine;
-
-    private ArrayAdapter<Map<String, Object>> arrayAdapter;
-
-    private boolean metricUnits = true;
-
-    private Track.Id recordingTrackId;
-
-    private boolean recordingTrackPaused;
-
-    private SearchListBinding viewBinding;
-
-    // Callback when an item is selected in the contextual action mode
-    private final ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
-        @Override
-        public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
-            boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
-            boolean isSingleSelection = positions.length == 1;
-
-            boolean isSingleSelectionTrack;
-            if (isSingleSelection) {
-                Map<String, Object> item = arrayAdapter.getItem(positions[0]);
-                isSingleSelectionTrack = item.get(MARKER_ID_FIELD) == null;
-            } else {
-                isSingleSelectionTrack = false;
-            }
-
-            // Not recording, one item, item is a track
-            MenuItem shareMenuItem = menu.findItem(R.id.list_context_menu_share);
-            if (isSingleSelectionTrack) {
-                shareMenuItem.setVisible(!isRecording);
-            }
-
-            // One item, item is a marker
-            menu.findItem(R.id.list_context_menu_show_on_map).setVisible(isSingleSelection && !isSingleSelectionTrack);
-            // One item, can be a track or a marker
-            menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection);
-            // One item. If track, no restriction.
-            menu.findItem(R.id.list_context_menu_delete).setVisible(isSingleSelection && isSingleSelectionTrack);
-            // Disable select all, no action is available for multiple selection
-            menu.findItem(R.id.list_context_menu_select_all).setVisible(false);
-        }
-
-        @Override
-        public boolean onClick(int itemId, int[] positions, long[] ids) {
-            return handleContextItem(itemId, positions);
-        }
-    };
-
-    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.stats_units_key, key)) {
-                metricUnits = PreferencesUtils.isMetricUnits(SearchListActivity.this);
-            }
-            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.recording_track_id_key, key)) {
-                recordingTrackId = PreferencesUtils.getRecordingTrackId(SearchListActivity.this);
-            }
-            if (PreferencesUtils.isKey(SearchListActivity.this, R.string.recording_track_paused_key, key)) {
-                recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(SearchListActivity.this);
-            }
-            if (key != null) {
-                runOnUiThread(() -> arrayAdapter.notifyDataSetChanged());
-            }
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
-
-        recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
-
-        contentProviderUtils = new ContentProviderUtils(this);
-        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection();
-        searchEngine = new SearchEngine(contentProviderUtils);
-
-        arrayAdapter = new ArrayAdapter<Map<String, Object>>(this, R.layout.list_item, R.id.list_item_name) {
-            @NonNull
-            @Override
-            public View getView(int position, View convertView, @NonNull android.view.ViewGroup parent) {
-                View view = convertView;
-                if (convertView == null) {
-                    view = getLayoutInflater().inflate(R.layout.list_item, parent, false);
-                }
-
-                Map<String, Object> resultMap = getItem(position);
-                boolean isRecording = (boolean) resultMap.get(IS_RECORDING_FIELD);
-                boolean isPaused = (boolean) resultMap.get(IS_PAUSED_FIELD);
-                int iconId = (int) resultMap.get(ICON_ID_FIELD);
-                int iconContentDescriptionId = (int) resultMap.get(ICON_CONTENT_DESCRIPTION_ID_FIELD);
-                String name = (String) resultMap.get(NAME_FIELD);
-                String totalTime = (String) resultMap.get(TOTAL_TIME_FIELD);
-                String totalDistance = (String) resultMap.get(TOTAL_DISTANCE_FIELD);
-                int markerCount = (int) resultMap.get(MARKER_COUNT_FIELD);
-                long startTime = (long) resultMap.get(START_TIME_FIELD);
-                String category = (String) resultMap.get(CATEGORY_FIELD);
-                String description = (String) resultMap.get(DESCRIPTION_FIELD);
-                String photoUrl = (String) resultMap.get(PHOTO_URL_FIELD);
-
-                ListItemUtils.setListItem(SearchListActivity.this, view, isRecording, isPaused, iconId,
-                        iconContentDescriptionId, name, totalTime, totalDistance, markerCount,
-                        startTime, false, category, description, photoUrl);
-                return view;
-            }
-        };
-        // UI elements
-        viewBinding.searchList.setEmptyView(viewBinding.searchListEmpty);
-        viewBinding.searchList.setAdapter(arrayAdapter);
-        viewBinding.searchList.setOnItemClickListener((parent, view, position, id) -> {
-            Map<String, Object> item = arrayAdapter.getItem(position);
-            Track.Id trackId = (Track.Id) item.get(TRACK_ID_FIELD);
-            Marker.Id markerId = (Marker.Id) 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(viewBinding.searchList, contextualActionModeCallback);
-        handleIntent(getIntent());
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        sharedPreferenceChangeListener.onSharedPreferenceChanged(null, null);
-        trackRecordingServiceConnection.startConnection(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        arrayAdapter.notifyDataSetChanged();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        trackRecordingServiceConnection.unbind(this);
-    }
-
-    @Override
-    protected View getRootView() {
-        viewBinding = SearchListBinding.inflate(getLayoutInflater());
-        return viewBinding.getRoot();
-    }
-
-    @Override
-    public void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        setIntent(intent);
-        handleIntent(intent);
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_SEARCH) {
-            return true;
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
-    /**
-     * Handles a context item selection.
-     *
-     * @param itemId    the menu item id
-     * @param positions the positions of the selected rows
-     * @return true if handled.
-     */
-    private boolean handleContextItem(int itemId, int[] positions) {
-        if (positions.length != 1) {
-            return false;
-        }
-        Map<String, Object> item = arrayAdapter.getItem(positions[0]);
-        Track.Id trackId = (Track.Id) item.get(TRACK_ID_FIELD);
-        Marker.Id markerId = (Marker.Id) item.get(MARKER_ID_FIELD);
-        Intent intent;
-        switch (itemId) {
-            case R.id.list_context_menu_show_on_map:
-                IntentUtils.showCoordinateOnMap(this, (double) item.get(MARKER_LATITUDE_FIELD), (double) item.get(MARKER_LONGITUDE_FIELD), item.get(NAME_FIELD) + "");
-                return true;
-            case R.id.list_context_menu_share:
-                intent = IntentUtils.newShareFileIntent(this, trackId);
-                intent = Intent.createChooser(intent, null);
-                startActivity(intent);
-                return true;
-            case R.id.list_context_menu_edit:
-                if (markerId != null) {
-                    intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
-                            .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerId);
-                } else {
-                    intent = IntentUtils.newIntent(this, TrackEditActivity.class)
-                            .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
-                }
-                startActivity(intent);
-
-                // Close the searchable result since its content can change after edit.
-                finish();
-                return true;
-            case R.id.list_context_menu_delete:
-                if (markerId != null) {
-                    DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerId);
-                } else {
-                    deleteTracks(trackId);
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Handles the intent.
-     *
-     * @param intent the intent
-     */
-    private void handleIntent(Intent intent) {
-        if (!Intent.ACTION_SEARCH.equals(intent.getAction())) {
-            Log.e(TAG, "Invalid intent action: " + intent);
-            finish();
-            return;
-        }
-
-        final String textQuery = intent.getStringExtra(SearchManager.QUERY);
-        setTitle(textQuery);
-
-        doSearch(textQuery);
-    }
-
-    /**
-     * Do the searchable.
-     *
-     * @param textQuery the query
-     */
-    private void doSearch(String textQuery) {
-        SearchQuery query = new SearchQuery(textQuery, null, null, System.currentTimeMillis());
-        SortedSet<ScoredResult> scoredResults = searchEngine.search(query);
-        final List<Map<String, Object>> displayResults = prepareResultsforDisplay(scoredResults);
-
-        // Use the UI thread to display the results
-        runOnUiThread(() -> {
-            arrayAdapter.clear();
-            arrayAdapter.addAll(displayResults);
-        });
-    }
-
-    /**
-     * Prepares the result for display.
-     *
-     * @param scoredResults a list of score results
-     * @return a list of result maps
-     */
-    private List<Map<String, Object>> prepareResultsforDisplay(Collection<ScoredResult> scoredResults) {
-        //TODO Replace use of map<string, object>, but rather provide Track or Marker directly.
-        ArrayList<Map<String, Object>> output = new ArrayList<>(scoredResults.size());
-        for (ScoredResult result : scoredResults) {
-            if (result.track != null) {
-                output.add(prepareTrackForDisplay(result.track));
-            } else {
-                output.add(prepareMarkerForDisplay(result.marker));
-            }
-        }
-        return output;
-    }
-
-    private Map<String, Object> prepareMarkerForDisplay(Marker marker) {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        //TODO: It may be more appropriate to obtain the track name as a join in the retrieval phase of the searchable.
-        String trackName = null;
-        Track.Id trackId = marker.getTrackId();
-        if (!trackId.isValid()) {
-            Track track = contentProviderUtils.getTrack(trackId);
-            if (track != null) {
-                trackName = track.getName();
-            }
-        }
-
-        resultMap.put(IS_RECORDING_FIELD, false);
-        resultMap.put(IS_PAUSED_FIELD, true);
-        resultMap.put(ICON_ID_FIELD, MarkerUtils.ICON_ID);
-        resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_marker);
-        resultMap.put(NAME_FIELD, marker.getName());
-        // Display the marker's track name in the total time field
-        resultMap.put(TOTAL_TIME_FIELD, trackName == null ? null : getString(R.string.search_list_marker_track_location, trackName));
-        resultMap.put(TOTAL_DISTANCE_FIELD, null);
-        resultMap.put(MARKER_COUNT_FIELD, 0);
-        resultMap.put(START_TIME_FIELD, marker.getLocation().getTime());
-        resultMap.put(CATEGORY_FIELD, marker.getCategory());
-        resultMap.put(DESCRIPTION_FIELD, marker.getDescription());
-        resultMap.put(PHOTO_URL_FIELD, marker.getPhotoUrl());
-        resultMap.put(TRACK_ID_FIELD, marker.getTrackId());
-        resultMap.put(MARKER_ID_FIELD, marker.getId());
-
-        resultMap.put(MARKER_LATITUDE_FIELD, marker.getLocation().getLatitude());
-        resultMap.put(MARKER_LONGITUDE_FIELD, marker.getLocation().getLongitude());
-
-        return resultMap;
-    }
-
-    /**
-     * Prepares a track for display by filling in a result map.
-     *
-     * @param track the track
-     * @return the result map
-     */
-    private Map<String, Object> prepareTrackForDisplay(Track track) {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        TrackStatistics trackStatistics = track.getTrackStatistics();
-        String icon = track.getIcon();
-        String category = icon != null && !icon.equals("") ? null : track.getCategory();
-
-        resultMap.put(IS_RECORDING_FIELD, track.getId().equals(recordingTrackId));
-        resultMap.put(IS_PAUSED_FIELD, recordingTrackPaused);
-        resultMap.put(ICON_ID_FIELD, TrackIconUtils.getIconDrawable(icon));
-        resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_track);
-        resultMap.put(NAME_FIELD, track.getName());
-        resultMap.put(TOTAL_TIME_FIELD, StringUtils.formatElapsedTime(trackStatistics.getTotalTime()));
-        resultMap.put(TOTAL_DISTANCE_FIELD, StringUtils.formatDistance(this, trackStatistics.getTotalDistance(), metricUnits));
-        resultMap.put(MARKER_COUNT_FIELD, contentProviderUtils.getMarkerCount(track.getId()));
-        resultMap.put(START_TIME_FIELD, trackStatistics.getStartTime_ms());
-        resultMap.put(CATEGORY_FIELD, category);
-        resultMap.put(DESCRIPTION_FIELD, track.getDescription());
-        resultMap.put(PHOTO_URL_FIELD, null);
-        resultMap.put(TRACK_ID_FIELD, track.getId());
-        resultMap.put(MARKER_ID_FIELD, null);
-
-        return resultMap;
-    }
-
-    @Override
-    public void onDeleteMarkerDone() {
-        runOnUiThread(() -> handleIntent(getIntent()));
-    }
-
-    @Override
-    protected TrackRecordingServiceConnection getTrackRecordingServiceConnection() {
-        return trackRecordingServiceConnection;
-    }
-
-    @Override
-    protected void onDeleted() {
-        runOnUiThread(() -> handleIntent(getIntent()));
-    }
-}
@@ -18,17 +18,11 @@ package de.dennisguse.opentracks;

 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.graphics.drawable.AnimatedVectorDrawable;
-import android.graphics.drawable.Drawable;
+import android.graphics.drawable.TransitionDrawable;
 import android.os.Handler;
-import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ImageButton;
-import android.widget.Toast;
-
-import androidx.core.content.ContextCompat;
+import android.view.accessibility.AccessibilityEvent;

 import de.dennisguse.opentracks.databinding.TrackControllerBinding;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -42,26 +36,29 @@ import de.dennisguse.opentracks.util.UnitConversions;
 *
 * @author Jimmy Shih
 */
-public class TrackController {
+public class TrackController implements View.OnTouchListener {

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

    private final Activity activity;
    private final TrackRecordingServiceConnection trackRecordingServiceConnection;
-    private final Handler handlerUpdateTotalTime;
+    private final Handler handlerUpdateTotalTime = new Handler();
    private final boolean alwaysShow;
-    private ButtonDelay buttonDelay;
+
+    private Runnable buttonDelay;
+    private final int buttonDelayDuration;

    private final TrackControllerBinding viewBinding;
+    private final TransitionDrawable transition;

    private boolean isRecording;
    private boolean isPaused;
    private long totalTime = 0;
-
    private long totalTimeTimestamp = 0;
-
    private boolean isResumed = false;

+    private final Callback callback;
+
    // A runnable to update the total time.
    private final Runnable updateTotalTimeRunnable = new Runnable() {
        public void run() {
@@ -73,98 +70,98 @@ public class TrackController {
    };

    @SuppressLint("ClickableViewAccessibility")
-    TrackController(Activity activity, TrackControllerBinding viewBinding, TrackRecordingServiceConnection trackRecordingServiceConnection, boolean alwaysShow, OnClickListener recordListener, OnClickListener stopListener) {
+    TrackController(Activity activity, TrackControllerBinding viewBinding, TrackRecordingServiceConnection trackRecordingServiceConnection, boolean alwaysShow, Callback callback) {
        this.activity = activity;
        this.viewBinding = viewBinding;
        this.trackRecordingServiceConnection = trackRecordingServiceConnection;
        this.alwaysShow = alwaysShow;
-        handlerUpdateTotalTime = new Handler();
-        viewBinding.trackControllerRecord.setOnTouchListener((view, motionEvent) -> onRecordTouch(activity, recordListener, motionEvent));
+        this.callback = callback;

-        viewBinding.trackControllerStop.setOnTouchListener((view, motionEvent) -> onStopTouch(activity, stopListener, motionEvent));
+        buttonDelayDuration = activity.getResources().getInteger(R.integer.buttonDelayMillis);
+
+        viewBinding.trackControllerRecord.setOnTouchListener(this);
+        viewBinding.trackControllerRecord.setOnClickListener((view) -> {
+            if (buttonDelay != null || (isRecording && !isPaused)) {
+                return;
+            }
+
+            callback.recordStart();
+        });
+
+        viewBinding.trackControllerStop.setOnTouchListener(this);
+        transition = (TransitionDrawable) viewBinding.trackControllerContainer.getBackground();
    }

-    private boolean onRecordTouch(final Activity activity, final OnClickListener recordListener, final MotionEvent motionEvent) {
-        if (isRecording && !isPaused) {
-            if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                buttonDelay = new ButtonDelay(activity, viewBinding.trackControllerRecord, R.drawable.ic_button_pause_anim, R.string.hold_to_pause, recordListener);
-                new Thread(buttonDelay).start();
-                return true;
-            } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                viewBinding.trackControllerRecord.setImageResource(R.drawable.ic_button_pause);
-                if (buttonDelay != null) {
-                    buttonDelay.canceled = true;
-                }
-                return true;
-            }
-        } else if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-            recordListener.onClick(null);
+    @SuppressLint("ClickableViewAccessibility") //We do accessibility manually.
+    @Override
+    public boolean onTouch(final View view, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_MOVE) {
+            return false;
+        }
+
+        if (buttonDelay != null && event.getAction() == MotionEvent.ACTION_UP) {
+            handlerUpdateTotalTime.removeCallbacks(buttonDelay);
+            buttonDelay = null;
+            view.setPressed(false);
+
+            transition.resetTransition();
+
+            showStatusSetDefaultText();
+
+            return false;
+        }
+
+        //Trigger button pressed animation
+        view.setPressed(true);
+
+        //To pause a recording
+        if (viewBinding.trackControllerRecord.equals(view)
+                && event.getAction() == MotionEvent.ACTION_DOWN
+                && isRecording && !isPaused) {
+
+            transition.startTransition(buttonDelayDuration);
+
+            ActivityUtils.vibrate(activity, 150);
+            viewBinding.trackControllerStatus.setText(R.string.hold_to_pause);
+
+            buttonDelay = () -> {
+                view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+                view.performClick();
+                callback.recordStart(); //TODO Should be recordPause();
+
+                transition.resetTransition();
+
+                ActivityUtils.vibrate(activity, 1000);
+            };
+            handlerUpdateTotalTime.postDelayed(buttonDelay, buttonDelayDuration);
            return true;
        }
+
+        //To stop a recording
+        if (viewBinding.trackControllerStop.equals(view)
+                && event.getAction() == MotionEvent.ACTION_DOWN
+                && isRecording) {
+
+
+            transition.startTransition(buttonDelayDuration);
+
+            ActivityUtils.vibrate(activity, 150);
+            viewBinding.trackControllerStatus.setText(R.string.hold_to_stop);
+
+            buttonDelay = () -> {
+                view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+                callback.recordStop();
+                ActivityUtils.vibrate(activity, 1000);
+
+                transition.resetTransition();
+            };
+            handlerUpdateTotalTime.postDelayed(buttonDelay, buttonDelayDuration);
+            return true;
+        }
+
        return false;
    }

-    private boolean onStopTouch(final Activity activity, final OnClickListener stopListener, final MotionEvent motionEvent) {
-        if (isRecording) {
-            if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                buttonDelay = new ButtonDelay(activity, viewBinding.trackControllerStop, R.drawable.ic_button_stop_anim, R.string.hold_to_stop, stopListener);
-                new Thread(buttonDelay).start();
-                return true;
-            } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                viewBinding.trackControllerStop.setImageResource(R.drawable.ic_button_stop);
-                if (buttonDelay != null) {
-                    buttonDelay.canceled = true;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static class ButtonDelay implements Runnable {
-
-        private boolean canceled = false;
-
-        private final ImageButton imageButton;
-        private final Activity activity;
-        private final OnClickListener clickListener;
-        private final int delayMillis;
-        private final Drawable drawable;
-        private final int delayMessageId;
-
-        private ButtonDelay(final Activity activity, final ImageButton imageButton, final int animDrawableId, final int delayMessageId, final OnClickListener clickListener) {
-            this.activity = activity;
-            this.clickListener = clickListener;
-            this.delayMillis = activity.getResources().getInteger(R.integer.buttonDelayMillis);
-            this.imageButton = imageButton;
-            this.drawable = ContextCompat.getDrawable(activity, animDrawableId);
-            this.delayMessageId = delayMessageId;
-        }
-
-        @Override
-        public void run() {
-            activity.runOnUiThread(() -> {
-                imageButton.setImageDrawable(drawable);
-                if (drawable instanceof AnimatedVectorDrawable) {
-                    ((AnimatedVectorDrawable) drawable).start();
-                }
-                ActivityUtils.vibrate(activity, 150);
-                ActivityUtils.toast(activity, delayMessageId, Toast.LENGTH_SHORT, Gravity.TOP);
-            });
-
-            try {
-                Thread.sleep(delayMillis);
-            } catch (InterruptedException ignored) {
-            }
-            if (!canceled) {
-                activity.runOnUiThread(() -> {
-                    clickListener.onClick(null);
-                    ActivityUtils.vibrate(activity, 1000);
-                });
-            }
-        }
-    }
-
    public void update(boolean recording, boolean paused) {
        if (!isResumed) {
            return;
@@ -182,13 +179,12 @@ public class TrackController {
        viewBinding.trackControllerRecord.setImageResource(isRecording && !isPaused ? R.drawable.ic_button_pause : R.drawable.button_record);
        viewBinding.trackControllerRecord.setContentDescription(activity.getString(isRecording && !isPaused ? R.string.image_pause : R.string.image_record));

-        viewBinding.trackControllerStop.setImageResource(isRecording ? R.drawable.ic_button_stop : R.drawable.ic_button_stop_disabled);
        viewBinding.trackControllerStop.setEnabled(isRecording);

        viewBinding.trackControllerStatus.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
        if (isRecording) {
            viewBinding.trackControllerStatus.setTextColor(activity.getResources().getColor(isPaused ? android.R.color.white : R.color.recording_text));
-            viewBinding.trackControllerStatus.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
+            showStatusSetDefaultText();
        }

        handlerUpdateTotalTime.removeCallbacks(updateTotalTimeRunnable);
@@ -228,4 +224,14 @@ public class TrackController {
        TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
        return trackRecordingService != null ? trackRecordingService.getTotalTime() : 0L;
    }
+
+    private void showStatusSetDefaultText() {
+        viewBinding.trackControllerStatus.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
+    }
+
+    public interface Callback {
+        void recordStart();
+
+        void recordStop();
+    }
 }
@@ -78,6 +78,12 @@ public class TrackDeleteActivity extends AbstractActivity {
        deleteThread.interrupt();
    }

+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        viewBinding = null;
+    }
+
    @Override
    protected View getRootView() {
        viewBinding = TrackDeleteBinding.inflate(getLayoutInflater());
@@ -18,8 +18,6 @@ package de.dennisguse.opentracks;

 import android.os.Bundle;
 import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ArrayAdapter;

@@ -96,19 +94,8 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
            iconValue = track.getIcon();
        }

-        viewBinding.trackEditActivityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue));
-        viewBinding.trackEditActivityTypeIcon.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_UP) {
-                ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.trackEditActivityType.getText().toString());
-            }
-            return true;
-        });
-        viewBinding.trackEditActivityTypeIcon.setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.trackEditActivityType.getText().toString());
-            }
-            return true;
-        });
+        setActivityTypeIcon(iconValue);
+        viewBinding.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.trackEditActivityType.getText().toString()));

        viewBinding.trackEditDescription.setText(track.getDescription());

@@ -156,7 +143,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit

    private void setActivityTypeIcon(String iconValue) {
        this.iconValue = iconValue;
-        TrackIconUtils.setIconSpinner(viewBinding.trackEditActivityTypeIcon, iconValue);
+        viewBinding.trackEditActivityTypeIcon.setImageResource(TrackIconUtils.getIconDrawable(iconValue));
    }

    @Override
@@ -33,15 +33,14 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import androidx.loader.app.LoaderManager;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;

@@ -60,14 +59,13 @@ import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.util.TrackUtils;

 /**
 * An activity displaying a list of tracks.
 *
 * @author Leif Hendrik Wilden
 */
-public class TrackListActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
+public class TrackListActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackController.Callback {

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

@@ -80,26 +78,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe

    private TrackListBinding viewBinding;

-    private final LoaderCallbacks<Cursor> loaderCallbacks = new LoaderCallbacks<Cursor>() {
-        @Override
-        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-            String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
-                    TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME,
-                    TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, "markerCount"};
-
-            return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, null, null, TrackUtils.TRACK_SORT_ORDER);
-        }
-
-        @Override
-        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-            resourceCursorAdapter.swapCursor(cursor);
-        }
-
-        @Override
-        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-            resourceCursorAdapter.swapCursor(null);
-        }
-    };
+    private final TrackLoaderCallBack loaderCallbacks = new TrackLoaderCallBack();

    // Preferences
    private boolean metricUnits = true;
@@ -117,8 +96,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        }

        @Override
-        public boolean onClick(int itemId, int[] positions, long[] ids) {
-            return handleContextItem(itemId, ids);
+        public boolean onClick(int itemId, int[] positions, long[] trackIds) {
+            return handleContextItem(itemId, trackIds);
        }
    };

@@ -142,7 +121,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
            if (key != null) {
                runOnUiThread(() -> {
                    TrackListActivity.this.invalidateOptionsMenu();
-                    LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
+                    loaderCallbacks.restart();
                    boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
                    trackController.update(isRecording, recordingTrackPaused);
                });
@@ -154,14 +133,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
    private MenuItem searchMenuItem;
    private MenuItem startGpsMenuItem;

-    private final OnClickListener stopListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            updateMenuItems(false, false);
-            trackRecordingServiceConnection.stopRecording(TrackListActivity.this, true);
-        }
-    };
-
    // Callback when the trackRecordingServiceConnection binding changes.
    private final Runnable bindChangedCallback = new Runnable() {
        @Override
@@ -196,33 +167,13 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        }
    };

-    private final OnClickListener recordListener = new OnClickListener() {
-        public void onClick(View v) {
-            if (!PreferencesUtils.isRecording(recordingTrackId)) {
-                // Not recording -> Recording
-                updateMenuItems(false, true);
-                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
-                startActivity(newIntent);
-            } else if (recordingTrackPaused) {
-                // Paused -> Resume
-                updateMenuItems(false, true);
-                trackRecordingServiceConnection.resumeTrack();
-                trackController.update(true, false);
-            } else {
-                // Recording -> Paused
-                updateMenuItems(false, true);
-                trackRecordingServiceConnection.pauseTrack();
-                trackController.update(true, true);
-            }
-        }
-    };
-
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        // Reset theme after splash
        setTheme(R.style.ThemeCustom);

        super.onCreate(savedInstanceState);
+        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);

        gpsStatusValue = GpsStatusValue.GPS_NONE;

@@ -231,9 +182,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        sharedPreferences = PreferencesUtils.getSharedPreferences(this);

        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
-        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, true, recordListener, stopListener);
+        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, true, this);

-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);

        // Show trackController when search dialog is dismissed
        SearchManager searchManager = (SearchManager) getSystemService(SEARCH_SERVICE);
@@ -287,14 +237,19 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
            }
        };
        viewBinding.trackList.setAdapter(resourceCursorAdapter);
-
        ActivityUtils.configureListViewContextualMenu(viewBinding.trackList, contextualActionModeCallback);

-        LoaderManager.getInstance(this).initLoader(0, null, loaderCallbacks);
+        loadData(getIntent());

        requestGPSPermissions();
    }

+    @Override
+    protected void setupActionBarBack(Toolbar toolbar) {
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_logo_color_24dp);
+    }
+
    @Override
    protected void onStart() {
        super.onStart();
@@ -304,6 +259,14 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        trackRecordingServiceConnection.startConnection(this);
    }

+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        // Update UI
+        trackController.onPause();
+    }
+
    @Override
    protected void onResume() {
        super.onResume();
@@ -314,14 +277,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        trackController.onResume(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused);
    }

-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        // Update UI
-        trackController.onPause();
-    }
-
    @Override
    protected void onStop() {
        super.onStop();
@@ -372,43 +327,45 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-        Intent intent;
-        switch (item.getItemId()) {
-            case R.id.track_list_start_gps:
-                LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
-                if (locationManager != null && !locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
-                    intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-                    startActivity(intent);
+        if (item.getItemId() == R.id.track_list_start_gps) {
+            LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
+            if (locationManager != null && !locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+                startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+            } else {
+                // Invoke trackRecordingService
+                if (!isGpsStarted()) {
+                    trackRecordingServiceConnection.startAndBind(this);
+                    bindChangedCallback.run();
                } else {
-                    // Invoke trackRecordingService
-                    if (!isGpsStarted()) {
-                        trackRecordingServiceConnection.startAndBind(this);
-                        bindChangedCallback.run();
-                    } else {
-                        TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
-                        if (trackRecordingService != null) {
-                            trackRecordingService.stopGps();
-                        }
-                        trackRecordingServiceConnection.unbindAndStop(this);
+                    TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
+                    if (trackRecordingService != null) {
+                        trackRecordingService.stopGps();
                    }
-
-                    // Update menu after starting or stopping gps
-                    this.invalidateOptionsMenu();
+                    trackRecordingServiceConnection.unbindAndStop(this);
                }
-                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);
-                return true;
-            case R.id.track_list_settings:
-                intent = IntentUtils.newIntent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
+
+                // Update menu after starting or stopping gps
+                this.invalidateOptionsMenu();
+            }
+
+            return true;
        }
+
+        if (item.getItemId() == R.id.track_list_aggregated_stats) {
+            startActivity(IntentUtils.newIntent(this, AggregatedStatisticsActivity.class));
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_list_markers) {
+            startActivity(IntentUtils.newIntent(this, MarkerListActivity.class));
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_list_settings) {
+            startActivity(IntentUtils.newIntent(this, SettingsActivity.class));
+            return true;
+        }
+
        return super.onOptionsItemSelected(item);
    }

@@ -420,6 +377,36 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
        return super.onKeyUp(keyCode, event);
    }

+    @Override
+    public void onBackPressed() {
+        if (loaderCallbacks.getSearchQuery() != null) {
+            loaderCallbacks.setSearch(null);
+            return;
+        }
+        SearchView searchView = (SearchView) searchMenuItem.getActionView();
+        if (!searchView.isIconified()) {
+            searchView.setIconified(true);
+            return;
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        loadData(intent);
+    }
+
+    private void loadData(Intent intent) {
+        String searchQuery = null;
+        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+            searchQuery = intent.getStringExtra(SearchManager.QUERY);
+        }
+
+        loaderCallbacks.setSearch(searchQuery);
+    }
+
    @Override
    public boolean onSearchRequested() {
        // Hide trackController when search dialog is shown
@@ -433,7 +420,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
    }

    @Override
-    protected void onDeleted() {
+    protected void onTrackDeleted() {
        // Do nothing
    }

@@ -489,31 +476,116 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
            trackIds[i] = new Track.Id(longTrackIds[i]);
        }

-        Intent intent;
-        switch (itemId) {
-            case R.id.list_context_menu_show_on_map:
-                IntentDashboardUtils.startDashboard(this, false, trackIds);
-                return true;
-            case R.id.list_context_menu_share:
-                intent = IntentUtils.newShareFileIntent(this, trackIds);
-                intent = Intent.createChooser(intent, null);
-                startActivity(intent);
-                return true;
-            case R.id.list_context_menu_edit:
-                intent = IntentUtils.newIntent(this, TrackEditActivity.class)
-                        .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackIds[0]);
-                startActivity(intent);
-                return true;
-            case R.id.list_context_menu_delete:
-                deleteTracks(trackIds);
-                return true;
-            case R.id.list_context_menu_select_all:
-                int size = viewBinding.trackList.getCount();
-                for (int i = 0; i < size; i++) {
-                    viewBinding.trackList.setItemChecked(i, true);
-                }
-                return false;
+        if (itemId == R.id.list_context_menu_show_on_map) {
+            IntentDashboardUtils.startDashboard(this, false, trackIds);
+            return true;
        }
+
+        if (itemId == R.id.list_context_menu_share) {
+            Intent intent = IntentUtils.newShareFileIntent(this, trackIds);
+            intent = Intent.createChooser(intent, null);
+            startActivity(intent);
+            return true;
+        }
+
+
+        if (itemId == R.id.list_context_menu_edit) {
+            Intent intent = IntentUtils.newIntent(this, TrackEditActivity.class)
+                    .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackIds[0]);
+            startActivity(intent);
+            return true;
+        }
+
+        if (itemId == R.id.list_context_menu_delete) {
+            deleteTracks(trackIds);
+            return true;
+        }
+        if (itemId == R.id.list_context_menu_select_all) {
+            for (int i = 0; i < viewBinding.trackList.getCount(); i++) {
+                viewBinding.trackList.setItemChecked(i, true);
+            }
+            return false;
+        }
+
        return false;
    }
+
+    private class TrackLoaderCallBack implements LoaderManager.LoaderCallbacks<Cursor> {
+
+        private String searchQuery = null;
+
+        public String getSearchQuery() {
+            return searchQuery;
+        }
+
+        public void setSearch(String searchQuery) {
+            this.searchQuery = searchQuery;
+            restart();
+            if (searchQuery != null) {
+                setTitle(searchQuery);
+            } else {
+                setTitle(R.string.app_name);
+            }
+        }
+
+        public void restart() {
+            LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
+        }
+
+        @NonNull
+        @Override
+        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
+            final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
+                    TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME,
+                    TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT};
+
+            final String sortOrder = TracksColumns.STARTTIME + " DESC";
+
+            if (searchQuery == null) {
+                return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, null, null, sortOrder);
+            } else {
+                final String SEARCH_QUERY = TracksColumns.NAME + " LIKE ? OR " +
+                        TracksColumns.DESCRIPTION + " LIKE ? OR " +
+                        TracksColumns.CATEGORY + " LIKE ?";
+                final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
+                return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, sortOrder);
+            }
+        }
+
+        @Override
+        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
+            resourceCursorAdapter.swapCursor(cursor);
+        }
+
+        @Override
+        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+            resourceCursorAdapter.swapCursor(null);
+        }
+    }
+
+    @Override
+    public void recordStart() {
+        if (!PreferencesUtils.isRecording(recordingTrackId)) {
+            // Not recording -> Recording
+            updateMenuItems(false, true);
+            Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
+            startActivity(newIntent);
+        } else if (recordingTrackPaused) {
+            // Paused -> Resume
+            updateMenuItems(false, true);
+            trackRecordingServiceConnection.resumeTrack();
+            trackController.update(true, false);
+        } else {
+            // Recording -> Paused
+            updateMenuItems(false, true);
+            trackRecordingServiceConnection.pauseTrack();
+            trackController.update(true, true);
+        }
+    }
+
+    @Override
+    public void recordStop() {
+        updateMenuItems(false, false);
+        trackRecordingServiceConnection.stopRecording(TrackListActivity.this, true);
+    }
 }
@@ -25,8 +25,10 @@ import android.view.View;

 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import com.google.android.material.tabs.TabLayoutMediator;

 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.data.Marker;
@@ -75,8 +77,10 @@ public class TrackRecordedActivity extends AbstractListActivity implements Confi

        trackDataHub = new TrackDataHub(this);

-        viewBinding.trackDetailActivityViewPager.setAdapter(new CustomFragmentPagerAdapter(getSupportFragmentManager(), FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT));
-        viewBinding.trackDetailActivityTablayout.setupWithViewPager(viewBinding.trackDetailActivityViewPager);
+        CustomFragmentPagerAdapter pagerAdapter = new CustomFragmentPagerAdapter(this);
+        viewBinding.trackDetailActivityViewPager.setAdapter(pagerAdapter);
+        new TabLayoutMediator(viewBinding.trackDetailActivityTablayout, viewBinding.trackDetailActivityViewPager,
+                (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position))).attach();
        if (savedInstanceState != null) {
            viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
        }
@@ -142,43 +146,51 @@ public class TrackRecordedActivity extends AbstractListActivity implements Confi

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-        Intent intent;
-        switch (item.getItemId()) {
-            case R.id.track_detail_share:
-                intent = IntentUtils.newShareFileIntent(this, trackId);
-                intent = Intent.createChooser(intent, null);
-                startActivity(intent);
-                return true;
-            case R.id.track_detail_menu_show_on_map:
-                IntentDashboardUtils.startDashboard(this, false, trackId);
-                return true;
-            case R.id.track_detail_markers:
-                intent = IntentUtils.newIntent(this, MarkerListActivity.class)
-                        .putExtra(MarkerListActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(intent);
-                return true;
-            case R.id.track_detail_edit:
-                intent = IntentUtils.newIntent(this, TrackEditActivity.class)
-                        .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(intent);
-                return true;
-            case R.id.track_detail_delete:
-                deleteTracks(trackId);
-                return true;
-            case R.id.track_detail_resume_track:
-                Intent newIntent = IntentUtils.newIntent(TrackRecordedActivity.this, TrackRecordingActivity.class)
-                        .putExtra(TrackRecordingActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(newIntent);
-                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-                finish();
-                return true;
-            case R.id.track_detail_settings:
-                intent = IntentUtils.newIntent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == R.id.track_detail_share) {
+            Intent intent = Intent.createChooser(IntentUtils.newShareFileIntent(this, trackId), null);
+            startActivity(intent);
+            return true;
        }
+
+        if (item.getItemId() == R.id.track_detail_menu_show_on_map) {
+            IntentDashboardUtils.startDashboard(this, false, trackId);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_detail_markers) {
+            Intent intent = IntentUtils.newIntent(this, MarkerListActivity.class)
+                    .putExtra(MarkerListActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(intent);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_detail_edit) {
+            Intent intent = IntentUtils.newIntent(this, TrackEditActivity.class)
+                    .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(intent);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_detail_delete) {
+            deleteTracks(trackId);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_detail_resume_track) {
+            Intent newIntent = IntentUtils.newIntent(TrackRecordedActivity.this, TrackRecordingActivity.class)
+                    .putExtra(TrackRecordingActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(newIntent);
+            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+            finish();
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_detail_settings) {
+            startActivity(IntentUtils.newIntent(this, SettingsActivity.class));
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
    }

    @Override
@@ -188,7 +200,7 @@ public class TrackRecordedActivity extends AbstractListActivity implements Confi
    }

    @Override
-    protected void onDeleted() {
+    protected void onTrackDeleted() {
        runOnUiThread(this::finish);
    }

@@ -220,20 +232,15 @@ public class TrackRecordedActivity extends AbstractListActivity implements Confi
        }
    }

-    private class CustomFragmentPagerAdapter extends FragmentPagerAdapter {
+    private class CustomFragmentPagerAdapter extends FragmentStateAdapter {

-        public CustomFragmentPagerAdapter(@NonNull FragmentManager fm, int behavior) {
-            super(fm, behavior);
-        }
-
-        @Override
-        public int getCount() {
-            return 4;
+        public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
+            super(fa);
        }

        @NonNull
        @Override
-        public Fragment getItem(int position) {
+        public Fragment createFragment(int position) {
            switch (position) {
                case 0:
                    return StatisticsRecordedFragment.newInstance(trackId);
@@ -249,6 +256,10 @@ public class TrackRecordedActivity extends AbstractListActivity implements Confi
        }

        @Override
+        public int getItemCount() {
+            return 4;
+        }
+
        public CharSequence getPageTitle(int position) {
            switch (position) {
                case 0:
@@ -9,13 +9,14 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.WindowManager;

 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import com.google.android.material.tabs.TabLayoutMediator;

 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.data.Track;
@@ -42,7 +43,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
 */
 //NOTE: This activity does NOT react to preference changes of R.string.recording_track_id_key.
 //This mode of communication should be removed anyhow.
-public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface {
+public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface, TrackController.Callback {

    public static final String EXTRA_TRACK_ID = "track_id";

@@ -126,36 +127,6 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
    private MenuItem insertMarkerMenuItem;
    private MenuItem markerListMenuItem;

-    private final OnClickListener recordListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (recordingTrackPaused) {
-                // Paused -> Resume
-                updateMenuItems(false);
-                trackRecordingServiceConnection.resumeTrack();
-                trackController.update(true, false);
-            } else {
-                // Recording -> Paused
-                updateMenuItems(true);
-                trackRecordingServiceConnection.pauseTrack();
-                trackController.update(true, true);
-            }
-        }
-    };
-
-    private final OnClickListener stopListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this, true);
-            Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackRecordedActivity.class)
-                    .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-            startActivity(newIntent);
-            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-            updateMenuItems(true);
-            finish();
-        }
-    };
-
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -179,13 +150,15 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
        trackDataHub = new TrackDataHub(this);

-        viewBinding.trackDetailActivityViewPager.setAdapter(new CustomFragmentPagerAdapter(getSupportFragmentManager(), FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT));
-        viewBinding.trackDetailActivityTablayout.setupWithViewPager(viewBinding.trackDetailActivityViewPager);
+        CustomFragmentPagerAdapter pagerAdapter = new CustomFragmentPagerAdapter(this);
+        viewBinding.trackDetailActivityViewPager.setAdapter(pagerAdapter);
+        new TabLayoutMediator(viewBinding.trackDetailActivityTablayout, viewBinding.trackDetailActivityViewPager,
+                (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position))).attach();
        if (savedInstanceState != null) {
            viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
        }

-        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, false, recordListener, stopListener);
+        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, false, this);
    }

    @Override
@@ -305,34 +278,41 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-        Intent intent;
-        switch (item.getItemId()) {
-            case R.id.track_detail_insert_marker:
-                intent = IntentUtils
-                        .newIntent(this, MarkerEditActivity.class)
-                        .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(intent);
-                return true;
-            case R.id.track_detail_menu_show_on_map:
-                IntentDashboardUtils.startDashboard(this, true, trackId);
-                return true;
-            case R.id.track_detail_markers:
-                intent = IntentUtils.newIntent(this, MarkerListActivity.class)
-                        .putExtra(MarkerListActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(intent);
-                return true;
-            case R.id.track_detail_edit:
-                intent = IntentUtils.newIntent(this, TrackEditActivity.class)
-                        .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(intent);
-                return true;
-            case R.id.track_detail_settings:
-                intent = IntentUtils.newIntent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == R.id.track_detail_insert_marker) {
+            Intent intent = IntentUtils
+                    .newIntent(this, MarkerEditActivity.class)
+                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(intent);
+            return true;
        }
+
+        if (item.getItemId() == R.id.track_detail_menu_show_on_map) {
+            IntentDashboardUtils.startDashboard(this, true, trackId);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_detail_markers) {
+            Intent intent = IntentUtils.newIntent(this, MarkerListActivity.class)
+                    .putExtra(MarkerListActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(intent);
+            return true;
+
+        }
+
+        if (item.getItemId() == R.id.track_detail_edit) {
+            Intent intent = IntentUtils.newIntent(this, TrackEditActivity.class)
+                    .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(intent);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.track_detail_settings) {
+            Intent intent = IntentUtils.newIntent(this, SettingsActivity.class);
+            startActivity(intent);
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
    }

    /**
@@ -363,20 +343,41 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
    }

-    private class CustomFragmentPagerAdapter extends FragmentPagerAdapter {
-
-        public CustomFragmentPagerAdapter(@NonNull FragmentManager fm, int behavior) {
-            super(fm, behavior);
+    @Override
+    public void recordStart() {
+        if (recordingTrackPaused) {
+            // Paused -> Resume
+            updateMenuItems(false);
+            trackRecordingServiceConnection.resumeTrack();
+            trackController.update(true, false);
+        } else {
+            // Recording -> Paused
+            updateMenuItems(true);
+            trackRecordingServiceConnection.pauseTrack();
+            trackController.update(true, true);
        }
+    }

-        @Override
-        public int getCount() {
-            return 4;
+    @Override
+    public void recordStop() {
+        trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this, true);
+        Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackRecordedActivity.class)
+                .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
+        startActivity(newIntent);
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+        updateMenuItems(true);
+        finish();
+    }
+
+    private class CustomFragmentPagerAdapter extends FragmentStateAdapter {
+
+        public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
+            super(fa);
        }

        @NonNull
        @Override
-        public Fragment getItem(int position) {
+        public Fragment createFragment(int position) {
            switch (position) {
                case 0:
                    return StatisticsRecordingFragment.newInstance();
@@ -392,6 +393,10 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        }

        @Override
+        public int getItemCount() {
+            return 4;
+        }
+
        public CharSequence getPageTitle(int position) {
            switch (position) {
                case 0:
@@ -46,49 +46,45 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {

    @Override
    public View getView(int position, View convertView, ViewGroup parent) {
-        AggregatedStatistics.AggregatedStatistic aggregatedStats = getItem(position);
-        ViewHolder viewHolder;
+        AggregatedStatistics.AggregatedStatistic aggregatedStatistic = getItem(position);

-        if (isSpeedSport(position)) {
-            viewHolder = new ViewSpeedHolder();
+        ViewHolder viewHolder;
+        if (convertView == null) {
+            convertView = LayoutInflater.from(context).inflate(R.layout.aggregated_stats_list_item, parent, false);
+            viewHolder = new ViewHolder(convertView);
+            convertView.setTag(viewHolder);
        } else {
-            viewHolder = new ViewPaceHolder();
+            viewHolder = (ViewHolder) convertView.getTag();
        }

-        convertView = LayoutInflater.from(context).inflate(R.layout.aggregated_stats_list_item, parent, false);
-        viewHolder.setValues(convertView, getIcon(position), getName(position), aggregatedStats);
+        if (TrackIconUtils.isSpeedIcon(context, aggregatedStatistic.getCategory())) {
+            viewHolder.setSpeed(aggregatedStatistic);
+        } else {
+            viewHolder.setPace(aggregatedStatistic);
+        }

        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;
+        private final ImageView sportIcon;
+        private final TextView typeLabel;
+        private final TextView numTracks;
+        private final TextView distance;
+        private final TextView distanceUnit;
+        private final TextView time;

-        public void setValues(View view, int iconDrawable, String name, AggregatedStatistics.AggregatedStatistic aggregatedStats) {
-            reportSpeed = PreferencesUtils.isReportSpeed(context, name);
-            metricsUnits = PreferencesUtils.isMetricUnits(context);
+        private final TextView avgSpeed;
+        private final TextView avgSpeedUnit;
+        private final TextView avgSpeedLabel;
+        private final TextView maxSpeed;
+        private final TextView maxSpeedUnit;
+        private final TextView maxSpeedLabel;

+        private boolean metricsUnits;
+        private boolean reportSpeed;
+
+        public ViewHolder(View view) {
            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);
@@ -96,86 +92,68 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
            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);
+        }

+        public void setSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
+            setCommonValues(aggregatedStatistic);
            {
-                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStats.getTrackStatistics().getAverageMovingSpeed(), metricsUnits, reportSpeed);
+                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStatistic.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);
+                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStatistic.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);

+        public void setPace(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
+            setCommonValues(aggregatedStatistic);
            {
-                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, aggregatedStatistic.getTrackStatistics().getAverageMovingSpeed(), metricsUnits, reportSpeed);
+                avgSpeed.setText(parts.first);
+                avgSpeedUnit.setText(parts.second);
+                avgSpeedLabel.setText(context.getString(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);
+                Pair<String, String> parts = StringUtils.getSpeedParts(context, aggregatedStatistic.getTrackStatistics().getMaxSpeed(), metricsUnits, reportSpeed);
+                maxSpeed.setText(parts.first);
+                maxSpeedUnit.setText(parts.second);
+                maxSpeedLabel.setText(R.string.stats_fastest_pace);
            }
        }
+
+        private void setCommonValues(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
+            String category = aggregatedStatistic.getCategory();
+
+            reportSpeed = PreferencesUtils.isReportSpeed(context, category);
+            metricsUnits = PreferencesUtils.isMetricUnits(context);
+
+            sportIcon.setImageResource(getIcon(aggregatedStatistic));
+            typeLabel.setText(category);
+            numTracks.setText(StringUtils.valueInParentheses(String.valueOf(aggregatedStatistic.getCountTracks())));
+
+            Pair<String, String> parts = StringUtils.getDistanceParts(context, aggregatedStatistic.getTrackStatistics().getTotalDistance(), metricsUnits);
+            distance.setText(parts.first);
+            distanceUnit.setText(parts.second);
+
+            time.setText(StringUtils.formatElapsedTime(aggregatedStatistic.getTrackStatistics().getMovingTime()));
+        }
+
+        private int getIcon(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
+            String iconValue = TrackIconUtils.getIconValue(context, aggregatedStatistic.getCategory());
+            return TrackIconUtils.getIconDrawable(iconValue);
+        }
    }
 }
@@ -1,7 +1,6 @@
 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;
@@ -20,10 +19,9 @@ import de.dennisguse.opentracks.viewmodels.IntervalStatistics;

 public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.Interval> {

-    private StackMode stackMode;
-    private boolean metricUnits;
-    private float sumDistance_m;
-    private String category;
+    private final StackMode stackMode;
+    private final boolean metricUnits;
+    private final String category;

    public IntervalStatisticsAdapter(Context context, List<IntervalStatistics.Interval> intervalList, String category, StackMode stackMode) {
        super(context, R.layout.interval_stats_list_item, intervalList);
@@ -47,12 +45,14 @@ public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.I
            viewHolder.distance = intervalView.findViewById(R.id.interval_item_distance);
            viewHolder.rate = intervalView.findViewById(R.id.interval_item_rate);
            viewHolder.gain = intervalView.findViewById(R.id.interval_item_gain);
+            viewHolder.loss = intervalView.findViewById(R.id.interval_item_loss);

            intervalView.setTag(viewHolder);
        } else {
            viewHolder = (ViewHolder) intervalView.getTag();
        }

+        float sumDistance_m;
        if (actualPosition + 1 == getCount() && actualPosition > 0) {
            sumDistance_m = actualPosition * getItem(actualPosition - 1).getDistance_m() + interval.getDistance_m();
        } else {
@@ -61,15 +61,13 @@ public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.I
        viewHolder.distance.setText(StringUtils.formatDistance(getContext(), sumDistance_m, metricUnits));

        if (PreferencesUtils.isReportSpeed(getContext(), category)) {
-            Pair<String, String> speedParts = StringUtils.getSpeedParts(getContext(), interval.getSpeed_ms(), metricUnits, true);
-            viewHolder.rate.setText(speedParts.first + " " + speedParts.second);
+            viewHolder.rate.setText(StringUtils.formatSpeed(getContext(), interval.getSpeed_ms(), metricUnits, true));
        } else {
-            Pair<String, String> paceParts = StringUtils.getSpeedParts(getContext(), interval.getSpeed_ms(), metricUnits, false);
-            viewHolder.rate.setText(paceParts.first + " " + paceParts.second);
+            viewHolder.rate.setText(StringUtils.formatSpeed(getContext(), interval.getSpeed_ms(), metricUnits, false));
        }

-        Pair<String, String> gainParts = StringUtils.formatElevation(getContext(), interval.getGain_m(), metricUnits);
-        viewHolder.gain.setText(gainParts.first + " " + gainParts.second);
+        viewHolder.gain.setText(StringUtils.formatDistance(getContext(), interval.getGain_m(), metricUnits));
+        viewHolder.loss.setText(StringUtils.formatDistance(getContext(), interval.getLoss_m(), metricUnits));

        return intervalView;
    }
@@ -86,5 +84,6 @@ public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.I
        private TextView distance;
        private TextView rate;
        private TextView gain;
+        private TextView loss;
    }
 }
@@ -0,0 +1,158 @@
+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.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.sensor.SensorData;
+import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
+import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower;
+import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
+import de.dennisguse.opentracks.util.StringUtils;
+
+public class SensorsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public static final int HEART_RATE_TYPE = 0;
+    public static final int CADENCE_TYPE = 1;
+    public static final int POWER_TYPE = 2;
+
+    private List<Pair<Integer, SensorData>> sensorDataList;
+    private final Context context;
+
+    public SensorsAdapter(Context context) {
+        this.context = context;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sensor_item, parent, false);
+        return new SensorsAdapter.ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        SensorsAdapter.ViewHolder viewHolder = (SensorsAdapter.ViewHolder) holder;
+        int type = sensorDataList.get(position).first;
+        SensorData sensorData = sensorDataList.get(position).second;
+        viewHolder.setData(sensorData, type);
+    }
+
+    @Override
+    public int getItemCount() {
+        if (sensorDataList == null) {
+            return 0;
+        } else {
+            return sensorDataList.size();
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return sensorDataList.get(position).first;
+    }
+
+    public List<Pair<Integer, SensorData>> swapData(List<Pair<Integer, SensorData>> data) {
+        if (sensorDataList == data) {
+            return null;
+        }
+
+        sensorDataList = data;
+
+        if (data != null) {
+            this.notifyDataSetChanged();
+        }
+
+        return data;
+    }
+
+    private class ViewHolder extends RecyclerView.ViewHolder {
+        TextView label;
+        TextView sensorValue;
+        TextView value;
+        TextView unit;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            label = itemView.findViewById(R.id.stats_sensor_label);
+            sensorValue = itemView.findViewById(R.id.stats_sensor_sensor_value);
+            value = itemView.findViewById(R.id.stats_sensor_value);
+            unit = itemView.findViewById(R.id.stats_sensor_unit);
+        }
+
+        public void setData(SensorData sensorData, int type) {
+            switch (type) {
+                case HEART_RATE_TYPE:
+                    setHeartRateSensorData((SensorDataHeartRate) sensorData);
+                    break;
+                case CADENCE_TYPE:
+                    setCadenceSensorData((SensorDataCycling.Cadence) sensorData);
+                    break;
+                case POWER_TYPE:
+                    setPowerSensorData((SensorDataCyclingPower) sensorData);
+                    break;
+                default:
+                    throw new RuntimeException("Unknown sensor type");
+            }
+        }
+
+        private void setHeartRateSensorData(SensorDataHeartRate data) {
+            String sensorValue = context.getString(R.string.value_unknown);
+            String sensorName = context.getString(R.string.value_unknown);
+            if (data != null) {
+                sensorName = data.getSensorNameOrAddress();
+                if (data.hasHeartRate_bpm() && data.isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(data.getHeartRate_bpm(), 0);
+                }
+            }
+
+            this.label.setText(context.getString(R.string.sensor_state_heart_rate));
+            this.sensorValue.setText(sensorName);
+            this.value.setText(sensorValue);
+            this.unit.setText(R.string.sensor_unit_beats_per_minute);
+        }
+
+        private void setCadenceSensorData(SensorDataCycling.Cadence data) {
+            String sensorValue = context.getString(R.string.value_unknown);
+            String sensorName = context.getString(R.string.value_unknown);
+            if (data != null) {
+                sensorName = data.getSensorNameOrAddress();
+
+                if (data.hasCadence_rpm() && data.isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(data.getCadence_rpm(), 0);
+                }
+            }
+
+            this.label.setText(context.getString(R.string.sensor_state_cadence));
+            this.sensorValue.setText(sensorName);
+            this.value.setText(sensorValue);
+            this.unit.setText(R.string.sensor_unit_rounds_per_minute);
+        }
+
+        private void setPowerSensorData(SensorDataCyclingPower data) {
+            String sensorValue = context.getString(R.string.value_unknown);
+            String sensorName = context.getString(R.string.value_unknown);
+            if (data != null) {
+                sensorName = data.getSensorNameOrAddress();
+
+                if (data.hasPower_w() && data.isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(data.getPower_w(), 0);
+                }
+            }
+
+            this.label.setText(context.getString(R.string.sensor_state_power));
+            this.sensorValue.setText(sensorName);
+            this.value.setText(sensorValue);
+            this.unit.setText(R.string.sensor_unit_power);
+        }
+    }
+}
@@ -68,7 +68,7 @@ abstract class ChartValueSeries {
     * @param fillColor       the fill color
     * @param strokeColor     the stroke color
     */
-    ChartValueSeries(Context context, int absoluteMin, int absoluteMax, int[] intervalValues, int metricTitleId, int imperialTitleId, int fillColor, int strokeColor) {
+    ChartValueSeries(Context context, int absoluteMin, int absoluteMax, int[] intervalValues, int metricTitleId, int imperialTitleId, int fillColor, int strokeColor, int fontSizeSmall, int fontSizeMedium) {
        this.absoluteMin = absoluteMin;
        this.absoluteMax = absoluteMax;
        this.intervalValues = intervalValues;
@@ -85,16 +85,14 @@ abstract class ChartValueSeries {
        strokePaint.setColor(context.getResources().getColor(strokeColor));
        strokePaint.setAntiAlias(true);

-        float scale = context.getResources().getDisplayMetrics().density;
-
        // Make copies of the stroke paint with the default thickness
        titlePaint = new Paint(strokePaint);
-        titlePaint.setTextSize(ChartView.MEDIUM_TEXT_SIZE * scale);
+        titlePaint.setTextSize(fontSizeMedium);
        titlePaint.setTextAlign(Align.CENTER);
        titlePaint.setStyle(Style.FILL_AND_STROKE);

        markerPaint = new Paint(strokePaint);
-        markerPaint.setTextSize(ChartView.SMALL_TEXT_SIZE * scale);
+        markerPaint.setTextSize(fontSizeSmall);
        markerPaint.setTextAlign(Align.RIGHT);
        markerPaint.setStyle(Style.FILL_AND_STROKE);

@@ -30,9 +30,11 @@ import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.View;
+import android.view.ViewParent;
 import android.widget.Scroller;

 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.GestureDetectorCompat;

 import java.text.NumberFormat;
@@ -58,9 +60,6 @@ import de.dennisguse.opentracks.util.UnitConversions;
 */
 public class ChartView extends View {

-    static final float MEDIUM_TEXT_SIZE = 18f;
-    static final float SMALL_TEXT_SIZE = 12f;
-
    static final int Y_AXIS_INTERVALS = 5;

    private static final int TARGET_X_AXIS_INTERVALS = 4;
@@ -114,7 +113,7 @@ public class ChartView extends View {
    private int effectiveWidth = 0;
    private int effectiveHeight = 0;

-    private boolean chartByDistance;
+    private final boolean chartByDistance;
    private boolean metricUnits = true;
    private boolean reportSpeed = true;
    private boolean showPointer = false;
@@ -192,6 +191,9 @@ public class ChartView extends View {
    public ChartView(Context context, final boolean chartByDistance) {
        super(context);
        this.chartByDistance = chartByDistance;
+        int fontSizeSmall = ThemeUtils.getFontSizeSmallInPx(context);
+        int fontSizeMedium = ThemeUtils.getFontSizeMediumInPx(context);
+
        seriesList.add(new ChartValueSeries(context,
                Integer.MIN_VALUE,
                Integer.MAX_VALUE,
@@ -199,7 +201,9 @@ public class ChartView extends View {
                R.string.description_elevation_metric,
                R.string.description_elevation_imperial,
                R.color.chart_elevation_fill,
-                R.color.chart_elevation_border) {
+                R.color.chart_elevation_border,
+                fontSizeSmall,
+                fontSizeMedium) {
            @Override
            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                return chartPoint.getElevation();
@@ -218,7 +222,9 @@ public class ChartView extends View {
                R.string.description_speed_metric,
                R.string.description_speed_imperial,
                R.color.chart_speed_fill,
-                R.color.chart_speed_border) {
+                R.color.chart_speed_border,
+                fontSizeSmall,
+                fontSizeMedium) {
            @Override
            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                return chartPoint.getSpeed();
@@ -238,7 +244,9 @@ public class ChartView extends View {
                R.string.description_pace_metric,
                R.string.description_pace_imperial,
                R.color.chart_pace_fill,
-                R.color.chart_pace_border) {
+                R.color.chart_pace_border,
+                fontSizeSmall,
+                fontSizeMedium) {
            @Override
            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                return chartPoint.getPace();
@@ -258,7 +266,9 @@ public class ChartView extends View {
                R.string.description_sensor_heart_rate,
                R.string.description_sensor_heart_rate,
                R.color.chart_heart_rate_fill,
-                R.color.chart_heart_rate_border) {
+                R.color.chart_heart_rate_border,
+                fontSizeSmall,
+                fontSizeMedium) {
            @Override
            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                return chartPoint.getHeartRate();
@@ -277,7 +287,9 @@ public class ChartView extends View {
                R.string.description_sensor_cadence,
                R.string.description_sensor_cadence,
                R.color.chart_cadence_fill,
-                R.color.chart_cadence_border) {
+                R.color.chart_cadence_border,
+                fontSizeSmall,
+                fontSizeMedium) {
            @Override
            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                return chartPoint.getCadence();
@@ -295,7 +307,9 @@ public class ChartView extends View {
                R.string.description_sensor_power,
                R.string.description_sensor_power,
                R.color.chart_power_fill,
-                R.color.chart_power_border) {
+                R.color.chart_power_border,
+                fontSizeSmall,
+                fontSizeMedium) {
            @Override
            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                return chartPoint.getPower();
@@ -309,13 +323,11 @@ public class ChartView extends View {

        backgroundColor = ThemeUtils.getBackgroundColor(context);

-        float scale = context.getResources().getDisplayMetrics().density;
-
        axisPaint = new Paint();
        axisPaint.setStyle(Style.FILL_AND_STROKE);
        axisPaint.setColor(ThemeUtils.getTextColorPrimary(context));
        axisPaint.setAntiAlias(true);
-        axisPaint.setTextSize(SMALL_TEXT_SIZE * scale);
+        axisPaint.setTextSize(fontSizeSmall);

        xAxisMarkerPaint = new Paint(axisPaint);
        xAxisMarkerPaint.setTextAlign(Align.CENTER);
@@ -330,7 +342,7 @@ public class ChartView extends View {
        markerPaint.setStyle(Style.STROKE);
        markerPaint.setAntiAlias(false);

-        pointer = context.getResources().getDrawable(R.drawable.ic_logo_color_24dp);
+        pointer = ContextCompat.getDrawable(context, R.drawable.ic_logo_color_24dp);
        pointer.setBounds(0, 0, pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight());

        markerPin = MarkerUtils.getDefaultPhoto(context);
@@ -489,6 +501,18 @@ public class ChartView extends View {
        invalidate();
    }

+    /**
+     * Handle parent's view disallow touch event.
+     *
+     * @param disallow Does disallow parent touch event?
+     */
+    private void requestDisallowInterceptTouchEventInParent(boolean disallow) {
+        ViewParent parent = getParent();
+        if (parent != null) {
+            parent.requestDisallowInterceptTouchEvent(disallow);
+        }
+    }
+
    /**
     * Scrolls the view horizontally by a given amount.
     *
@@ -496,13 +520,15 @@ public class ChartView extends View {
     */
    private void scrollBy(int deltaX) {
        int scrollX = getScrollX() + deltaX;
-        if (scrollX < 0) {
+        if (scrollX <= 0) {
            scrollX = 0;
        }
+
        int maxWidth = effectiveWidth * (zoomLevel - 1);
-        if (scrollX > maxWidth) {
+        if (scrollX >= maxWidth) {
            scrollX = maxWidth;
        }
+
        scrollTo(scrollX, 0);
    }

@@ -527,6 +553,10 @@ public class ChartView extends View {
    public boolean onTouchEvent(MotionEvent event) {
        boolean isZoom = detectorZoom.onTouchEvent(event);
        boolean isScrollTab = detectorScrollFlingTab.onTouchEvent(event);
+
+        // ChartView handles zoom gestures (more than one pointer) and all gestures when zoomed itself
+        requestDisallowInterceptTouchEventInParent(event.getPointerCount() != 1 || zoomLevel != MIN_ZOOM_LEVEL);
+
        return isZoom || isScrollTab;
    }

@@ -881,6 +911,7 @@ public class ChartView extends View {

    /**
     * Finds the index of the first data point containing data for a series.
+     *
     * @return -1 if no data point contains data for the series.
     */
    private int getFirstPopulatedChartDataIndex(ChartValueSeries chartValueSeries) {
@@ -140,6 +140,11 @@ public class DescriptionGenerator {
            writeElevation(stats.getTotalElevationGain(), builder, R.string.description_elevation_gain, lineBreak);
        }

+        // Elevation loss
+        if (stats.hasTotalElevationLoss()) {
+            writeElevation(stats.getTotalElevationLoss(), builder, R.string.description_elevation_loss, lineBreak);
+        }
+
        // Recorded time
        builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTime(context, stats.getStartTime_ms())));
        builder.append(lineBreak);
@@ -1,425 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks.content;
-
-import android.database.Cursor;
-import android.location.Location;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.MarkerColumns;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.util.LocationUtils;
-import de.dennisguse.opentracks.util.UnitConversions;
-
-/**
- * Engine for searching for tracks and markers by text.
- *
- * @author Rodrigo Damazio
- */
-public class SearchEngine {
-
-    /**
-     * WHERE query to get tracks by name.
-     */
-    private static final String TRACK_SELECTION_QUERY =
-            TracksColumns.NAME + " LIKE ? OR " +
-                    TracksColumns.DESCRIPTION + " LIKE ? OR " +
-                    TracksColumns.CATEGORY + " LIKE ?";
-
-    /**
-     * WHERE query to get markers by name.
-     */
-    private static final String MARKER_SELECTION_QUERY =
-            MarkerColumns.NAME + " LIKE ? OR " +
-                    MarkerColumns.DESCRIPTION + " LIKE ? OR " +
-                    MarkerColumns.CATEGORY + " LIKE ?";
-
-    /**
-     * Order of track results.
-     */
-    private static final String TRACK_SELECTION_ORDER = TracksColumns._ID + " DESC LIMIT 1000";
-
-    /**
-     * Order of marker results.
-     */
-    private static final String MARKER_SELECTION_ORDER = MarkerColumns._ID + " DESC";
-
-    /**
-     * How much we promote a match in the track category.
-     */
-    private static final double TRACK_CATEGORY_PROMOTION = 2.0;
-
-    /**
-     * How much we promote a match in the track description.
-     */
-    private static final double TRACK_DESCRIPTION_PROMOTION = 8.0;
-
-    /**
-     * How much we promote a match in the track name.
-     */
-    private static final double TRACK_NAME_PROMOTION = 16.0;
-
-    /**
-     * How much we promote a marker result if it's in the currently-selected track.
-     */
-    private static final double CURRENT_TRACK_MARKER_PROMOTION = 2.0;
-
-    /**
-     * How much we promote a track result if it's the currently-selected track.
-     */
-    private static final double CURRENT_TRACK_DEMOTION = 0.5;
-
-    /**
-     * Maximum number of markers which will be retrieved and scored.
-     */
-    private static final int MAX_SCORED_MARKERS = 100;
-
-    /**
-     * Oldest timestamp for which we rank based on time (2000-01-01 00:00:00.000)
-     */
-    public static final long OLDEST_ALLOWED_TIMESTAMP = 946692000000L;
-
-    /**
-     * Comparator for scored results.
-     */
-    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 markers.
-        if (r1.marker != null && r2.track != null) {
-            return 1;
-        } else if (r1.track != null && r2.marker != null) {
-            return -1;
-        }
-
-        // Finally, use arbitrary ordering, by ID.
-        long id1 = r1.track != null ? r1.track.getId().getId() : r1.marker.getId().getId();
-        long id2 = r2.track != null ? r2.track.getId().getId() : r2.marker.getId().getId();
-        long idDiff = id2 - id1;
-        return Long.signum(idDiff);
-    };
-
-    private final ContentProviderUtils providerUtils;
-
-    public SearchEngine(ContentProviderUtils providerUtils) {
-        this.providerUtils = providerUtils;
-    }
-
-    /**
-     * Squashes a number by calculating 1 / log (1 + x).
-     */
-    //TODO Why is this done?
-    private static double squash(double x) {
-        return 1.0 / Math.log1p(x);
-    }
-
-    /**
-     * Executes a searchable query and returns a set of sorted results.
-     *
-     * @param query the query to execute
-     * @return a set of results, sorted according to their score
-     */
-    public SortedSet<ScoredResult> search(SearchQuery query) {
-        TreeSet<ScoredResult> scoredResults = new TreeSet<>(SCORED_RESULT_COMPARATOR);
-
-        scoreTrackResults(retrieveTracks(query), query, scoredResults);
-        scoreMarkersResults(retrieveMarkers(query), query, scoredResults);
-
-        return scoredResults;
-    }
-
-    /**
-     * Retrieves tracks matching the given query from the database.
-     *
-     * @param query the query to retrieve for
-     */
-    private List<Track> retrieveTracks(SearchQuery query) {
-        ArrayList<Track> tracks = new ArrayList<>();
-
-        String queryLikeSelection = "%" + query.textQuery + "%";
-        String[] trackSelectionArgs = new String[]{
-                queryLikeSelection,
-                queryLikeSelection,
-                queryLikeSelection
-        };
-
-        try (Cursor cursor = providerUtils.getTrackCursor(TRACK_SELECTION_QUERY, trackSelectionArgs, TRACK_SELECTION_ORDER)) {
-            if (cursor != null) {
-                tracks.ensureCapacity(cursor.getCount());
-                while (cursor.moveToNext()) {
-                    tracks.add(providerUtils.createTrack(cursor));
-                }
-            }
-        }
-
-        return tracks;
-    }
-
-    /**
-     * Retrieves markers matching the given query from the database.
-     *
-     * @param query the query to retrieve for
-     */
-    private List<Marker> retrieveMarkers(SearchQuery query) {
-        ArrayList<Marker> markers = new ArrayList<>();
-
-        String queryLikeSelection2 = "%" + query.textQuery + "%";
-        String[] markersSelectionArgs = new String[]{
-                queryLikeSelection2,
-                queryLikeSelection2,
-                queryLikeSelection2
-        };
-
-        try (Cursor cursor = providerUtils.getMarkerCursor(MARKER_SELECTION_QUERY, markersSelectionArgs, MARKER_SELECTION_ORDER, MAX_SCORED_MARKERS)) {
-            if (cursor != null) {
-                markers.ensureCapacity(cursor.getCount());
-                while (cursor.moveToNext()) {
-                    Marker marker = providerUtils.createMarker(cursor);
-                    if (LocationUtils.isValidLocation(marker.getLocation())) {
-                        markers.add(marker);
-                    }
-                }
-            }
-        }
-
-        return markers;
-    }
-
-    /**
-     * Scores a collection of track results.
-     *
-     * @param tracks the results to score
-     * @param query  the query to score for
-     * @param output the collection to fill with scored results
-     */
-    private void scoreTrackResults(Collection<Track> tracks, SearchQuery query, Collection<ScoredResult> output) {
-        for (Track track : tracks) {
-            // Calculate the score.
-            double score = scoreTrackResult(query, track);
-
-            // Add to the output.
-            output.add(new ScoredResult(track, score));
-        }
-    }
-
-    /**
-     * Scores a single track result.
-     *
-     * @param query the query to score for
-     * @param track the results to score
-     * @return the score for the track
-     */
-    private double scoreTrackResult(SearchQuery query, Track track) {
-        double score = 1.0;
-
-        score *= getTitleBoost(query, track.getName(), track.getDescription(), track.getCategory());
-
-        TrackStatistics statistics = track.getTrackStatistics();
-
-        long meanTimestamp = (statistics.getStartTime_ms() + statistics.getStopTime_ms()) / 2L;
-        score *= getTimeBoost(query, meanTimestamp);
-
-        // Score the currently-selected track lower (user is already there, wouldn't be searching for it).
-        if (track.getId().equals(query.currentTrackId)) {
-            score *= CURRENT_TRACK_DEMOTION;
-        }
-
-        return score;
-    }
-
-    /**
-     * Scores a collection of marker results.
-     *
-     * @param markers the results to score
-     * @param query   the query to score for
-     * @param output  the collection to fill with scored results
-     */
-    private void scoreMarkersResults(Collection<Marker> markers, SearchQuery query, Collection<ScoredResult> output) {
-        for (Marker marker : markers) {
-            // Calculate the score.
-            double score = scoreMarkerResult(query, marker);
-
-            // Add to the output.
-            output.add(new ScoredResult(marker, score));
-        }
-    }
-
-    /**
-     * Scores a single marker result.
-     *
-     * @param query  the query to score for
-     * @param marker the results to score
-     * @return the score for the marker
-     */
-    private double scoreMarkerResult(SearchQuery query, Marker marker) {
-        double score = 1.0;
-
-        Location location = marker.getLocation();
-        score *= getTitleBoost(query, marker.getName(), marker.getDescription(), marker.getCategory());
-        score *= getDistanceBoost(query, location.getLatitude(), location.getLongitude());
-        score *= getTimeBoost(query, location.getTime());
-
-        // Score markers in the currently-selected track higher (searching inside the current track).
-        if (marker.getTrackId() != null && marker.getTrackId().equals(query.currentTrackId)) {
-            score *= CURRENT_TRACK_MARKER_PROMOTION;
-        }
-
-        return score;
-    }
-
-    /**
-     * Calculates the boosting of the score due to the field(s) in which the match occured.
-     *
-     * @param query       the query to boost for
-     * @param name        the name of the track or marker
-     * @param description the description of the track or marker
-     * @param category    the category of the track or marker
-     * @return the total boost to be applied to the result
-     */
-    private double getTitleBoost(SearchQuery query, String name, String description, String category) {
-        // Title boost: track name > description > category.
-        double boost = 1.0;
-        if (name.toLowerCase(Locale.getDefault()).contains(query.textQuery)) {
-            boost *= TRACK_NAME_PROMOTION;
-        }
-        if (description.toLowerCase(Locale.getDefault()).contains(query.textQuery)) {
-            boost *= TRACK_DESCRIPTION_PROMOTION;
-        }
-        if (category.toLowerCase(Locale.getDefault()).contains(query.textQuery)) {
-            boost *= TRACK_CATEGORY_PROMOTION;
-        }
-        return boost;
-    }
-
-    /**
-     * Calculates the boosting of the score due to the recency of the matched entity.
-     *
-     * @param query     the query to boost for
-     * @param timestamp the timestamp to calculate the boost for
-     * @return the total boost to be applied to the result
-     */
-    private double getTimeBoost(SearchQuery query, long timestamp) {
-        if (timestamp < OLDEST_ALLOWED_TIMESTAMP) {
-            // Safety: if timestamp is too old or invalid, don't rank based on time.
-            return 1.0;
-        }
-
-        // Score recent tracks higher.
-        long timeAgoHours = (long) ((query.currentTimestamp - timestamp) * UnitConversions.MS_TO_S * UnitConversions.S_TO_MIN * UnitConversions.MIN_TO_HR);
-        if (timeAgoHours > 0L) {
-            return squash(timeAgoHours);
-        } else {
-            // Should rarely happen (track recorded in the last hour).
-            return Double.POSITIVE_INFINITY;
-        }
-    }
-
-    /**
-     * Calculates the boosting of the score due to proximity to a location.
-     *
-     * @param query     the query to boost for
-     * @param latitude  the latitude to calculate the boost for
-     * @param longitude the longitude to calculate the boost for
-     * @return the total boost to be applied to the result
-     */
-    private double getDistanceBoost(SearchQuery query, double latitude, double longitude) {
-        if (query.currentLocation == null) {
-            return 1.0;
-        }
-
-        float[] distanceResults = new float[1];
-
-        Location.distanceBetween(
-                latitude, longitude,
-                query.currentLocation.getLatitude(), query.currentLocation.getLongitude(),
-                distanceResults);
-
-        // Score tracks close to the current location higher.
-        double distanceKm = distanceResults[0] * UnitConversions.M_TO_KM;
-
-        if (distanceKm > 0.0) {
-            // Use the inverse of the amortized distance.
-            return squash(distanceKm);
-        } else {
-            // Should rarely happen (distance is exactly 0).
-            return Double.POSITIVE_INFINITY;
-        }
-    }
-
-    /**
-     * Description of a searchable query, along with all contextual data needed to execute it.
-     */
-    public static class SearchQuery {
-        final String textQuery;
-        final Location currentLocation;
-        final Track.Id currentTrackId;
-        final long currentTimestamp;
-
-        public SearchQuery(String textQuery, Location currentLocation, Track.Id currentTrackId, long currentTimestamp) {
-            this.textQuery = textQuery.toLowerCase(Locale.getDefault());
-            this.currentLocation = currentLocation;
-            this.currentTrackId = currentTrackId;
-            this.currentTimestamp = currentTimestamp;
-        }
-    }
-
-    /**
-     * Description of a searchable result which has been retrieved and scored.
-     */
-    public static class ScoredResult {
-        public final Track track;
-        public final Marker marker;
-        final double score;
-
-        ScoredResult(Track track, double score) {
-            this.track = track;
-            this.marker = null;
-            this.score = score;
-        }
-
-        ScoredResult(Marker marker, double score) {
-            this.track = null;
-            this.marker = marker;
-            this.score = score;
-        }
-
-        @NonNull
-        @Override
-        public String toString() {
-            return "ScoredResult ["
-                    + (track != null ? ("trackId=" + track.getId().getId() + ", ") : "")
-                    + (marker != null ? ("wptId=" + marker.getId().getId() + ", ") : "")
-                    + "score=" + score + "]";
-        }
-    }
-}
@@ -48,6 +48,11 @@ public final class Marker {
    @Deprecated //TODO Make an URI instead of String
    private String photoUrl = "";

+    public Marker(@Nullable Track.Id trackId) {
+        this.trackId = trackId;
+        location = null;
+    }
+
    @VisibleForTesting
    public Marker(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
        this(trackId, trackPoint.getLocation());
@@ -118,6 +118,10 @@ public class Track {
            this.id = id;
        }

+        protected Id(Parcel in) {
+            id = in.readLong();
+        }
+
        //TOOD Limit visibility to TrackRecordingService / ContentProvider
        public long getId() {
            return id;
@@ -33,6 +33,7 @@ public class TrackPoint {
    private Float cyclingCadence_rpm = null;
    private Float power = null;
    private Float elevationGain = null;
+    private Float elevationLoss = null;

    public TrackPoint() {
        this.location = new Location("");
@@ -50,6 +51,7 @@ public class TrackPoint {
        this.power = trackPoint.getPower();

        this.elevationGain = trackPoint.getElevationGain();
+        this.elevationLoss = trackPoint.getElevationLoss();
    }

    public TrackPoint(double latitude, double longitude, Double altitude, long time) {
@@ -107,6 +109,18 @@ public class TrackPoint {
        this.elevationGain = elevationGain;
    }

+    public boolean hasElevationLoss() {
+        return elevationLoss != null;
+    }
+
+    public float getElevationLoss() {
+        return elevationLoss;
+    }
+
+    public void setElevationLoss(Float elevationLoss) {
+        this.elevationLoss = elevationLoss;
+    }
+
    public double getLatitude() {
        return location.getLatitude();
    }
@@ -54,6 +54,7 @@ public interface TrackPointsColumns extends BaseColumns {
    String SENSOR_CADENCE = "sensor_cadence";
    String SENSOR_POWER = "sensor_power";
    String ELEVATION_GAIN = "elevation_gain";
+    String ELEVATION_LOSS = "elevation_loss";

    String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
            + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
@@ -69,6 +70,7 @@ public interface TrackPointsColumns extends BaseColumns {
            + SENSOR_CADENCE + " FLOAT, "
            + SENSOR_POWER + " FLOAT, "
            + ELEVATION_GAIN + " FLOAT, "
+            + ELEVATION_LOSS + " FLOAT, "
            + "FOREIGN KEY (" + TRACKID + ") REFERENCES " + TracksColumns.TABLE_NAME + "(" + TracksColumns._ID + ") ON UPDATE CASCADE ON DELETE CASCADE"
            + ")";

@@ -54,6 +54,7 @@ public interface TracksColumns extends BaseColumns {
    String MINELEVATION = "minelevation"; // minimum elevation
    String MAXELEVATION = "maxelevation"; // maximum elevation
    String ELEVATIONGAIN = "elevationgain"; // elevation gain
+    String ELEVATIONLOSS = "elevationloss"; // elevation loss
    String ICON = "icon"; // track activity type icon

    String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
@@ -74,7 +75,8 @@ public interface TracksColumns extends BaseColumns {
            + MAXELEVATION + " FLOAT, "
            + ELEVATIONGAIN + " FLOAT, "
            + ICON + " TEXT, "
-            + UUID + " BLOB)";
+            + UUID + " BLOB, "
+            + ELEVATIONLOSS + " FLOAT)";

    String CREATE_TABLE_INDEX = "CREATE UNIQUE INDEX " + TABLE_NAME + "_" + UUID + "_index ON " + TABLE_NAME + "(" + UUID + ")";

@@ -20,6 +20,7 @@ class CachedTrackPointsIndexes {
    final int sensorCadenceIndex;
    final int sensorPowerIndex;
    final int elevationGainIndex;
+    final int elevationLossIndex;

    CachedTrackPointsIndexes(Cursor cursor) {
        idIndex = cursor.getColumnIndex(TrackPointsColumns._ID);
@@ -34,5 +35,6 @@ class CachedTrackPointsIndexes {
        sensorCadenceIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_CADENCE);
        sensorPowerIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_POWER);
        elevationGainIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.ELEVATION_GAIN);
+        elevationLossIndex = cursor.getColumnIndexOrThrow(TrackPointsColumns.ELEVATION_LOSS);
    }
 }
@@ -28,8 +28,6 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;

 import java.io.File;
 import java.util.ArrayList;
@@ -116,6 +114,7 @@ public class ContentProviderUtils {
        int minElevationIndex = cursor.getColumnIndexOrThrow(TracksColumns.MINELEVATION);
        int maxElevationIndex = cursor.getColumnIndexOrThrow(TracksColumns.MAXELEVATION);
        int elevationGainIndex = cursor.getColumnIndexOrThrow(TracksColumns.ELEVATIONGAIN);
+        int elevationLossIndex = cursor.getColumnIndexOrThrow(TracksColumns.ELEVATIONLOSS);
        int iconIndex = cursor.getColumnIndexOrThrow(TracksColumns.ICON);

        Track track = new Track();
@@ -162,6 +161,9 @@ public class ContentProviderUtils {
        if (!cursor.isNull(elevationGainIndex)) {
            trackStatistics.setTotalElevationGain(cursor.getFloat(elevationGainIndex));
        }
+        if (!cursor.isNull(elevationLossIndex)) {
+            trackStatistics.setTotalElevationLoss(cursor.getFloat(elevationLossIndex));
+        }
        if (!cursor.isNull(iconIndex)) {
            track.setIcon(cursor.getString(iconIndex));
        }
@@ -205,7 +207,6 @@ public class ContentProviderUtils {
        contentResolver.delete(MarkerColumns.CONTENT_URI, MarkerColumns.TRACKID + "=?", selectionArgs);
    }

-    @VisibleForTesting
    public List<Track> getTracks() {
        ArrayList<Track> tracks = new ArrayList<>();
        try (Cursor cursor = getTrackCursor(null, null, TracksColumns._ID)) {
@@ -219,19 +220,6 @@ public class ContentProviderUtils {
        return tracks;
    }

-    @Deprecated
-    //TODO Do not use; rather get the proper TrackId (e.g., resume a track might give you some weird effects).
-    @VisibleForTesting
-    public Track getLastTrack() {
-        try (Cursor cursor = getTrackCursor(null, null, TracksColumns.STARTTIME + " DESC")) {
-            // Using the same order as shown in the track list
-            if (cursor != null && cursor.moveToNext()) {
-                return createTrack(cursor);
-            }
-        }
-        return null;
-    }
-
    /**
     * @param trackId the track id.
     */
@@ -316,6 +304,7 @@ public class ContentProviderUtils {
        values.put(TracksColumns.MINELEVATION, trackStatistics.getMinElevation());
        values.put(TracksColumns.MAXELEVATION, trackStatistics.getMaxElevation());
        values.put(TracksColumns.ELEVATIONGAIN, trackStatistics.getTotalElevationGain());
+        values.put(TracksColumns.ELEVATIONLOSS, trackStatistics.getTotalElevationLoss());
        values.put(TracksColumns.ICON, track.getIcon());

        return values;
@@ -415,8 +404,7 @@ public class ContentProviderUtils {
        if (!markerId.isValid()) {
            return null;
        }
-        try (Cursor cursor = getMarkerCursor(null, MarkerColumns._ID + "=?",
-                new String[]{Long.toString(markerId.getId())}, MarkerColumns._ID, 1)) {
+        try (Cursor cursor = getMarkerCursor(null, MarkerColumns._ID + "=?", new String[]{Long.toString(markerId.getId())}, MarkerColumns._ID, 1)) {
            if (cursor != null && cursor.moveToFirst()) {
                return createMarker(cursor);
            }
@@ -424,18 +412,6 @@ public class ContentProviderUtils {
        return null;
    }

-    /**
-     * The caller owns the returned cursor and is responsible for closing it.
-     *
-     * @param selection     the selection. Can be null
-     * @param selectionArgs the selection arguments. Can be null
-     * @param sortOrder     the sort order. Can be null
-     * @param maxCount      the maximum number of markers to return. -1 for no limit
-     */
-    public Cursor getMarkerCursor(String selection, String[] selectionArgs, String sortOrder, int maxCount) {
-        return getMarkerCursor(null, selection, selectionArgs, sortOrder, maxCount);
-    }
-
    /**
     * The caller owns the returned cursor and is responsible for closing it.
     *
@@ -474,21 +450,6 @@ public class ContentProviderUtils {
        return markers;
    }

-    public static Loader<Cursor> getMarkersLoader(Context context, @Nullable Track.Id trackId) {
-        final String[] PROJECTION = new String[]{MarkerColumns._ID,
-                MarkerColumns.NAME, MarkerColumns.DESCRIPTION, MarkerColumns.CATEGORY,
-                MarkerColumns.TIME, MarkerColumns.PHOTOURL,
-                MarkerColumns.LATITUDE, MarkerColumns.LONGITUDE};
-
-        if (trackId != null) {
-            return new CursorLoader(context, MarkerColumns.CONTENT_URI, PROJECTION,
-                    MarkerColumns.TRACKID + "=?",
-                    new String[]{String.valueOf(trackId.getId())}, null);
-        } else {
-            return new CursorLoader(context, MarkerColumns.CONTENT_URI, PROJECTION, null, null, null);
-        }
-    }
-
    @Deprecated //TODO TracksColumns.MARKER_COUNT while querying for tracks
    public int getMarkerCount(Track.Id trackId) {
        if (!trackId.isValid()) {
@@ -518,7 +479,7 @@ public class ContentProviderUtils {
    private void deleteMarkerPhoto(Context context, Marker marker) {
        if (marker != null && marker.hasPhoto()) {
            Uri uri = marker.getPhotoURI();
-            File file = FileUtils.getPhotoFileIfExists(context, marker.getTrackId(), uri);
+            File file = FileUtils.buildInternalPhotoFile(context, marker.getTrackId(), uri);
            if (file.exists()) {
                File parent = file.getParentFile();
                file.delete();
@@ -635,6 +596,9 @@ public class ContentProviderUtils {
        if (!cursor.isNull(indexes.elevationGainIndex)) {
            trackPoint.setElevationGain(cursor.getFloat(indexes.elevationGainIndex));
        }
+        if (!cursor.isNull(indexes.elevationLossIndex)) {
+            trackPoint.setElevationLoss(cursor.getFloat(indexes.elevationLossIndex));
+        }

        return trackPoint;
    }
@@ -646,7 +610,7 @@ public class ContentProviderUtils {
     * @param trackId     the trackPoints id
     * @return the number of trackPoints inserted
     */
-    //TODO Only used for testing and file import; might be better to replace it.
+    //TODO Only used for testing; might be better to replace it.
    public int bulkInsertTrackPoint(TrackPoint[] trackPoints, Track.Id trackId) {
        ContentValues[] values = new ContentValues[trackPoints.length];
        for (int i = 0; i < values.length; i++) {
@@ -655,6 +619,15 @@ public class ContentProviderUtils {
        return contentResolver.bulkInsert(TrackPointsColumns.CONTENT_URI_BY_ID, values);
    }

+    //TODO Only used for file import; might be better to replace it.
+    public int bulkInsertTrackPoint(List<TrackPoint> trackPoints, Track.Id trackId) {
+        ContentValues[] values = new ContentValues[trackPoints.size()];
+        for (int i = 0; i < trackPoints.size(); i++) {
+            values[i] = createContentValues(trackPoints.get(i), trackId);
+        }
+        return contentResolver.bulkInsert(TrackPointsColumns.CONTENT_URI_BY_ID, values);
+    }
+
    /**
     * Gets the first location id for a track.
     * Returns null if it doesn't exist.
@@ -828,6 +801,9 @@ public class ContentProviderUtils {
        if (trackPoint.hasElevationGain()) {
            values.put(TrackPointsColumns.ELEVATION_GAIN, trackPoint.getElevationGain());
        }
+        if (trackPoint.hasElevationLoss()) {
+            values.put(TrackPointsColumns.ELEVATION_LOSS, trackPoint.getElevationLoss());
+        }

        return values;
    }
@@ -25,7 +25,7 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {

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

-    private static final int DATABASE_VERSION = 28;
+    private static final int DATABASE_VERSION = 29;

    @VisibleForTesting
    public static final String DATABASE_NAME = "database.db";
@@ -76,6 +76,9 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                case 28:
                    upgradeFrom27to28(db);
                    break;
+                case 29:
+                    upgradeFrom28to29(db);
+                    break;

                default:
                    throw new RuntimeException("Not implemented: upgrade to " + toVersion);
@@ -103,6 +106,9 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
                case 27:
                    downgradeFrom28to27(db);
                    break;
+                case 28:
+                    downgradeFrom29to28(db);
+                    break;

                default:
                    throw new RuntimeException("Not implemented: downgrade to " + toVersion);
@@ -284,4 +290,44 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
        db.setTransactionSuccessful();
        db.endTransaction();
    }
+
+    /**
+     * Add elevation loss.
+     */
+    private void upgradeFrom28to29(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE tracks ADD COLUMN elevationloss FLOAT");
+        db.execSQL("ALTER TABLE trackpoints ADD COLUMN elevation_loss FLOAT");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom29to28(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        // Tracks
+        db.execSQL("DROP INDEX tracks_uuid_index");
+
+        db.execSQL("ALTER TABLE tracks RENAME TO tracks_old");
+        db.execSQL("CREATE TABLE tracks (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, starttime INTEGER, stoptime INTEGER, numpoints INTEGER, totaldistance FLOAT, totaltime INTEGER, movingtime INTEGER, avgspeed FLOAT, avgmovingspeed FLOAT, maxspeed FLOAT, minelevation FLOAT, maxelevation FLOAT, elevationgain FLOAT, icon TEXT, uuid BLOB)");
+        db.execSQL("INSERT INTO tracks SELECT _id, name, description, category, starttime, stoptime, numpoints, totaldistance, totaltime, movingtime, avgspeed, avgmovingspeed, maxspeed, minelevation, maxelevation, elevationgain, icon, uuid FROM tracks_old");
+        db.execSQL("DROP TABLE tracks_old");
+
+        db.execSQL("CREATE UNIQUE INDEX tracks_uuid_index ON tracks(uuid)");
+
+        // TrackPoints
+        db.execSQL("DROP INDEX trackpoints_trackid_index");
+
+        db.execSQL("ALTER TABLE trackpoints RENAME TO trackpoints_old");
+        db.execSQL("CREATE TABLE trackpoints (_id INTEGER PRIMARY KEY AUTOINCREMENT, trackid INTEGER NOT NULL, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, speed FLOAT, bearing FLOAT, sensor_heartrate FLOAT, sensor_cadence FLOAT, sensor_power FLOAT, elevation_gain FLOAT, FOREIGN KEY (trackid) REFERENCES tracks(_id) ON UPDATE CASCADE ON DELETE CASCADE)");
+        db.execSQL("INSERT INTO trackpoints SELECT _id, trackid, longitude, latitude, time, elevation, accuracy, speed, bearing, sensor_heartrate, sensor_cadence, sensor_power, elevation_gain FROM trackpoints_old");
+        db.execSQL("DROP TABLE trackpoints_old");
+
+        db.execSQL("CREATE INDEX trackpoints_trackid_index ON trackpoints(trackid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
 }
@@ -42,7 +42,7 @@ public final class SensorDataCycling {
         * Workaround for Wahoo CADENCE: provides speed instead of cadence
         */
        public Cadence(@NonNull SensorDataCycling.Speed speed) {
-            this(speed.getSensorAddress(), speed.getSensorName(), speed.getWheelRevolutionsCount(), speed.getWheelRevolutionsTime());
+            this(speed.getSensorAddress(), speed.getSensorName(), speed.wheelRevolutionsCount, speed.wheelRevolutionsTime);
        }

        public boolean hasData() {
@@ -82,7 +82,7 @@ public final class SensorDataCycling {
        @NonNull
        @Override
        public String toString() {
-            return "cadence=" + getCadence_rpm() + " time=" + getCrankRevolutionsTime() + " count=" + getCrankRevolutionsCount();
+            return "cadence=" + cadence_rpm + " time=" + crankRevolutionsTime + " count=" + crankRevolutionsCount;
        }

        @Override
@@ -90,7 +90,11 @@ public final class SensorDataCycling {
            if (!(obj instanceof Cadence)) return false;

            Cadence comp = (Cadence) obj;
-            return getCrankRevolutionsCount() == comp.getCrankRevolutionsCount() && getCrankRevolutionsTime() == comp.getCrankRevolutionsTime();
+            if (hasData() && comp.hasData() == hasData()) {
+                return getCrankRevolutionsCount() == comp.getCrankRevolutionsCount() && getCrankRevolutionsTime() == comp.getCrankRevolutionsTime();
+            } else {
+                return false;
+            }
        }
    }

@@ -149,7 +153,7 @@ public final class SensorDataCycling {
        @NonNull
        @Override
        public String toString() {
-            return "speed=" + getSpeed_mps() + " time=" + getWheelRevolutionsTime() + " count=" + getWheelRevolutionsCount();
+            return "speed=" + speed_mps + " time=" + wheelRevolutionsTime + " count=" + wheelRevolutionsCount;
        }

        @Override
@@ -157,7 +161,11 @@ public final class SensorDataCycling {
            if (!(obj instanceof Speed)) return false;

            Speed comp = (Speed) obj;
-            return getWheelRevolutionsCount() == comp.getWheelRevolutionsCount() && getWheelRevolutionsTime() == comp.getWheelRevolutionsTime();
+            if (hasData() && comp.hasData() == hasData()) {
+                return getWheelRevolutionsCount() == comp.getWheelRevolutionsCount() && getWheelRevolutionsTime() == comp.getWheelRevolutionsTime();
+            } else {
+                return false;
+            }
        }
    }

@@ -0,0 +1,32 @@
+package de.dennisguse.opentracks.content.sensor;
+
+import androidx.annotation.NonNull;
+
+public class SensorDataCyclingPower extends SensorData {
+
+    private final Float power_w;
+
+    public SensorDataCyclingPower(String address) {
+        super(address);
+        this.power_w = null;
+    }
+
+    public SensorDataCyclingPower(String name, String address, float power_w) {
+        super(name, address);
+        this.power_w = power_w;
+    }
+
+    public boolean hasPower_w() {
+        return power_w != null;
+    }
+
+    public float getPower_w() {
+        return power_w;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "power=" + power_w;
+    }
+}
@@ -12,6 +12,8 @@ public final class SensorDataSet {

    private SensorDataCycling.Speed cyclingSpeed;

+    private SensorDataCyclingPower cyclingPower;
+
    public SensorDataSet() {
    }

@@ -27,6 +29,10 @@ public final class SensorDataSet {
        return cyclingSpeed;
    }

+    public SensorDataCyclingPower getCyclingPower() {
+        return cyclingPower;
+    }
+
    public void set(SensorData data) {
        set(data, data);
    }
@@ -39,6 +45,7 @@ public final class SensorDataSet {
        this.heartRate = null;
        this.cyclingCadence = null;
        this.cyclingSpeed = null;
+        this.cyclingPower = null;
    }

    public void fillTrackPoint(TrackPoint trackPoint) {
@@ -53,6 +60,10 @@ public final class SensorDataSet {
        if (cyclingSpeed != null && cyclingSpeed.hasSpeed_mps()) {
            trackPoint.setSpeed(cyclingSpeed.getSpeed_mps());
        }
+
+        if (cyclingPower != null && cyclingPower.hasPower_w()) {
+            trackPoint.setPower(cyclingPower.getPower_w());
+        }
    }

    @NonNull
@@ -60,10 +71,11 @@ public final class SensorDataSet {
    public String toString() {
        return (getHeartRate() != null ? "" + getHeartRate() : "")
                + (getCyclingCadence() != null ? " " + getCyclingCadence() : "")
-                + (getCyclingSpeed() != null ? " " + getCyclingSpeed() : "");
+                + (getCyclingSpeed() != null ? " " + getCyclingSpeed() : "")
+                + (getCyclingPower() != null ? " " + getCyclingPower() : "");
    }

-    private void set(SensorData type, SensorData data) {
+    private void set(@NonNull SensorData type, SensorData data) {
        if (type instanceof SensorDataHeartRate) {
            this.heartRate = (SensorDataHeartRate) data;
            return;
@@ -78,6 +90,11 @@ public final class SensorDataSet {
            return;
        }

-        throw new UnsupportedOperationException();
+        if (type instanceof SensorDataCyclingPower) {
+            this.cyclingPower = (SensorDataCyclingPower) data;
+            return;
+        }
+
+        throw new UnsupportedOperationException(type.getClass().getCanonicalName());
    }
 }
@@ -76,7 +76,8 @@ public class ChartFragment extends Fragment implements TrackDataListener {

    private ChartBinding viewBinding;

-    //TODO Why is this needed?
+    //TODO REMOVE: Used to restore the TrackStatistics via TrackStatisticsUpdater; for the diagrams we should consider not this setting and just use all data that is in the database
+    @Deprecated
    private int recordingDistanceInterval;
    private String category = "";

@@ -58,7 +58,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements
    }

    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        viewBinding = ChooseActivityTypeBinding.inflate(inflater, container, false);

        List<Integer> imageIds = new ArrayList<>();
@@ -65,24 +65,18 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
    @NonNull
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        final Marker.Id[] markerIds = (Marker.Id[]) getArguments().getParcelableArray(KEY_MARKER_IDS);
+        final Context context = getContext();

        final FragmentActivity fragmentActivity = getActivity();
-        int titleId;
-        int messageId;
-        if (markerIds == null) {
-            titleId = R.string.generic_delete_all_confirm_title;
-            messageId = R.string.marker_delete_all_confirm_message;
-        } else {
-            titleId = markerIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.marker_delete_one_confirm_title;
-            messageId = markerIds.length > 1 ? R.string.marker_delete_multiple_confirm_message : R.string.marker_delete_one_confirm_message;
-        }
+        int titleId = markerIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.marker_delete_one_confirm_title;
+        int 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), (dialog, which) -> new Thread(() -> {
                    ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
                    for (Marker.Id markerId : markerIds) {
-                        contentProviderUtils.deleteMarker(getContext(), markerId);
+                        contentProviderUtils.deleteMarker(context, markerId);
                    }
-                    caller.onDeleteMarkerDone();
+                    caller.onMarkerDeleted();
                }).start());
    }

@@ -96,6 +90,6 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
        /**
         * Called when delete marker is done.
         */
-        void onDeleteMarkerDone();
+        void onMarkerDeleted();
    }
 }
@@ -40,7 +40,7 @@ public class IntervalsFragment extends Fragment implements TrackDataListener {
    protected IntervalStatisticsAdapter.StackMode stackModeListView;
    private IntervalStatisticsModel.IntervalOption selectedInterval;

-    private String intervalUnit;
+    private boolean metricUnits;
    private IntervalStatisticsAdapter adapter;
    private ArrayAdapter<IntervalStatisticsModel.IntervalOption> spinnerAdapter;

@@ -51,7 +51,7 @@ public class IntervalsFragment extends Fragment implements TrackDataListener {

    protected 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)) {
-            intervalUnit = PreferencesUtils.isMetricUnits(getContext()) ? getContext().getString(R.string.unit_kilometer) : getContext().getString(R.string.unit_mile);
+            metricUnits = PreferencesUtils.isMetricUnits(getContext());
            if (adapter != null) {
                adapter.notifyDataSetChanged();
                spinnerAdapter.notifyDataSetChanged();
@@ -74,7 +74,7 @@ public class IntervalsFragment extends Fragment implements TrackDataListener {
        super.onViewCreated(view, savedInstanceState);

        PreferencesUtils.register(getContext(), sharedPreferenceChangeListener);
-        intervalUnit = PreferencesUtils.isMetricUnits(getContext()) ? getContext().getString(R.string.unit_kilometer) : getContext().getString(R.string.unit_mile);
+        metricUnits = PreferencesUtils.isMetricUnits(getContext());

        viewBinding.intervalList.setEmptyView(viewBinding.intervalListEmptyView);

@@ -87,15 +87,17 @@ public class IntervalsFragment extends Fragment implements TrackDataListener {
            @Override
            public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
                TextView v = (TextView) super.getView(position, convertView, parent);
-                v.setText(v.getText() + " " + intervalUnit);
+                if (metricUnits) {
+                    v.setText(getContext().getString(R.string.value_integer_kilometer, Integer.parseInt(v.getText().toString())));
+                } else {
+                    v.setText(getContext().getString(R.string.value_integer_mile, Integer.parseInt(v.getText().toString())));
+                }
                return v;
            }

            @Override
            public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-                TextView v = (TextView) super.getDropDownView(position, convertView, parent);
-                v.setText(v.getText() + " " + intervalUnit);
-                return v;
+                return getView(position, convertView, parent);
            }
        };

@@ -149,7 +151,6 @@ public class IntervalsFragment extends Fragment implements TrackDataListener {
            return;
        }

-        boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
        IntervalStatistics intervalStatistics = viewModel.getIntervalStats(metricUnits, selectedInterval);
        adapter = new IntervalStatisticsAdapter(getContext(), intervalStatistics.getIntervalList(), category, stackModeListView);
        viewBinding.intervalList.setAdapter(adapter);
@@ -176,12 +177,16 @@ public class IntervalsFragment extends Fragment implements TrackDataListener {
    @Override
    public void onTrackUpdated(Track track) {
        if (isResumed()) {
-            // Set category.
-            category = track != null ? track.getCategory() : "";
+            getActivity().runOnUiThread(() -> {
+                if (isResumed()) {
+                    // Set category.
+                    category = track != null ? track.getCategory() : "";

-            // Set rate label.
-            boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
-            viewBinding.intervalRate.setText(reportSpeed ? R.string.stats_speed : R.string.stats_pace);
+                    // Set rate label.
+                    boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
+                    viewBinding.intervalRate.setText(reportSpeed ? R.string.stats_speed : R.string.stats_pace);
+                }
+            });
        }
    }

@@ -62,6 +62,8 @@ public class MarkerDetailFragment extends Fragment {

    private ContentProviderUtils contentProviderUtils;
    private Handler handler;
+
+    private Marker.Id markerId;
    private Marker marker;

    private MarkerDetailFragmentBinding viewBinding;
@@ -104,7 +106,7 @@ public class MarkerDetailFragment extends Fragment {
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        Marker.Id markerId = getArguments().getParcelable(KEY_MARKER_ID);
+        markerId = getArguments().getParcelable(KEY_MARKER_ID);
        if (markerId == null) {
            Log.d(TAG, "invalid marker id");
            getParentFragmentManager().popBackStack();
@@ -153,6 +155,13 @@ public class MarkerDetailFragment extends Fragment {
        viewBinding = null;
    }

+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        markerId = null;
+        marker = null;
+    }
+
    @Override
    public void setMenuVisibility(boolean menuVisible) {
        super.setMenuVisibility(menuVisible);
@@ -182,36 +191,40 @@ public class MarkerDetailFragment extends Fragment {

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-        Marker.Id markerId = getArguments().getParcelable(KEY_MARKER_ID); //TODO Should only happen in onCreate?
        FragmentActivity fragmentActivity = getActivity();
-        Intent intent;
-        switch (item.getItemId()) {
-            case R.id.marker_detail_show_on_map:
-                IntentUtils.showCoordinateOnMap(getContext(), marker);
-                return true;
-            case R.id.marker_detail_edit:
-                intent = IntentUtils.newIntent(fragmentActivity, MarkerEditActivity.class)
-                        .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerId);
-                startActivity(intent);
-                return true;
-            case R.id.marker_detail_share:
-                if (marker.hasPhoto()) {
-                    intent = IntentUtils.newShareImageIntent(getContext(), marker.getPhotoURI());
-                    intent = Intent.createChooser(intent, null);
-                    startActivity(intent);
-                }
-                return true;
-            case R.id.marker_detail_delete:
-                DeleteMarkerDialogFragment.showDialog(getChildFragmentManager(), markerId);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+
+        if (item.getItemId() == R.id.marker_detail_show_on_map) {
+            IntentUtils.showCoordinateOnMap(getContext(), marker);
+            return true;
        }
+
+        if (item.getItemId() == R.id.marker_detail_edit) {
+            Intent intent = IntentUtils.newIntent(fragmentActivity, MarkerEditActivity.class)
+                    .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerId);
+            startActivity(intent);
+            return true;
+        }
+
+        if (item.getItemId() == R.id.marker_detail_share) {
+            if (marker.hasPhoto()) {
+                Intent intent = IntentUtils.newShareFileIntent(getContext(), marker.getId());
+                intent = Intent.createChooser(intent, null);
+                startActivity(intent);
+            }
+            return true;
+        }
+
+        if (item.getItemId() == R.id.marker_detail_delete) {
+            DeleteMarkerDialogFragment.showDialog(getChildFragmentManager(), markerId);
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
    }

    private void updateMarker(boolean refresh) {
        if (refresh || marker == null) {
-            marker = contentProviderUtils.getMarker(getArguments().getParcelable(KEY_MARKER_ID)); //TODO Should only happen in onCreate?
+            marker = contentProviderUtils.getMarker(markerId);
            if (marker == null) {
                Log.d(TAG, "marker is null");
                getParentFragmentManager().popBackStack();
@@ -135,7 +135,6 @@ public class StatisticsRecordedFragment extends Fragment {
        // Set activity type
        {
            String trackIconValue = TrackIconUtils.getIconValue(getContext(), category);
-            viewBinding.statsActivityTypeIcon.setEnabled(false);
            viewBinding.statsActivityTypeIcon.setImageDrawable(ContextCompat.getDrawable(getContext(), TrackIconUtils.getIconDrawable(trackIconValue)));
        }

@@ -177,17 +176,24 @@ public class StatisticsRecordedFragment extends Fragment {
            viewBinding.statsMovingSpeedUnit.setText(parts.second);
        }

-        // Set elevation gain
+        // Set elevation gain and loss
        {
            // Make elevation visible?
            boolean showElevation = PreferencesUtils.isShowStatsElevation(getContext());
            viewBinding.statsElevationGroup.setVisibility(showElevation ? View.VISIBLE : View.GONE);

            Float elevationGain_m = trackStatistics != null ? trackStatistics.getTotalElevationGain() : null;
+            Float elevationLoss_m = trackStatistics != null ? trackStatistics.getTotalElevationLoss() : null;

-            Pair<String, String> parts = StringUtils.formatElevation(getContext(), elevationGain_m, metricUnits);
+            Pair<String, String> parts;
+
+            parts = StringUtils.formatElevation(getContext(), elevationGain_m, metricUnits);
            viewBinding.statsElevationGainValue.setText(parts.first);
            viewBinding.statsElevationGainUnit.setText(parts.second);
+
+            parts = StringUtils.formatElevation(getContext(), elevationLoss_m, metricUnits);
+            viewBinding.statsElevationLossValue.setText(parts.first);
+            viewBinding.statsElevationLossUnit.setText(parts.second);
        }
    }
 }
@@ -5,24 +5,28 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.util.Pair;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;

 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackRecordingActivity;
+import de.dennisguse.opentracks.adapters.SensorsAdapter;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
 import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.content.sensor.SensorData;
 import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
-import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.databinding.StatisticsRecordingBinding;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -60,6 +64,8 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi

    private StatisticsRecordingBinding viewBinding;

+    private SensorsAdapter sensorsAdapter;
+
    public static Fragment newInstance() {
        return new StatisticsRecordingFragment();
    }
@@ -101,19 +107,13 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi

        handlerUpdateUI = new Handler();

-        viewBinding.statsActivityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
-        viewBinding.statsActivityTypeIcon.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_UP) {
-                ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
-            }
-            return true;
-        });
-        viewBinding.statsActivityTypeIcon.setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
-            }
-            return true;
-        });
+
+        viewBinding.statsActivityTypeIcon.setOnClickListener(v -> ((TrackRecordingActivity) getActivity()).chooseActivityType(category));
+
+        sensorsAdapter = new SensorsAdapter(getContext());
+        RecyclerView sensorsRecyclerView = viewBinding.statsSensorsRecyclerView;
+        sensorsRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
+        sensorsRecyclerView.setAdapter(sensorsAdapter);
    }

    @Override
@@ -261,7 +261,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi

    /**
     * Tries to fetch most recent {@link SensorDataSet} from {@link de.dennisguse.opentracks.services.TrackRecordingService}.
-     * Also sets elevation gain.
+     * Also sets elevation gain and loss.
     */
    private void updateSensorDataUI() {
        TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
@@ -271,58 +271,27 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
        } else {
            SensorDataSet sensorDataSet = trackRecordingService.getSensorData();
            if (sensorDataSet != null) {
-                setHeartRateSensorData(sensorDataSet);
-                setCadenceSensorData(sensorDataSet);
-                setSpeedSensorData(sensorDataSet, isSelectedTrackRecording());
+                List<Pair<Integer, SensorData>> sensorDataList = new ArrayList<>();
+                if (sensorDataSet.getHeartRate() != null) {
+                    sensorDataList.add(new Pair<>(SensorsAdapter.HEART_RATE_TYPE, sensorDataSet.getHeartRate()));
+                }
+                if (sensorDataSet.getCyclingCadence() != null) {
+                    sensorDataList.add(new Pair<>(SensorsAdapter.CADENCE_TYPE, sensorDataSet.getCyclingCadence()));
+                }
+                if(sensorDataSet.getCyclingPower() != null) {
+                    sensorDataList.add(new Pair<>(SensorsAdapter.POWER_TYPE, sensorDataSet.getCyclingPower()));
+                }
+                sensorsAdapter.swapData(sensorDataList);
+                setSpeedSensorData(sensorDataSet);
            }
-
+            //TODO Check if we can distribute the total elevation gain and loss via trackStatistics instead of doing some computation in the UI layer.
            setTotalElevationGain(trackRecordingService.getElevationGain_m());
+            setTotalElevationLoss(trackRecordingService.getElevationLoss_m());
        }
    }

-    private void setHeartRateSensorData(SensorDataSet sensorDataSet) {
-        int isVisible = sensorDataSet.getHeartRate() != null ? View.VISIBLE : View.GONE;
-        viewBinding.statsSensorHeartRateGroup.setVisibility(isVisible);
-        setVisibilitySensorHorizontalLine();
-
-        String sensorValue = getContext().getString(R.string.value_unknown);
-        String sensorName = getContext().getString(R.string.value_unknown);
-        if (sensorDataSet.getHeartRate() != null) {
-            SensorDataHeartRate data = sensorDataSet.getHeartRate();
-
-            sensorName = data.getSensorNameOrAddress();
-            if (data.hasHeartRate_bpm() && data.isRecent()) {
-                sensorValue = StringUtils.formatDecimal(data.getHeartRate_bpm(), 0);
-            }
-        }
-
-        viewBinding.statsSensorHeartRateSensorValue.setText(sensorName);
-        viewBinding.statsSensorHeartRateValue.setText(sensorValue);
-    }
-
-    private void setCadenceSensorData(SensorDataSet sensorDataSet) {
-        int isVisible = sensorDataSet.getCyclingCadence() != null ? View.VISIBLE : View.GONE;
-        viewBinding.statsSensorCadenceGroup.setVisibility(isVisible);
-        setVisibilitySensorHorizontalLine();
-
-        String sensorValue = getContext().getString(R.string.value_unknown);
-        String sensorName = getContext().getString(R.string.value_unknown);
-        if (sensorDataSet.getCyclingCadence() != null) {
-            SensorDataCycling.Cadence data = sensorDataSet.getCyclingCadence();
-            sensorName = data.getSensorNameOrAddress();
-
-            if (data.hasCadence_rpm() && data.isRecent()) {
-                sensorValue = StringUtils.formatDecimal(data.getCadence_rpm(), 0);
-            }
-        }
-
-        viewBinding.statsSensorCadenceSensorValue.setText(sensorName);
-        viewBinding.statsSensorCadenceValue.setText(sensorValue);
-    }
-
    // Set elevation gain
    private void setTotalElevationGain(Float elevationGain_m) {
-        //TODO Check if we can distribute the total elevation gain via trackStatistics instead of doing some computation in the UI layer.
        boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());

        Float totalElevationGain = elevationGain_m;
@@ -340,23 +309,31 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
        viewBinding.statsElevationGainUnit.setText(parts.second);
    }

-    /**
-     * If cadence and hear rate groups are invisible then sensor horizontal line hast to be invisible too.
-     */
-    private void setVisibilitySensorHorizontalLine() {
-        if (viewBinding.statsSensorCadenceGroup.getVisibility() != View.VISIBLE && viewBinding.statsSensorHeartRateGroup.getVisibility() != View.VISIBLE) {
-            viewBinding.statsSensorHorizontalLine.setVisibility(View.GONE);
+    // Set elevation loss
+    private void setTotalElevationLoss(Float elevationLoss_m) {
+        boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
+
+        Float totalElevationLoss = elevationLoss_m;
+
+        if (lastTrackStatistics != null && lastTrackStatistics.hasTotalElevationLoss()) {
+            if (elevationLoss_m == null) {
+                totalElevationLoss = lastTrackStatistics.getTotalElevationLoss();
+            } else {
+                totalElevationLoss += lastTrackStatistics.getTotalElevationLoss();
+            }
        }
+
+        Pair<String, String> parts = StringUtils.formatElevation(getContext(), totalElevationLoss, metricUnits);
+        viewBinding.statsElevationLossValue.setText(parts.first);
+        viewBinding.statsElevationLossUnit.setText(parts.second);
    }

-    private void setSpeedSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
-        if (isRecording) {
-            if (sensorDataSet != null && sensorDataSet.getCyclingSpeed() != null) {
-                SensorDataCycling.Speed data = sensorDataSet.getCyclingSpeed();
+    private void setSpeedSensorData(SensorDataSet sensorDataSet) {
+        if (sensorDataSet != null && sensorDataSet.getCyclingSpeed() != null) {
+            SensorDataCycling.Speed data = sensorDataSet.getCyclingSpeed();

-                if (data.hasSpeed_mps() && data.isRecent()) {
-                    setSpeed(data.getSpeed_mps());
-                }
+            if (data.hasSpeed_mps() && data.isRecent()) {
+                setSpeed(data.getSpeed_mps());
            }
        }
    }
@@ -380,7 +357,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
        // Set activity type
        {
            viewBinding.statsActivityTypeIcon.setEnabled(isRecording);
-            TrackIconUtils.setIconSpinner(viewBinding.statsActivityTypeIcon, trackIconValue);
+            viewBinding.statsActivityTypeIcon.setImageResource(TrackIconUtils.getIconDrawable(trackIconValue));
        }

        // Set time
@@ -421,7 +398,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
            viewBinding.statsMovingSpeedUnit.setText(parts.second);
        }

-        // Set elevation (gain)
+        // Set elevation gain and loss
        {
            // Make elevation visible?
            boolean showElevation = PreferencesUtils.isShowStatsElevation(getContext());
@@ -54,14 +54,14 @@ public class ErrorListDialog extends DialogFragment {
        outState.putStringArrayList(EXTRA_ERROR_LIST, errorList);
    }

+    @NonNull
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final String[] tracks = errorList.stream().toArray(String[]::new);
+        final String[] tracks = errorList.toArray(new String[0]);
        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity())
                .setTitle(title)
                .setItems(tracks, null)
                .setPositiveButton(R.string.generic_ok, (dialog, which) -> dismiss());
-        AlertDialog dialog = alertDialogBuilder.create();
-        return dialog;
+        return alertDialogBuilder.create();
    }
 }
@@ -24,7 +24,6 @@ import android.view.View;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.FragmentActivity;
@@ -73,7 +72,6 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes

    private ExportServiceResultReceiver resultReceiver;

-    private String directoryDisplayName;
    private List<String> directoryFiles;

    private int trackExportSuccessCount;
@@ -144,7 +142,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
        contentProviderUtils = new ContentProviderUtils(this);

        DocumentFile documentFile = DocumentFile.fromTreeUri(this, directoryUri);
-        directoryDisplayName = FileUtils.getPath(documentFile);
+        String directoryDisplayName = FileUtils.getPath(documentFile);

        viewBinding.toolbar.toolbar.setTitle(getString(R.string.export_progress_message, directoryDisplayName));

@@ -361,7 +359,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
        public boolean resolve() {
            if (autoConflict == CONFLICT_NONE) {
                Track track = contentProviderUtils.getTrack(trackId);
-                viewBinding.exportProgressAlertIcon.setImageDrawable(getDrawable(R.drawable.ic_report_problem_24));
+                viewBinding.exportProgressAlertIcon.setImageDrawable(ContextCompat.getDrawable(ExportActivity.this, R.drawable.ic_report_problem_24));
                viewBinding.exportProgressAlertMsg.setText(getString(R.string.export_track_already_exists_msg, track.getName()));
                setConflictVisibility(View.VISIBLE);
                return false;
@@ -197,10 +197,9 @@ public class GpxTrackWriter implements TrackWriter {

            printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(trackPoint.getTime()) + "</time>");

-            if (trackPoint.hasSpeed() || trackPoint.hasHeartRate() || trackPoint.hasCyclingCadence()) {
+            if (trackPoint.hasSpeed() || trackPoint.hasHeartRate() || trackPoint.hasCyclingCadence() || trackPoint.hasElevationGain() || trackPoint.hasElevationLoss()) {
                printWriter.println("<extensions><gpxtpx:TrackPointExtension>");

-
                if (trackPoint.hasSpeed()) {
                    printWriter.println("<gpxtpx:speed>" + SPEED_FORMAT.format(trackPoint.getSpeed()) + "</gpxtpx:speed>");
                }
@@ -213,6 +212,14 @@ public class GpxTrackWriter implements TrackWriter {
                    printWriter.println("<gpxtpx:cad>" + HEARTRATE_FORMAT.format(trackPoint.getCyclingCadence_rpm()) + "</gpxtpx:cad>");
                }

+                if (trackPoint.hasElevationGain()) {
+                    printWriter.println("<opentracks:gain>" + ELEVATION_FORMAT.format(trackPoint.getElevationGain()) + "</opentracks:gain>");
+                }
+
+                if (trackPoint.hasElevationLoss()) {
+                    printWriter.println("<opentracks:loss>" + ELEVATION_FORMAT.format(trackPoint.getElevationLoss()) + "</opentracks:loss>");
+                }
+
                printWriter.println("</gpxtpx:TrackPointExtension></extensions>");
            }

@@ -51,6 +51,7 @@ public class KmlTrackWriter implements TrackWriter {
    public static final String EXTENDED_DATA_TYPE_HEART_RATE = "heart_rate";
    public static final String EXTENDED_DATA_TYPE_POWER = "power";
    public static final String EXTENDED_DATA_TYPE_ELEVATION_GAIN = "elevation_gain";
+    public static final String EXTENDED_DATA_TYPE_ELEVATION_LOSS = "elevation_loss";

    private static final String MARKER_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";
@@ -70,6 +71,7 @@ public class KmlTrackWriter implements TrackWriter {
    private final List<Float> cadenceList = new ArrayList<>();
    private final List<Float> heartRateList = new ArrayList<>();
    private final List<Float> elevationGainList = new ArrayList<>();
+    private final List<Float> elevationLossList = new ArrayList<>();

    private TrackPoint startTrackPoint;

@@ -167,7 +169,7 @@ public class KmlTrackWriter implements TrackWriter {
    @Override
    public void writeMarker(Marker marker) {
        if (printWriter != null && exportTrackDetail) {
-            boolean existsPhoto = FileUtils.getPhotoFileIfExists(context, marker.getTrackId(), marker.getPhotoURI()) != null;
+            boolean existsPhoto = FileUtils.buildInternalPhotoFile(context, marker.getTrackId(), marker.getPhotoURI()) != null;
            if (marker.hasPhoto() && exportPhotos && existsPhoto) {
                float heading = getHeading(marker.getTrackId(), marker.getLocation());
                writePhotoOverlay(marker, heading);
@@ -262,6 +264,9 @@ public class KmlTrackWriter implements TrackWriter {
                if (elevationGainList.size() > 0) {
                    writeSimpleArrayData(elevationGainList, EXTENDED_DATA_TYPE_ELEVATION_GAIN);
                }
+                if (elevationLossList.size() > 0) {
+                    writeSimpleArrayData(elevationLossList, EXTENDED_DATA_TYPE_ELEVATION_LOSS);
+                }
            }
            printWriter.println("</SchemaData>");
            printWriter.println("</ExtendedData>");
@@ -295,6 +300,9 @@ public class KmlTrackWriter implements TrackWriter {
                if (trackPoint.hasElevationGain()) {
                    elevationGainList.add(trackPoint.getElevationGain());
                }
+                if (trackPoint.hasElevationLoss()) {
+                    elevationLossList.add(trackPoint.getElevationLoss());
+                }
            }
        }
    }
@@ -53,7 +53,7 @@ public class KmzTrackExporter implements TrackExporter {
    private final FileTrackExporter fileTrackExporter;

    private final boolean exportPhotos;
-    private Context context;
+    private final Context context;

    /**
     * Constructor.
@@ -108,7 +108,7 @@ public class KmzTrackExporter implements TrackExporter {
                        Marker marker = contentProviderUtils.createMarker(cursor);
                        if (marker.hasPhoto()) {
                            Uri uriPhoto = marker.getPhotoURI();
-                            boolean existsPhoto = FileUtils.getPhotoFileIfExists(context, track.getId(), uriPhoto) != null;
+                            boolean existsPhoto = FileUtils.buildInternalPhotoFile(context, track.getId(), uriPhoto) != null;
                            if (existsPhoto) {
                                addImage(context, zipOutputStream, uriPhoto, marker);
                            }
@@ -29,7 +29,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
@@ -61,14 +60,10 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track

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

-    // The maximum number of buffered locations for bulk-insertion
-    private static final int MAX_BUFFERED_LOCATIONS = 512;
-
    private final Context context;
    private final ContentProviderUtils contentProviderUtils;
    private final int recordingDistanceInterval;

-    private Track.Id importTrackId;
    private final List<Track.Id> trackIds = new ArrayList<>();
    private final List<Marker> markers = new ArrayList<>();

@@ -91,6 +86,8 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
    protected String markerType;
    protected String photoUrl;
    protected String uuid;
+    protected String gain;
+    protected String loss;

    // The current track data
    private TrackData trackData;
@@ -104,11 +101,6 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        this.recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(context);
    }

-    AbstractFileTrackImporter(Context context, ContentProviderUtils contentProviderUtils, Track.Id importTrackId) {
-        this(context, contentProviderUtils);
-        this.importTrackId = importTrackId;
-    }
-
    @Override
    public void setDocumentLocator(Locator locator) {
        this.locator = locator;
@@ -133,18 +125,15 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track

            saxParser.parse(inputStream, this);
            Log.d(TAG, "Total import time: " + (System.currentTimeMillis() - start) + "ms");
-            if (trackIds.size() != 1) {
-                // TODO Multi track is not supported yet.
-                throw new ImportParserException("Multi track not supported");
-            }
            return trackIds.get(0);
        } catch (IOException | SAXException | ParserConfigurationException e) {
            Log.e(TAG, "Unable to import file", e);
-            cleanImport();
+            if (trackIds.size() > 0) {
+                cleanImport();
+            }
            throw new ImportParserException(e);
        } catch (SQLiteConstraintException e) {
            Log.e(TAG, "Unable to import file", e);
-            cleanImport();
            throw new ImportAlreadyExistsException(e);
        }
    }
@@ -181,6 +170,10 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
                        // No more markers
                        return;
                    }
+                    // If marker had photo it must be translated to internal photo url (depend on track id)
+                    if (marker.hasPhoto()) {
+                        marker.setPhotoUrl(getInternalPhotoUrl(marker.getPhotoUrl()));
+                    }
                }

                if (trackPoint == null) {
@@ -230,26 +223,12 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
     */
    protected void onTrackStart() throws SAXException {
        trackData = new TrackData();
-        Track.Id trackId;
-        if (importTrackId == null) {
-            Uri uri = contentProviderUtils.insertTrack(trackData.track);
-            trackId = new Track.Id(Long.parseLong(uri.getLastPathSegment()));
-        } else {
-            if (trackIds.size() > 0) {
-                throw new SAXException(createErrorMessage("Cannot import more than one track to an existing track " + importTrackId.getId()));
-            }
-            trackId = importTrackId;
-            contentProviderUtils.clearTrack(trackId);
-        }
-        trackIds.add(trackId);
-        trackData.track.setId(trackId);
    }

    /**
     * On track end.
     */
    protected void onTrackEnd() {
-        flushLocations(trackData);
        if (name != null) {
            trackData.track.setName(name);
        }
@@ -279,17 +258,27 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        }
        trackData.track.setTrackStatistics(trackData.trackStatisticsUpdater.getTrackStatistics());

-        try {
-            contentProviderUtils.updateTrack(trackData.track);
-        } catch (SQLiteConstraintException e) {
+        Track track = contentProviderUtils.getTrack(trackData.track.getUuid());
+        if (track != null) {
            if (PreferencesUtils.getPreventReimportTracks(context)) {
-                throw e;
+                throw new ImportAlreadyExistsException(context.getString(R.string.import_prevent_reimport));
            }

            //TODO This is a workaround until we have proper UI.
            trackData.track.setUuid(UUID.randomUUID());
-            contentProviderUtils.updateTrack(trackData.track);
        }
+
+        if (trackIds.size() > 0) {
+            // TODO Multi track is not supported yet.
+            cleanImport();
+            throw new ImportParserException("Multi track not supported");
+        }
+        Uri uri = contentProviderUtils.insertTrack(trackData.track);
+        Track.Id trackId = new Track.Id(Long.parseLong(uri.getLastPathSegment()));
+        trackIds.add(trackId);
+        trackData.track.setId(trackId);
+
+        flushLocations(trackData);
    }

    /**
@@ -314,7 +303,8 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        TrackPoint trackPoint = createTrackPoint();

        if (!LocationUtils.isValidLocation(trackPoint.getLocation())) {
-            throw new SAXException(createErrorMessage("Invalid location detected: " + trackPoint));
+            Log.w(TAG, "Marker with invalid coordinates ignored: " + trackPoint.getLocation());
+            return;
        }
        Marker marker = new Marker(trackPoint.getLocation());

@@ -401,7 +391,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
     * @param externalPhotoUrl the file name
     */
    protected String getInternalPhotoUrl(String externalPhotoUrl) {
-        if (importTrackId == null) {
+        if (trackData.track.getId() == null) {
            Log.e(TAG, "Track id is invalid.");
            return null;
        }
@@ -412,7 +402,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        }

        String importFileName = KmzTrackImporter.importNameForFilename(externalPhotoUrl);
-        File file = FileUtils.getPhotoFileIfExists(context, importTrackId, Uri.parse(importFileName));
+        File file = FileUtils.buildInternalPhotoFile(context, trackData.track.getId(), Uri.parse(importFileName));
        if (file != null) {
            Uri photoUri = FileUtils.getUriForFile(context, file);
            return "" + photoUri;
@@ -479,6 +469,21 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
            }
        }

+        if (gain != null) {
+            try {
+                trackPoint.setElevationGain(Float.parseFloat(gain));
+            } catch (Exception e) {
+                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse elevation gain: %s", gain)), e);
+            }
+        }
+        if (loss != null) {
+            try {
+                trackPoint.setElevationLoss(Float.parseFloat(loss));
+            } catch (Exception e) {
+                throw new SAXException(createErrorMessage(String.format(Locale.US, "Unable to parse elevation loss: %s", loss)), e);
+            }
+        }
+
        return trackPoint;
    }

@@ -493,13 +498,9 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        }
        trackData.trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval);

-        trackData.bufferedTrackPoints[trackData.numBufferedTrackPoints] = trackPoint;
+        trackData.bufferedTrackPoints.add(trackPoint);
        trackData.numBufferedTrackPoints++;
        trackData.numberOfLocations++;
-
-        if (trackData.numBufferedTrackPoints >= MAX_BUFFERED_LOCATIONS) {
-            flushLocations(trackData);
-        }
    }

    /**
@@ -511,7 +512,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        if (data.numBufferedTrackPoints <= 0) {
            return;
        }
-        contentProviderUtils.bulkInsertTrackPoint(Arrays.copyOfRange(data.bufferedTrackPoints, 0, data.numBufferedTrackPoints), data.track.getId());
+        contentProviderUtils.bulkInsertTrackPoint(data.bufferedTrackPoints, data.track.getId());
        data.numBufferedTrackPoints = 0;
    }

@@ -548,7 +549,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
        final long importTime = System.currentTimeMillis();

        // The buffered locations
-        final TrackPoint[] bufferedTrackPoints = new TrackPoint[MAX_BUFFERED_LOCATIONS];
+        final List<TrackPoint> bufferedTrackPoints = new ArrayList<>();

        // The number of buffered locations
        int numBufferedTrackPoints = 0;
@@ -54,6 +54,9 @@ public class GpxFileTrackImporter extends AbstractFileTrackImporter {
    private static final String TAG_EXTENSION_HEARTRATE = "gpxtpx:hr";
    private static final String TAG_EXTENSION_CADENCE = "gpxtpx:cad";

+    private static final String TAG_EXTENSION_GAIN = "opentracks:gain";
+    private static final String TAG_EXTENSION_LOSS = "opentracks:loss";
+
    /**
     * Constructor.
     *
@@ -151,6 +154,16 @@ public class GpxFileTrackImporter extends AbstractFileTrackImporter {
                    uuid = content.trim();
                }
                break;
+            case TAG_EXTENSION_GAIN:
+                if (content != null) {
+                    gain = content.trim();
+                }
+                break;
+            case TAG_EXTENSION_LOSS:
+                if (content != null) {
+                    loss = content.trim();
+                }
+                break;
        }

        // Reset element content
@@ -176,6 +189,8 @@ public class GpxFileTrackImporter extends AbstractFileTrackImporter {
        altitude = null;
        time = null;
        speed = null;
+        gain = null;
+        loss = null;
    }

    /**
@@ -24,6 +24,7 @@ import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
@@ -110,7 +111,7 @@ public class ImportActivity extends FragmentActivity {

    @Override
    public void onBackPressed() {
-        if (doubleBackToCancel || getTotalDone() == summary.getTotalCount()) {
+        if (doubleBackToCancel || (summary != null && getTotalDone() == summary.getTotalCount())) {
            super.onBackPressed();
            viewModel.cancel();
            getViewModelStore().clear();
@@ -130,7 +131,7 @@ public class ImportActivity extends FragmentActivity {
    }

    private int getTotalDone() {
-        return summary.getSuccessCount() + summary.getExistsCount() + summary.getErrorCount();
+        return summary != null ? summary.getSuccessCount() + summary.getExistsCount() + summary.getErrorCount() : 0;
    }

    private void setProgress() {
@@ -161,12 +162,12 @@ public class ImportActivity extends FragmentActivity {
            viewBinding.importProgressLeftButton.setVisibility(View.VISIBLE);
            viewBinding.importProgressLeftButton.setText(getString(R.string.generic_show_errors));
            viewBinding.importProgressLeftButton.setOnClickListener((view) -> ErrorListDialog.showDialog(getSupportFragmentManager(), getString(R.string.import_error_list_dialog_title), summary.getFileErrors()));
-            viewBinding.importProgressAlertIcon.setImageDrawable(getDrawable(R.drawable.ic_report_problem_24));
+            viewBinding.importProgressAlertIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_report_problem_24));
            String msg = getResources().getQuantityString(R.plurals.generic_completed_with_errors, summary.getErrorCount(), summary.getErrorCount());
            viewBinding.importProgressAlertMsg.setText(msg);
        } else {
            viewBinding.importProgressLeftButton.setVisibility(View.GONE);
-            viewBinding.importProgressAlertIcon.setImageDrawable(getDrawable(R.drawable.ic_dialog_success_24dp));
+            viewBinding.importProgressAlertIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_dialog_success_24dp));
            viewBinding.importProgressAlertMsg.setText(getString(R.string.generic_completed));
        }
    }
@@ -4,4 +4,8 @@ class ImportAlreadyExistsException extends RuntimeException {
    public ImportAlreadyExistsException(Exception e) {
        super(e);
    }
+
+    public ImportAlreadyExistsException(String msg) {
+        super(msg);
+    }
 }
@@ -63,12 +63,13 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {

    private boolean trackStarted = false;
    private String extendedDataType;
-    private ArrayList<TrackPoint> trackPoints = new ArrayList<>();
-    private ArrayList<Float> speedList = new ArrayList<>();
-    private ArrayList<Float> cadenceList = new ArrayList<>();
-    private ArrayList<Float> heartRateList = new ArrayList<>();
-    private ArrayList<Float> powerList = new ArrayList<>();
-    private ArrayList<Float> elevationGainList = new ArrayList<>();
+    private final ArrayList<TrackPoint> trackPoints = new ArrayList<>();
+    private final ArrayList<Float> speedList = new ArrayList<>();
+    private final ArrayList<Float> cadenceList = new ArrayList<>();
+    private final ArrayList<Float> heartRateList = new ArrayList<>();
+    private final ArrayList<Float> powerList = new ArrayList<>();
+    private final ArrayList<Float> elevationGainList = new ArrayList<>();
+    private final ArrayList<Float> elevationLossList = new ArrayList<>();

    public KmlFileTrackImporter(Context context) {
        this(context, new ContentProviderUtils(context));
@@ -193,10 +194,6 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
        if (!MARKER_STYLE.equals(markerType)) {
            return;
        }
-
-        // If there is photoUrl it has to be changed because that url in kml file is a relative path to the internal kmz file.
-        photoUrl = getInternalPhotoUrl(photoUrl);
-
        addMarker();
    }

@@ -221,6 +218,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
        cadenceList.clear();
        powerList.clear();
        elevationGainList.clear();
+        elevationLossList.clear();
    }

    /**
@@ -246,6 +244,9 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
            if (i < elevationGainList.size()) {
                trackPoint.setElevationGain(elevationGainList.get(i));
            }
+            if (i < elevationLossList.size()) {
+                trackPoint.setElevationLoss(elevationLossList.get(i));
+            }

            insertTrackPoint(trackPoint);
        }
@@ -315,6 +316,9 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
            case KmlTrackWriter.EXTENDED_DATA_TYPE_ELEVATION_GAIN:
                elevationGainList.add(value);
                break;
+            case KmlTrackWriter.EXTENDED_DATA_TYPE_ELEVATION_LOSS:
+                elevationLossList.add(value);
+                break;
            default:
                Log.w(TAG, "Data from extended data " + extendedDataType + " is not (yet) supported.");
        }
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

+import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
@@ -53,7 +54,6 @@ public class KmzTrackImporter implements TrackImporter {
    private static final int BUFFER_SIZE = 4096;

    private final Context context;
-    private Track.Id importTrackId; //TODO needed?
    private final Uri uriKmzFile;

    /**
@@ -67,22 +67,10 @@ public class KmzTrackImporter implements TrackImporter {

    @Override
    public Track.Id importFile(InputStream inputStream) {
-        Track.Id trackId;
+        Track.Id trackId = findAndParseKmlFile(inputStream);

-        if (!copyKmzImages()) {
-            cleanImport(context, importTrackId);
-            return null;
-        }
-
-        try {
-            trackId = findAndParseKmlFile(inputStream);
-        } catch (Exception e) {
-            cleanImport(context, importTrackId);
-            throw e;
-        }
-
-        if (trackId == null) {
-            cleanImport(context, importTrackId);
+        if (!copyKmzImages(trackId)) {
+            cleanImport(context, trackId);
            return null;
        }

@@ -96,7 +84,7 @@ public class KmzTrackImporter implements TrackImporter {
     *
     * @return false if there are errors or true otherwise.
     */
-    private boolean copyKmzImages() {
+    private boolean copyKmzImages(Track.Id trackId) {
        try (InputStream inputStream = context.getContentResolver().openInputStream(uriKmzFile);
             ZipInputStream zipInputStream = new ZipInputStream(inputStream)) {
            ZipEntry zipEntry;
@@ -109,7 +97,7 @@ public class KmzTrackImporter implements TrackImporter {

                String fileName = zipEntry.getName();
                if (hasImageExtension(fileName)) {
-                    readAndSaveImageFile(zipInputStream, importNameForFilename(fileName));
+                    readAndSaveImageFile(zipInputStream, trackId, importNameForFilename(fileName));
                }

                zipInputStream.closeEntry();
@@ -175,7 +163,7 @@ public class KmzTrackImporter implements TrackImporter {
            while ((zipEntry = zipInputStream.getNextEntry()) != null) {
                if (Thread.interrupted()) {
                    Log.d(TAG, "Thread interrupted");
-                    return null;
+                    throw new RuntimeException(context.getString(R.string.import_thread_interrupted));
                }

                String fileName = zipEntry.getName();
@@ -183,12 +171,16 @@ public class KmzTrackImporter implements TrackImporter {
                    trackId = parseKml(zipInputStream);
                    if (trackId == null) {
                        Log.d(TAG, "Unable to parse kml in kmz");
-                        return null;
+                        throw new ImportParserException(context.getString(R.string.import_unable_to_import_file, fileName));
                    }
                }

                zipInputStream.closeEntry();
            }
+            if (trackId == null) {
+                Log.d(TAG, "Unable to find doc.kml in kmz");
+                throw new ImportParserException(context.getString(R.string.import_no_kml_file_found));
+            }
            return trackId;
        } catch (ImportParserException | ImportAlreadyExistsException e) {
            Log.e(TAG, "Unable to import file", e);
@@ -283,14 +275,15 @@ public class KmzTrackImporter implements TrackImporter {
     * Reads an image file (zipInputStream) and save it in a file called fileName inside photo folder.
     *
     * @param zipInputStream the zip input stream
+     * @param trackId        the track's id which image belongs to.
     * @param fileName       the file name
     */
-    private void readAndSaveImageFile(ZipInputStream zipInputStream, String fileName) throws IOException {
-        if (importTrackId == null || fileName.equals("")) {
+    private void readAndSaveImageFile(ZipInputStream zipInputStream, Track.Id trackId, String fileName) throws IOException {
+        if (trackId == null || fileName.equals("")) {
            return;
        }

-        File dir = FileUtils.getPhotoDir(context, importTrackId);
+        File dir = FileUtils.getPhotoDir(context, trackId);
        File file = new File(dir, fileName);

        try (FileOutputStream fileOutputStream = new FileOutputStream(file)) {
@@ -25,6 +25,8 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
@@ -46,12 +48,14 @@ 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.io.file.exporter.ExportServiceResultReceiver;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.services.handlers.HandlerServer;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.services.sensors.ElevationSumManager;
 import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTaskFactory;
 import de.dennisguse.opentracks.services.tasks.PeriodicTaskExecutor;
+import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.util.ExportUtils;
@@ -69,7 +73,7 @@ import de.dennisguse.opentracks.util.TrackPointUtils;
 *
 * @author Leif Hendrik Wilden
 */
-public class TrackRecordingService extends Service implements HandlerServer.HandlerServerInterface {
+public class TrackRecordingService extends Service implements HandlerServer.HandlerServerInterface, ExportServiceResultReceiver.Receiver {

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

@@ -431,7 +435,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
            }
        }

-        ExportUtils.postWorkoutExport(this, track);
+        ExportUtils.postWorkoutExport(this, track, new ExportServiceResultReceiver(new Handler(), this));

        endRecording(true);
    }
@@ -661,6 +665,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
        try {
            if (elevationSumManager != null) {
                trackPoint.setElevationGain(elevationSumManager.getElevationGain_m());
+                trackPoint.setElevationLoss(elevationSumManager.getElevationLoss_m());
                elevationSumManager.reset();
            }
            contentProviderUtils.insertTrackPoint(trackPoint, track.getId());
@@ -676,7 +681,6 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
        voiceExecutor.update();
    }

-
    /**
     * Updates the recording track time.
     *
@@ -714,6 +718,17 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
        return elevationSumManager.getElevationGain_m();
    }

+    /**
+     * Returns the relative elevation loss (since last trackpoint).
+     */
+    Float getElevationLoss_m() {
+        if (elevationSumManager == null || !elevationSumManager.isConnected()) {
+            return null;
+        }
+
+        return elevationSumManager.getElevationLoss_m();
+    }
+
    private void showNotification(boolean isGpsStarted) {
        if (isRecording()) {
            Intent intent = IntentUtils.newIntent(this, TrackRecordingActivity.class)
@@ -751,4 +766,16 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
    public GpsStatusValue getGpsStatus() {
        return handlerServer.getGpsStatus();
    }
+
+    @Override
+    public void onReceiveResult(final int resultCode, final Bundle resultData) {
+        Log.w(TAG, "onReceiveResult: " + resultCode);
+        if (resultCode != ExportServiceResultReceiver.RESULT_CODE_SUCCESS) {
+            Intent intent = new Intent(this, SettingsActivity.class);
+            intent.putExtra(SettingsActivity.EXTRAS_CHECK_EXPORT_DIRECTORY, true);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        }
+    }
+
 }
@@ -104,6 +104,11 @@ class TrackRecordingServiceBinder extends android.os.Binder implements TrackReco
        return trackRecordingService.getElevationGain_m();
    }

+    @Override
+    public Float getElevationLoss_m() {
+        return trackRecordingService.getElevationLoss_m();
+    }
+
    @VisibleForTesting
    @Override
    public void setRemoteSensorManager(BluetoothRemoteSensorManager remoteSensorManager) {
@@ -78,6 +78,13 @@ public interface TrackRecordingServiceInterface {
     */
    Float getElevationGain_m();

+    /**
+     * Gets the current elevation loss.
+     *
+     * @return elevation loss in m or null.
+     */
+    Float getElevationLoss_m();
+
    @VisibleForTesting
    void setRemoteSensorManager(BluetoothRemoteSensorManager remoteSensorManager);

@@ -25,7 +25,7 @@ class GpsStatus {

    private GpsStatusValue gpsStatus = GpsStatusValue.GPS_NONE;
    private GpsStatusListener client;
-    private Context context;
+    private final Context context;

    // Last location. It can be null.
    private Location lastLocation = null;
@@ -51,7 +51,7 @@ class GpsStatus {
        }
    }

-    private Handler gpsStatusHandler;
+    private final Handler gpsStatusHandler;
    private GpsStatusRunner gpsStatusRunner = null;

    /**
@@ -12,7 +12,7 @@ import de.dennisguse.opentracks.content.data.TrackPoint;

 public class HandlerServer {

-    private static String TAG = HandlerServer.class.getSimpleName();
+    private static final String TAG = HandlerServer.class.getSimpleName();

    private final LocationHandler locationHandler;
    private final HandlerServerInterface service;
@@ -32,6 +32,7 @@ import java.util.UUID;

 import de.dennisguse.opentracks.content.sensor.SensorData;
 import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
+import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower;
 import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
 import de.dennisguse.opentracks.util.BluetoothUtils;

@@ -88,8 +89,14 @@ public abstract class BluetoothConnectionManager {

            // Register for updates.
            BluetoothGattDescriptor descriptor = characteristic.getDescriptor(BluetoothUtils.CLIENT_CHARACTERISTIC_CONFIG_UUID);
+            if (descriptor == null) {
+                Log.e(TAG, "CLIENT_CHARACTERISTIC_CONFIG_UUID characteristic not available; cannot request notifications for changed data.");
+                return;
+            }
+
            descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
            gatt.writeDescriptor(descriptor);
+
        }

        @Override
@@ -170,7 +177,7 @@ public abstract class BluetoothConnectionManager {
    public static class CyclingCadence extends BluetoothConnectionManager {

        CyclingCadence(SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPPED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
+            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
        }

        @Override
@@ -201,7 +208,7 @@ public abstract class BluetoothConnectionManager {
    public static class CyclingSpeed extends BluetoothConnectionManager {

        CyclingSpeed(SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPPED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
+            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
        }

        @Override
@@ -219,6 +226,25 @@ public abstract class BluetoothConnectionManager {
        }
    }

+    public static class CyclingPower extends BluetoothConnectionManager {
+
+        CyclingPower(@NonNull SensorDataObserver observer) {
+            super(BluetoothUtils.CYCLING_POWER_UUID, BluetoothUtils.CYCLING_POWER_MEASUREMENT_CHAR_UUID, observer);
+        }
+
+        @Override
+        protected SensorData createEmptySensorData(String address) {
+            return new SensorDataCyclingPower(address);
+        }
+
+        @Override
+        protected SensorDataCyclingPower parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) {
+            Integer cyclingPower = BluetoothUtils.parseCyclingPower(characteristic);
+
+            return cyclingPower != null ? new SensorDataCyclingPower(address, sensorName, cyclingPower) : null;
+        }
+    }
+
    interface SensorDataObserver {

        void onChanged(SensorData sensorData);
@@ -59,6 +59,7 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
    private final BluetoothConnectionManager.HeartRate heartRate = new BluetoothConnectionManager.HeartRate(this);
    private final BluetoothConnectionManager.CyclingCadence cyclingCadence = new BluetoothConnectionManager.CyclingCadence(this);
    private final BluetoothConnectionManager.CyclingSpeed cyclingSpeed = new BluetoothConnectionManager.CyclingSpeed(this);
+    private final BluetoothConnectionManager.CyclingPower cyclingPower = new BluetoothConnectionManager.CyclingPower(this);

    private final SensorDataSet sensorDataSet = new SensorDataSet();

@@ -82,6 +83,12 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.

                connect(cyclingSpeed, address);
            }
+
+            if (PreferencesUtils.isKey(context, R.string.settings_sensor_bluetooth_cycling_power_key, key)) {
+                String address = PreferencesUtils.getBluetoothCyclingPowerSensorAddress(context);
+
+                connect(cyclingPower, address);
+            }
        }
    };

@@ -102,6 +109,8 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
    public synchronized void stop() {
        heartRate.disconnect();
        cyclingCadence.disconnect();
+        cyclingSpeed.disconnect();
+        cyclingPower.disconnect();

        sensorDataSet.clear();

@@ -112,6 +112,6 @@ public class ElevationSumManager implements SensorEventListener {

        lastSeenSensorValue_hPa = value_hPa;

-        Log.v(TAG, "elevation gain: " + elevationGain_m);
+        Log.v(TAG, "elevation gain: " + elevationGain_m + ", elevation loss: " + elevationLoss_m);
    }
 }
@@ -168,8 +168,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
        String category = track != null ? track.getCategory() : "";

        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(track.getId());
-        IntervalStatistics intervalStatistics = new IntervalStatistics();
-        intervalStatistics.build(trackPoints, (float) (PreferencesUtils.isMetricUnits(context) ? 1d * UnitConversions.KM_TO_M : 1d * UnitConversions.MI_TO_M));
+        IntervalStatistics intervalStatistics = new IntervalStatistics(trackPoints, (float) (PreferencesUtils.isMetricUnits(context) ? 1d * UnitConversions.KM_TO_M : 1d * UnitConversions.MI_TO_M));
        IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval();

        String announcement = AnnouncementUtils.getAnnouncement(context, trackStatistics, category, lastInterval);
@@ -19,12 +19,10 @@ package de.dennisguse.opentracks.settings;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
-import android.widget.Spinner;
+import android.widget.ImageView;

 import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDialogFragmentCompat;
@@ -63,7 +61,7 @@ public class ActivityTypePreference extends DialogPreference {
    public static class ActivityPreferenceDialog extends PreferenceDialogFragmentCompat {

        private AutoCompleteTextView textView;
-        private Spinner spinner;
+        private ImageView iconView;

        static ActivityPreferenceDialog newInstance(String preferenceKey) {
            ActivityTypePreference.ActivityPreferenceDialog dialog = new ActivityTypePreference.ActivityPreferenceDialog();
@@ -87,30 +85,19 @@ public class ActivityTypePreference extends DialogPreference {
            textView.setAdapter(adapter);
            textView.setOnItemClickListener((parent, v, position, id) -> {
                String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));
-                TrackIconUtils.setIconSpinner(spinner, iconValue);
+                updateIcon(iconValue);
            });
            textView.setOnFocusChangeListener((v, hasFocus) -> {
                if (!hasFocus) {
                    String iconValue = TrackIconUtils.getIconValue(context, textView.getText().toString());
-                    TrackIconUtils.setIconSpinner(spinner, iconValue);
+                    updateIcon(iconValue);
                }
            });

-            String iconValue = TrackIconUtils.getIconValue(context, category);
-            spinner = view.findViewById(R.id.activity_type_preference_spinner);
-            spinner.setAdapter(TrackIconUtils.getIconSpinnerAdapter(context, iconValue));
-            spinner.setOnTouchListener((v, event) -> {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    showIconSelectDialog();
-                }
-                return true;
-            });
-            spinner.setOnKeyListener((v, keyCode, event) -> {
-                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    showIconSelectDialog();
-                }
-                return true;
-            });
+            iconView = view.findViewById(R.id.activity_type_preference_spinner);
+            iconView.setOnClickListener((it) -> showIconSelectDialog());
+
+            updateIcon(TrackIconUtils.getIconValue(context, category));
        }

        private void showIconSelectDialog() {
@@ -129,15 +116,13 @@ public class ActivityTypePreference extends DialogPreference {
            }
        }

-        /**
-         * Updates the value of the dialog.
-         *
-         * @param iconValue the icon value
-         */
        public void updateUI(String iconValue) {
-            TrackIconUtils.setIconSpinner(spinner, iconValue);
            textView.setText(getActivity().getString(TrackIconUtils.getIconActivityType(iconValue)));
            textView.clearFocus();
        }
+
+        private void updateIcon(String iconValue) {
+            iconView.setImageResource(TrackIconUtils.getIconDrawable(iconValue));
+        }
    }
 }
@@ -1,11 +1,13 @@
 package de.dennisguse.opentracks.settings;

+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 import android.widget.Toast;

-import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.DialogFragment;
@@ -16,10 +18,12 @@ import androidx.preference.PreferenceFragmentCompat;

 import java.util.Locale;

+import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference;
+import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingPowerPreference;
 import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeHeartRatePreference;
 import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeSensorPreference;
 import de.dennisguse.opentracks.util.ActivityUtils;
@@ -28,25 +32,52 @@ import de.dennisguse.opentracks.util.HackUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;

-public class SettingsActivity extends AppCompatActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, ResetDialogPreference.ResetCallback {
+public class SettingsActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, ResetDialogPreference.ResetCallback {

    private static final String TAG = SettingsActivity.class.getSimpleName();
+    public static final String EXTRAS_CHECK_EXPORT_DIRECTORY = "Check Export Directory";

    private PrefsFragment prefsFragment;
+    private boolean checkExportDirectory = false;

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

-        setContentView(R.layout.settings);
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbar.setTitle(R.string.menu_settings);
-        setSupportActionBar(toolbar);
-
+        Intent intent = getIntent();
+        if (intent != null && intent.hasExtra(EXTRAS_CHECK_EXPORT_DIRECTORY)) {
+            checkExportDirectory = true;
+        }
        onReset();
    }

+    @Override
+    protected View getRootView() {
+        return getLayoutInflater().inflate(R.layout.settings, null);
+    }
+
+    @Override
+    protected void setupActionBarBack(Toolbar toolbar) {
+        super.setupActionBarBack(toolbar);
+        toolbar.setTitle(R.string.menu_settings);
+    }
+
+    @Override
+    protected void onResume() {
+        if (checkExportDirectory) {
+            checkExportDirectory = false;
+            new AlertDialog.Builder(this)
+                    .setIcon(R.drawable.ic_logo_24dp)
+                    .setTitle(R.string.app_name)
+                    .setMessage(R.string.export_error_post_workout)
+                    .setNeutralButton(R.string.generic_ok, null)
+                    .create()
+                    .show();
+        }
+
+        super.onResume();
+    }
+
    @Override
    public void onChooseActivityTypeDone(String iconValue) {
        prefsFragment.setDefaultActivity(iconValue);
@@ -129,9 +160,11 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
                activityPreferenceDialog = ActivityTypePreference.ActivityPreferenceDialog.newInstance(preference.getKey());
                dialogFragment = activityPreferenceDialog;
            } else if (preference instanceof BluetoothLeHeartRatePreference) {
-                dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.HEART_RATE_SERVICE_UUID);
+                dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.HEART_RATE_SUPPORTING_DEVICES);
            } else if (preference instanceof BluetoothLeCyclingCadenceAndSpeedPreference) {
                dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID);
+            } else if (preference instanceof BluetoothLeCyclingPowerPreference) {
+                dialogFragment = BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(preference.getKey(), BluetoothUtils.CYCLING_POWER_UUID);
            }

            if (dialogFragment != null) {
@@ -0,0 +1,23 @@
+package de.dennisguse.opentracks.settings.bluetooth;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class BluetoothLeCyclingPowerPreference extends BluetoothLeSensorPreference {
+
+    public BluetoothLeCyclingPowerPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BluetoothLeCyclingPowerPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BluetoothLeCyclingPowerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BluetoothLeCyclingPowerPreference(Context context) {
+        super(context);
+    }
+}
@@ -8,8 +8,6 @@ import android.bluetooth.le.ScanResult;
 import android.bluetooth.le.ScanSettings;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.drawable.Animatable;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.ParcelUuid;
 import android.text.TextUtils;
@@ -18,13 +16,15 @@ import android.util.Log;
 import android.widget.Toast;

 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDialogFragmentCompat;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.BluetoothLeAdapter;
@@ -39,7 +39,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {

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

-    private static final String ARG_BLUETOOTH_UUID = "bluetoothUUID";
+    private static final String ARG_BLE_SERVICE_UUIDS = "bluetoothUUID";

    private static final int DEVICE_NONE_RESOURCEID = R.string.value_none;

@@ -94,6 +94,8 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {

    public static class BluetoothLeSensorPreferenceDialog extends PreferenceDialogFragmentCompat {

+        private AnimatedVectorDrawableCompat bluetoothIcon;
+
        private int selectedEntryIndex;
        private final BluetoothLeAdapter listAdapter = new BluetoothLeAdapter();

@@ -109,8 +111,9 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {

            @Override
            public void onBatchScanResults(List<ScanResult> results) {
-                for (ScanResult scanResult : results) {
-                    listAdapter.add(scanResult.getDevice());
+                for (ScanResult result : results) {
+                    Log.d(TAG, "Found device " + result.getDevice().getName() + " " + result);
+                    listAdapter.add(result.getDevice());
                }
            }

@@ -124,10 +127,14 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
        };

        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, UUID sensorUUID) {
+            return newInstance(preferenceKey, Collections.singletonList(sensorUUID));
+        }
+
+        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, List<UUID> sensorUUIDs) {
            final BluetoothLeSensorPreferenceDialog fragment = new BluetoothLeSensorPreferenceDialog();
            final Bundle b = new Bundle(1);
            b.putString(ARG_KEY, preferenceKey);
-            b.putSerializable(ARG_BLUETOOTH_UUID, sensorUUID);
+            b.putParcelableArrayList(ARG_BLE_SERVICE_UUIDS, new ArrayList<>(sensorUUIDs.stream().map(ParcelUuid::new).collect(Collectors.toList())));
            fragment.setArguments(b);
            return fragment;
        }
@@ -136,8 +143,12 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
        public void onCreate(Bundle savedInstanceState) {
            super.onCreate(savedInstanceState);

-            UUID sensorUUID = (UUID) getArguments().getSerializable(ARG_BLUETOOTH_UUID);
-            Log.i(TAG, "UUID: " + sensorUUID);
+            List<ParcelUuid> serviceUUIDs = getArguments().getParcelableArrayList(ARG_BLE_SERVICE_UUIDS);
+
+            // Don't know why: need to load the drawable _twice_, so that animation is actually started.
+            bluetoothIcon = AnimatedVectorDrawableCompat.create(getContext(), R.drawable.ic_bluetooth_searching_animated_24dp);
+            bluetoothIcon = AnimatedVectorDrawableCompat.create(getContext(), R.drawable.ic_bluetooth_searching_animated_24dp);
+            bluetoothIcon.start();

            BluetoothAdapter bluetoothAdapter = BluetoothUtils.getAdapter(getContext());
            if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled()) {
@@ -148,7 +159,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
            }

            if (bluetoothAdapter.isDiscovering()) {
-                Log.i(TAG, "Cancelling ongoing B<aluetooth discovery.");
+                Log.i(TAG, "Cancelling ongoing Bluetooth discovery.");
                bluetoothAdapter.cancelDiscovery();
            }

@@ -170,9 +181,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
                selectedEntryIndex = 1;
            }

-            ScanFilter.Builder scanFilterBuilder = new ScanFilter.Builder().setServiceUuid(new ParcelUuid(sensorUUID));
-            List<ScanFilter> scanFilter = new ArrayList<>();
-            scanFilter.add(scanFilterBuilder.build());
+            List<ScanFilter> scanFilter = serviceUUIDs.stream().map(it -> new ScanFilter.Builder().setServiceUuid(it).build()).collect(Collectors.toList());

            ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder();
            scanSettingsBuilder.setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY);
@@ -193,9 +202,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
                        dialog.dismiss();
                    });

-            Drawable icon = ContextCompat.getDrawable(getContext(), R.drawable.ic_bluetooth_searching_animated_24dp);
-            ((Animatable) icon).start();
-            builder.setIcon(icon);
+            builder.setIcon(bluetoothIcon);

            builder.setPositiveButton(null, null);
        }
@@ -214,5 +221,12 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
                }
            }
        }
+
+        @Override
+        public void onDestroy() {
+            super.onDestroy();
+            bluetoothIcon = null;
+            scanner = null;
+        }
    }
 }
@@ -45,6 +45,8 @@ public class TrackStatistics {
    private double maxSpeed_mps;
    // The total elevation gained (meters).
    private Float totalElevationGain_m = null;
+    // The total elevation lost (meters).
+    private Float totalElevationLoss_m = null;

    public TrackStatistics() {
    }
@@ -63,6 +65,7 @@ public class TrackStatistics {
        maxSpeed_mps = other.maxSpeed_mps;
        elevationExtremities.set(other.elevationExtremities.getMin(), other.elevationExtremities.getMax());
        totalElevationGain_m = other.totalElevationGain_m;
+        totalElevationLoss_m = other.totalElevationLoss_m;
    }

    /**
@@ -91,6 +94,15 @@ public class TrackStatistics {
                totalElevationGain_m += other.totalElevationGain_m;
            }
        }
+        if (totalElevationLoss_m == null) {
+            if (other.totalElevationLoss_m != null) {
+                totalElevationLoss_m = other.totalElevationLoss_m;
+            }
+        } else {
+            if (other.totalElevationLoss_m != null) {
+                totalElevationLoss_m += other.totalElevationLoss_m;
+            }
+        }
    }

    /**
@@ -257,6 +269,26 @@ public class TrackStatistics {
        totalElevationGain_m += gain_m;
    }

+    public boolean hasTotalElevationLoss() {
+        return totalElevationLoss_m != null;
+    }
+
+    public @Nullable
+    Float getTotalElevationLoss() {
+        return totalElevationLoss_m;
+    }
+
+    public void setTotalElevationLoss(float totalElevationLoss_m) {
+        this.totalElevationLoss_m = totalElevationLoss_m;
+    }
+
+    public void addTotalElevationLoss(float loss_m) {
+        if (totalElevationLoss_m == null) {
+            totalElevationLoss_m = 0f;
+        }
+        totalElevationLoss_m += loss_m;
+    }
+
    @NonNull
    @Override
    public String toString() {
@@ -264,6 +296,7 @@ public class TrackStatistics {
                + "; Total Distance: " + getTotalDistance() + "; Total Time: " + getTotalTime()
                + "; Moving Time: " + getMovingTime() + "; Max Speed: " + getMaxSpeed()
                + "; Min Elevation: " + getMinElevation() + "; Max Elevation: " + getMaxElevation()
-                + "; Elevation Gain: " + getTotalElevationGain() + "}";
+                + "; Elevation Gain: " + getTotalElevationGain()
+                + "; Elevation Loss: " + getTotalElevationLoss() + "}";
    }
 }
@@ -145,6 +145,12 @@ public class TrackStatisticsUpdater {
            Log.d(TAG, "elevation gain: " + trackPoint.getElevationGain());
        }

+        //Get elevation loss
+        if (trackPoint.hasElevationLoss()) {
+            currentSegment.addTotalElevationLoss(trackPoint.getElevationLoss());
+            Log.d(TAG, "elevation loss: " + trackPoint.getElevationLoss());
+        }
+
        if (lastTrackPoint == null || lastMovingTrackPoint == null) {
            lastTrackPoint = trackPoint;
            lastMovingTrackPoint = trackPoint;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dennis Guse	75b8f3b9cf	Release: v3.14.1	2021-01-03 13:25:19 +01:00
Jaroslav Lichtblau	9462221a28	Translated using Weblate (Czech) Currently translated at 100.0% (516 of 516 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/cs/	2020-12-31 12:34:58 +01:00
FTno	af82eae8a4	Translated using Weblate (Norwegian Bokmål) Currently translated at 99.4% (511 of 514 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2020-12-31 12:34:58 +01:00
Román Martínez	1c4946e85b	Move RuntimeException to ImportParseExceptio so app is not crashes and import process go on. Fixes #557 .	2020-12-31 12:34:38 +01:00
Román Martínez	fd1b7b8af9	Added opentracks:gain and opentracks:loss information in GPX files. Fixes #555 .	2020-12-26 20:30:10 +01:00
Dennis Guse	eb02c4c469	Marker images can now be shared from the list directly via the context menu (like tracks). Fixes #495.	2020-12-25 18:36:41 +01:00
Román Martínez	4714171e21	Added elevation loss via barometer (like elevation gain). Fixes #547 .	2020-12-25 18:19:01 +01:00
Dennis Guse	4bff376442	pt-BR: plural vs lint.	2020-12-20 00:17:00 +01:00
Dennis Guse	c14413cbe7	CodeQL action: removed now unecessary step.	2020-12-20 00:03:42 +01:00
Vinicius	778fb4b346	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (507 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/pt_BR/	2020-12-19 23:16:02 +01:00
Xosé M	130552f0eb	Translated using Weblate (Galician) Currently translated at 100.0% (507 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2020-12-19 23:16:02 +01:00
FTno	41eca663e8	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (507 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2020-12-19 23:16:02 +01:00
FTno	6c79702075	Translated using Weblate (Norwegian Bokmål) Currently translated at 99.0% (502 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2020-12-19 23:16:02 +01:00
FTno	6d109a1c5a	Translated using Weblate (Norwegian Bokmål) Currently translated at 98.0% (497 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2020-12-19 23:16:02 +01:00
FTno	b71904a3bd	Translated using Weblate (Norwegian Bokmål) Currently translated at 97.4% (494 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2020-12-19 23:16:01 +01:00
bortox	ef28784682	Translated using Weblate (Italian) Currently translated at 100.0% (507 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/it/	2020-12-19 23:16:01 +01:00
FTno	05b7242191	Translated using Weblate (Norwegian Bokmål) Currently translated at 93.4% (474 of 507 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2020-12-19 23:16:01 +01:00
Xosé M	94c69f92a6	Translated using Weblate (Galician) Currently translated at 100.0% (506 of 506 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/gl/	2020-12-19 23:16:01 +01:00
mitakjakub	8f12ba3d48	Translated using Weblate (Polish) Currently translated at 86.1% (436 of 506 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/pl/	2020-12-19 23:16:01 +01:00
Román Martínez	190a572951	Translated using Weblate (Spanish) Currently translated at 100.0% (506 of 506 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/es/	2020-12-19 23:16:01 +01:00
FTno	7ae8809101	Translated using Weblate (Norwegian Bokmål) Currently translated at 93.6% (474 of 506 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://weblate.bubu1.eu/projects/OpenTracks/opentracks/nb_NO/	2020-12-19 23:16:01 +01:00
Dennis Guse	19a7ef3217	Activity icon now properly tint'ed in detail activity.	2020-12-19 18:29:34 +01:00
Dennis Guse	f261e8ab9d	Cleanup.	2020-12-17 23:16:09 +01:00
Dennis Guse	a41160229d	Implement basic EspressoUI test.	2020-12-17 23:16:09 +01:00
Dennis Guse	2fa8b998f9	Code cleanup using AndroidStudio's analyze feature.	2020-12-17 19:59:53 +01:00
Román Martínez	99847dbed9	Just tiny changes.	2020-12-17 19:15:35 +01:00
Román Martínez	483736637e	Refactoring MarkerEditActivity. Logic has been moved to a ViewModel.	2020-12-17 19:15:35 +01:00
Dennis Guse	e133743547	Actionbar: icon provides back functionality (except in TrackListActivity).	2020-12-17 18:56:42 +01:00
Dennis Guse	eb2c2b4d78	As of ADT 14 as well as Gradle Plugin 5.0 those are not final anymore. Fixes #544. Missed in `1862e38a20`	2020-12-15 23:36:03 +01:00
Dennis Guse	1409537e56	AggregatedStatistics: fixed ViewHolder pattern.	2020-12-15 22:53:52 +01:00
Dennis Guse	76c3699518	Intervals: list height should match parent.	2020-12-15 22:46:01 +01:00
Dennis Guse	5675dc800d	Aggregated stats: ordered by number number of tracks per category.	2020-12-13 22:44:44 +01:00
Dennis Guse	e1e7c24d9f	Aggregated stats: icon now primary color, value centered.	2020-12-13 18:40:06 +01:00
Dennis Guse	2733071a4d	Aggregated stats: simplified layout.	2020-12-13 18:14:39 +01:00
Dennis Guse	2255624235	Cleanup: rename waypoint to marker (tests).	2020-12-13 18:05:08 +01:00
Dennis Guse	55fa6d2d79	Code cleanup using AndroidStudio.	2020-12-13 18:05:08 +01:00
Dennis Guse	96371336f4	MarkerDetailFragment: load markerId once in onCreate().	2020-12-13 17:12:03 +01:00
Dennis Guse	1862e38a20	Compare resourceIds via if rather than switch. As of ADT 14 as well as Gradle Plugin 5.0 those are not final anymore. Fixes #544.	2020-12-12 22:14:51 +01:00
Dennis Guse	397e056f6f	Release: v3.14.0	2020-12-10 22:52:02 +01:00
Dennis Guse	eb79f2277a	ChartView let's parent handle TouchEvents if not zoomed.	2020-12-06 22:35:44 +01:00
Román Martínez	ae8833d21b	ViewPager migrate to ViewPager2. Fixes #522 . Swiping between tabs work. Fixes #105.	2020-12-06 22:35:44 +01:00
Dennis Guse	e8017a4e9d	Bugfix: In preferences, the Bluetooth search icon was only animated after opening the dialog a 2nd time.	2020-12-06 00:09:24 +01:00
Dennis Guse	cea180f871	Code cleanup using AndroidStudio's Analyze feature.	2020-12-05 23:22:15 +01:00
Dennis Guse	be1b6ece9d	IntervalsFragment: generate UI values from strings.xml (i18n).	2020-12-05 23:11:29 +01:00
Vanous	0592863d3c	add Huami devices into Readme Tested Sensors	2020-12-05 15:42:09 +01:00
Dennis Guse	18bc100d5a	BLE sensors: Miband3's is now considered a heart rate sensor during discovery. Some BLE devices do not announce all there supported services in the BLE advertisement packages. Android's ScanFilter decides based upon this information only. When connecting to such a device (and trigger service discovery), the service can still be used. Fixes #447.	2020-12-05 12:36:57 +01:00
Peter Storch	4476a15558	throw Exception when no doc.kml file found in kmz	2020-11-29 13:56:22 +01:00
Peter Storch	215c28be85	fix #537 ignore waypoint markers with invalid coordinates on import. I've also added a unit test with such an export file.	2020-11-29 13:56:22 +01:00
Dennis Guse	a429fbe4df	Interval list: RTL and localized formatting (only default strings.xml).	2020-11-28 15:05:49 +01:00
Dennis Guse	6b470c7fdc	Intervals: change label from elevation to gain.	2020-11-28 15:05:49 +01:00
Dennis Guse	6b690f38ad	Charts: text size is resolved from styles. Fixes #524.	2020-11-28 15:05:49 +01:00
Dennis Guse	f138826d60	Text in charts now scales using Android's global settings. Fixes #524.	2020-11-28 15:05:49 +01:00
Dennis Guse	14ac29095d	Removed unused theme.	2020-11-28 15:05:49 +01:00
Dennis Guse	a3f4de7d18	Interval list: table header in accent color.	2020-11-28 15:05:49 +01:00
Dennis Guse	6392e88dc7	Enable RTL.	2020-11-28 15:05:49 +01:00
FTno	1e913d6bb5	Update strings.xml Typos in source strings - Issue #530	2020-11-26 07:35:34 +01:00
dependabot[bot]	ced8454f59	Bump mockito-android from 3.6.0 to 3.6.28 Bumps [mockito-android](https://github.com/mockito/mockito) from 3.6.0 to 3.6.28. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.6.0...v3.6.28) Signed-off-by: dependabot[bot] <support@github.com>	2020-11-25 12:15:57 +01:00
Román Martínez	974a5afeb1	Only clean if parse error is out of <trk>	2020-11-25 06:39:07 +01:00
Román Martínez	9c9bdde6b9	Import files by track in memory (avoid clean track when error). Fixes #473 .	2020-11-25 06:39:07 +01:00
Dennis Guse	ca2bc6426c	Release: v3.13.2	2020-11-22 20:21:50 +01:00
Dennis Guse	81097aac40	Bugfix: crash in landscape mode in TrackController due to wrong background.	2020-11-22 20:21:11 +01:00
Dennis Guse	a74b5fc743	Cleanup.	2020-11-21 18:42:32 +01:00
Dennis Guse	e996ad0a0c	Release: v3.13.1	2020-11-21 10:37:25 +01:00
Dennis Guse	0f726958e0	Revert "Shrinking all APK builds without obfuscation. Fixes #433." Introduced #523. This reverts commit `34834120`	2020-11-21 10:34:15 +01:00
Peter Storch	3a84520819	removed duplicate export	2020-11-20 21:56:39 +01:00
Dennis Guse	8328069b9d	README: add human tech badge :) Fixes #521.	2020-11-20 21:51:45 +01:00
Peter Storch	b2df79caf2	fix #516 post workout export fails silently (#520 ) Change the post workout export to use the ExportService (JobIntentService) and directing the user to the SettingsActivity in case the export failed to check the export directory.	2020-11-20 20:59:52 +01:00
Dennis Guse	6bcb8db40c	Release: v3.13.0	2020-11-17 22:21:24 +01:00
Román Martínez	974baaf611	Marker Bugfixes: markers deletion didn't work and track import didn't include marker's photos. Fixes #514 . Marker edition bugfixed: orphan photos are deleted.	2020-11-17 22:02:26 +01:00
Dennis Guse	fd77e77bb9	TrackController: readded stop button's pressed state. Removed in `18546fd3cc`	2020-11-17 21:49:21 +01:00
Dennis Guse	1e8beff015	TrackController: refactor button (delayed action) UI and use handler.	2020-11-17 21:43:12 +01:00
Dennis Guse	96bc347374	Activity icon uses now an image instead of a spinner (which was only used as an icon). Fixed #503.	2020-11-17 21:43:12 +01:00
dependabot[bot]	8f144d4a97	Bump desugar_jdk_libs from 1.1.0 to 1.1.1 Bumps [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/google/desugar_jdk_libs/releases) - [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/desugar_jdk_libs/commits) Signed-off-by: dependabot[bot] <support@github.com>	2020-11-13 07:26:29 +01:00
Dennis Guse	3c3641376d	Added power meter infos to READMEs.	2020-11-12 17:12:44 +01:00
Dennis Guse	35f4427aec	Merge pull request #444 from OpenTracksApp/cyclingPower Bluetooth Sensor: add cycling powermeter.	2020-11-12 12:00:13 +01:00
Dennis Guse	5a0cb10838	Bugfix: cadence and speed now can compare when data is not set.	2020-11-11 21:25:56 +01:00
Dennis Guse	bf92851c97	Show sensor data's unit.	2020-11-11 21:08:39 +01:00
Dennis Guse	55c45b2050	Bugfix: SensorDataCycling.toString() should use attributes instead of their getters.	2020-11-11 21:08:39 +01:00
Román Martínez	d01715444f	Adaptive recording layout for sensors (heart rate, cycling cadence and cycling power).	2020-11-11 21:08:39 +01:00
Dennis Guse	634a7a4321	Bluetooth Sensor: add cycling powermeter.	2020-11-11 21:08:39 +01:00
Dennis Guse	e5911a79ab	Translation: Norwegian used wrong language code. Introduced in `56aab12110` Fixes #515.	2020-11-11 20:07:59 +01:00
dependabot[bot]	a78b3eb66d	Bump gradle from 4.1.0 to 4.1.1 Bumps gradle from 4.1.0 to 4.1.1. Signed-off-by: dependabot[bot] <support@github.com>	2020-11-11 07:53:54 +01:00
Román Martínez	28890abd47	Bugfix: view changed from wrong thread. Fixes #509 .	2020-11-09 20:19:08 +01:00
Dennis Guse	0a466d240b	Wrap searchQuery in SQLite wildcards.	2020-11-09 18:56:25 +01:00
Dennis Guse	9ef312fc93	Search is now handled by TrackListActivity and MarkerListActivity. * data is loaded via cursor, * removed custom ranking (handled in database), * search text is wrapped with wildcards, and * search view can be closed by back button. Fixes #492.	2020-11-09 18:56:25 +01:00
Dennis Guse	56aab12110	Noway's translation was included twice.	2020-11-09 18:55:38 +01:00
Dennis Guse	c394448273	Removed Transifex configuration.	2020-11-09 18:41:38 +01:00
Dennis Guse	95671f4927	Translation is now on Weblate.	2020-11-09 18:27:38 +01:00
Dennis Guse	348341204e	Shrinking all APK builds without obfuscation. Fixes #433.	2020-11-09 12:09:37 +01:00
Román Martínez	82f5c127ee	Bugfix: NPE in import. Fixes #506 .	2020-11-08 14:33:31 +01:00
Dennis Guse	dd490f528e	Cursors must be closed.	2020-11-08 00:37:01 +01:00
Christoph Wurst	27731319f0	Fix internet access typo in readme Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2020-11-07 10:05:41 +01:00
Christoph Wurst	86bfe6d0ce	Fix formatting of md lists, remove trailing whitespaces Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2020-11-07 09:21:55 +01:00
Christoph Wurst	ea8bbb0b36	Update list of tested sensors with Polar H10 and Garmin SPD/CAD Adds three tested sensors * "Polar H10" heart rate sensor * "Garmin Cadence Sensor 2" cadence sensor * "Garmin Speed Sensor 2" speed sensor Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2020-11-07 09:21:55 +01:00
dependabot[bot]	c02fdd3bba	Bump desugar_jdk_libs from 1.0.10 to 1.1.0 Bumps [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 1.0.10 to 1.1.0. - [Release notes](https://github.com/google/desugar_jdk_libs/releases) - [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/desugar_jdk_libs/commits) Signed-off-by: dependabot[bot] <support@github.com>	2020-11-04 07:46:08 +01:00