Release: v3.15.1

Fixes #613.

.github/workflows/codeql-analysis.yml

@@ -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:

.idea/codeStyles/Project.xml

@@ -1,5 +1,26 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.tx/config

@@ -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
-

README.md

@@ -2,61 +2,76 @@
 
 _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>
-        <th>Paid (same as free)</th>
         <th>Donations</th>
         <th>Translations</th>
     </tr>
     <tr>
-        <td>
+        <td align="center">
             <a href="https://f-droid.org/packages/de.dennisguse.opentracks">
                 <img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle">
-                <br />
-                <img alt="OpenTracks version published on F-Droid" src="https://img.shields.io/f-droid/v/de.dennisguse.opentracks.svg" align="middle" >
             </a>
         </td>
-        <td>
-            <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">
-                <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle">
-            </a>
-        </td>
-        <td>
+        <td align="center">
             <a href="https://liberapay.com/OpenTracks/donate">
                 <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45" align="middle">
             </a>
         </td>
-        <td>
-            <a href="https://www.transifex.com/opentracks/opentracks/">
-                Transifex
+        <td align="center">
+            <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>
+    <tr>
+        <td align="center">
+            <img alt="OpenTracks version published on F-Droid" src="https://img.shields.io/f-droid/v/de.dennisguse.opentracks.svg" align="middle" >
+        </td>
+        <td align="center">
+            <a href="bitcoin:bc1qckpls3lpjlcpyxzm66hcy65hnesas9zgacy6yc">
+                <img alt="bitcoin:bc1qckpls3lpjlcpyxzm66hcy65hnesas9zgacy6yc" src="promotion/donations-bitcoin.png" height="90" align="middle">
+            </a>
+        </td align="center">
+        <td></td>
+    </tr>
+    <tr>
+        <td></td>
+        <td align="center">
+            <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">
+                <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle">
+            </a>
+        </td>
+        <td></td>
+    </tr>
 </table>
 
 ## Features:
-* __Tracking:__ track your sport and outdoor activities 
+* __Tracking:__ track your sport and outdoor activities
 * __Photos and Markers:__ mark interesting locations while tracking (also with photos)
-* __Bluetooth LE sensors:__ 
+* __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__
 * __No advertising__
 * __Privacy:__
     * _does not contain any in-app analytics_
-    * _does not use Google Play Services_ 
+    * _does not use Google Play Services_
     * _has no cloud integration_
-    
+
 __Only required permissions:__
 * _ACCESS_FINE_LOCATION_: required to use the GPS.
 
 An overview of Bluetooth LE sensors that are known to work with OpenTracks is in [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md).
 
 _Please note:_
-_OpenTracks_ does not contain a _map_ (as this would required Internet access).
+_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.
@@ -69,12 +84,16 @@ However, this is rather slow and does not provide updates while recording.
 
 ## Screenshots
 <div>
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_5.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_6.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot1.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot2.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot3.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot4.png">
+</div>
+<div>
+	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot5.png">
+    <img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot6.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot7.png">
+	<img width="23%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot8.png">
 </div>
 
 ## Project history
@@ -87,8 +106,8 @@ Plonk42's version is available [here](https://github.com/Plonk42/mytracks).
 In 2019, _OpenTracks_ was forked from Plonk42's _My Tracks_ and major rework was conducted.
 
 Rework of _OpenTracks_ included:
-* removing Google's analytics code, 
-* removing integration into Google Drive, 
+* removing Google's analytics code,
+* removing integration into Google Drive,
 * removing Google Maps integration,
 * removing Google Earth integration,
 * removing use of Google Play service,
@@ -98,7 +117,7 @@ Rework of _OpenTracks_ included:
 * removing Protobuf (store sensosensorr data in SQLite columns directly), and
 * removing Android Service API for other apps.
 
-Artwork, logos and user interface remained more or less unchanged. 
+Artwork, logos and user interface remained more or less unchanged.
 
 More information about _Google My Tracks_:
 * [Wikipedia page](https://en.wikipedia.org/wiki/MyTracks)

README_RELEASE.md

@@ -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/).

README_TESTED_SENSORS.md

@@ -1,20 +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
+

RELEASE.sh

@@ -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"

UPDATE_SCREENSHOTS.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+# Folder where svg screenshots are expected.
+SRC_DIR="screenshots-svg/"
+# Folder where png files will be saved.
+DST_DIR="fastlane/metadata/android/en-US/phoneScreenshots/"
+
+echo "Exporting svg files to png..."
+
+# Source and destination folder must exist.
+if [ ! -d "$SRC_DIR" ]
+then
+    echo "\nERROR: ${SRC_DIR} doesn't exist."
+    exit
+fi
+
+if [ ! -d "$DST_DIR" ]
+then
+    echo "\nERROR: ${DST_DIR} doesn't exist."
+    exit
+fi
+
+# It needs Inkscape that is the tool used to convert svg to png.
+if ! command -v inkscape > /dev/null
+then
+    echo "\nERROR: inkscape couldn't be found and it's needed to convert screenshots from svg to png."
+    exit
+fi
+
+# Convert all svg files from source directory.
+for path in ${SRC_DIR}/*.svg
+do
+    filename="${path##*/}"
+    basename="${filename%.svg}"
+    `inkscape ${path} --export-filename ${DST_DIR}/${basename}.png`
+done

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }
 
@@ -45,10 +45,14 @@ android {
 
     compileSdkVersion 30
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 3661
-        versionName "v3.11.1"
+        versionCode 3862
+        versionName "v3.15.1"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -82,17 +86,18 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha04'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.1'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 
     androidTestImplementation 'androidx.test:core:1.3.0'
     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.5.13'
+    androidTestImplementation 'org.mockito:mockito-android:3.8.0'
 }

doc/activities.txt

@@ -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,10 +42,14 @@ MarkerDetailActivity --> CoordinateOnMapIntent : URI
 
 SettingsActivity --> AboutActivity
 SettingsActivity --> HelpActivity
+SettingsActivity --> ImportActivity
 SettingsActivity --> ExportActivity
-SettingsActivity --> DirectoryChooserActivity
-SettingsActivity --> DirectoryChooserActivity
-DirectoryChooserActivity$ImportDirectoryChooserActivity --> ImportActivity
-DirectoryChooserActivity$ExportDirectoryChooserActivity --> ExportActivity
+SettingsActivity --> DirectoryChooserActivity.ImportDirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity.ExportDirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity.DefaultTrackExportDirectoryChooserActivity
+DirectoryChooserActivity.ImportDirectoryChooserActivity --> ImportActivity
+DirectoryChooserActivity.ExportDirectoryChooserActivity --> ExportActivity
+
+FileImportIntent --> ImportActivity
 
 @enduml

doc/data-flow.txt

@@ -4,7 +4,8 @@ LocationManager --> TrackRecordingService
 ElevationSumManager --> TrackRecordingService
 
 TrackRecordingService --> TrackRecordingServiceConnection
-TrackRecordingService --> Database
+TrackRecordingService --> CustomContentProvider
+CustomContentProvider --> Database
 
 Database --> CustomContentProvider
 CustomContentProvider --> TrackDataHub

doc/data-structure.txt

@@ -8,10 +8,10 @@ class Track {
     -icon
 }
 Track o-- TrackPoint
-Track o-- Waypoint
-Track "1" - "1" TripStatistics
+Track o-- Marker
+Track "1" - "1" TrackStatistics
 
-class TripStatistics {
+class TrackStatistics {
     - startTime
     - stopTime
     - totalDistance
@@ -21,8 +21,15 @@ class TripStatistics {
     - totalElevationGain
 }
 
-class TrackPoint extends android.location.Location {
-    - id
+class TrackStatisticsUpdater {
+}
+
+TrackStatisticsUpdater ..> TrackStatistics : creates/updates
+TrackStatisticsUpdater ..> TrackPoint : uses
+
+class TrackPoint {
+    - id (database id, order)
+    - type
     - trackId
     - longitude
     - latitude
@@ -36,7 +43,8 @@ class TrackPoint extends android.location.Location {
     - sensor_power
 }
 
-class Waypoint {
+
+class Marker {
     - id
     - trackId
     - name
@@ -45,8 +53,28 @@ class Waypoint {
     - icon
     - length
     - duration
-    - location
-    - tripStatistics
+    - longitude
+    - latitude
     - photoUrl
 }
+
+note left of TrackPoint
+As of OpenTracks version 3.15.0, all times are using device time.
+Before that TrackPoint.time contained GPS time (determined by GPS hardware).
+However, start/pause/stop events (also stored as TrackPoints) used device time.
+end note
+
+note right of Track
+A track is an ordered collection of one or more segments (i.e., continuous parts of distance covered).
+Segments may be started by a user (i.e., start a track recording, continue a paused track, or resume a track) as well as stopped by the user (i.e., pausing or stopping a recording).
+Also segments may started automatically while recording (i.e., distance to previous location was to large).
+Note that this finishes the previous segment.
+
+Segment data is stored as TrackPoints (Type.SEGMENT_START_MANUAL, Type.SEGMENT_START_AUTOMATIC, or Type.SEGMENT_END_MANUAL).
+Trackpoints with Type.SEGMENT_START_AUTOMATIC also mark the end of the previous segment.
+All TrackPoints of Type.TRACKPOINT belong to the segment started by the prior TrackPoint with Type.SEGMENT_START_(MANUAL|AUTOMATIC).
+Trackpoints of Type.SEGMENT_START_MANUAL or Type.SEGMENT_END_MANUAL do not contain location data or sensor data.
+
+Tracks recorded prior to OpenTracks version 3.15.0, do neither begin with a Type.SEGMENT_START_MANUAL nor end with a Type.SEGMENT_END_MANUAL.
+end note
 @enduml

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

@@ -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

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

@@ -0,0 +1,22 @@
+v3.12.0: OpenTracks
+
+Changes:
+- Bluetooth sensor addresses
+- Intervals: show elevation gain
+- Export: default export directory
+- Export: automatic export after finishing a track
+- Manual import/export: new user interface
+- Manual export: option to overwrite on manual export
+
+Faster:
+- Track lists loading
+- Deleting multiple tracks
+
+Bugfix:
+- Fixed intent filters for import
+- KMZ could not be parsed
+- Export: fix crash on Android 11
+
+Developer:
+- Use ViewBindings
+- Database enforces foreign key and uses cascading deletes

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

@@ -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

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

@@ -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)

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

@@ -0,0 +1,5 @@
+v3.13.2: OpenTracks
+
+Bugfix:
+- Crash in landscape mode
+

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

@@ -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

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

@@ -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

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

@@ -0,0 +1,10 @@
+v3.14.2: OpenTracks
+
+Changes:
+- Downgrade database from upcoming release v3.15.0
+- Import/Export UI improved
+- Import offers to show imported track
+- Marker list performance improved 
+
+Developer:
+- Track.Id/Marker.Id: use null 

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

@@ -0,0 +1,4 @@
+v3.14.3: OpenTracks
+
+Bugfix: 
+- Downgrading database from upcoming release v3.15.0

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

@@ -0,0 +1,22 @@
+v3.15.0: OpenTracks
+
+WARNING: 
+This release applies database changes that CANNOT BE REVERTED.
+As KMZ/KML export/import behaviour changes as well, it is recommended to (A) take a backup BEFORE upgrading and (B) afterwards.
+Recommended format: KMZ.
+
+BREAKING CHANGES:
+- Internal storage of track segments is changed
+  (user generated events are now considered trackpoints without a location but with timestamp)
+- Device time instead of GPS time is stored 
+  (existing data is not modified)
+- Dashboard API v2 
+  (please upgrade OSMDashboard 2.10.0)
+
+Changes:
+- KML/KMZ can used to backup and restore exactly (incl. statistics)
+
+Developer:
+- Reworked track segmentation and it's storage (formerly PAUSE/RESUME marker)
+- TrackStatistics are computed solely using TrackPoints
+- Replaced long with Instant/Duration

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

@@ -0,0 +1,7 @@
+v3.15.1: OpenTracks
+
+Changes:
+- After recording show sensor statistics (e.g., avg HR)
+
+Bugfix:
+- Crash on recording start with show latitude/longitude enabled

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

@@ -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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,7 +82,6 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -130,7 +129,6 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -1,104 +1,103 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

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

@@ -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();
+            }
+        };
+    }
+}

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

@@ -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();

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

@@ -25,6 +25,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Duration;
+import java.time.Instant;
+
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -40,7 +43,7 @@ import static org.junit.Assert.assertEquals;
 @RunWith(AndroidJUnit4.class)
 public class DescriptionGeneratorTest {
 
-    private static final long START_TIME = 1288721514000L;
+    private static final Instant START_TIME = Instant.ofEpochMilli(1288721514000L);
     private DescriptionGenerator descriptionGenerator;
 
     private final Context context = ApplicationProvider.getApplicationContext();
@@ -58,13 +61,14 @@ public class DescriptionGeneratorTest {
         Track track = new Track();
         TrackStatistics stats = new TrackStatistics();
         stats.setTotalDistance(20000);
-        stats.setTotalTime(600000);
-        stats.setMovingTime(300000);
+        stats.setTotalTime(Duration.ofMillis(600000));
+        stats.setMovingTime(Duration.ofMillis(300000));
         stats.setMaxSpeed(100);
         stats.setMaxElevation(550);
         stats.setMinElevation(-500);
-        stats.setTotalElevationGain(6000);
-        stats.setStartTime_ms(START_TIME);
+        stats.setTotalElevationGain(6000f);
+        stats.setTotalElevationLoss(6000f);
+        stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
         track.setCategory("hiking");
         String expected = //"Created by"
@@ -84,6 +88,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));
@@ -94,13 +99,14 @@ public class DescriptionGeneratorTest {
         Track track = new Track();
         TrackStatistics stats = new TrackStatistics();
         stats.setTotalDistance(20000);
-        stats.setTotalTime(600000);
-        stats.setMovingTime(300000);
+        stats.setTotalTime(Duration.ofMillis(600000));
+        stats.setMovingTime(Duration.ofMillis(300000));
         stats.setMaxSpeed(100);
         stats.setMaxElevation(Double.POSITIVE_INFINITY);
         stats.setMinElevation(Double.NEGATIVE_INFINITY);
-        stats.setTotalElevationGain(6000);
-        stats.setStartTime_ms(START_TIME);
+        stats.setTotalElevationGain(6000f);
+        stats.setTotalElevationLoss(6000f);
+        stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
         track.setCategory("hiking");
         String expected = //"Created by"
@@ -118,6 +124,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));
@@ -135,12 +142,12 @@ public class DescriptionGeneratorTest {
     }
 
     /**
-     * Tests {@link DescriptionGenerator#writeTime(long, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeTime(Duration, StringBuilder, int, String)}.
      */
     @Test
     public void testWriteTime() {
         StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeTime(1000, builder, R.string.description_total_time, "<br>");
+        descriptionGenerator.writeTime(Duration.ofMillis(1000), builder, R.string.description_total_time, "<br>");
         assertEquals("Total time: 00:01<br>", builder.toString());
     }
 

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

@@ -1,322 +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(location);
-        waypoint.setName(title);
-        waypoint.setDescription(description);
-        waypoint.setCategory(category);
-        waypoint.setTrackId(trackId);
-
-        Uri uri = providerUtils.insertMarker(waypoint);
-        return new Marker.Id(ContentUris.parseId(uri));
-    }
-
-    private Marker.Id insertWaypoint(String title, String description, String category) {
-        return insertWaypoint(title, description, category, 0.0, -1, null);
-    }
-
-    private Marker.Id insertWaypoint(String title, double distance) {
-        return insertWaypoint(title, "", "", distance, -1, null);
-    }
-
-    private Marker.Id insertWaypoint(String title, long hoursAgo) {
-        return insertWaypoint(title, "", "", 0.0, hoursAgo, null);
-    }
-
-    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
-        insertWaypoint("bb", "cc", "dd");
-        Marker.Id descriptionMatchId = insertWaypoint("bb", "aa", "cc");
-        Marker.Id categoryMatchId = insertWaypoint("bb", "cc", "aa");
-        Marker.Id titleMatchId = insertWaypoint("aa", "bb", "cc");
-        Marker.Id titleCategoryMatchId = insertWaypoint("aa", "bb", "ca");
-        Marker.Id titleDescriptionMatchId = insertWaypoint("aa", "ba", "cc");
-        Marker.Id allMatchId = insertWaypoint("aa", "ba", "ca");
-
-        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
-        Marker.Id descriptionWaypointId = insertWaypoint("bb", "aa", "cc");
-        insertWaypoint("bb", "cc", "dd");
-        Marker.Id titleWaypointId = insertWaypoint("aa", "bb", "cc");
-        insertTrack("bb", "cc", "dd");
-        Track.Id trackId = insertTrack("aa", "bb", "cc");
-
-        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.
-        Marker.Id farFarAwayId = insertWaypoint("aa", 0.3);
-        Marker.Id nearId = insertWaypoint("ab", 0.1);
-        Marker.Id farId = insertWaypoint("ac", 0.2);
-
-        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.
-        Marker.Id oldestId = insertWaypoint("aa", 2);
-        Marker.Id recentId = insertWaypoint("ab", 0);
-        Marker.Id oldId = insertWaypoint("ac", 1);
-
-        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.
-        Marker.Id otherId = insertWaypoint("aa", 1, new Track.Id(456));
-        Marker.Id currentId = insertWaypoint("ab", 1, new Track.Id(123));
-
-        SearchQuery query = new SearchQuery("a", null, new Track.Id(123), 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], result.marker.getId());
-        }
-    }
-}

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

@@ -1,12 +1,14 @@
 package de.dennisguse.opentracks.content.data;
 
 import android.content.Context;
-import android.location.Location;
 import android.net.Uri;
 import android.util.Pair;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.util.FileUtils;
@@ -16,6 +18,8 @@ public class TestDataUtil {
     public static final double INITIAL_LATITUDE = 37.0;
     public static final double INITIAL_LONGITUDE = -57.0;
     public static final double ALTITUDE_INTERVAL = 2.5;
+    public static final float ELEVATION_GAIN = 3;
+    public static final float ELEVATION_LOSS = 3;
 
     /**
      * Create a track without any trackPoints.
@@ -34,19 +38,65 @@ public class TestDataUtil {
      * @param trackId   the trackId of the track
      * @param numPoints the trackPoints number in the track
      */
-    public static Pair<Track, TrackPoint[]> createTrack(Track.Id trackId, int numPoints) {
+    @Deprecated //TODO Should start with SEGMENT_START_MANUAL and end with SEGMENT_END_MANUAL.
+    public static Pair<Track, List<TrackPoint>> createTrack(Track.Id trackId, int numPoints) {
         Track track = createTrack(trackId);
 
-        TrackPoint[] trackPoints = new TrackPoint[numPoints];
+        List<TrackPoint> trackPoints = new ArrayList<>(numPoints);
         for (int i = 0; i < numPoints; i++) {
-            trackPoints[i] = createTrackPoint(i);
+            trackPoints.add(createTrackPoint(i));
         }
 
         return new Pair<>(track, trackPoints);
     }
 
+
+    public static TrackData createTestingTrack(Track.Id trackId) {
+        Track track = createTrack(trackId);
+
+        int i = 0;
+        List<TrackPoint> trackPoints = List.of(
+                TrackPoint.createSegmentStartManualWithTime(Instant.ofEpochMilli(i++ + 1)),
+                createTrackPoint(i++),
+                createTrackPoint(i++),
+                createTrackPoint(i++),
+                createTrackPoint(i++, TrackPoint.Type.SEGMENT_START_AUTOMATIC),
+                createTrackPoint(i++),
+                createTrackPoint(i++),
+                createTrackPoint(i++),
+                TrackPoint.createSegmentEndWithTime(Instant.ofEpochSecond(i++ + 1)),
+
+                TrackPoint.createSegmentStartManualWithTime(Instant.ofEpochSecond(i++)),
+                createTrackPoint(i++),
+                createTrackPoint(i++),
+                createTrackPoint(i++),
+                TrackPoint.createSegmentEndWithTime(Instant.ofEpochSecond(i++ + 1))
+        );
+
+        List<Marker> markers = List.of(
+                new Marker("Marker 1", "Marker description 1", "Marker category 3", "", trackId, 0.0, 0, trackPoints.get(1), null),
+                new Marker("Marker 2", "Marker description 2", "Marker category 3", "", trackId, 0.0, 0, trackPoints.get(4), null),
+                new Marker("Marker 3", "Marker description 3", "Marker category 3", "", trackId, 0.0, 0, trackPoints.get(5), null)
+        );
+
+        return new TrackData(track, trackPoints, markers);
+    }
+
+    public static class TrackData {
+        public final Track track;
+        public final List<TrackPoint> trackPoints;
+        public final List<Marker> markers;
+
+        public TrackData(Track track, List<TrackPoint> trackPoints, List<Marker> markers) {
+            this.track = track;
+            this.trackPoints = trackPoints;
+            this.markers = markers;
+        }
+    }
+
+
     public static Track createTrackAndInsert(ContentProviderUtils contentProviderUtils, Track.Id trackId, int numPoints) {
-        Pair<Track, TrackPoint[]> pair = createTrack(trackId, numPoints);
+        Pair<Track, List<TrackPoint>> pair = createTrack(trackId, numPoints);
 
         insertTrackWithLocations(contentProviderUtils, pair.first, pair.second);
 
@@ -59,18 +109,25 @@ public class TestDataUtil {
      * @param i the index for the TrackPoint.
      */
     public static TrackPoint createTrackPoint(int i) {
-        TrackPoint trackPoint = new TrackPoint();
+        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT);
         trackPoint.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
         trackPoint.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
         trackPoint.setAccuracy((float) i / 100.0f);
         trackPoint.setAltitude(i * ALTITUDE_INTERVAL);
-        trackPoint.setTime(i + 1);
-        trackPoint.setSpeed(5f + (i / 10));
+        trackPoint.setTime(Instant.ofEpochSecond(i + 1));
+        trackPoint.setSpeed(5f + (i / 10f));
 
         trackPoint.setHeartRate_bpm(100f + i);
         trackPoint.setCyclingCadence_rpm(300f + i);
         trackPoint.setPower(400f + i);
-        trackPoint.setElevationGain(500f + i);
+        trackPoint.setElevationGain(ELEVATION_GAIN);
+        trackPoint.setElevationLoss(ELEVATION_LOSS);
+        return trackPoint;
+    }
+
+    public static TrackPoint createTrackPoint(int i, TrackPoint.Type type) {
+        TrackPoint trackPoint = createTrackPoint(i);
+        trackPoint.setType(type);
         return trackPoint;
     }
 
@@ -80,25 +137,17 @@ public class TestDataUtil {
      * @param track       track to be inserted
      * @param trackPoints trackPoints to be inserted
      */
-    public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, TrackPoint[] trackPoints) {
+    public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, List<TrackPoint> trackPoints) {
         contentProviderUtils.insertTrack(track);
         contentProviderUtils.bulkInsertTrackPoint(trackPoints, track.getId());
     }
 
-    /**
-     * Creates a Waypoint with a photo.
-     *
-     * @param context  The context.
-     * @param trackId  The track id.
-     * @param location The location.
-     * @return the Waypoint created.
-     */
-    public static Marker createWaypointWithPhoto(Context context, Track.Id trackId, Location location) throws IOException {
+    public static Marker createMarkerWithPhoto(Context context, Track.Id trackId, TrackPoint trackPoint) 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, trackPoint, photoUrl);
     }
 }

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

@@ -33,10 +33,12 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.data.MarkerColumns;
@@ -64,8 +66,9 @@ 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!";
@@ -87,50 +90,37 @@ public class CustomContentProviderUtilsTest {
 
     @Test
     public void testLocationIterator_noPoints() {
-        testIterator(new Track.Id(1), 0, 1, false);
+        testIterator(new Track.Id(1), 0, 1);
     }
 
     @Test
     public void testLocationIterator_noBatchAscending() {
-        testIterator(new Track.Id(1), 50, 100, false);
-        testIterator(new Track.Id(2), 50, 50, false);
-    }
-
-    @Test
-    public void testLocationIterator_noBatchDescending() {
-        testIterator(new Track.Id(1), 50, 100, true);
-        testIterator(new Track.Id(2), 50, 50, true);
+        testIterator(new Track.Id(1), 50, 100);
+        testIterator(new Track.Id(2), 50, 50);
     }
 
     @Test
     public void testLocationIterator_batchAscending() {
-        testIterator(new Track.Id(1), 50, 11, false);
-        testIterator(new Track.Id(2), 50, 25, false);
-    }
-
-    @Test
-    public void testLocationIterator_batchDescending() {
-        testIterator(new Track.Id(1), 50, 11, true);
-        testIterator(new Track.Id(2), 50, 25, true);
+        testIterator(new Track.Id(1), 50, 11);
+        testIterator(new Track.Id(2), 50, 25);
     }
 
     @Test
     public void testLocationIterator_largeTrack() {
-        testIterator(new Track.Id(1), 20000, 2000, false);
+        testIterator(new Track.Id(1), 20000, 2000);
     }
 
-    private void testIterator(Track.Id trackId, int numPoints, int batchSize, boolean descending) {
+    private void testIterator(Track.Id trackId, int numPoints, int batchSize) {
         long lastPointId = initializeTrack(trackId, numPoints);
         contentProviderUtils.setDefaultCursorBatchSize(batchSize);
         List<TrackPoint> locations = new ArrayList<>(numPoints);
-        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(trackId, -1L, descending)) {
+        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) {
             while (it.hasNext()) {
-                TrackPoint loc = it.next();
-                assertNotNull(loc);
-                locations.add(loc);
+                TrackPoint trackPoint = it.next();
+                assertNotNull(trackPoint);
+                locations.add(trackPoint);
                 // Make sure the IDs are returned in the right order.
-                assertEquals(descending ? lastPointId - locations.size() + 1
-                        : lastPointId - numPoints + locations.size(), it.getTrackPointId());
+                assertEquals(lastPointId - numPoints + locations.size(), trackPoint.getId().getId());
             }
             assertEquals(numPoints, locations.size());
         }
@@ -144,24 +134,24 @@ public class CustomContentProviderUtilsTest {
         track = contentProviderUtils.getTrack(id);
         assertNotNull(track);
 
-        TrackPoint[] trackPoints = new TrackPoint[numPoints];
+        List<TrackPoint> trackPoints = new ArrayList<>(numPoints);
         for (int i = 0; i < numPoints; ++i) {
             Location loc = new Location("test");
             loc.setLatitude(37.0 + (double) i / 10000.0);
             loc.setLongitude(57.0 - (double) i / 10000.0);
             loc.setAccuracy((float) i / 100.0f);
             loc.setAltitude(i * 2.5);
-            trackPoints[i] = new TrackPoint(loc);
+            trackPoints.add(new TrackPoint(loc));
         }
         contentProviderUtils.bulkInsertTrackPoint(trackPoints, id);
 
         // Load all inserted trackPoints.
         long lastPointId = -1;
         int counter = 0;
-        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(id, -1L, false)) {
+        try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(id, null)) {
             while (it.hasNext()) {
-                it.next();
-                lastPointId = it.getTrackPointId();
+                TrackPoint trackPoint = it.next();
+                lastPointId = trackPoint.getId().getId();
                 counter++;
             }
         }
@@ -198,7 +188,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 +198,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(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 +219,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);
+        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 +256,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());
     }
 
@@ -282,22 +272,21 @@ public class CustomContentProviderUtilsTest {
         Track.Id trackId2 = new Track.Id(random + 1);
         Track.Id trackId3 = new Track.Id(random + 2);
 
-        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId1, 0);
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId1, 10);
 
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId2, 10);
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId3, 10);
 
-        Marker waypoint = new Marker(contentProviderUtils.getLastValidTrackPoint(trackId2));
-        waypoint.setTrackId(trackId1);
-        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());
+        assertEquals(30, tracksPointsCursor.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.
@@ -305,15 +294,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);
@@ -324,15 +313,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);
+        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);
+        contentProviderUtils.insertMarker(marker2);
         File dir2 = FileUtils.getPhotoDir(context, trackId2);
 
         // Check.
@@ -341,9 +330,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());
@@ -357,8 +346,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());
     }
@@ -381,16 +370,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)}
      */
@@ -442,18 +421,16 @@ 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);
+        Pair<Track, List<TrackPoint>> track = TestDataUtil.createTrack(trackId, 10);
 
-        // Bottom
-        long startTime = 1000L;
         // AverageSpeed
         TrackStatistics statistics = new TrackStatistics();
-        statistics.setStartTime_ms(startTime);
-        statistics.setStopTime_ms(2500L);
-        statistics.setTotalTime(1500L);
-        statistics.setMovingTime(700L);
+        statistics.setStartTime(Instant.ofEpochMilli(1000));
+        statistics.setStopTime(Instant.ofEpochMilli(2500));
+        statistics.setTotalTime(Duration.ofMillis(1500));
+        statistics.setMovingTime(Duration.ofMillis(700));
         statistics.setTotalDistance(750.0);
         statistics.setTotalElevationGain(50.0f);
         statistics.setMaxSpeed(60.0);
@@ -463,16 +440,16 @@ public class CustomContentProviderUtilsTest {
         track.first.setTrackStatistics(statistics);
         contentProviderUtils.insertTrack(track.first);
 
-        Marker waypoint = new Marker(track.second[0]);
-        waypoint.setDescription(TEST_DESC);
-        contentProviderUtils.insertMarker(waypoint);
+        Marker marker = new Marker(trackId, track.second.get(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));
     }
@@ -481,7 +458,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++);
@@ -505,81 +482,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(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint1.setDescription(TEST_DESC);
-        waypoint1.setTrackId(trackId);
-        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);
+        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);
 
@@ -600,44 +576,38 @@ public class CustomContentProviderUtilsTest {
 //        TestDataUtil.insertTrackWithLocations(contentProviderUtils, track);
 
         // Insert at first.
-        Marker waypoint1 = new Marker(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint1.setDescription(MOCK_DESC);
-        waypoint1.setTrackId(trackId);
-        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(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint2.setDescription(MOCK_DESC);
-        waypoint2.setTrackId(trackId);
-        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(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint1.setTrackId(trackId);
-        Marker waypoint2 = new Marker(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint2.setTrackId(trackId);
-        Marker waypoint3 = new Marker(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint3.setTrackId(trackId);
-        Marker waypoint4 = new Marker(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint4.setTrackId(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));
     }
@@ -647,56 +617,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(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        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(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        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);
-        waypoint.setTrackId(trackId);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
+        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
+        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());
@@ -704,14 +671,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);
@@ -721,18 +688,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);
-        waypoint.setTrackId(trackId);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
+        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
+        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());
@@ -740,15 +706,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());
     }
 
@@ -756,55 +722,53 @@ 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);
-        waypoint.setTrackId(trackId);
-        Marker otherWaypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        otherWaypoint.setDescription(TEST_DESC);
-        otherWaypoint.setTrackId(trackId);
-        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
-        contentProviderUtils.insertMarker(otherWaypoint);
+        Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
+        marker.setDescription(TEST_DESC);
+        Marker otherMarker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
+        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);
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(TrackPoint[], Track.Id)}.
+     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(List, Track.Id)}.
      */
     @Test
     public void testBulkInsertTrackPoint() {
         // given
         Track.Id trackId = new Track.Id(System.currentTimeMillis());
-        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        Pair<Track, List<TrackPoint>> track = TestDataUtil.createTrack(trackId, 10);
         TestDataUtil.insertTrackWithLocations(contentProviderUtils, track.first, track.second);
 
         // when / then
         contentProviderUtils.bulkInsertTrackPoint(track.second, trackId);
-        assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
-        contentProviderUtils.bulkInsertTrackPoint(Arrays.copyOfRange(track.second, 0, 8), trackId);
-        assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
+        assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, null, 1000).getCount());
+        contentProviderUtils.bulkInsertTrackPoint(track.second.subList(0, 8), trackId);
+        assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, null, 1000).getCount());
     }
 
     /**
@@ -845,7 +809,7 @@ public class CustomContentProviderUtilsTest {
         // then
         assertEquals(longitude, trackPoint.getLongitude(), 0.01);
         assertEquals(latitude, trackPoint.getLatitude(), 0.01);
-        assertEquals(time, trackPoint.getTime(), 0.01);
+        assertEquals(time, trackPoint.getTime().toEpochMilli());
         assertEquals(speed, trackPoint.getSpeed(), 0.01);
         assertFalse(trackPoint.hasHeartRate());
     }
@@ -899,104 +863,45 @@ public class CustomContentProviderUtilsTest {
         checkLocation(9, lastTrackPoint.getLocation());
     }
 
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(Track.Id, long, int, boolean)} in descending.
-     */
-    @Test
-    public void testGetTrackPointCursor_desc() {
-        // given
-        Track.Id trackId = new Track.Id(System.currentTimeMillis());
-        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track.first);
-
-        long[] trackpointIds = new long[track.second.length];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
-        }
-
-        // when
-        Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[1], 5, true);
-
-        // then
-        assertEquals(2, cursor.getCount());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(Track.Id, long, int, boolean)} in ascending.
-     */
     @Test
     public void testGetTrackPointCursor_asc() {
         // given
         Track.Id trackId = new Track.Id(System.currentTimeMillis());
-        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        Pair<Track, List<TrackPoint>> track = TestDataUtil.createTrack(trackId, 10);
         contentProviderUtils.insertTrack(track.first);
 
-        long[] trackpointIds = new long[track.second.length];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
-        }
+        List<TrackPoint.Id> trackpointIds = track.second.stream()
+                .map(it -> ContentUris.parseId(contentProviderUtils.insertTrackPoint(it, track.first.getId())))
+                .map(TrackPoint.Id::new).collect(Collectors.toList());
 
         // when
-        Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[8], 5, false);
+        Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds.get(8), 5);
 
         // then
         assertEquals(2, cursor.getCount());
     }
 
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(Track.Id, long, boolean)} in descending.
-     */
-    @Test
-    public void testGetTrackPointLocationIterator_desc() {
-        // given
-        Track.Id trackId = new Track.Id(System.currentTimeMillis());
-        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
-        contentProviderUtils.insertTrack(track.first);
-
-        long[] trackpointIds = new long[track.second.length];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
-        }
-
-        long startTrackPointId = trackpointIds[9];
-        // when
-        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true);
-
-        // then
-        for (int i = 0; i < trackpointIds.length; i++) {
-            assertTrue(trackPointIterator.hasNext());
-            TrackPoint trackPoint = trackPointIterator.next();
-            assertEquals(startTrackPointId - i, trackPointIterator.getTrackPointId());
-            checkLocation((trackpointIds.length - 1) - i, trackPoint.getLocation());
-        }
-        assertFalse(trackPointIterator.hasNext());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(Track.Id, long, boolean)} in ascending.
-     */
     @Test
     public void testGetTrackPointLocationIterator_asc() {
         // given
         Track.Id trackId = new Track.Id(System.currentTimeMillis());
-        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
+        Pair<Track, List<TrackPoint>> track = TestDataUtil.createTrack(trackId, 10);
         contentProviderUtils.insertTrack(track.first);
 
-        long[] trackpointIds = new long[track.second.length];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId()));
-        }
+        List<TrackPoint.Id> trackpointIds = track.second.stream()
+                .map(it -> ContentUris.parseId(contentProviderUtils.insertTrackPoint(it, track.first.getId())))
+                .map(TrackPoint.Id::new).collect(Collectors.toList());
 
-        long startTrackPointId = trackpointIds[0];
+        TrackPoint.Id startTrackPointId = trackpointIds.get(0);
 
         // when
-        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false);
+        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, trackpointIds.get(0));
 
         // then
-        for (int i = 0; i < trackpointIds.length; i++) {
+        for (int i = 0; i < trackpointIds.size(); i++) {
             assertTrue(trackPointIterator.hasNext());
             TrackPoint trackPoint = trackPointIterator.next();
-            assertEquals(startTrackPointId + i, trackPointIterator.getTrackPointId());
+            assertEquals(startTrackPointId.getId() + i, trackPoint.getId().getId());
 
             checkLocation(i, trackPoint.getLocation());
         }

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

@@ -5,8 +5,8 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteQueryBuilder;
 
-import androidx.annotation.VisibleForTesting;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -15,7 +15,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import de.dennisguse.opentracks.content.data.MarkerColumns;
@@ -38,39 +40,21 @@ public class CustomSQLiteOpenHelperTest {
     private final Context context = ApplicationProvider.getApplicationContext();
 
     /**
-     * Get the SQL create statements for all tables (ordered by name).
+     * Get the SQL create statements for all SQLite elements of type (ordered by name).
      *
-     * @return Map(TableName, SQL)
+     * @param type index, table
+     * @return Map(name, SQL)
      */
-    @VisibleForTesting
-    public static Map<String, String> getTableSQL(SQLiteDatabase db) {
-        HashMap<String, String> tableSQL = new HashMap<>();
-        try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "name IN ('" + TracksColumns.TABLE_NAME + "', '" + TrackPointsColumns.TABLE_NAME + "', '" + MarkerColumns.TABLE_NAME + "')", null, null, null, "name")) {
+    public static Map<String, String> getSQL(SQLiteDatabase db, String type) {
+        HashMap<String, String> sqlMap = new HashMap<>();
+        try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "type=?", new String[]{type}, null, null, "name")) {
             if (cursor != null) {
                 while (cursor.moveToNext()) {
-                    tableSQL.put(cursor.getString(0), cursor.getString(1));
+                    sqlMap.put(cursor.getString(0), cursor.getString(1));
                 }
             }
         }
-        return tableSQL;
-    }
-
-    /**
-     * Get the SQL create statements for all indices (ordered by name).
-     *
-     * @return Map(tableName, SQL)
-     */
-    @VisibleForTesting
-    public static Map<String, String> getIndexSQL(SQLiteDatabase db) {
-        HashMap<String, String> indexSQL = new HashMap<>();
-        try (Cursor cursor = db.rawQuery("SELECT tbl_name, SQL FROM sqlite_master WHERE type = 'index'", null)) {
-            if (cursor != null) {
-                while (cursor.moveToNext()) {
-                    indexSQL.put(cursor.getString(0), cursor.getString(1));
-                }
-            }
-        }
-        return indexSQL;
+        return sqlMap;
     }
 
     /**
@@ -109,7 +93,7 @@ public class CustomSQLiteOpenHelperTest {
             assertTrue(hasSqlCreate(db, MarkerColumns.CREATE_TABLE));
             assertTrue(hasSqlCreate(db, MarkerColumns.CREATE_TABLE_INDEX));
         } catch (Exception e) {
-            fail();
+            fail("Database could not be created: " + e);
         }
     }
 
@@ -121,8 +105,8 @@ public class CustomSQLiteOpenHelperTest {
         Map<String, String> tableByUpgrade;
         Map<String, String> indicesByUpgrade;
         try (SQLiteDatabase dbUpgraded = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
-            tableByUpgrade = getTableSQL(dbUpgraded);
-            indicesByUpgrade = getIndexSQL(dbUpgraded);
+            tableByUpgrade = getSQL(dbUpgraded, "table");
+            indicesByUpgrade = getSQL(dbUpgraded, "index");
         }
         context.deleteDatabase(DATABASE_NAME);
 
@@ -130,12 +114,14 @@ public class CustomSQLiteOpenHelperTest {
         Map<String, String> tablesByCreate;
         Map<String, String> indicesByCreate;
         try (SQLiteDatabase dbCreated = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
-            tablesByCreate = getTableSQL(dbCreated);
-            indicesByCreate = getIndexSQL(dbCreated);
+            tablesByCreate = getSQL(dbCreated, "table");
+            indicesByCreate = getSQL(dbCreated, "index");
         }
 
+
         // then - verify table structure
-        assertEquals(3, tableByUpgrade.size());
+        int tableCount = 3 + 2; //Three with data tables + two SQLite
+        assertEquals(tableCount, tableByUpgrade.size());
         assertEquals(tableByUpgrade.size(), tablesByCreate.size());
 
         assertEquals(tablesByCreate.get(TracksColumns.TABLE_NAME), tableByUpgrade.get(TracksColumns.TABLE_NAME));
@@ -158,8 +144,8 @@ public class CustomSQLiteOpenHelperTest {
         Map<String, String> tablesByDowngrade;
         Map<String, String> indicesByDowngrade;
         try (SQLiteDatabase db = new CustomSQLiteOpenHelper(context, DATABASE_NAME, 23).getReadableDatabase()) {
-            tablesByDowngrade = getTableSQL(db);
-            indicesByDowngrade = getIndexSQL(db);
+            tablesByDowngrade = getSQL(db, "table");
+            indicesByDowngrade = getSQL(db, "index");
         }
 
         // then - verify table structure
@@ -182,6 +168,101 @@ public class CustomSQLiteOpenHelperTest {
         }
     }
 
+    @Test
+    public void upgrade_data_to_30() {
+        // given: a track in version 29
+        createVersion23();
+        try (SQLiteDatabase db29 = new CustomSQLiteOpenHelper(context, DATABASE_NAME, 29).getWritableDatabase()) {
+            db29.beginTransaction();
+            db29.execSQL("INSERT INTO tracks (_id) VALUES (1)");
+
+            // Record -> stop
+            db29.execSQL("INSERT INTO tracks (_id) VALUES (2)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (2, 2.1, 2.1)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (2, 2.2, 2.2)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (2, 2.3, 2.3)");
+
+            // Record -> pause -> stop
+            db29.execSQL("INSERT INTO tracks (_id) VALUES (3)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (3, 3.1, 3.1)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (3, 3.2, 3.2)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (3, 0.0, 100)"); //manual PAUSE
+
+            // Record -> segment marker (distance to previous) -> pause -> resume -> stop
+            db29.execSQL("INSERT INTO tracks (_id) VALUES (4)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 4.1, 4.1)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 4.2, 4.2)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 0.0, 100 * 1E6)"); //SegmentEndMarker; will be deleted
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 4.3, 4.3)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 4.4, 4.4)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 0.0, 100 * 1E6)"); //manual PAUSE
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 0.0, 200 * 1E6)"); //manual RESUME
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 4.5, 4.5)");
+            db29.execSQL("INSERT INTO trackpoints (trackId, longitude, latitude) VALUES (4, 4.6, 4.6)");
+
+            db29.setTransactionSuccessful();
+            db29.endTransaction();
+        }
+
+        // when / then
+        try (SQLiteDatabase db30 = new CustomSQLiteOpenHelper(context, DATABASE_NAME, 30).getWritableDatabase()) {
+            {
+                // Track 1
+                SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+                queryBuilder.setTables("trackpoints");
+                queryBuilder.appendWhere("trackid = 1");
+                try (Cursor cursor = queryBuilder.query(db30, null, null, null, null, null, "_id")) {
+                    assertEquals(0, cursor.getCount());
+                }
+            }
+
+            {
+                // Track 2
+                SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+                queryBuilder.setTables("trackpoints");
+                queryBuilder.appendWhere("trackid = 2");
+                try (Cursor cursor = queryBuilder.query(db30, null, null, null, null, null, "_id")) {
+                    assertEquals(3, cursor.getCount());
+                }
+            }
+
+            {
+                // Track 3
+                SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+                queryBuilder.setTables("trackpoints");
+                queryBuilder.appendWhere("trackid = 3");
+                try (Cursor cursor = queryBuilder.query(db30, null, null, null, null, null, "_id")) {
+                    assertEquals(3, cursor.getCount());
+                }
+            }
+
+            {
+                // Track 4
+                SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+                queryBuilder.setTables("trackpoints");
+                queryBuilder.appendWhere("trackid = 4");
+                try (Cursor cursor = queryBuilder.query(db30, null, null, null, null, null, "_id")) {
+                    assertEquals(8, cursor.getCount());
+
+                    List<Integer> types = new ArrayList<>();
+                    List<Double> latitude = new ArrayList<>();
+                    cursor.moveToFirst();
+                    do {
+                        types.add(cursor.getInt(cursor.getColumnIndexOrThrow("type")));
+                        if (!cursor.isNull(cursor.getColumnIndexOrThrow("latitude"))) {
+                            latitude.add(cursor.getDouble(cursor.getColumnIndexOrThrow("latitude")));
+                        } else {
+                            latitude.add(-1.0);
+                        }
+                    } while (cursor.moveToNext());
+
+                    assertEquals(List.of(0, 0, -1, 0, 1, -2, 0, 0), types);
+                    assertEquals(List.of(4.1, 4.2, 4.3, 4.4, -1.0, -1.0, 4.5, 4.6), latitude);
+                }
+            }
+        }
+    }
+
     private void createVersion23() {
         // Manually create database schema with version 23 (base version)
         SQLiteDatabase dbBase = new SQLiteOpenHelper(context, DATABASE_NAME, null, 23) {

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

@@ -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 {
@@ -23,7 +24,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        assertEquals(60, current.getCadence_rpm(), 0.01);
+        assertEquals(60, current.getValue(), 0.01);
     }
 
     @Test
@@ -36,7 +37,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        assertEquals(33.53, current.getCadence_rpm(), 0.01);
+        assertEquals(33.53, current.getValue(), 0.01);
     }
 
     @Test
@@ -49,7 +50,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        assertEquals(0, current.getCadence_rpm(), 0.01);
+        assertEquals(0, current.getValue(), 0.01);
     }
 
 
@@ -63,7 +64,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        assertFalse(current.hasCadence_rpm());
+        assertFalse(current.hasValue());
     }
 
     @Test
@@ -76,7 +77,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        assertEquals(60, current.getCadence_rpm(), 0.01);
+        assertEquals(60, current.getValue(), 0.01);
     }
 
     @Test
@@ -89,7 +90,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        assertEquals(60, current.getCadence_rpm(), 0.01);
+        assertEquals(60, current.getValue(), 0.01);
     }
 
     @Test
@@ -102,7 +103,7 @@ public class SensorDataCyclingTest {
         current.compute(previous, 2150);
 
         // then
-        assertEquals(1.20, current.getSpeed_mps(), 0.01);
+        assertEquals(1.20, current.getValue(), 0.01);
     }
 
     @Test
@@ -115,6 +116,34 @@ public class SensorDataCyclingTest {
         current.compute(previous, 2000);
 
         // then
-        assertEquals(2, current.getSpeed_mps(), 0.01);
+        assertEquals(2, current.getValue(), 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);
     }
 }

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

@@ -28,7 +28,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import de.dennisguse.opentracks.TrackStubUtils;
+import java.time.Duration;
+import java.time.Instant;
+
 import de.dennisguse.opentracks.chart.ChartPoint;
 import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.data.TrackPoint;
@@ -62,9 +64,8 @@ public class ChartFragmentTest {
     @Before
     public void setUp() {
         boolean chartByDistance = false;
-        chartFragment = (ChartFragment) ChartFragment.newInstance(chartByDistance);
+        chartFragment = ChartFragment.newInstance(chartByDistance);
         chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext(), chartByDistance));
-        chartFragment.setTrackStatisticsUpdater(TrackStubUtils.INITIAL_TIME);
     }
 
     /**
@@ -192,15 +193,21 @@ public class ChartFragmentTest {
      */
     @Test
     public void testCreatePendingPoint_time() {
+        // given
         chartFragment.setChartByDistance(false);
         TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
+        trackPoint1.setTime(Instant.ofEpochMilli(TrackStubUtils.INITIAL_TIME)); //Keep old TrackPoint behavior of having time=0 for this test
+
+        // when
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
+
+        // then
         assertEquals(0.0, point.getTimeOrDistance(), 0.01);
-        long timeSpan = 222;
+        Duration timeSpan = Duration.ofMillis(222);
         TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint2.setTime(trackPoint1.getTime() + timeSpan);
+        trackPoint2.setTime(Instant.ofEpochMilli(TrackStubUtils.INITIAL_TIME).plus(timeSpan));
         point = chartFragment.createPendingPoint(trackPoint2);
-        assertEquals((double) timeSpan, point.getTimeOrDistance(), 0.01);
+        assertEquals(timeSpan, Duration.ofMillis((long) point.getTimeOrDistance()));
     }
 
     /**
@@ -251,8 +258,8 @@ public class ChartFragmentTest {
         /*
          * Add a time span here to make sure the second point is valid, the value 222 here is doesn't matter.
          */
-        trackPoint2.setTime(trackPoint1.getTime() + 222);
-        trackPoint2.setSpeed(130);
+        trackPoint2.setTime(trackPoint1.getTime().plusMillis(222));
+        trackPoint2.setSpeed(130f);
         point = chartFragment.createPendingPoint(trackPoint2);
         assertEquals(130.0 * UnitConversions.MPS_TO_KMH, point.getSpeed(), 0.01);
     }
@@ -276,8 +283,8 @@ public class ChartFragmentTest {
          * Add a time span here to make sure the second point and the speed is valid.
          * Speed is valid if: speedDifference > Constants.MAX_ACCELERATION * timeDifference speedDifference = 102 -100 timeDifference = 222
          */
-        trackPoint2.setTime(trackPoint2.getTime() + 222);
-        trackPoint2.setSpeed(102);
+        trackPoint2.setTime(trackPoint2.getTime().plusMillis(222));
+        trackPoint2.setSpeed(102f);
         point = chartFragment.createPendingPoint(trackPoint2);
         assertEquals(102.0 * UnitConversions.MPS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01);
     }
@@ -301,8 +308,8 @@ public class ChartFragmentTest {
          * Add a time span here to make sure the second point and the speed is valid.
          * Speed is valid if: speedDifference > Constants.MAX_ACCELERATION * timeDifference speedDifference = 102 -100 timeDifference = 222
          */
-        trackPoint2.setTime(trackPoint2.getTime() + 222);
-        trackPoint2.setSpeed(102);
+        trackPoint2.setTime(trackPoint2.getTime().plusMillis(222));
+        trackPoint2.setSpeed(102f);
         point = chartFragment.createPendingPoint(trackPoint2);
         assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MPS_TO_KMH), point.getPace(), 0.01);
     }
@@ -314,7 +321,7 @@ public class ChartFragmentTest {
     public void testCreatePendingPoint_pace_zeroSpeed() {
         chartFragment.setReportSpeed(false);
         TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint.setSpeed(0);
+        trackPoint.setSpeed(0f);
         ChartPoint point = chartFragment.createPendingPoint(trackPoint);
         assertEquals(0.0, point.getPace(), 0.01);
     }

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

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.fragments;
 
 import android.location.Location;
 
@@ -57,7 +57,7 @@ public class TrackStubUtils {
         location.setAltitude(altitude);
         location.setAccuracy(INITIAL_ACCURACY);
         location.setSpeed(INITIAL_SPEED);
-        location.setTime(INITIAL_TIME);
+        location.setTime(INITIAL_TIME); //TODO This is nowadays ignored as the constructor will replace the time.
         location.setBearing(INITIAL_BEARING);
 
         return new TrackPoint(location);

src/androidTest/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackExporterTest.java

@@ -0,0 +1,53 @@
+package de.dennisguse.opentracks.io.file.exporter;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.ByteArrayOutputStream;
+import java.time.Instant;
+
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(JUnit4.class)
+public class KmlTrackExporterTest {
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    /**
+     * Sensor data by type should only be created if present in at least on TrackPoint.
+     */
+    @Test
+    public void writeCloseSegment_only_write_sensordata_if_present() {
+        String expected = "<when>1970-01-01T00:00:00Z</when>\n" +
+                "<gx:coord/>\n" +
+                "<ExtendedData>\n" +
+                "<SchemaData schemaUrl=\"#schema\">\n" +
+                "</SchemaData>\n" +
+                "</ExtendedData>\n" +
+                "</gx:Track>\n";
+
+        // given
+        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0));
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        KMLTrackExporter kmlTrackWriter = (KMLTrackExporter) TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        kmlTrackWriter.prepare(outputStream);
+
+        kmlTrackWriter.writeTrackPoint(trackPoint);
+
+        // when
+        kmlTrackWriter.writeCloseSegment();
+        kmlTrackWriter.close();
+
+        // then
+        assertEquals(expected, outputStream.toString());
+    }
+}

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

@@ -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());
-        }
-    }
-}

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

@@ -1,14 +1,21 @@
 package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
+import android.content.Intent;
+import android.location.Location;
+import android.os.Looper;
 import android.util.Log;
-import android.util.Pair;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.LargeTest;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.rule.ServiceTestRule;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -17,34 +24,50 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Export a track to {@link TrackFileFormat} and verify that the import is identical.
  * <p>
- * TODO: test ignores {@link TrackStatistics} for now.
  */
 @RunWith(JUnit4.class)
 public class ExportImportTest {
 
     private static final String TAG = ExportImportTest.class.getSimpleName();
 
+    @Rule
+    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
+
+    @Rule
+    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
+
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
     private final Context context = ApplicationProvider.getApplicationContext();
 
     private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
@@ -53,46 +76,54 @@ public class ExportImportTest {
     private static final String TRACK_CATEGORY = "the category";
     private static final String TRACK_DESCRIPTION = "the description";
 
-    private final List<Marker> markers = new ArrayList<>();
-    private final List<TrackPoint> trackPoints = new ArrayList<>();
+    private Track track;
+    private List<Marker> markers = new ArrayList<>();
+    private List<TrackPoint> trackPoints = new ArrayList<>();
 
+    private Track.Id trackId;
     private Track.Id importTrackId;
-    private final Track.Id trackId = new Track.Id(System.currentTimeMillis());
 
     @Before
-    public void setUp() {
-        Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
-        track.first.setIcon(TRACK_ICON);
-        track.first.setCategory(TRACK_CATEGORY);
-        track.first.setDescription(TRACK_DESCRIPTION);
-        contentProviderUtils.insertTrack(track.first);
-        contentProviderUtils.bulkInsertTrackPoint(track.second, track.first.getId());
+    public void setUp() throws TimeoutException {
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)));
 
-        trackPoints.clear();
-        trackPoints.addAll(Arrays.asList(track.second));
+        trackId = service.startNewTrack();
 
-        for (int i = 0; i < 3; i++) {
-            Marker marker = new Marker(track.second[i].getLocation());
-            marker.setName("the marker " + i);
-            marker.setDescription("the marker description " + i);
-            marker.setCategory("the marker category" + i);
-            marker.setIcon("the marker icon" + i);
-            marker.setPhotoUrl("the photo url" + i);
-            marker.setTrackId(trackId);
-            contentProviderUtils.insertMarker(marker);
+        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14, 10, 15, 10, 0, 66, 3, 50), 0);
+        service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null);
+        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.001, 10, 15, 10, 0, 66, 3, 50), 0);
+        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.002, 10, 15, 10, 0, 66, 3, 50), 0);
+        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);
+        service.pauseCurrentTrack();
 
-            markers.add(marker);
-        }
+        service.resumeCurrentTrack();
+        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.003, 10, 15, 10, 0, 66, 3, 50), 0);
+        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 16, 10, 15, 10, 0, 66, 3, 50), 0);
+        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 16.001, 10, 15, 10, 0, 66, 3, 50), 0);
+        service.endCurrentTrack();
 
-        assertEquals(markers.size(), contentProviderUtils.getMarkerCount(trackId));
+        track = contentProviderUtils.getTrack(trackId);
+        track.setIcon(TRACK_ICON);
+        track.setCategory(TRACK_CATEGORY);
+        track.setDescription(TRACK_DESCRIPTION);
+        contentProviderUtils.updateTrack(track);
+
+        track = contentProviderUtils.getTrack(trackId);
+        trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        markers = contentProviderUtils.getMarkers(trackId);
+        assertEquals(10, trackPoints.size());
+        assertEquals(2, markers.size());
     }
 
     @After
     public void tearDown() {
         contentProviderUtils.deleteTrack(context, trackId);
-        contentProviderUtils.deleteTrack(context, importTrackId);
+        if (importTrackId != null) {
+            contentProviderUtils.deleteTrack(context, importTrackId);
+        }
     }
 
+    @Ignore("Not implemented")
     @LargeTest
     @Test
     public void kml_only_track() {
@@ -106,7 +137,7 @@ public class ExportImportTest {
         // given
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL.newTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL.createTrackExporter(context);
 
         // when
         // 1. export
@@ -129,11 +160,14 @@ public class ExportImportTest {
         assertEquals(track.getIcon(), importedTrack.getIcon());
         assertEquals(track.getUuid(), importedTrack.getUuid());
 
-        // 2. markers
-        assertMarkers();
+        // 2. trackpoints
+        assertTrackpoints(trackPoints, false, false, false, false, false);
 
-        // 3. trackpoints
-        assertTrackpoints(false, false, false, false);
+        // 3. trackstatistics
+        assertTrackStatistics(false, false);
+
+        // 4. markers
+        assertMarkers();
     }
 
     @LargeTest
@@ -142,7 +176,7 @@ public class ExportImportTest {
         // given
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.newTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
 
         // when
         // 1. export
@@ -164,21 +198,24 @@ public class ExportImportTest {
         assertEquals(track.getName(), importedTrack.getName());
         assertEquals(track.getIcon(), importedTrack.getIcon());
 
-        // 2. markers
-        assertMarkers();
+        // 2. trackpoints
+        assertTrackpoints(trackPoints, true, true, true, true, true);
 
-        // 3. trackpoints
-        assertTrackpoints(true, true, true, true);
+        // 2. trackstatistics
+        assertTrackStatistics(false, true);
+
+        // 4. markers
+        assertMarkers();
     }
 
     @LargeTest
-    @Test
+    @Test(expected = ImportAlreadyExistsException.class)
     public void kml_with_trackdetail_and_sensordata_duplicate_trackUUID() {
         // given
         PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.newTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
 
         // when
         // 1. export
@@ -195,6 +232,7 @@ public class ExportImportTest {
         assertNull(importedTrack);
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_only_track() {
@@ -202,6 +240,7 @@ public class ExportImportTest {
         Log.e(TAG, "Test not implemented.");
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_with_trackdetail() {
@@ -209,6 +248,7 @@ public class ExportImportTest {
         Log.e(TAG, "Test not implemented.");
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_with_trackdetail_and_sensordata() {
@@ -216,6 +256,7 @@ public class ExportImportTest {
         Log.e(TAG, "Test not implemented.");
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_with_trackdetail_and_sensordata_and_pictures() {
@@ -229,7 +270,7 @@ public class ExportImportTest {
         // given
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.GPX.newTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
 
         // when
         // 1. export
@@ -253,21 +294,30 @@ public class ExportImportTest {
         //TODO exporting and importing a track icon is not yet supported by GpxTrackWriter.
         //assertEquals(track.getIcon(), trackImported.getIcon());
 
-        // 2. markers
-        assertMarkers();
+        // 2. trackpoints
+        // The GPX exporter does not support exporting TrackPoints without lat/lng.
+        // Therefore, the track segmentation is changes.
+        List<TrackPoint> trackPointsWithCoordinates = trackPoints.stream().filter(it -> TrackPoint.Type.SEGMENT_START_AUTOMATIC.equals(it.getType()) || TrackPoint.Type.TRACKPOINT.equals(it.getType())).collect(Collectors.toList());
+        trackPointsWithCoordinates.get(0).setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
+        trackPointsWithCoordinates.get(3).setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
 
-        // 3. trackpoints
-        assertTrackpoints(false, true, true, false);
+        assertTrackpoints(trackPointsWithCoordinates, false, true, true, true, true);
+
+        // 3. trackstatistics
+        assertTrackStatistics(true, true);
+
+        // 4. markers
+        assertMarkers();
     }
 
     @LargeTest
-    @Test
+    @Test(expected = ImportAlreadyExistsException.class)
     public void gpx_duplicate_trackUUID() {
         // given
         PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.GPX.newTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
 
         // when
         // 1. export
@@ -304,23 +354,42 @@ public class ExportImportTest {
         }
     }
 
-    private void assertTrackpoints(boolean verifyPower, boolean verifyHeartrate, boolean verifyCadence, boolean verifyElevationGain) {
+    private void assertTrackpoints(List<TrackPoint> trackPoints, boolean verifyPower, boolean verifyHeartrate, boolean verifyCadence, boolean verifyElevationGain, boolean verifyElevationLoss) {
         List<TrackPoint> importedTrackPoints = contentProviderUtils.getTrackPoints(importTrackId);
+
         assertEquals(trackPoints.size(), importedTrackPoints.size());
 
         for (int i = 0; i < trackPoints.size(); i++) {
             TrackPoint trackPoint = trackPoints.get(i);
             TrackPoint importedTrackPoint = importedTrackPoints.get(i);
 
-            assertEquals(trackPoint.getTime(), importedTrackPoint.getTime(), 0.01);
+            assertEquals(trackPoint.getTime(), importedTrackPoint.getTime());
+            TrackPoint.Type type = trackPoint.getType();
+            Log.e(TAG, "" + importedTrackPoint.getType().equals(type));
+            assertEquals("" + i, type, importedTrackPoint.getType());
 
             // TODO Not exported for GPX/KML
             //   assertEquals(trackPoint.getAccuracy(), importedTrackPoint.getAccuracy(), 0.01);
 
-            assertEquals(trackPoint.getLatitude(), importedTrackPoint.getLatitude(), 0.001);
-            assertEquals(trackPoint.getLongitude(), importedTrackPoint.getLongitude(), 0.001);
-            assertEquals(trackPoint.getAltitude(), importedTrackPoint.getAltitude(), 0.001);
-            assertEquals(trackPoint.getSpeed(), importedTrackPoint.getSpeed(), 0.001);
+            assertEquals(trackPoint.hasLocation(), importedTrackPoint.hasLocation());
+            if (trackPoint.hasLocation()) {
+                assertEquals(trackPoint.getLatitude(), importedTrackPoint.getLatitude(), 0.001);
+                assertEquals(trackPoint.getLongitude(), importedTrackPoint.getLongitude(), 0.001);
+            }
+            assertEquals(trackPoint.hasSpeed(), importedTrackPoint.hasSpeed());
+            if (trackPoint.hasSpeed()) {
+                assertEquals(trackPoint.getSpeed(), importedTrackPoint.getSpeed(), 0.001);
+            }
+            assertEquals(trackPoint.hasAltitude(), importedTrackPoint.hasAltitude());
+            if (trackPoint.hasAltitude()) {
+                assertEquals(trackPoint.getAltitude(), importedTrackPoint.getAltitude(), 0.001);
+            }
+
+            if (type.equals(TrackPoint.Type.SEGMENT_START_MANUAL) || type.equals(TrackPoint.Type.SEGMENT_END_MANUAL)) {
+                //TODO REMOVE
+                continue;
+            }
+
             if (verifyHeartrate) {
                 assertEquals(trackPoint.getHeartRate_bpm(), importedTrackPoint.getHeartRate_bpm(), 0.01);
             }
@@ -333,6 +402,64 @@ public class ExportImportTest {
             if (verifyElevationGain) {
                 assertEquals(trackPoint.getElevationGain(), importedTrackPoint.getElevationGain(), 0.01);
             }
+            if (verifyElevationLoss) {
+                assertEquals(trackPoint.getElevationLoss(), importedTrackPoint.getElevationLoss(), 0.01);
+            }
         }
     }
+
+    private void assertTrackStatistics(boolean isGpx, boolean verifyElevationGainAndLoss) {
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+
+        assertNotNull(importedTrack.getTrackStatistics());
+
+        TrackStatistics trackStatistics = track.getTrackStatistics();
+        TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics();
+
+        // Time
+        assertTrue(trackStatistics.getStartTime().isBefore(trackStatistics.getStopTime())); //Just to be sure.
+        if (!isGpx) {
+            assertEquals(trackStatistics.getStartTime(), importedTrackStatistics.getStartTime());
+            assertEquals(trackStatistics.getStopTime(), importedTrackStatistics.getStopTime());
+
+            assertEquals(trackStatistics.getTotalTime(), importedTrackStatistics.getTotalTime());
+            assertEquals(trackStatistics.getMovingTime(), importedTrackStatistics.getMovingTime());
+
+            // Distance
+            assertEquals(trackStatistics.getTotalDistance(), importedTrackStatistics.getTotalDistance(), 0.01);
+
+            // Speed
+            assertEquals(trackStatistics.getMaxSpeed(), importedTrackStatistics.getMaxSpeed(), 0.01);
+            assertEquals(trackStatistics.getAverageSpeed(), importedTrackStatistics.getAverageSpeed(), 0.01);
+            assertEquals(trackStatistics.getAverageMovingSpeed(), importedTrackStatistics.getAverageMovingSpeed(), 0.01);
+        }
+
+        // Elevation
+        assertEquals(trackStatistics.getMinElevation(), importedTrackStatistics.getMinElevation(), 0.01);
+        assertEquals(trackStatistics.getMaxElevation(), importedTrackStatistics.getMaxElevation(), 0.01);
+        if (verifyElevationGainAndLoss) {
+            assertEquals(trackStatistics.getTotalElevationGain(), importedTrackStatistics.getTotalElevationGain(), 0.01);
+            assertEquals(trackStatistics.getTotalElevationLoss(), importedTrackStatistics.getTotalElevationLoss(), 0.01);
+        } else {
+            assertFalse(importedTrackStatistics.hasTotalElevationGain());
+            assertFalse(importedTrackStatistics.hasTotalElevationLoss());
+        }
+    }
+
+    private static TrackPoint createTrackPoint(long time, double latitude, double longitude, float accuracy, long speed, long altitude, float elevationGain, float heartRate, float cyclingCadence, float power) {
+        Location location = new Location("");
+        location.setTime(time);
+        location.setLongitude(longitude);
+        location.setLatitude(latitude);
+        location.setAccuracy(accuracy);
+        location.setAltitude(altitude);
+        location.setSpeed(speed);
+
+        TrackPoint tp = new TrackPoint(location);
+        tp.setHeartRate_bpm(heartRate);
+        tp.setCyclingCadence_rpm(cyclingCadence);
+        tp.setPower(power);
+        tp.setElevationGain(elevationGain);
+        return tp;
+    }
 }

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

@@ -0,0 +1,157 @@
+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.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Test that legacy KML/GPX formats can still be imported.
+ */
+@RunWith(JUnit4.class)
+public class LegacyImportTest {
+
+    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);
+        }
+    }
+
+    /**
+     * Check that data with statistics markers is imported and those ignored.
+     * Statistics marker were created to avoid recomputing the track statistics (e.g., distance until a certain time).
+     */
+    @LargeTest
+    @Test
+    public void kml_with_statistics_marker() {
+        // given
+        KmlFileTrackImporter trackImporter = new KmlFileTrackImporter(context);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_kml_statistics_marker);
+
+        // 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(6, importedTrackPoints.size());
+
+        // first 3 trackpoints
+        assertTrackpoint(importedTrackPoints.get(0), TrackPoint.Type.SEGMENT_START_AUTOMATIC, "2020-11-28T17:06:22.401Z", 1.234156, 12.340097, 469.286376953125);
+        assertTrackpoint(importedTrackPoints.get(1), TrackPoint.Type.TRACKPOINT, "2020-11-28T17:06:25.448Z", 1.23415, 12.340036, 439.1626281738281);
+        assertTrackpoint(importedTrackPoints.get(2), TrackPoint.Type.TRACKPOINT, "2020-11-28T17:06:47.888Z", 1.23405, 12.340057, 421.8070983886719);
+
+        // created resume trackpoint with time of next valid trackpoint
+        assertTrackpoint(importedTrackPoints.get(3), TrackPoint.Type.SEGMENT_START_AUTOMATIC, "2020-11-28T17:06:55.861Z", 1.23405, 12.340057, 419.93902587890625);
+        assertTrackpoint(importedTrackPoints.get(4), TrackPoint.Type.TRACKPOINT, "2020-11-28T17:06:56.905Z", 1.23405, 12.340057, 419.9036560058594);
+        assertTrackpoint(importedTrackPoints.get(5), TrackPoint.Type.TRACKPOINT, "2020-11-28T17:07:20.870Z", 1.234046, 12.340082, 417.99432373046875);
+    }
+
+    /**
+     * At least one valid location is required.
+     * Before v3.15.0, Tracks without TrackPoints could be created; such tracks cannot be imported as we cannot restore the TrackStatistics (especially startTime and stopTime).
+     */
+    @LargeTest
+    @Test(expected = ImportParserException.class)
+    public void kml_without_locations() {
+        // given
+        KmlFileTrackImporter trackImporter = new KmlFileTrackImporter(context);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_kml_empty);
+
+        // when
+        importTrackId = trackImporter.importFile(inputStream);
+    }
+
+    /**
+     * Check that data that contains pause (lat=100, lng=0) and resume (lat=200, lng=0) locations are restored to a segment break.
+     */
+    @LargeTest
+    @Test
+    public void gpx_with_pause_resume() {
+        // given
+        GpxFileTrackImporter trackImporter = new GpxFileTrackImporter(context);
+        InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_gpx_pause_resume);
+
+        // when
+        // 1. import
+        importTrackId = trackImporter.importFile(inputStream);
+
+        // then
+        // 1. track
+        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
+        assertNotNull(importedTrack);
+        assertEquals("the category", importedTrack.getCategory());
+        assertEquals("the description", importedTrack.getDescription());
+        assertEquals("2021-01-07 22:51", importedTrack.getName());
+        assertEquals("UNKNOWN", importedTrack.getIcon());
+
+        // 3. trackpoints
+        List<TrackPoint> importedTrackPoints = contentProviderUtils.getTrackPoints(importTrackId);
+        assertEquals(6, importedTrackPoints.size());
+
+        // first segment
+        assertTrackpoint(importedTrackPoints.get(0), TrackPoint.Type.SEGMENT_START_AUTOMATIC, "2021-01-07T21:51:59.179Z", 14.0, 3.0, 10.0);
+        assertTrackpoint(importedTrackPoints.get(1), TrackPoint.Type.TRACKPOINT, "2021-01-07T21:52:00.653Z", 14.001, 3.0, 10.0);
+        assertTrackpoint(importedTrackPoints.get(2), TrackPoint.Type.TRACKPOINT, "2021-01-07T21:52:01.010Z", 14.002, 3.0, 10.0);
+        assertTrackpoint(importedTrackPoints.get(3), TrackPoint.Type.SEGMENT_END_MANUAL, "2021-01-07T21:52:02.658Z", null, null, null);
+
+        // created resume trackpoint with time of next valid trackpoint
+        assertTrackpoint(importedTrackPoints.get(4), TrackPoint.Type.SEGMENT_START_MANUAL, "2021-01-07T21:52:03.873Z", null, null, null);
+        assertTrackpoint(importedTrackPoints.get(5), TrackPoint.Type.TRACKPOINT, "2021-01-07T21:52:04.103Z", 14.003, 3.0, 10.0);
+    }
+
+    private void assertTrackpoint(final TrackPoint trackPoint, final TrackPoint.Type type, final String when, final Double longitude, final Double latitude, final Double altitude) {
+        assertEquals(StringUtils.parseTime(when), trackPoint.getTime());
+        assertEquals(type, trackPoint.getType());
+
+        if (longitude == null) {
+            assertFalse(trackPoint.hasLocation());
+        } else {
+            assertEquals(latitude, (Double) trackPoint.getLatitude());
+            assertEquals(longitude, (Double) trackPoint.getLongitude());
+        }
+
+        if (altitude == null) {
+            assertFalse(trackPoint.hasAltitude());
+        } else {
+            assertEquals(altitude, (Double) trackPoint.getAltitude());
+        }
+
+    }
+}

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

@@ -20,6 +20,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.time.Duration;
+
 import de.dennisguse.opentracks.services.handlers.AdaptiveLocationListenerPolicy;
 
 import static org.junit.Assert.assertEquals;
@@ -32,13 +34,13 @@ import static org.junit.Assert.assertEquals;
 @RunWith(JUnit4.class)
 public class AdaptiveLocationListenerPolicyTest {
 
-    private static final long MIN = 1000;
-    private static final long MAX = 3000;
+    private static final Duration MIN = Duration.ofMillis(1000);
+    private static final Duration MAX = Duration.ofMillis(3000);
     private static final int MIN_DISTANCE = 10;
-    private static final long NEW_IDLE_TIME_BIG = 10000;
-    private static final long NEW_IDLE_TIME_NORMAL = 5000;
-    private static final long NEW_IDLE_TIME_SMALL = 2000;
-    private static final long NEW_IDLE_TIME_LESS_THAN_MIN = 500;
+    private static final Duration NEW_IDLE_TIME_BIG = Duration.ofMillis(10000);
+    private static final Duration NEW_IDLE_TIME_NORMAL = Duration.ofMillis(5000);
+    private static final Duration NEW_IDLE_TIME_SMALL = Duration.ofMillis(2000);
+    private static final Duration NEW_IDLE_TIME_LESS_THAN_MIN = Duration.ofMillis(500);
     private AdaptiveLocationListenerPolicy adaptiveLocationListenerPolicy;
 
     @Before
@@ -62,7 +64,7 @@ public class AdaptiveLocationListenerPolicyTest {
 
         adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_NORMAL);
         // First get the half of NEW_IDLE_TIME_NORMAL, and then round it to the nearest second.
-        assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        assertEquals(NEW_IDLE_TIME_NORMAL.dividedBy(2).getSeconds(), adaptiveLocationListenerPolicy.getDesiredPollingInterval().getSeconds());
 
         adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL);
         assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());

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

@@ -47,7 +47,6 @@ import de.dennisguse.opentracks.R;
 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.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -138,7 +137,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,9 +155,9 @@ public class TrackRecordingServiceTest {
 
     @MediumTest
     @Test
-    public void testRecording_oldTracks() throws Exception {
+    public void testRecording_oldTracks() throws TimeoutException {
         // given
-        createDummyTrack(trackId, -1L, false);
+        createDummyTrack(trackId, false);
 
         // when
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
@@ -170,9 +169,9 @@ public class TrackRecordingServiceTest {
 
     @MediumTest
     @Test
-    public void testRecording_serviceRestart_whileRecording() throws Exception {
+    public void testRecording_serviceRestart_whileRecording() throws TimeoutException {
         // given
-        createDummyTrack(trackId, -1L, true);
+        createDummyTrack(trackId, true);
 
         //when
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
@@ -183,11 +182,44 @@ public class TrackRecordingServiceTest {
 
     @MediumTest
     @Test
-    public void testRecording_pauseAndResume() throws Exception {
+    public void testRecording_start() throws TimeoutException {
         // given
-        createDummyTrack(trackId, -1L, true);
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
-        newTrackPoint(service);
+
+        // when
+        Track.Id trackId = service.startNewTrack();
+
+        // then
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+
+        assertEquals(1, trackPoints.size());
+        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_stop() throws TimeoutException {
+        // given
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        Track.Id trackId = service.startNewTrack();
+
+        // when
+        service.endCurrentTrack();
+
+        // then
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+
+        assertEquals(2, trackPoints.size());
+        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
+        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_pauseAndResume() throws TimeoutException {
+        // given
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        Track.Id trackId = service.startNewTrack();
 
         // when
         service.pauseCurrentTrack();
@@ -197,29 +229,28 @@ public class TrackRecordingServiceTest {
 
         //when
         service.resumeTrack(trackId);
-        newTrackPoint(service);
 
         // then
         assertTrue(service.isRecording());
         assertEquals(trackId, service.getRecordingTrackId());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        assertEquals(5, trackPoints.size());
-        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
-        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
-        assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(3).getLatitude(), 0.01);
+        assertEquals(3, trackPoints.size());
+        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
+        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
+        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(2).getType());
     }
 
     @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)));
-        newTrackPoint(service);
+        Track.Id trackId = service.startNewTrack();
+        assertTrue(service.isRecording());
         service.endCurrentTrack();
 
-        assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size());
+        assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size());
 
         // when
         service.resumeTrack(trackId);
@@ -231,14 +262,40 @@ public class TrackRecordingServiceTest {
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
         assertEquals(4, trackPoints.size());
-        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
-        assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
+        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
+        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
+        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(2).getType());
+        assertEquals(TrackPoint.Type.TRACKPOINT, trackPoints.get(3).getType());
+    }
+
+    @MediumTest
+    @Test
+    public void testRecording_stopPausedTrack() throws TimeoutException {
+        // given
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        Track.Id trackId = service.startNewTrack();
+        assertTrue(service.isRecording());
+        service.pauseCurrentTrack();
+
+        assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size());
+
+        // when
+        service.endCurrentTrack();
+
+        // then
+        assertFalse(service.isRecording());
+        assertNull(service.getRecordingTrackId());
+
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        assertEquals(2, trackPoints.size());
+        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
+        assertEquals(TrackPoint.Type.SEGMENT_END_MANUAL, trackPoints.get(1).getType());
     }
 
     @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 +311,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 +331,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 +347,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 +370,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());
@@ -328,7 +385,7 @@ public class TrackRecordingServiceTest {
     }
 
     private void addTrack(Track track, boolean isRecording) {
-        assertTrue(track.getId().isValid());
+        assertNotNull(track.getId());
         contentProviderUtils.insertTrack(track);
         assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId());
         PreferencesUtils.setLong(context, R.string.recording_track_id_key, isRecording ? track.getId().getId() : PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
@@ -336,12 +393,11 @@ public class TrackRecordingServiceTest {
     }
 
     // NOTE: Do not use to create a track that is currently recording.
-    private void createDummyTrack(Track.Id id, long stopTime, boolean isRecording) {
+    private void createDummyTrack(Track.Id id, boolean isRecording) {
         Track dummyTrack = new Track();
         dummyTrack.setId(id);
         dummyTrack.setName("Dummy Track");
         TrackStatistics trackStatistics = new TrackStatistics();
-        trackStatistics.setStopTime_ms(stopTime);
         dummyTrack.setTrackStatistics(trackStatistics);
         addTrack(dummyTrack, isRecording);
     }
@@ -358,7 +414,7 @@ public class TrackRecordingServiceTest {
      * Inserts a location and waits for 200ms.
      */
     private static void newTrackPoint(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed, long time) throws InterruptedException {
-        Location location = new Location("gps");
+        Location location = new Location("");
         location.setLongitude(longitude);
         location.setLatitude(latitude);
         location.setAccuracy(accuracy);
@@ -368,8 +424,5 @@ public class TrackRecordingServiceTest {
         TrackPoint trackPoint = new TrackPoint(location);
         int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(ApplicationProvider.getApplicationContext());
         trackRecordingService.newTrackPoint(trackPoint, prefAccuracy);
-
-        //TODO Needed?
-        Thread.sleep(200);
     }
 }

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

@@ -4,6 +4,7 @@ import android.content.ContentProvider;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Looper;
+import android.util.Pair;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -24,7 +25,6 @@ import java.util.concurrent.TimeoutException;
 
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
@@ -34,6 +34,7 @@ import de.dennisguse.opentracks.util.PreferencesUtils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Tests insert location.
@@ -69,6 +70,7 @@ public class TrackRecordingServiceTestLocation {
         customContentProvider.attachInfo(context, null);
 
         contentProviderUtils = new ContentProviderUtils(context);
+        tearDown();
 
         // Let's use default values.
         SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
@@ -79,11 +81,6 @@ public class TrackRecordingServiceTestLocation {
 
     @After
     public void tearDown() {
-        // Reset service (if some previous test failed)
-        if (service.isRecording() || service.isPaused()) {
-            service.endCurrentTrack();
-        }
-
         // Ensure that the database is empty after every test
         contentProviderUtils.deleteAllTracks(context);
     }
@@ -95,12 +92,12 @@ public class TrackRecordingServiceTestLocation {
         Track.Id trackId = service.startNewTrack();
 
         // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0001, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0002, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0003, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0001, 35.0, 2, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0002, 35.0, 3, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0003, 35.0, 4, 15);
         TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0005, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0005, 35.0, 6, 15);
 
         service.endCurrentTrack();
 
@@ -108,8 +105,17 @@ public class TrackRecordingServiceTestLocation {
         assertFalse(service.isRecording());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        assertEquals(6, trackPoints.size());
-        assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01);
+        assertEquals(8, trackPoints.size());
+        assertTrackPoints(List.of(
+                new Pair<>(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 1),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 2),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 3),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 4),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 5),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 6),
+                new Pair<>(TrackPoint.Type.SEGMENT_END_MANUAL, null)
+        ), trackPoints);
     }
 
     @MediumTest
@@ -117,14 +123,15 @@ public class TrackRecordingServiceTestLocation {
     public void testOnLocationChangedAsync_slowMovingAccurate() throws Exception {
         // given
         Track.Id trackId = service.startNewTrack();
+        assertNotNull(trackId);
 
         // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000001, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000002, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000003, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000001, 35.0, 2, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000002, 35.0, 3, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000003, 35.0, 4, 15);
         TrackRecordingServiceTest.newTrackPoint(service, 45.000004, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000005, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000005, 35.0, 6, 15);
 
         service.endCurrentTrack();
 
@@ -132,8 +139,13 @@ public class TrackRecordingServiceTestLocation {
         assertFalse(service.isRecording());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        assertEquals(2, trackPoints.size());
-        assertEquals(45.000005, trackPoints.get(1).getLatitude(), 0.01);
+        assertEquals(4, trackPoints.size());
+        assertTrackPoints(List.of(
+                new Pair<>(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 1),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 6),
+                new Pair<>(TrackPoint.Type.SEGMENT_END_MANUAL, null)
+        ), trackPoints);
     }
 
 //    @MediumTest
@@ -174,10 +186,13 @@ public class TrackRecordingServiceTestLocation {
         assertFalse(service.isRecording());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        assertEquals(3, trackPoints.size());
-        assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
-        assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
-        assertEquals(6, trackPoints.get(2).getAccuracy(), 0.01);
+        assertTrackPoints(List.of(
+                new Pair<>(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 1),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 2),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 6),
+                new Pair<>(TrackPoint.Type.SEGMENT_END_MANUAL, null)
+        ), trackPoints);
     }
 
     @MediumTest
@@ -200,14 +215,17 @@ public class TrackRecordingServiceTestLocation {
         assertFalse(service.isRecording());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        assertEquals(4, trackPoints.size());
-        assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
-        assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
-        assertEquals(5, trackPoints.get(2).getAccuracy(), 0.01); //TODO Check why this trackPoint is inserted.
-        assertEquals(6, trackPoints.get(3).getAccuracy(), 0.01);
+        assertEquals(6, trackPoints.size());
+        assertTrackPoints(List.of(
+                new Pair<>(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 1),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 2),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 5),  //TODO Check why this trackPoint is inserted.
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 6),
+                new Pair<>(TrackPoint.Type.SEGMENT_END_MANUAL, null)
+        ), trackPoints);
     }
 
-
     @MediumTest
     @Test
     public void testOnLocationChangedAsync_idle_withSensorData() throws Exception {
@@ -230,12 +248,12 @@ public class TrackRecordingServiceTestLocation {
         });
 
         // when
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 0, 0);
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 2, 0);
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 3, 0);
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 4, 0);
         TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 5, 0);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 6, 0);
 
         service.endCurrentTrack();
 
@@ -243,13 +261,17 @@ public class TrackRecordingServiceTestLocation {
         assertFalse(service.isRecording());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        assertEquals(6, trackPoints.size());
-        assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01);
-        assertEquals(1, trackPoints.get(1).getAccuracy(), 0.01);
-        assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
-        assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
-        assertEquals(4, trackPoints.get(4).getAccuracy(), 0.01);
-        assertEquals(5, trackPoints.get(5).getAccuracy(), 0.01);
+        assertEquals(8, trackPoints.size());
+        assertTrackPoints(List.of(
+                new Pair<>(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 1),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 2),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 3),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 4),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 5),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 6),
+                new Pair<>(TrackPoint.Type.SEGMENT_END_MANUAL, null)
+        ), trackPoints);
     }
 
     @MediumTest
@@ -272,12 +294,26 @@ public class TrackRecordingServiceTestLocation {
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
         assertEquals(7, trackPoints.size());
-        assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
-        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
-        assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
-        assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
-        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(4).getLatitude(), 0.01);
-        assertEquals(4, trackPoints.get(5).getAccuracy(), 0.01);
-        assertEquals(5, trackPoints.get(6).getAccuracy(), 0.01);
+        assertTrackPoints(List.of(
+                new Pair<>(TrackPoint.Type.SEGMENT_START_MANUAL, null),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 1),
+
+                new Pair<>(TrackPoint.Type.SEGMENT_START_AUTOMATIC, 2),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 3),
+
+                new Pair<>(TrackPoint.Type.SEGMENT_START_AUTOMATIC, 4),
+                new Pair<>(TrackPoint.Type.TRACKPOINT, 5),
+                new Pair<>(TrackPoint.Type.SEGMENT_END_MANUAL, null)
+        ), trackPoints);
+    }
+
+    private void assertTrackPoints(List<Pair<TrackPoint.Type, Object>> typeAndAccuracy, List<TrackPoint> actual) {
+        assertEquals(typeAndAccuracy.size(), actual.size());
+        for (int i = 0; i < typeAndAccuracy.size(); i++) {
+            assertEquals(typeAndAccuracy.get(i).first, actual.get(i).getType());
+            if (typeAndAccuracy.get(i).second != null) {
+                assertEquals((Integer) typeAndAccuracy.get(i).second, actual.get(i).getAccuracy(), 0.01);
+            }
+        }
     }
 }

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

@@ -19,6 +19,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -203,7 +204,7 @@ public class TrackRecordingServiceTestLooper {
 
         // Start a track.
         Track.Id trackId = service.startNewTrack();
-        assertTrue(trackId.isValid());
+        assertNotNull(trackId);
         assertTrue(service.isRecording());
         Track track = contentProviderUtils.getTrack(trackId);
         assertNotNull(track);
@@ -239,7 +240,7 @@ public class TrackRecordingServiceTestLooper {
         assertEquals(trackId, track.getId());
         TrackStatistics trackStatistics = track.getTrackStatistics();
         assertNotNull(trackStatistics);
-        assertTrue(trackStatistics.getStartTime_ms() > 0);
-        assertTrue(trackStatistics.getStopTime_ms() >= trackStatistics.getStartTime_ms());
+        assertTrue(trackStatistics.getStartTime().isAfter(Instant.ofEpochMilli(0)));
+        assertTrue(trackStatistics.getStopTime().isAfter(trackStatistics.getStartTime()));
     }
 }

src/androidTest/java/de/dennisguse/opentracks/services/handlers/HandlerServerTest.java

@@ -50,7 +50,7 @@ public class HandlerServerTest {
     @Test
     public void sendTrackPoint() throws InterruptedException {
         // given
-        TrackPoint trackPoint = new TrackPoint();
+        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT);
         int accuracy = 50;
 
         // when

src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java

@@ -3,10 +3,12 @@ package de.dennisguse.opentracks.services.handlers;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.location.Location;
+import android.os.Looper;
 
 import androidx.test.core.app.ApplicationProvider;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -32,6 +34,12 @@ public class LocationHandlerTest {
     @InjectMocks
     private LocationHandler locationHandler;
 
+    @BeforeClass
+    public static void preSetUp() {
+        // Prepare looper for Android's message queue
+        if (Looper.myLooper() == null) Looper.prepare();
+    }
+
     @Before
     public void setUp() {
         // Let's use default values.
@@ -80,7 +88,6 @@ public class LocationHandlerTest {
         int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
 
         // when
-        // poor latitude
         locationHandler.onLocationChanged(createLocation(45f, 35f, prefAccuracy + 1, 5, System.currentTimeMillis()));
 
         // then

src/androidTest/java/de/dennisguse/opentracks/services/sensors/ElevationSumManagerTest.java

@@ -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

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

@@ -20,7 +20,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.time.Duration;
+import java.time.Instant;
+
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * Tests for {@link TrackStatistics}.
@@ -39,16 +43,40 @@ public class TrackStatisticsTest {
     }
 
     @Test
-    public void testMerge() {
+    public void testMerge_no_data() {
+        // given
         TrackStatistics statistics2 = new TrackStatistics();
-        statistics.setStartTime_ms(1000L);  // Resulting start time
-        statistics.setStopTime_ms(2500L);
-        statistics2.setStartTime_ms(3000L);
-        statistics2.setStopTime_ms(4000L);  // Resulting stop time
-        statistics.setTotalTime(1500L);
-        statistics2.setTotalTime(1000L);  // Result: 1500+1000
-        statistics.setMovingTime(700L);
-        statistics2.setMovingTime(600L);  // Result: 700+600
+
+        // when
+        statistics.merge(statistics2);
+
+        // then
+        assertNull(statistics.getStartTime());
+        assertNull(statistics.getStopTime());
+        assertEquals(Duration.ofSeconds(0), statistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(0), statistics.getTotalTime());
+
+        assertNull(statistics.getTotalElevationGain());
+        assertNull(statistics.getTotalElevationLoss());
+        assertEquals(Double.NEGATIVE_INFINITY, statistics.getMaxElevation(), 0.0);
+        assertEquals(Double.POSITIVE_INFINITY, statistics.getMinElevation(), 0.0);
+        assertEquals(0.0, statistics.getMaxSpeed(), 0.0);
+        assertEquals(0.0, statistics.getAverageSpeed(), 0.0);
+        assertEquals(0.0, statistics.getAverageMovingSpeed(), 0.0);
+    }
+
+    @Test
+    public void testMerge() {
+        // given
+        TrackStatistics statistics2 = new TrackStatistics();
+        statistics.setStartTime(Instant.ofEpochMilli(1000));  // Resulting start time
+        statistics.setStopTime(Instant.ofEpochMilli(2500));
+        statistics2.setStartTime(Instant.ofEpochMilli(3000));
+        statistics2.setStopTime(Instant.ofEpochMilli(4000));  // Resulting stop time
+        statistics.setTotalTime(Duration.ofMillis(1500));
+        statistics2.setTotalTime(Duration.ofMillis(1000));  // Result: 1500+1000
+        statistics.setMovingTime(Duration.ofMillis(700));
+        statistics2.setMovingTime(Duration.ofMillis(600));  // Result: 700+600
         statistics.setTotalDistance(750.0);
         statistics2.setTotalDistance(350.0);  // Result: 750+350
         statistics.setTotalElevationGain(50.0f);
@@ -60,15 +88,17 @@ public class TrackStatisticsTest {
         statistics2.setMaxElevation(3575.0);  // Resulting max elevation
         statistics2.setMinElevation(2800.0);
 
+        // when
         statistics.merge(statistics2);
 
-        assertEquals(1000L, statistics.getStartTime_ms());
-        assertEquals(4000L, statistics.getStopTime_ms());
-        assertEquals(2500L, statistics.getTotalTime());
-        assertEquals(1300L, statistics.getMovingTime());
+        // then
+        assertEquals(Instant.ofEpochMilli(1000), statistics.getStartTime());
+        assertEquals(Instant.ofEpochMilli(4000), statistics.getStopTime());
+        assertEquals(Duration.ofMillis(2500), statistics.getTotalTime());
+        assertEquals(Duration.ofMillis(1300), statistics.getMovingTime());
         assertEquals(1100.0, statistics.getTotalDistance(), 0.001);
         assertEquals(900.0, statistics.getTotalElevationGain(), 0.001);
-        assertEquals(statistics.getTotalDistance() / (statistics.getMovingTime() / 1000.0), statistics.getMaxSpeed(), 0.001);
+        assertEquals(statistics.getTotalDistance() / statistics.getMovingTime().getSeconds(), statistics.getMaxSpeed(), 0.001);
         assertEquals(1200.0, statistics.getMinElevation(), 0.001);
         assertEquals(3575.0, statistics.getMaxElevation(), 0.001);
     }
@@ -76,14 +106,14 @@ public class TrackStatisticsTest {
     @Test
     public void testGetAverageSpeed() {
         statistics.setTotalDistance(1000.0);
-        statistics.setTotalTime(50000);  // in milliseconds
+        statistics.setTotalTime(Duration.ofMillis(50000));
         assertEquals(20.0, statistics.getAverageSpeed(), 0.001);
     }
 
     @Test
     public void testGetAverageMovingSpeed() {
         statistics.setTotalDistance(1000.0);
-        statistics.setMovingTime(20000);  // in milliseconds
+        statistics.setMovingTime(Duration.ofMillis(20000));
         assertEquals(50.0, statistics.getAverageMovingSpeed(), 0.001);
     }
 }

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

@@ -0,0 +1,38 @@
+package de.dennisguse.opentracks.stats;
+
+import org.junit.Test;
+
+import java.time.Duration;
+
+import de.dennisguse.opentracks.content.data.TestDataUtil;
+import de.dennisguse.opentracks.content.data.Track;
+
+import static org.junit.Assert.assertEquals;
+
+public class TrackStatisticsUpdaterTest {
+
+    @Test
+    public void addTrackPoint() {
+        // given
+        TestDataUtil.TrackData data = TestDataUtil.createTestingTrack(new Track.Id(1));
+
+        // when
+        TrackStatisticsUpdater updater = new TrackStatisticsUpdater();
+        data.trackPoints.forEach(it -> updater.addTrackPoint(it, 50));
+
+        // then
+        TrackStatistics statistics = updater.getTrackStatistics();
+        assertEquals(85.35, statistics.getTotalDistance(), 0.01);
+        assertEquals(Duration.ofMillis(13999), statistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(6), statistics.getMovingTime());
+
+        assertEquals(2.5, statistics.getMinElevation(), 0.01);
+        assertEquals(27.5, statistics.getMaxElevation(), 0.01);
+        assertEquals(27, statistics.getTotalElevationGain(), 0.01);
+        assertEquals(27.0, statistics.getTotalElevationLoss(), 0.01);
+
+        assertEquals(14.226, statistics.getMaxSpeed(), 0.01);
+        assertEquals(14.226, statistics.getAverageMovingSpeed(), 0.01);
+        assertEquals(6.566, statistics.getAverageSpeed(), 0.01);
+    }
+}

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

@@ -8,7 +8,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.Arrays;
+import java.time.Duration;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
@@ -26,13 +26,15 @@ public class AnnouncementUtilsTest {
     private final Context context = ApplicationProvider.getApplicationContext();
 
     @Test
-    public void getAnnouncement() {
+    public void getAnnouncement_metric() {
+        PreferencesUtils.setString(context, R.string.stats_units_key, context.getString(R.string.stats_units_metric));
+
         TrackStatistics stats = new TrackStatistics();
         stats.setTotalDistance(20000);
-        stats.setTotalTime(600000);
-        stats.setMovingTime(300000);
+        stats.setTotalTime(Duration.ofMillis(600000));
+        stats.setMovingTime(Duration.ofMillis(300000));
         stats.setMaxSpeed(100);
-        stats.setTotalElevationGain(6000);
+        stats.setTotalElevationGain(6000f);
 
         // when
         String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", null);
@@ -42,43 +44,26 @@ public class AnnouncementUtilsTest {
     }
 
     @Test
-    public void getAnnouncement_withInterval() {
+    public void getAnnouncement_withInterval_metric() {
+        PreferencesUtils.setString(context, R.string.stats_units_key, context.getString(R.string.stats_units_metric));
+
         TrackStatistics stats = new TrackStatistics();
         stats.setTotalDistance(20000);
-        stats.setTotalTime(600000);
-        stats.setMovingTime(300000);
+        stats.setTotalTime(Duration.ofMillis(600000));
+        stats.setMovingTime(Duration.ofMillis(300000));
         stats.setMaxSpeed(100);
-        stats.setTotalElevationGain(6000);
+        stats.setTotalElevationGain(6000f);
 
-        IntervalStatistics intervalStatistics = new IntervalStatistics();
-        List<TrackPoint> trackPoints = Arrays.asList(TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 10).second);
-        intervalStatistics.build(trackPoints, 1000);
+        List<TrackPoint> trackPoints = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 10).second;
+        IntervalStatistics intervalStatistics = new IntervalStatistics(trackPoints, 1000);
         IntervalStatistics.Interval lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
 
-        int speedId = R.plurals.voiceSpeedKilometersPerHour;
-        double kmPerHour = lastInterval.getSpeed_ms() * UnitConversions.MPS_TO_KMH;
-
-        String firstPartMsg = "OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour";
-        String rateMsg = " Lap speed of " + context.getResources().getQuantityString(speedId, getQuantityCount(kmPerHour), kmPerHour);
-        String msg = firstPartMsg + rateMsg;
+        String expected = "OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour Lap speed of 51.2 kilometers per hour";
 
         // when
         String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", lastInterval);
 
         // then
-        assertEquals(msg, announcement);
-    }
-
-    private int getQuantityCount(double d) {
-        if (d == 0) {
-            return 0;
-        } else if (d == 1) {
-            return 1;
-        } else if (d == 2) {
-            return 2;
-        } else {
-            int count = (int) d;
-            return Math.max(count, 3);
-        }
+        assertEquals(expected, announcement);
     }
 }

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

@@ -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);
+    }
 }

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

@@ -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
     }
 }

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

@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Duration;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
@@ -40,55 +41,32 @@ public class StringUtilsTest {
 
     private final Context context = ApplicationProvider.getApplicationContext();
 
-
     /**
-     * Tests {@link StringUtils#formatDateTimeIso8601(long)}.
-     */
-    @Test
-    public void testFormatDateTimeIso8601() {
-        assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345));
-    }
-
-    /**
-     * Tests {@link StringUtils#formatElapsedTime(long)}.
+     * Tests {@link StringUtils#formatElapsedTime(Duration)}.
      */
     @Test
     public void testformatElapsedTime() {
-        // 1 second
-        assertEquals("00:01", StringUtils.formatElapsedTime(1000));
-        // 10 seconds
-        assertEquals("00:10", StringUtils.formatElapsedTime(10000));
-        // 1 minute
-        assertEquals("01:00", StringUtils.formatElapsedTime(60000));
-        // 10 minutes
-        assertEquals("10:00", StringUtils.formatElapsedTime(600000));
-        // 1 hour
-        assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000));
-        // 10 hours
-        assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000));
-        // 100 hours
-        assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000));
+        assertEquals("00:01", StringUtils.formatElapsedTime(Duration.ofMillis(1000)));
+        assertEquals("00:10", StringUtils.formatElapsedTime(Duration.ofMillis(10000)));
+        assertEquals("01:00", StringUtils.formatElapsedTime(Duration.ofMillis(60000)));
+        assertEquals("10:00", StringUtils.formatElapsedTime(Duration.ofMillis(600000)));
+        assertEquals("1:00:00", StringUtils.formatElapsedTime(Duration.ofMillis(3600000)));
+        assertEquals("10:00:00", StringUtils.formatElapsedTime(Duration.ofMillis(36000000)));
+        assertEquals("100:00:00", StringUtils.formatElapsedTime(Duration.ofMillis(360000000)));
     }
 
     /**
-     * Tests {@link StringUtils#formatElapsedTimeWithHour(long)}.
+     * Tests {@link StringUtils#formatElapsedTimeWithHour(Duration)}.
      */
     @Test
     public void testformatElapsedTimeWithHour() {
-        // 1 second
-        assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000));
-        // 10 seconds
-        assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000));
-        // 1 minute
-        assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000));
-        // 10 minutes
-        assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000));
-        // 1 hour
-        assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000));
-        // 10 hours
-        assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000));
-        // 100 hours
-        assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000));
+        assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(Duration.ofMillis(1000)));
+        assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(Duration.ofMillis(10000)));
+        assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(Duration.ofMillis(60000)));
+        assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(Duration.ofMillis(600000)));
+        assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(Duration.ofMillis(3600000)));
+        assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(Duration.ofMillis(36000000)));
+        assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(Duration.ofMillis(360000000)));
     }
 
     /**
@@ -170,29 +148,7 @@ public class StringUtilsTest {
 
         // This comparision tends to be flaky (difference of 1ms)
         // Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime));
-        assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1);
-    }
-
-    /**
-     * Tests {@link StringUtils#getTimeParts(long)} with a positive number.
-     */
-    @Test
-    public void testGetTimeParts_positive() {
-        int[] parts = StringUtils.getTimeParts(61000);
-        assertEquals(1, parts[0]);
-        assertEquals(1, parts[1]);
-        assertEquals(0, parts[2]);
-    }
-
-    /**
-     * Tests {@link StringUtils#getTimeParts(long)} with a negative number.
-     */
-    @Test
-    public void testGetTimeParts_negative() {
-        int[] parts = StringUtils.getTimeParts(-61000);
-        assertEquals(-1, parts[0]);
-        assertEquals(-1, parts[1]);
-        assertEquals(0, parts[2]);
+        assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime).toEpochMilli()) <= 1);
     }
 
     @Test
@@ -226,4 +182,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));
+    }
 }

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

@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
 import java.util.Locale;
 
 import de.dennisguse.opentracks.R;
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
 public class TrackNameUtilsTest {
 
     private static final Track.Id TRACK_ID = new Track.Id(1L);
-    private static final long START_TIME = 1288213406000L;
+    private static final Instant START_TIME = Instant.ofEpochMilli(1288213406000L);
 
     private static final Context CONTEXT = ApplicationProvider.getApplicationContext();
 
@@ -62,7 +62,7 @@ public class TrackNameUtilsTest {
     public void testTrackName_date_iso_8601() {
         PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value));
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(TrackNameUtils.ISO_8601_FORMAT, Locale.US);
-        assertEquals(simpleDateFormat.format(new Date(START_TIME)), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals(simpleDateFormat.format(START_TIME.toEpochMilli()), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 
     /**

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

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

src/androidTest/java/de/dennisguse/opentracks/viewmodels/AggregatedStatisticsTest.java

@@ -8,6 +8,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -21,19 +25,12 @@ public class AggregatedStatisticsTest {
 
     private final Context context = ApplicationProvider.getApplicationContext();
 
-    /**
-     * Create a TrackStatistics object.
-     *
-     * @param totalDistance distance in meters.
-     * @param totalTime     total time in milliseconds.
-     * @return TrackStatistics object.
-     */
     private static Track createTrack(Context context, long totalDistance, long totalTime, String category) {
         TrackStatistics statistics = new TrackStatistics();
-        statistics.setStartTime_ms(1000L);  // Resulting start time
-        statistics.setStopTime_ms(1000L + totalTime);
-        statistics.setTotalTime(totalTime);
-        statistics.setMovingTime(totalTime);
+        statistics.setStartTime(Instant.ofEpochMilli(1000L));  // Resulting start time
+        statistics.setStopTime(Instant.ofEpochMilli(1000L + totalTime));
+        statistics.setTotalTime(Duration.ofMillis(totalTime));
+        statistics.setMovingTime(Duration.ofMillis(totalTime));
         statistics.setTotalDistance(totalDistance);
         statistics.setTotalElevationGain(50.0f);
         statistics.setMaxSpeed(50.0);  // Resulting max speed
@@ -57,8 +54,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());
@@ -67,7 +63,7 @@ public class AggregatedStatisticsTest {
 
         TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
         assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-        assertEquals(totalTime, statistics2.getMovingTime());
+        assertEquals(Duration.ofMillis(totalTime), statistics2.getMovingTime());
     }
 
     @Test
@@ -80,8 +76,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 +92,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 +105,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());
@@ -128,7 +117,7 @@ public class AggregatedStatisticsTest {
 
         TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
         assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
-        assertEquals(totalTime * 2L, statistics2.getMovingTime());
+        assertEquals(Duration.ofMillis(totalTime * 2), statistics2.getMovingTime());
     }
 
     @Test
@@ -141,17 +130,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());
@@ -165,19 +151,19 @@ public class AggregatedStatisticsTest {
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
             assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(Duration.ofMillis(totalTime), statistics2.getMovingTime());
         }
 
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics();
             assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(Duration.ofMillis(totalTime), statistics2.getMovingTime());
         }
 
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics();
             assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(Duration.ofMillis(totalTime), statistics2.getMovingTime());
         }
     }
 
@@ -191,7 +177,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 +187,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.
@@ -232,28 +214,35 @@ public class AggregatedStatisticsTest {
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
             assertEquals(totalDistance * 5, statistics2.getTotalDistance(), 0);
-            assertEquals(totalTime * 5, statistics2.getMovingTime());
+            assertEquals(Duration.ofMillis(totalTime * 5), statistics2.getMovingTime());
         }
 
         // Running.
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics();
             assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
-            assertEquals(totalTime * 2, statistics2.getMovingTime());
+            assertEquals(Duration.ofMillis(totalTime * 2), statistics2.getMovingTime());
         }
 
         // Walking.
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics();
             assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
-            assertEquals(totalTime * 2, statistics2.getMovingTime());
+            assertEquals(Duration.ofMillis(totalTime * 2), statistics2.getMovingTime());
         }
 
         // Driving.
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(driving).getTrackStatistics();
             assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(Duration.ofMillis(totalTime), statistics2.getMovingTime());
+        }
+
+        // Check order
+
+        {
+            assertEquals(biking, aggregatedStatistics.getItem(0).getCategory());
+            assertEquals(driving, aggregatedStatistics.getItem(3).getCategory());
         }
     }
 }

src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java

@@ -1,12 +1,9 @@
 package de.dennisguse.opentracks.viewmodels;
 
-import android.util.Pair;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.util.Arrays;
 import java.util.List;
 
 import de.dennisguse.opentracks.content.data.TestDataUtil;
@@ -24,17 +21,16 @@ public class IntervalStatisticsTest {
 	private static final String TAG = IntervalStatisticsTest.class.getSimpleName();
 
 	private List<TrackPoint> buildTrackPoints(int numberOfTrackPoints) {
-		Pair<Track, TrackPoint[]> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints);
-		return Arrays.asList(pair.second);
+		return TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints).second;
 	}
 
 	private TrackStatistics buildTrackStatistics(List<TrackPoint> trackPoints) {
-		TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoints.get(0).getTime());
-		for (TrackPoint tp : trackPoints) {
-			trackStatisticsUpdater.addTrackPoint(tp, 0);
-		}
-		return trackStatisticsUpdater.getTrackStatistics();
-	}
+        TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater();
+        for (TrackPoint tp : trackPoints) {
+            trackStatisticsUpdater.addTrackPoint(tp, 0);
+        }
+        return trackStatisticsUpdater.getTrackStatistics();
+    }
 
 	/**
 	 * Tests that build method compute the distance correctly comparing the result with TrackStatisticsUpdater result.
@@ -47,10 +43,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 +59,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);
 	}
 
 	/**
@@ -80,11 +74,10 @@ public class IntervalStatisticsTest {
 		// given
 		List<TrackPoint> trackPoints = buildTrackPoints(200);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
-		float distanceInterval = 3000;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();
+		float distanceInterval = 3000f;
 
 		// when and then
-		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+		whenAndThen(trackPoints, trackStatistics, distanceInterval);
 	}
 
 	/**
@@ -97,11 +90,10 @@ public class IntervalStatisticsTest {
 		// given
 		List<TrackPoint> trackPoints = buildTrackPoints(1000);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
-		float distanceInterval = 3000;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();
+		float distanceInterval = 3000f;
 
 		// when and then
-		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+		whenAndThen(trackPoints, trackStatistics, distanceInterval);
 	}
 
 	/**
@@ -114,27 +106,29 @@ public class IntervalStatisticsTest {
 		// given
 		List<TrackPoint> trackPoints = buildTrackPoints(10000);
 		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
-		float distanceInterval = 1000;
-		IntervalStatistics intervalStatistics = new IntervalStatistics();
+		float distanceInterval = 1000f;
 
 		// 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;
+		float totalTime = 0L;
+		float totalGain = 0f;
 		for (IntervalStatistics.Interval i : intervalList) {
 			totalDistance += i.getDistance_m();
-			totalTime += ((i.getDistance_m() / i.getSpeed_ms()) * UnitConversions.S_TO_MS);
+			totalTime += i.getDistance_m() / i.getSpeed_ms();
+			totalGain += i.getGain_m();
 		}
 
 		// then
 		assertEquals(trackStatistics.getTotalDistance(), totalDistance, 0.01);
-		assertEquals(trackStatistics.getTotalTime() * UnitConversions.MS_TO_S, totalTime * UnitConversions.MS_TO_S, 0.1);
+		assertEquals(trackStatistics.getTotalTime().toMillis(), totalTime * UnitConversions.S_TO_MS, 1);
 		assertEquals(intervalList.size(), (int) Math.ceil(trackStatistics.getTotalDistance() / distanceInterval));
+		assertEquals(totalGain, trackPoints.size() * TestDataUtil.ELEVATION_GAIN, 0.1);
 		for (int i = 0; i < intervalList.size() - 1; i++) {
 			assertEquals(intervalList.get(i).getDistance_m(), distanceInterval, 0.001);
 			totalDistance -= intervalList.get(i).getDistance_m();

src/androidTest/res/.readme

@@ -1 +0,0 @@
-This hidden file is here to ensure there is a res folder.

src/androidTest/res/raw/legacy_gpx_pause_resume.gpx

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx xmlns="http://www.topografix.com/GPX/1/1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:gpxtpx="http://www.garmin.com/xmlschemes/TrackPointExtension/v2" xmlns:opentracks="http://opentracksapp.com/xmlschemas/v1" xmlns:topografix="http://www.topografix.com/GPX/Private/TopoGrafix/0/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" creator="OpenTracks (Debug)" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.topografix.com/GPX/Private/TopoGrafix/0/1 http://www.topografix.com/GPX/Private/TopoGrafix/0/1/topografix.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v2 https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd">
+  <metadata>
+    <name><![CDATA[2021-01-07 22:51]]></name>
+    <desc><![CDATA[the description]]></desc>
+  </metadata>
+  <wpt lat="3" lon="14">
+    <ele>10</ele>
+    <time>2021-01-07T21:51:59.179Z</time>
+    <name><![CDATA[Marker 1]]></name>
+    <desc><![CDATA[Marker 1 desc]]></desc>
+    <type><![CDATA[Marker 1 category]]></type>
+  </wpt>
+  <wpt lat="3" lon="14.002">
+    <ele>10</ele>
+    <time>2021-01-07T21:52:01.010Z</time>
+    <name><![CDATA[Marker 2]]></name>
+    <desc><![CDATA[Marker 2 desc]]></desc>
+    <type><![CDATA[Marker 2 category]]></type>
+  </wpt>
+  <trk>
+    <name><![CDATA[2021-01-07 22:51]]></name>
+    <desc><![CDATA[the description]]></desc>
+    <type><![CDATA[the category]]></type>
+    <extensions>
+      <topografix:color>c0c0c0</topografix:color>
+      <opentracks:trackid>7002101e-4198-4613-8c24-544e01ca3981</opentracks:trackid>
+    </extensions>
+    <trkseg>
+      <trkpt lat="3" lon="14">
+        <ele>10</ele>
+        <time>2021-01-07T21:51:59.179Z</time>
+      </trkpt>
+      <trkpt lat="3" lon="14.001">
+        <ele>10</ele>
+        <time>2021-01-07T21:52:00.653Z</time>
+      </trkpt>
+      <trkpt lat="3" lon="14.002">
+        <ele>10</ele>
+        <time>2021-01-07T21:52:01.010Z</time>
+      </trkpt>
+      <trkpt lat="100" lon="0">
+        <time>2021-01-07T21:52:02.658Z</time>
+      </trkpt>
+
+      <trkpt lat="200" lon="0">
+        <time>2021-01-07T21:52:03.873Z</time>
+      </trkpt>
+      <trkpt lat="3" lon="14.003">
+        <ele>10</ele>
+        <time>2021-01-07T21:52:04.103Z</time>
+      </trkpt>
+    </trkseg>
+  </trk>
+</gpx>

src/androidTest/res/raw/legacy_kml_empty.kml

@@ -0,0 +1,62 @@
+<?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-08-24 20:57]]></name>
+<atom:generator><![CDATA[OpenTracks]]></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>
+<Placemark>
+<name><![CDATA[2020-08-24 20:57]]></name>
+<description><![CDATA[]]></description>
+<icon><![CDATA[UNKNOWN]]></icon>
+<opentracks:trackid>9316e527-a5b8-47c5-bdbd-954b4be7d80e</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:MultiTrack>
+</Placemark>
+</Document>
+</kml>

src/androidTest/res/raw/legacy_kml_statistics_marker.kml

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:gx="http://www.google.com/kml/ext/2.2" 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 />
+      <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>

src/debug/res/values/strings.xml

@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-    <string name="app_name">OpenTracks (Debug)</string>
+    <string name="app_name" translatable="false">OpenTracks (Debug)</string>
 </resources>

src/main/AndroidManifest.xml

@@ -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" />
@@ -68,44 +69,188 @@ limitations under the License.
 
         <activity android:name=".io.file.importer.DirectoryChooserActivity$ImportDirectoryChooserActivity" />
 
-        <activity
-            android:name=".io.file.importer.ImportActivity"
-            android:theme="@style/ThemeCustomTransparentActivity">
+        <activity android:name=".io.file.importer.ImportActivity">
 
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/vnd.google-earth.kmz" />
-                <data
-                    android:scheme="content"
-                    android:host="*"
-                    android:pathPattern="*kmz" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/vnd.google-earth.kml+xml" />
-                <data
-                    android:scheme="content"
-                    android:host="*"
-                    android:pathPattern="*kml" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="application/gpx+xml" />
-                <data
-                    android:scheme="content"
-                    android:host="*"
-                    android:pathPattern="*gpx" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/gpx" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                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:pathPattern=".*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                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:pathPattern=".*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+            </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" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                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:pathPattern=".*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                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:pathPattern=".*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+            </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" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                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:pathPattern=".*\\.kml" />
+                <data android:pathPattern=".*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                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:pathPattern=".*\\.kml" />
+                <data android:pathPattern=".*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
             </intent-filter>
         </activity>
 
         <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>
@@ -114,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
@@ -137,25 +290,12 @@ 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" />
+        <activity android:name=".io.file.importer.DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity" />
 
-        <activity
-            android:name=".io.file.exporter.ExportActivity"
-            android:theme="@style/ThemeCustomTransparentActivity" />
+        <activity android:name=".io.file.exporter.ExportActivity" />
 
         <activity android:name=".settings.SettingsActivity" />
 
@@ -195,5 +335,15 @@ limitations under the License.
             android:foregroundServiceType="location|connectedDevice"
             android:icon="@drawable/ic_logo_color_24dp"
             android:label="@string/recording_service" />
+
+        <service
+            android:name=".io.file.exporter.ExportService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <service
+            android:name=".io.file.importer.ImportService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
     </application>
 </manifest>

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

@@ -2,38 +2,35 @@ package de.dennisguse.opentracks;
 
 import android.os.Bundle;
 import android.view.Menu;
-import android.widget.TextView;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import de.dennisguse.opentracks.databinding.AboutBinding;
 import de.dennisguse.opentracks.util.SystemUtils;
 import de.dennisguse.opentracks.util.ViewUtils;
 
 public class AboutActivity extends AbstractActivity {
 
+    private AboutBinding viewBinding;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setTitle(getString(R.string.about_preference_title));
 
-        TextView textDescription = findViewById(R.id.about_text_description);
-        textDescription.setText(getString(R.string.about_description));
-
-        TextView textVersionName = findViewById(R.id.about_text_version_name);
-        textVersionName.setText(getString(R.string.about_version_name, SystemUtils.getAppVersionName(this)));
-
-        TextView textVersionCode = findViewById(R.id.about_text_version_code);
-        textVersionCode.setText(getString(R.string.about_version_code, SystemUtils.getAppVersionCode(this)));
-
-        TextView textURL = findViewById(R.id.about_app_url);
-        textURL.setText(getString(R.string.about_url, getString(R.string.app_web_url)));
+        viewBinding.aboutTextDescription.setText(getString(R.string.about_description));
+        viewBinding.aboutTextVersionName.setText(getString(R.string.about_version_name, SystemUtils.getAppVersionName(this)));
+        viewBinding.aboutTextVersionCode.setText(getString(R.string.about_version_code, SystemUtils.getAppVersionCode(this)));
+        viewBinding.aboutAppUrl.setText(getString(R.string.about_url, getString(R.string.app_web_url)));
 
         ViewUtils.makeClickableLinks(findViewById(android.R.id.content));
     }
 
-    protected int getLayoutResId() {
-        return R.layout.about;
+    protected View getRootView() {
+        viewBinding = AboutBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override

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

@@ -17,7 +17,9 @@
 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;
 
@@ -35,14 +37,25 @@ public abstract class AbstractActivity extends AppCompatActivity {
         // Set volume control stream for text to speech
         setVolumeControlStream(TTSUtils.getTTSStream());
 
-        setContentView(getLayoutResId());
+        setContentView(getRootView());
 
         Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        setupActionBarBack(toolbar);
     }
 
-    /**
-     * Gets the layout resource id.
-     */
-    protected abstract int getLayoutResId();
+    @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);
+        }
+    }
 }

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

@@ -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();
 }

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

@@ -1,37 +1,39 @@
 package de.dennisguse.opentracks;
 
 import android.os.Bundle;
-import android.widget.ListView;
+import android.view.View;
 
 import androidx.lifecycle.ViewModelProvider;
 
 import de.dennisguse.opentracks.adapters.AggregatedStatisticsAdapter;
+import de.dennisguse.opentracks.databinding.AggregatedStatsBinding;
 import de.dennisguse.opentracks.viewmodels.AggregatedStatisticsModel;
 
 public class AggregatedStatisticsActivity extends AbstractActivity {
 
-    private ListView listView;
+    private AggregatedStatsBinding viewBinding;
+
     private AggregatedStatisticsAdapter adapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        listView = findViewById(R.id.aggregated_stats_list);
-        listView.setEmptyView(findViewById(R.id.aggregated_stats_empty_view));
+        viewBinding.aggregatedStatsList.setEmptyView(viewBinding.aggregatedStatsEmptyView);
 
         final AggregatedStatisticsModel viewModel = new ViewModelProvider(this).get(AggregatedStatisticsModel.class);
         viewModel.getAggregatedStats().observe(this, aggregatedStatistics -> {
             if (aggregatedStatistics != null) {
                 adapter = new AggregatedStatisticsAdapter(this, aggregatedStatistics);
-                listView.setAdapter(adapter);
+                viewBinding.aggregatedStatsList.setAdapter(adapter);
             }
             adapter.notifyDataSetChanged();
         });
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.aggregated_stats;
+    protected View getRootView() {
+        viewBinding = AggregatedStatsBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 }

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

@@ -1,9 +1,11 @@
 package de.dennisguse.opentracks;
 
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import de.dennisguse.opentracks.databinding.HelpBinding;
 import de.dennisguse.opentracks.util.ViewUtils;
 
 public class HelpActivity extends AbstractActivity {
@@ -15,7 +17,7 @@ public class HelpActivity extends AbstractActivity {
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.help;
+    protected View getRootView() {
+        return HelpBinding.inflate(getLayoutInflater()).getRoot();
     }
 }

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

@@ -19,6 +19,7 @@ package de.dennisguse.opentracks;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -32,6 +33,7 @@ import java.util.List;
 
 import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.MarkerDetailActivityBinding;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.fragments.MarkerDetailFragment;
 
@@ -48,13 +50,23 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
 
     private static final String TAG = MarkerDetailActivity.class.getSimpleName();
 
+    private MarkerDetailActivityBinding viewBinding;
+
     private List<Marker.Id> markerIds;
 
     @Override
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        Marker.Id markerId = getIntent().getParcelableExtra(EXTRA_MARKER_ID);
+        Object bundleMarkerId = getIntent().getExtras().get(EXTRA_MARKER_ID);
+        Marker.Id markerId = null;
+        if (bundleMarkerId instanceof Marker.Id) {
+            markerId = (Marker.Id) bundleMarkerId;
+        }
+        if (bundleMarkerId instanceof Long) {
+            //Incoming Intent via Dashboard API.
+            markerId = new Marker.Id((Long) bundleMarkerId);
+        }
         if (markerId == null) {
             Log.d(TAG, "invalid marker id");
             finish();
@@ -82,10 +94,9 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
             }
         }
 
-        final ViewPager viewPager = findViewById(R.id.maker_detail_activity_view_pager);
         final MarkerDetailPagerAdapter markerAdapter = new MarkerDetailPagerAdapter(getSupportFragmentManager());
-        viewPager.setAdapter(markerAdapter);
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        viewBinding.makerDetailActivityViewPager.setAdapter(markerAdapter);
+        viewBinding.makerDetailActivityViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -100,16 +111,17 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
             public void onPageScrollStateChanged(int state) {
             }
         });
-        viewPager.setCurrentItem(markerIndex == -1 ? 0 : markerIndex);
+        viewBinding.makerDetailActivityViewPager.setCurrentItem(markerIndex == -1 ? 0 : markerIndex);
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.marker_detail_activity;
+    protected View getRootView() {
+        viewBinding = MarkerDetailActivityBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
-    public void onDeleteMarkerDone() {
+    public void onMarkerDeleted() {
         runOnUiThread(this::finish);
     }
 

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

@@ -30,25 +30,19 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModelProvider;
 
-import com.google.android.material.textfield.TextInputEditText;
-
-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.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.databinding.MarkerEditBinding;
 import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.viewmodels.MarkerEditViewModel;
 
 /**
  * An activity to add/edit a marker.
@@ -60,28 +54,23 @@ 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 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 TextInputEditText markerName;
-    private AutoCompleteTextView markerType;
-    private TextInputEditText markerDescription;
-    private ImageView markerPhoto;
-    private ImageView markerDeletePhotoBtn;
+    private MarkerEditBinding viewBinding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -93,98 +82,49 @@ public class MarkerEditActivity extends AbstractActivity {
         hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
 
         // Setup UI elements
-        markerName = findViewById(R.id.marker_edit_name);
-        markerType = findViewById(R.id.marker_edit_marker_type);
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.marker_types, android.R.layout.simple_dropdown_item_1line);
-        markerType.setAdapter(adapter);
-        markerDescription = findViewById(R.id.marker_edit_description);
-        markerPhoto = findViewById(R.id.marker_edit_photo);
-
-        markerDeletePhotoBtn = findViewById(R.id.marker_edit_photo_delete);
-        markerDeletePhotoBtn.setOnClickListener(v -> {
-            if (marker != null && marker.hasPhoto()) {
-                marker.setPhotoUrl(null);
-            }
-            markerPhoto.setImageBitmap(null);
-            photoUri = null;
-            hideAndShowOptions();
+        viewBinding.markerEditMarkerType.setAdapter(adapter);
+        viewBinding.markerEditPhotoDelete.setOnClickListener(v -> {
+            viewModel.onPhotoDelete(viewBinding.markerEditName.getText().toString(),
+                    viewBinding.markerEditMarkerType.getText().toString(),
+                    viewBinding.markerEditDescription.getText().toString());
         });
 
-        Button cancel = findViewById(R.id.marker_edit_cancel);
-        cancel.setOnClickListener(v -> finish());
-
-        final boolean isNewMarker = markerId == null;
-
-        setTitle(isNewMarker ? R.string.menu_insert_marker : R.string.menu_edit);
-        Button done = findViewById(R.id.marker_edit_done);
-        done.setText(isNewMarker ? R.string.generic_add : R.string.generic_save);
-        done.setOnClickListener(v -> {
-            if (isNewMarker) {
-                addMarker();
-            } else {
-                saveMarker();
-            }
+        viewBinding.markerEditCancel.setOnClickListener(v -> {
+            viewModel.onCancel();
             finish();
         });
 
-        if (isNewMarker) {
-            int nextMarkerNumber = trackId == null ? -1 : new ContentProviderUtils(this).getNextMarkerNumber(trackId);
-            if (nextMarkerNumber == -1) {
-                nextMarkerNumber = 0;
-            }
-            markerName.setText(getString(R.string.marker_name_format, nextMarkerNumber));
-            markerName.selectAll();
-            markerType.setText("");
-            markerDescription.setText("");
-        } else {
-            marker = new ContentProviderUtils(this).getMarker(markerId);
-            if (marker == null) {
-                Log.d(TAG, "marker is null");
-                finish();
-                return;
-            }
-            markerName.setText(marker.getName());
-            markerType.setText(marker.getCategory());
-            markerDescription.setText(marker.getDescription());
+        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();
+            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);
-    }
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.marker_edit;
+    protected View getRootView() {
+        viewBinding = MarkerEditBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
@@ -201,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
@@ -220,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);
@@ -247,16 +182,16 @@ 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);
         }
-        markerDeletePhotoBtn.setVisibility(isPhotoSet ? View.VISIBLE : View.GONE);
+        viewBinding.markerEditPhotoDelete.setVisibility(isPhotoSet ? View.VISIBLE : View.GONE);
     }
 
     /**
@@ -270,7 +205,7 @@ public class MarkerEditActivity extends AbstractActivity {
         try (ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r")) {
             FileDescriptor fd = pfd.getFileDescriptor();
             Bitmap bitmap = BitmapFactory.decodeFileDescriptor(fd);
-            markerPhoto.setImageBitmap(bitmap);
+            viewBinding.markerEditPhoto.setImageBitmap(bitmap);
             hideAndShowOptions();
         } catch (IOException e) {
             Log.e(TAG, e.getMessage());
@@ -280,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);
     }
 
@@ -288,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,
-                markerName.getText().toString(),
-                markerType.getText().toString(),
-                markerDescription.getText().toString(),
-                photoUri != null ? photoUri.toString() : null);
-    }
-
-    private void saveMarker() {
-        marker.setName(markerName.getText().toString());
-        marker.setCategory(markerType.getText().toString());
-        marker.setDescription(markerDescription.getText().toString());
-        marker.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
-
-        new ContentProviderUtils(this).updateMarker(this, marker);
-    }
 }

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

@@ -16,7 +16,7 @@
 
 package de.dennisguse.opentracks;
 
-import android.content.Context;
+import android.app.SearchManager;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -26,24 +26,24 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ListView;
 
 import androidx.annotation.NonNull;
-import androidx.cursoradapter.widget.ResourceCursorAdapter;
+import androidx.appcompat.widget.SearchView;
 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.adapters.MarkerResourceCursorAdapter;
+import de.dennisguse.opentracks.adapters.ScrollVisibleViews;
 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.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.MarkerListBinding;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.util.ActivityUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.ListItemUtils;
-import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 /**
@@ -67,7 +67,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);
             }
@@ -80,23 +79,23 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         }
     };
     private Track track;
-    private ResourceCursorAdapter resourceCursorAdapter;
-    // UI elements
-    private ListView listView;
+    private MarkerResourceCursorAdapter resourceCursorAdapter;
+
+    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);
         }
 
@@ -120,57 +119,19 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
 
         track = trackId != null ? contentProviderUtils.getTrack(trackId) : null;
 
-        listView = findViewById(R.id.marker_list);
-        listView.setEmptyView(findViewById(R.id.marker_list_empty));
-        listView.setOnItemClickListener((parent, view, position, id) -> {
+        viewBinding.markerList.setEmptyView(viewBinding.markerListEmpty);
+        viewBinding.markerList.setOnItemClickListener((parent, view, position, id) -> {
+            resourceCursorAdapter.markerInvalid(id);
             Intent intent = IntentUtils.newIntent(MarkerListActivity.this, MarkerDetailActivity.class)
                     .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, new Marker.Id(id));
             startActivity(intent);
         });
-        resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) {
-            @Override
-            public void bindView(View view, Context context, Cursor cursor) {
-                int nameIndex = cursor.getColumnIndex(MarkerColumns.NAME);
-                int timeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TIME);
-                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);
-                long time = cursor.getLong(timeIndex);
-                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);
-            }
-        };
-        listView.setAdapter(resourceCursorAdapter);
-        ActivityUtils.configureListViewContextualMenu(listView, 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);
-            }
-        });
+        resourceCursorAdapter = new MarkerResourceCursorAdapter(this, R.layout.list_item);
+        ScrollVisibleViews scrollVisibleViews = new ScrollVisibleViews(resourceCursorAdapter);
+        viewBinding.markerList.setOnScrollListener(scrollVisibleViews);
+        viewBinding.markerList.setAdapter(resourceCursorAdapter);
+        ActivityUtils.configureListViewContextualMenu(viewBinding.markerList, contextualActionModeCallback);
     }
 
     @Override
@@ -184,6 +145,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     protected void onResume() {
         super.onResume();
         this.invalidateOptionsMenu();
+        loadData(getIntent());
     }
 
     @Override
@@ -193,8 +155,19 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.marker_list;
+    protected void onDestroy() {
+        super.onDestroy();
+        resourceCursorAdapter.clear();
+        viewBinding = null;
+        resourceCursorAdapter = null;
+        contentProviderUtils = null;
+        sharedPreferences = null;
+    }
+
+    @Override
+    protected View getRootView() {
+        viewBinding = MarkerListBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
@@ -229,44 +202,55 @@ 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 == listView.getCount()) {
-                    markerIds = null;
-                }
-                DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
-                return true;
-            case R.id.list_context_menu_select_all:
-                for (int i = 0; i < listView.getCount(); i++) {
-                    listView.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) {
+                resourceCursorAdapter.markerInvalid(markerIds[0].getId());
+                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
@@ -278,7 +262,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);
+        }
+    }
 }

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

@@ -1,444 +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 android.widget.ListView;
-
-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.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;
-
-    // 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
-        ListView listView = findViewById(R.id.search_list);
-        listView.setAdapter(arrayAdapter);
-        listView.setEmptyView(findViewById(R.id.search_list_empty));
-        listView.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(listView, 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 int getLayoutResId() {
-        return R.layout.search_list;
-    }
-
-    @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()));
-    }
-}

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

@@ -18,19 +18,15 @@ 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.TextView;
-import android.widget.Toast;
+import android.view.accessibility.AccessibilityEvent;
 
-import androidx.core.content.ContextCompat;
+import java.time.Duration;
 
+import de.dennisguse.opentracks.databinding.TrackControllerBinding;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
 import de.dennisguse.opentracks.util.ActivityUtils;
@@ -42,172 +38,167 @@ 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 View containerView;
-    private final TextView statusTextView;
-    private final TextView totalTimeTextView;
-    private final ImageButton recordImageButton;
-    private final ImageButton stopImageButton;
+    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 isRecordingPaused;
+    private Duration totalTime;
     private boolean isResumed = false;
 
+    private final Callback callback;
+
     // A runnable to update the total time.
     private final Runnable updateTotalTimeRunnable = new Runnable() {
         public void run() {
-            if (isResumed && isRecording && !isPaused) {
-                totalTimeTextView.setText(StringUtils.formatElapsedTimeWithHour(System.currentTimeMillis() - totalTimeTimestamp + totalTime));
+            if (isResumed && isRecording && !isRecordingPaused) {
+                updateTotalTime();
+                setTotalTime();
                 handlerUpdateTotalTime.postDelayed(this, UnitConversions.ONE_SECOND_MS);
             }
         }
     };
 
     @SuppressLint("ClickableViewAccessibility")
-    TrackController(Activity activity, 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();
-        containerView = activity.findViewById(R.id.track_controller_container);
-        statusTextView = activity.findViewById(R.id.track_controller_status);
-        totalTimeTextView = activity.findViewById(R.id.track_controller_total_time);
+        this.callback = callback;
 
-        recordImageButton = activity.findViewById(R.id.track_controller_record);
-        recordImageButton.setOnTouchListener((view, motionEvent) -> onRecordTouch(activity, recordListener, motionEvent));
+        buttonDelayDuration = activity.getResources().getInteger(R.integer.buttonDelayMillis);
 
-        stopImageButton = activity.findViewById(R.id.track_controller_stop);
-        stopImageButton.setOnTouchListener((view, motionEvent) -> onStopTouch(activity, stopListener, motionEvent));
+        viewBinding.trackControllerRecord.setOnTouchListener(this);
+        viewBinding.trackControllerRecord.setOnClickListener((view) -> {
+            if (buttonDelay != null || (isRecording && !isRecordingPaused)) {
+                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, recordImageButton, 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 ) {
-                recordImageButton.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 && !isRecordingPaused) {
+
+            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, stopImageButton, 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 ) {
-                stopImageButton.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) {
+            handlerUpdateTotalTime.removeCallbacks(updateTotalTimeRunnable);
             return;
         }
         isRecording = recording;
-        isPaused = paused;
+        isRecordingPaused = paused;
         boolean visible = alwaysShow || isRecording;
-        containerView.setVisibility(visible ? View.VISIBLE : View.GONE);
+        viewBinding.trackControllerContainer.setVisibility(visible ? View.VISIBLE : View.GONE);
 
         if (!visible) {
             handlerUpdateTotalTime.removeCallbacks(updateTotalTimeRunnable);
             return;
         }
 
-        recordImageButton.setImageResource(isRecording && !isPaused ? R.drawable.ic_button_pause : R.drawable.button_record);
-        recordImageButton.setContentDescription(activity.getString(isRecording && !isPaused ? R.string.image_pause : R.string.image_record));
-
-        stopImageButton.setImageResource(isRecording ? R.drawable.ic_button_stop : R.drawable.ic_button_stop_disabled);
-        stopImageButton.setEnabled(isRecording);
-
-        statusTextView.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
-        if (isRecording) {
-            statusTextView.setTextColor(activity.getResources().getColor(isPaused ? android.R.color.white : R.color.recording_text));
-            statusTextView.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
+        if (isRecording && !isRecordingPaused) {
+            handlerUpdateTotalTime.postDelayed(updateTotalTimeRunnable, UnitConversions.ONE_SECOND_MS);
         }
 
-        handlerUpdateTotalTime.removeCallbacks(updateTotalTimeRunnable);
-        totalTimeTextView.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
+        viewBinding.trackControllerRecord.setImageResource(isRecording && !isRecordingPaused ? R.drawable.ic_button_pause : R.drawable.button_record);
+        viewBinding.trackControllerRecord.setContentDescription(activity.getString(isRecording && !isRecordingPaused ? R.string.image_pause : R.string.image_record));
+
+        viewBinding.trackControllerStop.setEnabled(isRecording);
+
+        viewBinding.trackControllerStatus.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
         if (isRecording) {
-            totalTime = getTotalTime();
-            totalTimeTextView.setText(StringUtils.formatElapsedTimeWithHour(totalTime));
-            if (!isPaused) {
-                totalTimeTimestamp = System.currentTimeMillis();
-                handlerUpdateTotalTime.postDelayed(updateTotalTimeRunnable, UnitConversions.ONE_SECOND_MS);
-            }
+            viewBinding.trackControllerStatus.setTextColor(activity.getResources().getColor(isRecordingPaused ? android.R.color.white : R.color.recording_text));
+            showStatusSetDefaultText();
+        }
+
+        viewBinding.trackControllerTotalTime.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
+
+        if (isRecording) {
+            updateTotalTime();
+            setTotalTime();
         }
     }
 
@@ -222,18 +213,33 @@ public class TrackController {
     }
 
     public void hide() {
-        containerView.setVisibility(View.GONE);
+        viewBinding.trackControllerContainer.setVisibility(View.GONE);
     }
 
     public void show() {
-        containerView.setVisibility(View.VISIBLE);
+        viewBinding.trackControllerContainer.setVisibility(View.VISIBLE);
     }
 
-    /**
-     * Gets the total time for the current recording track.
-     */
-    private long getTotalTime() {
+    private void updateTotalTime() {
         TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
-        return trackRecordingService != null ? trackRecordingService.getTotalTime() : 0L;
+        if (trackRecordingService != null) {
+            totalTime = trackRecordingService.getTotalTime();
+        }
+    }
+
+    private void setTotalTime() {
+        if (totalTime != null) {
+            viewBinding.trackControllerTotalTime.setText(StringUtils.formatElapsedTimeWithHour(totalTime));
+        }
+    }
+
+    private void showStatusSetDefaultText() {
+        viewBinding.trackControllerStatus.setText(isRecordingPaused ? R.string.generic_paused : R.string.generic_recording);
+    }
+
+    public interface Callback {
+        void recordStart();
+
+        void recordStop();
     }
 }

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

@@ -25,6 +25,7 @@ import java.util.List;
 
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.TrackDeleteBinding;
 import de.dennisguse.opentracks.util.SystemUtils;
 
 /**
@@ -40,6 +41,8 @@ public class TrackDeleteActivity extends AbstractActivity {
 
     private Thread deleteThread;
 
+    private TrackDeleteBinding viewBinding;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -52,13 +55,7 @@ public class TrackDeleteActivity extends AbstractActivity {
             ContentProviderUtils contentProviderUtils = new ContentProviderUtils(TrackDeleteActivity.this);
 
             PowerManager.WakeLock wakeLock = SystemUtils.acquireWakeLock(TrackDeleteActivity.this, null);
-
-            for (Track.Id id : trackIds) {
-                if (Thread.interrupted()) {
-                    break;
-                }
-                contentProviderUtils.deleteTrack(TrackDeleteActivity.this, id);
-            }
+            contentProviderUtils.deleteTracks(TrackDeleteActivity.this, trackIds);
 
             wakeLock = SystemUtils.releaseWakeLock(wakeLock);
             if (Thread.interrupted()) {
@@ -82,12 +79,19 @@ public class TrackDeleteActivity extends AbstractActivity {
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.track_delete;
+    protected void onDestroy() {
+        super.onDestroy();
+        viewBinding = null;
+    }
+
+    @Override
+    protected View getRootView() {
+        viewBinding = TrackDeleteBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     public void onAsyncTaskCompleted() {
-        findViewById(R.id.progressbar).setVisibility(View.INVISIBLE);
+        viewBinding.progressbar.setVisibility(View.INVISIBLE);
         setResult(RESULT_OK);
         finish();
     }