Release v3.9.3

2020-08-31 12:45:20 +02:00
515 changed files with 13209 additions and 22621 deletions
@@ -1,13 +1,5 @@
 # Thanks for your contribution.

-## PLEASE REMOVE
-To support us in providing a nice (and fast) open-source experience:
-1. Verify that the tests are passing
-2. Check that the code is properly formatted (using AndroidStudio's autoformatter)
-3. Provide write access to the [branch](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)
-4. If the PR is not ready for review, please submit it as a [draft](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests)
-## PLEASE REMOVE
-
 **Describe the pull request**
 A clear and concise description of what the pull request changes/adds.

@@ -19,6 +19,9 @@ 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:
@@ -18,6 +18,4 @@ jobs:
          api-level: ${{ matrix.api-level }}
          target: ${{ matrix.target }}
          arch: x86_64
-          profile: Nexus 6
          script: ./gradlew connectedCheck
-
@@ -1,26 +1,5 @@
 <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" />
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
@@ -1,35 +0,0 @@
-# How to contribute?
-
-## Testing 
-
-Just use OpenTracks and tell us what can be improved by opening an issue [here](https://github.com/OpenTracksApp/OpenTracks/issues/new/choose)
-
-If we broke things (happens now and then), please tell us also.
-
-## Coding new features
-
-You have a cool idea for a feature that is missing in OpenTracks?
-And you would like to help by implementing it?
-If not, you can just take a look at the [issue tracker](https://github.com/OpenTracksApp/OpenTracks/issues).
-
-Advices:
-* creating an issue beforehand might be a good idea
-  Sometimes it is helpful to discuss your idea and also your implementation approach first.
-  We may be able to give you some hints on how to tackle the problem.
-  It also makes merging your changes easier and, usually, faster.
-* please only add new dependencies if is absolutely necessary
-  If you need to:
-  * tell us why those are required,
-  * what alternatives are existing, and
-  * why you choose this dependency.
-  And also verify that the license(s) are compatible with _Apache 2.0_ as well as open-source.
- 
-## Coding conventions
-
-None so far.
-Just keep it simple.
-And follow the _scout rule_. 
-
-You can take a look at existing code and get a feeling for it.
-
-Please autoformat your code using AndroidStudio's code formatter. 
@@ -1,201 +0,0 @@
-                                     Apache License
-                               Version 2.0, January 2004
-                            http://www.apache.org/licenses/
-
-       TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-       1. Definitions.
-
-          "License" shall mean the terms and conditions for use, reproduction,
-          and distribution as defined by Sections 1 through 9 of this document.
-
-          "Licensor" shall mean the copyright owner or entity authorized by
-          the copyright owner that is granting the License.
-
-          "Legal Entity" shall mean the union of the acting entity and all
-          other entities that control, are controlled by, or are under common
-          control with that entity. For the purposes of this definition,
-          "control" means (i) the power, direct or indirect, to cause the
-          direction or management of such entity, whether by contract or
-          otherwise, or (ii) ownership of fifty percent (50%) or more of the
-          outstanding shares, or (iii) beneficial ownership of such entity.
-
-          "You" (or "Your") shall mean an individual or Legal Entity
-          exercising permissions granted by this License.
-
-          "Source" form shall mean the preferred form for making modifications,
-          including but not limited to software source code, documentation
-          source, and configuration files.
-
-          "Object" form shall mean any form resulting from mechanical
-          transformation or translation of a Source form, including but
-          not limited to compiled object code, generated documentation,
-          and conversions to other media types.
-
-          "Work" shall mean the work of authorship, whether in Source or
-          Object form, made available under the License, as indicated by a
-          copyright notice that is included in or attached to the work
-          (an example is provided in the Appendix below).
-
-          "Derivative Works" shall mean any work, whether in Source or Object
-          form, that is based on (or derived from) the Work and for which the
-          editorial revisions, annotations, elaborations, or other modifications
-          represent, as a whole, an original work of authorship. For the purposes
-          of this License, Derivative Works shall not include works that remain
-          separable from, or merely link (or bind by name) to the interfaces of,
-          the Work and Derivative Works thereof.
-
-          "Contribution" shall mean any work of authorship, including
-          the original version of the Work and any modifications or additions
-          to that Work or Derivative Works thereof, that is intentionally
-          submitted to Licensor for inclusion in the Work by the copyright owner
-          or by an individual or Legal Entity authorized to submit on behalf of
-          the copyright owner. For the purposes of this definition, "submitted"
-          means any form of electronic, verbal, or written communication sent
-          to the Licensor or its representatives, including but not limited to
-          communication on electronic mailing lists, source code control systems,
-          and issue tracking systems that are managed by, or on behalf of, the
-          Licensor for the purpose of discussing and improving the Work, but
-          excluding communication that is conspicuously marked or otherwise
-          designated in writing by the copyright owner as "Not a Contribution."
-
-          "Contributor" shall mean Licensor and any individual or Legal Entity
-          on behalf of whom a Contribution has been received by Licensor and
-          subsequently incorporated within the Work.
-
-       2. Grant of Copyright License. Subject to the terms and conditions of
-          this License, each Contributor hereby grants to You a perpetual,
-          worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-          copyright license to reproduce, prepare Derivative Works of,
-          publicly display, publicly perform, sublicense, and distribute the
-          Work and such Derivative Works in Source or Object form.
-
-       3. Grant of Patent License. Subject to the terms and conditions of
-          this License, each Contributor hereby grants to You a perpetual,
-          worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-          (except as stated in this section) patent license to make, have made,
-          use, offer to sell, sell, import, and otherwise transfer the Work,
-          where such license applies only to those patent claims licensable
-          by such Contributor that are necessarily infringed by their
-          Contribution(s) alone or by combination of their Contribution(s)
-          with the Work to which such Contribution(s) was submitted. If You
-          institute patent litigation against any entity (including a
-          cross-claim or counterclaim in a lawsuit) alleging that the Work
-          or a Contribution incorporated within the Work constitutes direct
-          or contributory patent infringement, then any patent licenses
-          granted to You under this License for that Work shall terminate
-          as of the date such litigation is filed.
-
-       4. Redistribution. You may reproduce and distribute copies of the
-          Work or Derivative Works thereof in any medium, with or without
-          modifications, and in Source or Object form, provided that You
-          meet the following conditions:
-
-          (a) You must give any other recipients of the Work or
-              Derivative Works a copy of this License; and
-
-          (b) You must cause any modified files to carry prominent notices
-              stating that You changed the files; and
-
-          (c) You must retain, in the Source form of any Derivative Works
-              that You distribute, all copyright, patent, trademark, and
-              attribution notices from the Source form of the Work,
-              excluding those notices that do not pertain to any part of
-              the Derivative Works; and
-
-          (d) If the Work includes a "NOTICE" text file as part of its
-              distribution, then any Derivative Works that You distribute must
-              include a readable copy of the attribution notices contained
-              within such NOTICE file, excluding those notices that do not
-              pertain to any part of the Derivative Works, in at least one
-              of the following places: within a NOTICE text file distributed
-              as part of the Derivative Works; within the Source form or
-              documentation, if provided along with the Derivative Works; or,
-              within a display generated by the Derivative Works, if and
-              wherever such third-party notices normally appear. The contents
-              of the NOTICE file are for informational purposes only and
-              do not modify the License. You may add Your own attribution
-              notices within Derivative Works that You distribute, alongside
-              or as an addendum to the NOTICE text from the Work, provided
-              that such additional attribution notices cannot be construed
-              as modifying the License.
-
-          You may add Your own copyright statement to Your modifications and
-          may provide additional or different license terms and conditions
-          for use, reproduction, or distribution of Your modifications, or
-          for any such Derivative Works as a whole, provided Your use,
-          reproduction, and distribution of the Work otherwise complies with
-          the conditions stated in this License.
-
-       5. Submission of Contributions. Unless You explicitly state otherwise,
-          any Contribution intentionally submitted for inclusion in the Work
-          by You to the Licensor shall be under the terms and conditions of
-          this License, without any additional terms or conditions.
-          Notwithstanding the above, nothing herein shall supersede or modify
-          the terms of any separate license agreement you may have executed
-          with Licensor regarding such Contributions.
-
-       6. Trademarks. This License does not grant permission to use the trade
-          names, trademarks, service marks, or product names of the Licensor,
-          except as required for reasonable and customary use in describing the
-          origin of the Work and reproducing the content of the NOTICE file.
-
-       7. Disclaimer of Warranty. Unless required by applicable law or
-          agreed to in writing, Licensor provides the Work (and each
-          Contributor provides its Contributions) on an "AS IS" BASIS,
-          WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-          implied, including, without limitation, any warranties or conditions
-          of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-          PARTICULAR PURPOSE. You are solely responsible for determining the
-          appropriateness of using or redistributing the Work and assume any
-          risks associated with Your exercise of permissions under this License.
-
-       8. Limitation of Liability. In no event and under no legal theory,
-          whether in tort (including negligence), contract, or otherwise,
-          unless required by applicable law (such as deliberate and grossly
-          negligent acts) or agreed to in writing, shall any Contributor be
-          liable to You for damages, including any direct, indirect, special,
-          incidental, or consequential damages of any character arising as a
-          result of this License or out of the use or inability to use the
-          Work (including but not limited to damages for loss of goodwill,
-          work stoppage, computer failure or malfunction, or any and all
-          other commercial damages or losses), even if such Contributor
-          has been advised of the possibility of such damages.
-
-       9. Accepting Warranty or Additional Liability. While redistributing
-          the Work or Derivative Works thereof, You may choose to offer,
-          and charge a fee for, acceptance of support, warranty, indemnity,
-          or other liability obligations and/or rights consistent with this
-          License. However, in accepting such obligations, You may act only
-          on Your own behalf and on Your sole responsibility, not on behalf
-          of any other Contributor, and only if You agree to indemnify,
-          defend, and hold each Contributor harmless for any liability
-          incurred by, or claims asserted against, such Contributor by reason
-          of your accepting any such warranty or additional liability.
-
-       END OF TERMS AND CONDITIONS
-
-       APPENDIX: How to apply the Apache License to your work.
-
-          To apply the Apache License to your work, attach the following
-          boilerplate notice, with the fields enclosed by brackets "[]"
-          replaced with your own identifying information. (Don't include
-          the brackets!)  The text should be enclosed in the appropriate
-          comment syntax for the file format. We also recommend that a
-          file or class name and description of purpose be included on the
-          same "printed page" as the copyright notice for easier
-          identification within third-party archives.
-
-       Copyright [yyyy] [name of copyright owner]
-
-       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.
@@ -0,0 +1,194 @@
+Apache License
+==============
+
+_Version 2.0, January 2004_
+_&lt;<http://www.apache.org/licenses/>&gt;_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+### APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets `[]` replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same “printed page” as the copyright notice for easier identification within
+third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    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.
@@ -2,98 +2,77 @@

 _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 align="center">
+        <td>
            <a href="https://f-droid.org/packages/de.dennisguse.opentracks">
                <img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle">
            </a>
        </td>
-        <td 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 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">
+        <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>
+        <td>
+            <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
+            </a>
+        </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 require internet access).
+_OpenTracks_ does not contain a _map_ (as this would required Internet access).

 ## Custom Dashboards (incl. Map)
 As of v3.3.1 OpenTracks enables to use custom dashboards.
 The reference implementation is [OSMDashboard](https://github.com/OpenTracksApp/OSMDashboard), which presents an OpenStreetMap map (showing the current track, incl. updates).
 The developer documentation is in [README_API.md](README_API.md).

-Alternatively, recorded tracks can be shared as KMZ/GPX to installed applications (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand)).
+Alternatively, recorded tracks can be shared as KMZ/GPX to installed applications (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand) or [MAPS.ME](https://play.google.com/store/apps/details?id=com.mapswithme.maps.pro)).
 However, this is rather slow and does not provide updates while recording.


 ## Screenshots
 <div>
-    <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">
+    <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">
 </div>

 ## Project history
@@ -106,8 +85,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,
@@ -117,7 +96,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)
@@ -34,4 +34,4 @@ Requirement: `gem install fastlane`

 ## Translations (localization)

-Translations of the OpenTracks are handled in Weblate: [https://weblate.bubu1.eu/projects/OpenTracks/](https://weblate.bubu1.eu/projects/OpenTracks/).
+Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).
@@ -1,51 +1,20 @@
 # 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)
-* Amazfit Neo. But first you have to enable "Discoverable" and "Activity heart rate sharing" in the official Zepp app. (after pairing with OpenTracks you can disable them again)

 ## 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
-  * Has updatable firmware that requires an account for garmin.com
-  * This sensor reports speed data as cadence.
-    A workaround is in place.
-  * This sensor sometimes counts backwards (unknown software version).
-    A workaround is in place.
-
 * Wahoo Speed (Model: WFRPMSPD)

-### Cadence
-
-* Garmin Cadence Sensor 2
+### Cadence 
 * Wahoo Cadence (Model: WFPODCAD2)
  This sensor reports cadence data as speed.
-  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
-
+  A workaround is in place. 
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-set -e
-
-CHANGELOG_DIR="fastlane/metadata/android/en-US/changelogs/"
-
-echo "Checking main branch"
-git checkout main
-VERSIONID=$(git rev-list HEAD --count main)
-CHANGELOG_FILE="$CHANGELOG_DIR/$VERSIONID.txt"
-
-git diff --exit-code || echo -e "\nWARNING WARNING WARNING WARNING WARNING: this branch contains uncommit changes."
-
-#TODO Execute all tests: we are destroying data, running on a real device.
-# ./gradlew connectedCheck
-
-# Changelog
-echo -e "\nPrevious changelog\n------------"
-PREVIOUS_CHANGELOG=$(find "$CHANGELOG_DIR" -iname "[[:digit:]]**.txt" | sort -n | tail -1)
-sed 's/^/>/' "$PREVIOUS_CHANGELOG"
-
-#For F-Droid, a version starts with a 'v'
-read -p $'\n\nPlease enter the versionname (e.g., v3.9.5):\n> v' VERSIONNAME
-VERSIONNAME="v$VERSIONNAME"
-
-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
-
-echo -e "\nPlease edit the changelog for the new release"
-gedit -w "$CHANGELOG_FILE"
-git add "$CHANGELOG_FILE"
-
-echo "Updating build.gradle"
-sed -i s/versionCode\ .*/versionCode\ "$VERSIONID"/g build.gradle
-sed -i s/versionName\ .*/versionName\ "\"$VERSIONNAME\""/g build.gradle
-
-git diff
-
-COMMIT_MESSAGE="Release: $VERSIONNAME"
-echo -e "\nCommit message will be: '$COMMIT_MESSAGE'"
-
-echo -e "\nPress ENTER, if everything looks good."
-read
-
-git add -u
-git commit -m "$COMMIT_MESSAGE"
-
-echo -e "Next steps:\n1. Push to Github\n2. Create release on Github: https://github.com/OpenTracksApp/OpenTracks/releases"
@@ -1,38 +0,0 @@
-#!/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
@@ -6,7 +6,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
    }
 }

@@ -45,14 +45,10 @@ android {

    compileSdkVersion 30

-    buildFeatures {
-        viewBinding = true
-    }
-
    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 3981
-        versionName "v3.17.0"
+        versionCode 3544
+        versionName "v3.9.3"

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

@@ -86,18 +82,17 @@ android {
 }

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

    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.3.0'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation 'com.google.android.material:material:1.2.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.1'

    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.8.0'
+    androidTestImplementation 'org.mockito:mockito-android:3.4.6'
 }
@@ -10,11 +10,15 @@ endlegend

 [*] --> TrackListActivity
 TrackListActivity --> TrackRecordingActivity : Start recording
-TrackListActivity --> TrackRecordedActivity : Show track
+TrackListActivity --> SearchListActivity
 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
@@ -42,14 +46,10 @@ MarkerDetailActivity --> CoordinateOnMapIntent : URI

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

@enduml
@@ -2,7 +2,17 @@
 interface TrackExporter {
 }
 class KmzTrackExporter implements TrackExporter
-class KmlTrackExporter implements TrackExporter
+KmzTrackExporter o-- FileTrackExporter
+class FileTrackExporter implements TrackExporter {
+/' One track only '/
+}
+FileTrackExporter o-- TrackWriter
+
+interface TrackWriter {
+}
+class GpxTrackWriter implements TrackWriter
+class KmlTrackWriter implements TrackWriter
+

 interface TrackImporter {
 }
@@ -1,11 +1,10 @@
@startuml
-SensorManager --> AltitudeSumManager
+SensorManager --> ElevationSumManager
 LocationManager --> TrackRecordingService
 ElevationSumManager --> TrackRecordingService

 TrackRecordingService --> TrackRecordingServiceConnection
-TrackRecordingService --> CustomContentProvider
-CustomContentProvider --> Database
+TrackRecordingService --> Database

 Database --> CustomContentProvider
 CustomContentProvider --> TrackDataHub
@@ -14,6 +13,6 @@ TrackDataHub --> StatisticsRecordingFragment : TrackPoints, TrackStatistics, Way
 TrackDataHub --> StatisticsRecordedFragment : TrackPoints, TrackStatistics, Waypoints (push)
 TrackDataHub --> ChartFragment --> ChartView

-TrackRecordingServiceConnection --> StatisticsRecordingFragment : Sensor data (heartrate, cadence, altitude gain; pull 1s)
+TrackRecordingServiceConnection --> StatisticsRecordingFragment : Sensor data (heartrate, cadence, elevation gain; pull 1s)
 TrackRecordingServiceConnection --> TrackController : Start time (pull, onStart)
@enduml
@@ -8,28 +8,21 @@ class Track {
    -icon
 }
 Track o-- TrackPoint
-Track o-- Marker
-Track "1" - "1" TrackStatistics
+Track o-- Waypoint
+Track "1" - "1" TripStatistics

-class TrackStatistics {
+class TripStatistics {
    - startTime
    - stopTime
    - totalDistance
    - totalTime
    - movingTime
    - maxSpeed
-    - totalGain
+    - totalElevationGain
 }

-class TrackStatisticsUpdater {
-}
-
-TrackStatisticsUpdater ..> TrackStatistics : creates/updates
-TrackStatisticsUpdater ..> TrackPoint : uses
-
-class TrackPoint {
-    - id (database id, order)
-    - type
+class TrackPoint extends android.location.Location {
+    - id
    - trackId
    - longitude
    - latitude
@@ -43,8 +36,7 @@ class TrackPoint {
    - sensor_power
 }

-
-class Marker {
+class Waypoint {
    - id
    - trackId
    - name
@@ -53,28 +45,8 @@ class Marker {
    - icon
    - length
    - duration
-    - longitude
-    - latitude
+    - location
+    - tripStatistics
    - 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
@@ -1,32 +1,8 @@
 <?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
    targetNamespace="http://opentracksapp.com/xmlschemas/v1">

-    <xsd:element name="trackuuid"
-        type="xsd:string">
-        <xsd:annotation>
-            <xsd:documentation xml:lang="en">
-                A unique track identifier stored as UUID.
-            </xsd:documentation>
-        </xsd:annotation>
-    </xsd:element>
+    <xs:element name="trackuuid"
+        type="xs:string" />

-    <xsd:element name="loss"
-        type="xsd:float">
-        <xsd:annotation>
-            <xsd:documentation xml:lang="en">
-                The lost elevation in meters from the previous to the current TrackPoint.
-                Only used in GPX.
-            </xsd:documentation>
-        </xsd:annotation>
-    </xsd:element>
-    <xsd:element name="gain"
-        type="xsd:string">
-        <xsd:annotation>
-            <xsd:documentation xml:lang="en">
-                The gained elevation in meters from the previous to the current TrackPoint.
-                Only used in GPX.
-            </xsd:documentation>
-        </xsd:annotation>
-    </xsd:element>
-</xsd:schema>
+</xs:schema>
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   width="22"
-   fill="#000000"
-   version="1.0"
-   x="0px"
-   y="0px"
-   viewBox="0 0 21.84952 21.99934"
-   enable-background="new 0 0 99.316 99.997"
-   xml:space="preserve"
-   id="svg10"
-   sodipodi:docname="ic_activity_kayaking.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
-     id="metadata16"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs14" /><sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1024"
-     id="namedview12"
-     showgrid="false"
-     inkscape:pagecheckerboard="false"
-     inkscape:zoom="22.472123"
-     inkscape:cx="11.932326"
-     inkscape:cy="8.4821218"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg10"
-     inkscape:document-rotation="0" /><path
-     id="path2"
-     style="fill:#ffffff;stroke-width:0.20758"
-     d="m 18.296044,13.516712 c -1.017125,-0.01824 -1.903328,0.770666 -2.945647,0.500454 -0.952298,-0.271819 -1.950516,-0.765534 -2.949277,-0.338881 -0.938402,0.492101 -2.078868,0.493759 -3.017025,0 C 8.3845167,13.251481 7.3852162,13.744815 6.4321693,14.017166 5.229901,14.31201 4.2005498,13.256398 2.9984219,13.558671 2.2076549,13.806805 1.0222411,14.11299 1.0222411,14.11299 v 1.764949 c 1.0226762,0.01947 1.9128198,-0.776355 2.9601398,-0.498166 0.4416703,0.216761 1.6682446,0.3639 1.6529583,0.601941 l -1.3879215,1.383539 c -0.7385797,-0.502111 -1.5118619,0.0527 -1.9901253,0.625328 -0.5087615,0.568011 -1.1635382,1.025896 -1.5505475,1.687065 -0.44607206,0.952772 0.6576964,2.056499 1.6104671,1.610525 0.7016688,-0.428027 1.2006595,-1.122907 1.8093513,-1.672458 0.6218606,-0.429609 0.7776032,-1.247655 0.6297837,-1.861615 l 2.0038313,-1.999046 c 0.9553792,-0.44042 2.0942104,-0.606317 3.0559286,-0.07975 0.9566571,0.429062 1.9815791,0.09313 2.8934291,-0.263824 1.038124,-0.339466 1.95525,0.382078 2.955963,0.461915 1.087184,0.105691 2.019821,-0.784126 3.121615,-0.493622 0.55673,-0.01509 1.943197,1.034046 1.977683,0.148315 v -1.471252 c -0.878739,0.05089 -1.592095,-0.588897 -2.468753,-0.540124 z"
-     sodipodi:nodetypes="sccccccccccccccccccccccss" /><path
-     id="path4"
-     style="fill:#ffffff;stroke-width:0.20758"
-     d="M 19.135498,4.6094374 C 19.777729,3.9239548 20.518106,3.3189058 21.090567,2.5760423 21.630775,1.6723294 20.631775,0.46345938 19.642408,0.81572972 18.952145,1.1177762 18.525406,1.7968856 17.966518,2.2833866 17.44088,2.7777653 16.748383,3.4079168 17.123672,4.2079927 17.316456,4.5791871 16.670933,4.8230987 16.479267,5.1359209 L 15.065885,6.5509368 C 13.459538,5.9569743 11.849312,5.3583867 10.246781,4.7652258 9.2045735,4.5310231 8.2546176,5.3827898 8.1060604,6.3824119 7.7002321,7.7689937 7.2645314,9.1479847 6.8776693,10.539386 h -5.851069 v 2.366209 c 1.0341353,-0.06583 1.9719234,-0.790016 3.0482038,-0.491433 0.8514673,0.182595 1.7032854,0.742921 2.5975093,0.377297 1.0893234,-0.553582 2.4097276,-0.562618 3.4983496,-0.0022 0.895986,0.368665 1.751474,-0.190407 2.60469,-0.37517 1.078334,-0.302717 2.015803,0.427862 3.051521,0.490909 0.985146,-0.07753 1.867505,-0.470806 2.884112,-0.579104 0.847652,-0.0903 2.163908,-1.785603 2.163908,-1.785603 0,0 -1.819193,-0.01538 -2.935123,0.0029 -1.990467,-2.45e-4 -3.980934,-0.0021 -5.9714,-0.0044 l 2.483907,-2.4814163 c 0.762424,0.5726687 1.957001,-0.3877847 1.20272,-1.1977389 l 2.032212,-2.039685 c 0.462782,0.2519942 1.079225,0.1706574 1.448288,-0.2104864 z m -8.060346,5.9299486 c -0.486522,0.101516 -0.612149,-0.06543 -0.374498,-0.502616 l 0.909432,-3.029364 2.189559,0.8099787 z"
-     sodipodi:nodetypes="cccccccccccccccccsccccccccccccc" /><path
-     id="path851"
-     style="fill:#ffffff;stroke-width:1.16861"
-     d="m 12.520186,2.6733336 c 0.05505,1.1807821 -1.406378,2.0132887 -2.394197,1.3656163 -1.0445314,-0.553724 -1.0179219,-2.235304 0.04332,-2.7559413 1.018447,-0.59197226 2.378758,0.20782 2.350878,1.390325 z" /></svg>
@@ -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 sowie Leistungsmesser (Bluetooth LE)
+* nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren (Bluetooth LE)
 * exportiert deine Daten als KML oder GPX
 * funktioniert ganz ohne Internet
@@ -1,10 +0,0 @@
-v3.9.4: OpenTracks
-
-Changes:
- Added interval computation
- Voice announcements present last interval statistics
- Settings: Bluetooth icon is animated
-
-Bugfix:
- GPS was not turned off when stopping a recording
- Show on map via KML/KMZ/GPX was broken due to refactoring
@@ -1,8 +0,0 @@
-v3.9.5: OpenTracks
-
-Changes:
- UI shows speed only with one fractional digit
-
-Bugfix:
- App crash in search (due to Track.Id refactoring)
- Track list did now show if a recording was ongoing (due to Track.Id refactoring)
@@ -1,10 +0,0 @@
-v3.10.0: OpenTracks
-
-Changes:
- Elevation gain via barometer
- Add splash screen
- Android 11/F-Droid: downgrade to targetSDK 29 (v1 signature)
-  see https://gitlab.com/fdroid/fdroidserver/-/issues/827
-
-Bugfix:
- Several fixes due to trackId refactoring
@@ -1,10 +0,0 @@
-v3.11.0: OpenTracks
-
-Changes:
- Theming: day/night mode (default: night)
- Theming: use Material Design instead of custom element theming
- Use targetSDK 30 again (F-Droid signs now with V2)
-
-Bugfix:
- Android 11: export all crashed
- TrackDetail not updated in UI after data was changed by user
@@ -1,4 +0,0 @@
-v3.11.1: OpenTracks
-
-Bugfix:
- Voice announcements reported wrong statistics
@@ -1,22 +0,0 @@
-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
@@ -1,10 +0,0 @@
-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
@@ -1,5 +0,0 @@
-v3.13.1: OpenTracks
-
-Bugfix:
- Crash on record start: minify/shrink removed a drawable
- Automatic export failed silently (mainly remote destinations)
@@ -1,5 +0,0 @@
-v3.13.2: OpenTracks
-
-Bugfix:
- Crash in landscape mode
-
@@ -1,10 +0,0 @@
-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
@@ -1,14 +0,0 @@
-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
@@ -1,10 +0,0 @@
-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 
@@ -1,4 +0,0 @@
-v3.14.3: OpenTracks
-
-Bugfix: 
- Downgrading database from upcoming release v3.15.0
@@ -1,22 +0,0 @@
-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
@@ -1,7 +0,0 @@
-v3.15.1: OpenTracks
-
-Changes:
- After recording show sensor statistics (e.g., avg HR)
-
-Bugfix:
- Crash on recording start with show latitude/longitude enabled
@@ -1,7 +0,0 @@
-v3.15.2: OpenTracks
-
-Changes:
- Updated translations
-
-Bugfix:
- Crash on GPX export
@@ -1,8 +0,0 @@
-v3.15.3: OpenTracks
-
-Changes:
- Computation avg/max: heart rate, cadence, and power
-
-Bugfix:
- KML/KMZ do not export #start/#end placemarks anymore
- While recording: Speed/location was sometimes falsly shown as 0.
@@ -1,4 +0,0 @@
-v3.15.4: OpenTracks
-
-Bugfix:
- Voice annoucements interval should be in minutes (introduced in v3.15.0)
@@ -1,13 +0,0 @@
-v3.16.0: OpenTracks
-
-Changes:
- Cycling: get distance from BLE speed sensor
- Reworked UI presented while recording
- UI performance optimizations
- Exported filenames: <First 32bits UUID>_<track's name>.<extension> 
- Import multiple files via Intent (e.g., from Gadgetbridge)
- GPX: export power data
- Updated translations
-
-Bugfix:
- Voice announcement use minutes correctly
@@ -1,18 +0,0 @@
-v3.17.0: OpenTracks
-
-Changes:
- Add icon for kayaking
- Charts draw missing sensor data properly
- Default: show coordinates while recording 
-
-Bugfixes:
- GPX schema corrected
- GPX exported altitude loss as sensor distance
- Statistics not computed correctly if using a speed/distance sensor
-
-Developer:
- Distance/speed value objects
- Replaced communication via SharedPreferences 
- Use non-static service binder
- Use altitude in the code base (instead of elevation)
-
@@ -1,4 +1,4 @@
-(versionName): OpenTracks
+(tbd): OpenTracks

 Changes:
 -
@@ -6,6 +6,5 @@ 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
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -82,6 +82,7 @@ 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
@@ -129,6 +130,7 @@ 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
@@ -1,103 +1,104 @@
-@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
@@ -1,168 +0,0 @@
-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();
-            }
-        };
-    }
-}
@@ -14,7 +14,7 @@
 * the License.
 */

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

 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); //TODO This is nowadays ignored as the constructor will replace the time.
+        location.setTime(INITIAL_TIME);
        location.setBearing(INITIAL_BEARING);

        return new TrackPoint(location);
@@ -19,16 +19,13 @@ import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

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

 import de.dennisguse.opentracks.R;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
 * Tests {@link ChartValueSeries}.
 *
@@ -45,15 +42,13 @@ public class ChartValueSeriesTest {
                Integer.MIN_VALUE,
                Integer.MAX_VALUE,
                new int[]{100, 1000},
-                R.string.description_altitude_metric,
-                R.string.description_altitude_imperial,
-                R.color.chart_altitude_fill,
-                R.color.chart_altitude_border,
-                15,
-                18) {
+                R.string.description_elevation_metric,
+                R.string.description_elevation_imperial,
+                R.color.chart_elevation_fill,
+                R.color.chart_elevation_border) {
            @Override
            double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getAltitude();
+                return chartPoint.getElevation();
            }

            @Override
@@ -65,16 +60,16 @@ public class ChartValueSeriesTest {

    @Test
    public void testInitialConditions() {
-        assertEquals(1, series.getInterval());
-        assertEquals(0, series.getMinMarkerValue());
-        assertEquals(5, series.getMaxMarkerValue());
-        assertTrue(series.isEnabled());
+        Assert.assertEquals(1, series.getInterval());
+        Assert.assertEquals(0, series.getMinMarkerValue());
+        Assert.assertEquals(5, series.getMaxMarkerValue());
+        Assert.assertTrue(series.isEnabled());
    }

    @Test
    public void testEnabled() {
        series.setEnabled(false);
-        assertFalse(series.isEnabled());
+        Assert.assertFalse(series.isEnabled());
    }

    @Test
@@ -82,9 +77,9 @@ public class ChartValueSeriesTest {
        series.update(new ChartPoint(0));
        series.update(new ChartPoint(10));
        series.updateDimension();
-        assertEquals(100, series.getInterval());
-        assertEquals(0, series.getMinMarkerValue());
-        assertEquals(500, series.getMaxMarkerValue());
+        Assert.assertEquals(100, series.getInterval());
+        Assert.assertEquals(0, series.getMinMarkerValue());
+        Assert.assertEquals(500, series.getMaxMarkerValue());
    }

    @Test
@@ -92,9 +87,9 @@ public class ChartValueSeriesTest {
        series.update(new ChartPoint(0));
        series.update(new ChartPoint(901));
        series.updateDimension();
-        assertEquals(1000, series.getInterval());
-        assertEquals(0, series.getMinMarkerValue());
-        assertEquals(5000, series.getMaxMarkerValue());
+        Assert.assertEquals(1000, series.getInterval());
+        Assert.assertEquals(0, series.getMinMarkerValue());
+        Assert.assertEquals(5000, series.getMaxMarkerValue());
    }

    @Test
@@ -102,8 +97,8 @@ public class ChartValueSeriesTest {
        series.update(new ChartPoint(220));
        series.update(new ChartPoint(250));
        series.updateDimension();
-        assertEquals(100, series.getInterval());
-        assertEquals(200, series.getMinMarkerValue());
-        assertEquals(700, series.getMaxMarkerValue());
+        Assert.assertEquals(100, series.getInterval());
+        Assert.assertEquals(200, series.getMinMarkerValue());
+        Assert.assertEquals(700, series.getMaxMarkerValue());
    }
 }
@@ -21,22 +21,16 @@ import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

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

-import java.time.Duration;
-import java.time.Instant;
-
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;

-import static org.junit.Assert.assertEquals;
-
 /**
 * Tests for {@link DescriptionGenerator}.
 *
@@ -45,7 +39,7 @@ import static org.junit.Assert.assertEquals;
@RunWith(AndroidJUnit4.class)
 public class DescriptionGeneratorTest {

-    private static final Instant START_TIME = Instant.ofEpochMilli(1288721514000L);
+    private static final long START_TIME = 1288721514000L;
    private DescriptionGenerator descriptionGenerator;

    private final Context context = ApplicationProvider.getApplicationContext();
@@ -62,24 +56,23 @@ public class DescriptionGeneratorTest {
    public void testGenerateTrackDescription() {
        Track track = new Track();
        TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(20000));
-        stats.setTotalTime(Duration.ofMillis(600000));
-        stats.setMovingTime(Duration.ofMillis(300000));
-        stats.setMaxSpeed(Speed.of(100));
-        stats.setMaxAltitude(550);
-        stats.setMinAltitude(-500);
-        stats.setTotalAltitudeGain(6000f);
-        stats.setTotalAltitudeLoss(6000f);
-        stats.setStartTime(START_TIME);
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setMaxElevation(550);
+        stats.setMinElevation(-500);
+        stats.setTotalElevationGain(6000);
+        stats.setStartTime_ms(START_TIME);
        track.setTrackStatistics(stats);
        track.setCategory("hiking");
        String expected = //"Created by"
                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
-                        + "Name: -<br>"
-                        + "Activity type: hiking<br>"
-                        + "Description: -<br>"
-                        + "Total distance: 20.00 km (12.4 mi)<br>"
-                        + "Total time: 10:00<br>"
+                + "Name: -<br>"
+                + "Activity type: hiking<br>"
+                + "Description: -<br>"
+                + "Total distance: 20.00 km (12.4 mi)<br>"
+                + "Total time: 10:00<br>"
                + "Moving time: 05:00<br>"
                + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
                + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
@@ -90,25 +83,23 @@ 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));
+        Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
    }

    @Test
-    public void testGenerateTrackDescriptionWithoutMaxMinAltitude() {
+    public void testGenerateTrackDescriptionWithoutMaxMinElevation() {
        Track track = new Track();
        TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(20000));
-        stats.setTotalTime(Duration.ofMillis(600000));
-        stats.setMovingTime(Duration.ofMillis(300000));
-        stats.setMaxSpeed(Speed.of(100));
-        stats.setMaxAltitude(Double.POSITIVE_INFINITY);
-        stats.setMinAltitude(Double.NEGATIVE_INFINITY);
-        stats.setTotalAltitudeGain(6000f);
-        stats.setTotalAltitudeLoss(6000f);
-        stats.setStartTime(START_TIME);
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setMaxElevation(Double.POSITIVE_INFINITY);
+        stats.setMinElevation(Double.NEGATIVE_INFINITY);
+        stats.setTotalElevationGain(6000);
+        stats.setStartTime_ms(START_TIME);
        track.setTrackStatistics(stats);
        track.setCategory("hiking");
        String expected = //"Created by"
@@ -126,60 +117,59 @@ 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));
+        Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
    }


    /**
-     * Tests {@link DescriptionGenerator#writeDistance(Distance, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeDistance(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteDistance() {
        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeDistance(Distance.of(1100), builder, R.string.description_total_distance, "<br>");
-        assertEquals("Total distance: 1.10 km (0.7 mi)<br>", builder.toString());
+        descriptionGenerator.writeDistance(1100, builder, R.string.description_total_distance, "<br>");
+        Assert.assertEquals("Total distance: 1.10 km (0.7 mi)<br>", builder.toString());
    }

    /**
-     * Tests {@link DescriptionGenerator#writeTime(Duration, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeTime(long, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteTime() {
        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeTime(Duration.ofMillis(1000), builder, R.string.description_total_time, "<br>");
-        assertEquals("Total time: 00:01<br>", builder.toString());
+        descriptionGenerator.writeTime(1000, builder, R.string.description_total_time, "<br>");
+        Assert.assertEquals("Total time: 00:01<br>", builder.toString());
    }

    /**
-     * Tests {@link DescriptionGenerator#writeSpeed(Speed, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeSpeed(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWriteSpeed() {
        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeSpeed(Speed.of(1.1), builder, R.string.description_average_speed, "\n");
-        assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString());
+        descriptionGenerator.writeSpeed(1.1, builder, R.string.description_average_speed, "\n");
+        Assert.assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString());
    }

    /**
-     * Tests {@link DescriptionGenerator#writeAltitude(double, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writeElevation(double, StringBuilder, int, String)}.
     */
    @Test
-    public void testWriteAltitude() {
+    public void testWriteElevation() {
        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeAltitude(4.2, builder, R.string.description_min_altitude, "<br>");
-        assertEquals("Min elevation: 4 m (14 ft)<br>", builder.toString());
+        descriptionGenerator.writeElevation(4.2, builder, R.string.description_min_elevation, "<br>");
+        Assert.assertEquals("Min elevation: 4 m (14 ft)<br>", builder.toString());
    }

    /**
-     * Tests {@link DescriptionGenerator#writePace(Speed, StringBuilder, int, String)}.
+     * Tests {@link DescriptionGenerator#writePace(double, StringBuilder, int, String)}.
     */
    @Test
    public void testWritePace() {
        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writePace(Speed.of(1.1), builder, R.string.description_average_pace_in_minute, "\n");
-        assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString());
+        descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n");
+        Assert.assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString());
    }
 }
@@ -0,0 +1,319 @@
+/*
+ * 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.Assert;
+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.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.content.provider.CustomContentProvider;
+import de.dennisguse.opentracks.content.provider.CustomSQLiteOpenHelper;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+
+/**
+ * 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 Waypoint.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);
+        }
+        Waypoint waypoint = new Waypoint(location);
+        waypoint.setName(title);
+        waypoint.setDescription(description);
+        waypoint.setCategory(category);
+        waypoint.setTrackId(trackId);
+
+        Uri uri = providerUtils.insertWaypoint(waypoint);
+        return new Waypoint.Id(ContentUris.parseId(uri));
+    }
+
+    private Waypoint.Id insertWaypoint(String title, String description, String category) {
+        return insertWaypoint(title, description, category, 0.0, -1, null);
+    }
+
+    private Waypoint.Id insertWaypoint(String title, double distance) {
+        return insertWaypoint(title, "", "", distance, -1, null);
+    }
+
+    private Waypoint.Id insertWaypoint(String title, long hoursAgo) {
+        return insertWaypoint(title, "", "", 0.0, hoursAgo, null);
+    }
+
+    private Waypoint.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");
+        Waypoint.Id descriptionMatchId = insertWaypoint("bb", "aa", "cc");
+        Waypoint.Id categoryMatchId = insertWaypoint("bb", "cc", "aa");
+        Waypoint.Id titleMatchId = insertWaypoint("aa", "bb", "cc");
+        Waypoint.Id titleCategoryMatchId = insertWaypoint("aa", "bb", "ca");
+        Waypoint.Id titleDescriptionMatchId = insertWaypoint("aa", "ba", "cc");
+        Waypoint.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
+        Waypoint.Id descriptionWaypointId = insertWaypoint("bb", "aa", "cc");
+        insertWaypoint("bb", "cc", "dd");
+        Waypoint.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.
+        Assert.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.
+        Waypoint.Id farFarAwayId = insertWaypoint("aa", 0.3);
+        Waypoint.Id nearId = insertWaypoint("ab", 0.1);
+        Waypoint.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.
+        Waypoint.Id oldestId = insertWaypoint("aa", 2);
+        Waypoint.Id recentId = insertWaypoint("ab", 0);
+        Waypoint.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.
+        Waypoint.Id otherId = insertWaypoint("aa", 1, new Track.Id(456));
+        Waypoint.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) {
+        Assert.assertNotNull("Not a track", result.track);
+        Assert.assertNull("Ambiguous result", result.waypoint);
+        Assert.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;
+        Assert.assertEquals(results.size(), trackIds.length);
+        for (int i = 0; i < results.size(); i++) {
+            ScoredResult result = results.get(i);
+            Assert.assertNotNull(errMsg, result.track);
+            Assert.assertNull(errMsg, result.waypoint);
+            Assert.assertEquals(errMsg, trackIds[i], result.track.getId());
+        }
+    }
+
+    private void assertWaypointResult(Waypoint.Id waypointId, ScoredResult result) {
+        Assert.assertNotNull("Not a waypoint", result.waypoint);
+        Assert.assertNull("Ambiguous result", result.track);
+        Assert.assertEquals(waypointId, result.waypoint.getId());
+    }
+
+    private void assertWaypointResults(List<ScoredResult> results, Waypoint.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;
+        Assert.assertEquals(results.size(), waypointIds.length);
+        for (int i = 0; i < results.size(); i++) {
+            ScoredResult result = results.get(i);
+            Assert.assertNotNull(errMsg, result.waypoint);
+            Assert.assertNull(errMsg, result.track);
+            Assert.assertEquals(errMsg, waypointIds[i], result.waypoint.getId());
+        }
+    }
+}
@@ -1,19 +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.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;

 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
-import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;

 public class TestDataUtil {
@@ -21,8 +16,6 @@ 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 ALTITUDE_GAIN = 3;
-    public static final float ALTITUDE_LOSS = 3;

    /**
     * Create a track without any trackPoints.
@@ -41,95 +34,43 @@ public class TestDataUtil {
     * @param trackId   the trackId of the track
     * @param numPoints the trackPoints number in the track
     */
-    @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) {
+    public static Pair<Track, TrackPoint[]> createTrack(Track.Id trackId, int numPoints) {
        Track track = createTrack(trackId);

-        List<TrackPoint> trackPoints = new ArrayList<>(numPoints);
+        TrackPoint[] trackPoints = new TrackPoint[numPoints];
        for (int i = 0; i < numPoints; i++) {
-            trackPoints.add(createTrackPoint(i));
+            trackPoints[i] = 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.ofEpochSecond(i++)),
-                createTrackPoint(i++),
-                createTrackPoint(i++),
-                createTrackPoint(i++),
-                createTrackPoint(i++, TrackPoint.Type.SEGMENT_START_AUTOMATIC),
-                createTrackPoint(i++),
-                createTrackPoint(i++),
-                createTrackPoint(i++),
-                createTrackPoint(i++, TrackPoint.Type.SEGMENT_END_MANUAL),
-
-                TrackPoint.createSegmentStartManualWithTime(Instant.ofEpochSecond(i++)),
-                createTrackPoint(i++),
-                createTrackPoint(i++),
-                createTrackPoint(i++),
-                createTrackPoint(i, TrackPoint.Type.SEGMENT_END_MANUAL)
-        );
-
-        //TODO Use TrackStatisticsUpdater
-        TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(0));
-        stats.setTotalTime(Duration.ofMillis(0));
-        List<Marker> markers = List.of(
-                new Marker("Marker 1", "Marker description 1", "Marker category 3", "", trackId, stats, trackPoints.get(1), null),
-                new Marker("Marker 2", "Marker description 2", "Marker category 3", "", trackId, stats, trackPoints.get(4), null),
-                new Marker("Marker 3", "Marker description 3", "Marker category 3", "", trackId, stats, 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, List<TrackPoint>> pair = createTrack(trackId, numPoints);
+        Pair<Track, TrackPoint[]> pair = createTrack(trackId, numPoints);

        insertTrackWithLocations(contentProviderUtils, pair.first, pair.second);

        return pair.first;
    }

+    /**
+     * Creates a location.
+     *
+     * @param i the index for the TrackPoint.
+     */
    public static TrackPoint createTrackPoint(int i) {
-        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT);
+        TrackPoint trackPoint = new TrackPoint();
        trackPoint.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
        trackPoint.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
        trackPoint.setAccuracy((float) i / 100.0f);
        trackPoint.setAltitude(i * ALTITUDE_INTERVAL);
-        trackPoint.setTime(Instant.ofEpochSecond(i + 1));
-        trackPoint.setSpeed(Speed.of(5f + (i / 10f)));
+        trackPoint.setTime(i + 1);
+        trackPoint.setSpeed(5f + (i / 10));

        trackPoint.setHeartRate_bpm(100f + i);
+        trackPoint.setCyclingCadence_rpm(200f + i);
        trackPoint.setCyclingCadence_rpm(300f + i);
        trackPoint.setPower(400f + i);
-        trackPoint.setAltitudeGain(ALTITUDE_GAIN);
-        trackPoint.setAltitudeLoss(ALTITUDE_LOSS);
-        return trackPoint;
-    }
-
-    public static TrackPoint createTrackPoint(int i, TrackPoint.Type type) {
-        TrackPoint trackPoint = createTrackPoint(i);
-        trackPoint.setType(type);
        return trackPoint;
    }

@@ -139,31 +80,25 @@ public class TestDataUtil {
     * @param track       track to be inserted
     * @param trackPoints trackPoints to be inserted
     */
-    public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, List<TrackPoint> trackPoints) {
+    public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, TrackPoint[] trackPoints) {
        contentProviderUtils.insertTrack(track);
        contentProviderUtils.bulkInsertTrackPoint(trackPoints, track.getId());
    }

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

-        //TODO Use TrackStatisticsUpdater
-        TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(0));
-        stats.setTotalTime(Duration.ofMillis(0));
-
-        return new Marker("Marker name", "Marker description", "Marker category", "", trackId, stats, trackPoint, photoUrl);
-    }
-
-    public static List<TrackPoint> getTrackPoints(ContentProviderUtils contentProviderUtils, Track.Id trackId) {
-        TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null);
-        ArrayList<TrackPoint> trackPoints = new ArrayList<>();
-        while (trackPointIterator.hasNext()) {
-            trackPoints.add(trackPointIterator.next());
-        }
-        return trackPoints;
+        return new Waypoint("Waypoint name", "Waypoint description", "Waypoint category", "", trackId, 0.0, 0, location, photoUrl);
    }
 }
@@ -1,92 +0,0 @@
-package de.dennisguse.opentracks.content.data;
-
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestSensorDataUtil {
-
-    private final List<TrackPoint> trackPointList = new ArrayList<>();
-    private final List<SensorData> sensorDataList = new ArrayList<>();
-
-    public void add(Instant time, Float hr, Float cadence, Float power, TrackPoint.Type type) {
-        sensorDataList.add(new TestSensorDataUtil.SensorData(time, hr, cadence, power, type));
-        TrackPoint tp = new TrackPoint(type);
-        int i = trackPointList.size() + 1;
-        tp.setLatitude(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0);
-        tp.setLongitude(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0);
-        tp.setHeartRate_bpm(hr);
-        tp.setCyclingCadence_rpm(cadence);
-        tp.setPower(power);
-        tp.setAccuracy(1f);
-        tp.setAltitude(1f);
-        tp.setTime(time);
-        tp.setSpeed(Speed.of(5f + (i / 10f)));
-        tp.setAltitudeGain(3f);
-        tp.setAltitudeLoss(3f);
-        trackPointList.add(tp);
-    }
-
-    public List<TrackPoint> getTrackPointList() {
-        return this.trackPointList;
-    }
-
-    public SensorDataStats computeStats() {
-        if (sensorDataList.size() <= 1) {
-            return null;
-        }
-
-        SensorDataStats stats = new SensorDataStats();
-        long timeElapsed;
-        long movingTime = 0;
-        SensorData dataPrev = sensorDataList.get(0);
-        stats.maxHr = dataPrev.hr;
-        stats.maxCadence = dataPrev.cadence;
-        SensorData dataCurrent;
-        for (int i = 1; i < sensorDataList.size(); i++) {
-            dataCurrent = sensorDataList.get(i);
-            if (dataPrev.type != TrackPoint.Type.SEGMENT_START_MANUAL) {
-                timeElapsed = dataCurrent.type != TrackPoint.Type.SEGMENT_START_MANUAL ? dataCurrent.time.getEpochSecond() - dataPrev.time.getEpochSecond() : 0;
-                stats.avgHr += (dataPrev.hr * timeElapsed);
-                stats.maxHr = Math.max(dataPrev.hr, stats.maxHr);
-                stats.avgCadence += (dataPrev.cadence * timeElapsed);
-                stats.maxCadence = Math.max(dataPrev.cadence, stats.maxCadence);
-                stats.avgPower += (dataPrev.power * timeElapsed);
-
-                movingTime += timeElapsed;
-            }
-            dataPrev = dataCurrent;
-        }
-
-        stats.avgHr /= movingTime;
-        stats.avgCadence /= movingTime;
-        stats.avgPower /= movingTime;
-
-        return stats;
-    }
-
-    private static class SensorData {
-        final Instant time;
-        final float hr;
-        final float cadence;
-        final float power;
-        final TrackPoint.Type type;
-
-        public SensorData(Instant time, Float hr, Float cadence, Float power, TrackPoint.Type type) {
-            this.time = time;
-            this.hr = hr == null ? 0 : hr;
-            this.cadence = cadence == null ? 0 : cadence;
-            this.power = power == null ? 0 : power;
-            this.type = type;
-        }
-    }
-
-    public static class SensorDataStats {
-        public float avgHr = 0f;
-        public float maxHr = 0f;
-        public float avgCadence = 0f;
-        public float maxCadence = 0f;
-        public float avgPower = 0f;
-    }
-}
@@ -1,28 +0,0 @@
-package de.dennisguse.opentracks.content.data;
-
-import org.junit.Test;
-
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class TrackPointTest {
-
-    @Test
-    public void isRecent_true() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL);
-        tp.setTime(Instant.now());
-
-        assertTrue(tp.isRecent());
-    }
-
-    @Test
-    public void isRecent_false() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL);
-        tp.setTime(Instant.now().minus(2, ChronoUnit.MINUTES));
-
-        assertFalse(tp.isRecent());
-    }
-}
@@ -25,9 +25,9 @@ import androidx.test.core.app.ApplicationProvider;
 import org.junit.Before;
 import org.junit.Test;

-import de.dennisguse.opentracks.content.data.MarkerColumns;
 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -67,7 +67,7 @@ public class CustomContentProviderTest {
        assertEquals(TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI_BY_ID));
        assertEquals(TrackPointsColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(TrackPointsColumns.CONTENT_URI_BY_TRACKID.buildUpon(), 1).build()));

-        assertEquals(MarkerColumns.CONTENT_TYPE, customContentProvider.getType(MarkerColumns.CONTENT_URI));
-        assertEquals(MarkerColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(MarkerColumns.CONTENT_URI.buildUpon(), 1).build()));
+        assertEquals(WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
+        assertEquals(WaypointsColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(WaypointsColumns.CONTENT_URI.buildUpon(), 1).build()));
    }
 }
@@ -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,14 +15,12 @@ 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;
 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -40,21 +38,39 @@ public class CustomSQLiteOpenHelperTest {
    private final Context context = ApplicationProvider.getApplicationContext();

    /**
-     * Get the SQL create statements for all SQLite elements of type (ordered by name).
+     * Get the SQL create statements for all tables (ordered by name).
     *
-     * @param type index, table
-     * @return Map(name, SQL)
+     * @return Map(TableName, SQL)
     */
-    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")) {
+    @VisibleForTesting
+    public static Map<String, String> getTableSQL(SQLiteDatabase db) {
+        HashMap<String, String> tableSQL = new HashMap<>();
+        try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "name IN ('" + TracksColumns.TABLE_NAME + "', '" + TrackPointsColumns.TABLE_NAME + "', '" + WaypointsColumns.TABLE_NAME + "')", null, null, null, "name")) {
            if (cursor != null) {
                while (cursor.moveToNext()) {
-                    sqlMap.put(cursor.getString(0), cursor.getString(1));
+                    tableSQL.put(cursor.getString(0), cursor.getString(1));
                }
            }
        }
-        return sqlMap;
+        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;
    }

    /**
@@ -90,10 +106,10 @@ public class CustomSQLiteOpenHelperTest {
            assertTrue(hasSqlCreate(db, TrackPointsColumns.CREATE_TABLE));
            assertTrue(hasSqlCreate(db, TrackPointsColumns.CREATE_TABLE_INDEX));

-            assertTrue(hasSqlCreate(db, MarkerColumns.CREATE_TABLE));
-            assertTrue(hasSqlCreate(db, MarkerColumns.CREATE_TABLE_INDEX));
+            assertTrue(hasSqlCreate(db, WaypointsColumns.CREATE_TABLE));
+            assertTrue(hasSqlCreate(db, WaypointsColumns.CREATE_TABLE_INDEX));
        } catch (Exception e) {
-            fail("Database could not be created: " + e);
+            fail();
        }
    }

@@ -105,8 +121,8 @@ public class CustomSQLiteOpenHelperTest {
        Map<String, String> tableByUpgrade;
        Map<String, String> indicesByUpgrade;
        try (SQLiteDatabase dbUpgraded = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
-            tableByUpgrade = getSQL(dbUpgraded, "table");
-            indicesByUpgrade = getSQL(dbUpgraded, "index");
+            tableByUpgrade = getTableSQL(dbUpgraded);
+            indicesByUpgrade = getIndexSQL(dbUpgraded);
        }
        context.deleteDatabase(DATABASE_NAME);

@@ -114,25 +130,23 @@ public class CustomSQLiteOpenHelperTest {
        Map<String, String> tablesByCreate;
        Map<String, String> indicesByCreate;
        try (SQLiteDatabase dbCreated = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
-            tablesByCreate = getSQL(dbCreated, "table");
-            indicesByCreate = getSQL(dbCreated, "index");
+            tablesByCreate = getTableSQL(dbCreated);
+            indicesByCreate = getIndexSQL(dbCreated);
        }

-
        // then - verify table structure
-        int tableCount = 3 + 2; //Three with data tables + two SQLite
-        assertEquals(tableCount, tableByUpgrade.size());
+        assertEquals(3, tableByUpgrade.size());
        assertEquals(tableByUpgrade.size(), tablesByCreate.size());

        assertEquals(tablesByCreate.get(TracksColumns.TABLE_NAME), tableByUpgrade.get(TracksColumns.TABLE_NAME));
        assertEquals(tablesByCreate.get(TrackPointsColumns.TABLE_NAME), tableByUpgrade.get(TrackPointsColumns.TABLE_NAME));
-        assertEquals(tablesByCreate.get(MarkerColumns.TABLE_NAME), tableByUpgrade.get(MarkerColumns.TABLE_NAME));
+        assertEquals(tablesByCreate.get(WaypointsColumns.TABLE_NAME), tableByUpgrade.get(WaypointsColumns.TABLE_NAME));

        // then - verify custom indices
        assertEquals(3, indicesByCreate.size());
        assertEquals(indicesByUpgrade.get(TracksColumns.TABLE_NAME), indicesByCreate.get(TracksColumns.TABLE_NAME));
        assertEquals(indicesByUpgrade.get(TrackPointsColumns.TABLE_NAME), indicesByCreate.get(TrackPointsColumns.TABLE_NAME));
-        assertEquals(indicesByUpgrade.get(MarkerColumns.TABLE_NAME), indicesByCreate.get(MarkerColumns.TABLE_NAME));
+        assertEquals(indicesByUpgrade.get(WaypointsColumns.TABLE_NAME), indicesByCreate.get(WaypointsColumns.TABLE_NAME));
    }

    @Test
@@ -144,8 +158,8 @@ public class CustomSQLiteOpenHelperTest {
        Map<String, String> tablesByDowngrade;
        Map<String, String> indicesByDowngrade;
        try (SQLiteDatabase db = new CustomSQLiteOpenHelper(context, DATABASE_NAME, 23).getReadableDatabase()) {
-            tablesByDowngrade = getSQL(db, "table");
-            indicesByDowngrade = getSQL(db, "index");
+            tablesByDowngrade = getTableSQL(db);
+            indicesByDowngrade = getIndexSQL(db);
        }

        // then - verify table structure
@@ -168,101 +182,6 @@ 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) {
@@ -3,6 +3,7 @@ package de.dennisguse.opentracks.content.provider;
 import android.net.Uri;
 import android.util.Pair;

+import org.junit.Assert;
 import org.junit.Test;

 import java.util.HashSet;
@@ -11,19 +12,17 @@ import java.util.Set;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;

-import static org.junit.Assert.assertEquals;
-
 public class ShareContentProviderTest {

    @Test
-    public void testCreateAndParseURI_invalid() {
+    public void testCreateandParseURI_invalid() {
        Uri uri = Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/1");

-        assertEquals(0, ShareContentProvider.parseURI(uri).size());
+        Assert.assertEquals(0, ShareContentProvider.parseURI(uri).size());
    }

    @Test
-    public void testCreateAndParseURI_valid() {
+    public void testCreateandParseURI_valid() {
        Set<Track.Id> trackIds = new HashSet<>();
        trackIds.add(new Track.Id(1));
        trackIds.add(new Track.Id(3));
@@ -31,7 +30,7 @@ public class ShareContentProviderTest {

        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "TrackName", TrackFileFormat.KML_ONLY_TRACK);

-        assertEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first));
+        Assert.assertEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first));
    }

    @Test
@@ -40,6 +39,6 @@ public class ShareContentProviderTest {
        trackIds.add(new Track.Id(1));
        Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "../../&1=1", TrackFileFormat.KML_ONLY_TRACK);

-        assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/kml_only_track/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first);
+        Assert.assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/kml_only_track/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first);
    }
 }
@@ -2,15 +2,12 @@ package de.dennisguse.opentracks.content.sensor;

 import androidx.test.ext.junit.runners.AndroidJUnit4;

+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import de.dennisguse.opentracks.util.UintUtils;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-
@RunWith(AndroidJUnit4.class)
 public class SensorDataCyclingTest {

@@ -24,7 +21,7 @@ public class SensorDataCyclingTest {
        current.compute(previous);

        // then
-        assertEquals(60, current.getValue(), 0.01);
+        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
    }

    @Test
@@ -37,7 +34,7 @@ public class SensorDataCyclingTest {
        current.compute(previous);

        // then
-        assertEquals(33.53, current.getValue(), 0.01);
+        Assert.assertEquals(33.53, current.getCadence_rpm(), 0.01);
    }

    @Test
@@ -50,7 +47,7 @@ public class SensorDataCyclingTest {
        current.compute(previous);

        // then
-        assertEquals(0, current.getValue(), 0.01);
+        Assert.assertEquals(0, current.getCadence_rpm(), 0.01);
    }


@@ -64,7 +61,7 @@ public class SensorDataCyclingTest {
        current.compute(previous);

        // then
-        assertFalse(current.hasValue());
+        Assert.assertFalse(current.hasCadence_rpm());
    }

    @Test
@@ -77,7 +74,7 @@ public class SensorDataCyclingTest {
        current.compute(previous);

        // then
-        assertEquals(60, current.getValue(), 0.01);
+        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
    }

    @Test
@@ -90,62 +87,32 @@ public class SensorDataCyclingTest {
        current.compute(previous);

        // then
-        assertEquals(60, current.getValue(), 0.01);
+        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
    }

    @Test
    public void compute_speed() {
        // given
-        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 1, 6184);
-        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 2, 8016);
+        SensorDataCycling.Speed previous = new SensorDataCycling.Speed("sensorAddress", "sensorName", 1, 6184);
+        SensorDataCycling.Speed current = new SensorDataCycling.Speed("sensorAddress", "sensorName", 2, 8016);

        // when
        current.compute(previous, 2150);

        // then
-        assertEquals(2.15, current.getValue().distance.toM(), 0.01);
-        assertEquals(1.20, current.getValue().speed.toMPS(), 0.01);
+        Assert.assertEquals(1.20, current.getSpeed_mps(), 0.01);
    }

    @Test
    public void compute_speed_rollOverCount() {
        // given
-        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", UintUtils.UINT16_MAX - 1, 1024);
-        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("sensorAddress", "sensorName", 0, 2048);
+        SensorDataCycling.Speed previous = new SensorDataCycling.Speed("sensorAddress", "sensorName", UintUtils.UINT16_MAX - 1, 1024);
+        SensorDataCycling.Speed current = new SensorDataCycling.Speed("sensorAddress", "sensorName", 0, 2048);

        // when
        current.compute(previous, 2000);

        // then
-        assertEquals(2, current.getValue().distance.toM(), 0.01);
-        assertEquals(2, current.getValue().speed.toMPS(), 0.01);
-    }
-
-    @Test
-    public void equals_speed_with_no_data() {
-        // given
-        SensorDataCycling.DistanceSpeed previous = new SensorDataCycling.DistanceSpeed("sensorAddress");
-        SensorDataCycling.DistanceSpeed current = new SensorDataCycling.DistanceSpeed("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);
+        Assert.assertEquals(2, current.getSpeed_mps(), 0.01);
    }
 }
@@ -23,23 +23,18 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

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

-import java.time.Duration;
-import java.time.Instant;
-
+import de.dennisguse.opentracks.TrackStubUtils;
 import de.dennisguse.opentracks.chart.ChartPoint;
 import de.dennisguse.opentracks.chart.ChartView;
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.UnitConversions;

-import static org.junit.Assert.assertEquals;
-
 /**
 * Tests {@link ChartFragment}.
 *
@@ -66,9 +61,9 @@ public class ChartFragmentTest {
    @Before
    public void setUp() {
        boolean chartByDistance = false;
-        chartFragment = ChartFragment.newInstance(chartByDistance);
+        chartFragment = (ChartFragment) ChartFragment.newInstance(chartByDistance);
        chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext(), chartByDistance));
-        chartFragment.setRecordingDistanceInterval(Distance.of(50));
+        chartFragment.setTrackStatisticsUpdater(TrackStubUtils.INITIAL_TIME);
    }

    /**
@@ -83,9 +78,9 @@ public class ChartFragmentTest {
        ChartPoint point = chartFragment.createPendingPoint(trackPoint);

        // then
-        assertEquals(Float.NaN, point.getHeartRate(), 0.01);
-        assertEquals(Float.NaN, point.getCadence(), 0.01);
-        assertEquals(Float.NaN, point.getPower(), 0.01);
+        Assert.assertEquals(Float.NaN, point.getHeartRate(), 0.01);
+        Assert.assertEquals(Float.NaN, point.getCadence(), 0.01);
+        Assert.assertEquals(Float.NaN, point.getPower(), 0.01);
    }

    /**
@@ -103,9 +98,9 @@ public class ChartFragmentTest {
        ChartPoint point = chartFragment.createPendingPoint(trackPoint);

        // then
-        assertEquals(100.0, point.getHeartRate(), 0.01);
-        assertEquals(101.0, point.getCadence(), 0.01);
-        assertEquals(102.0, point.getPower(), 0.01);
+        Assert.assertEquals(100.0, point.getHeartRate(), 0.01);
+        Assert.assertEquals(101.0, point.getCadence(), 0.01);
+        Assert.assertEquals(102.0, point.getPower(), 0.01);
    }

    /**
@@ -117,12 +112,12 @@ public class ChartFragmentTest {
        // Resets last location and writes first location.
        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);

        // The second is a same location, just different time.
        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
        point = chartFragment.createPendingPoint(trackPoint2);
-        assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);

        // The third location is a new location, and use metric.
        TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint();
@@ -134,7 +129,7 @@ public class ChartFragmentTest {
        Location.distanceBetween(trackPoint2.getLatitude(), trackPoint2.getLongitude(),
                trackPoint3.getLatitude(), trackPoint3.getLongitude(), results);
        double distance1 = results[0] * UnitConversions.M_TO_KM;
-        assertEquals(distance1, point.getTimeOrDistance(), 0.01);
+        Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01);

        // The fourth location is a new location, and use metric.
        TrackPoint trackPoint4 = TrackStubUtils.createDefaultTrackPoint();
@@ -145,7 +140,7 @@ public class ChartFragmentTest {
        Location.distanceBetween(trackPoint3.getLatitude(), trackPoint3.getLongitude(),
                trackPoint4.getLatitude(), trackPoint4.getLongitude(), results);
        double distance2 = results[0] * UnitConversions.M_TO_KM;
-        assertEquals((distance1 + distance2), point.getTimeOrDistance(), 0.01);
+        Assert.assertEquals((distance1 + distance2), point.getTimeOrDistance(), 0.01);
    }

    /**
@@ -161,7 +156,7 @@ public class ChartFragmentTest {
        // The first is a same location, just different time.
        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);

        // The second location is a new location, and use imperial.
        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
@@ -175,7 +170,7 @@ public class ChartFragmentTest {
        float[] results = new float[4];
        Location.distanceBetween(trackPoint1.getLatitude(), trackPoint1.getLongitude(), trackPoint2.getLatitude(), trackPoint2.getLongitude(), results);
        double distance1 = results[0] * UnitConversions.M_TO_KM * UnitConversions.KM_TO_MI;
-        assertEquals(distance1, point.getTimeOrDistance(), 0.01);
+        Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01);

        // The third location is a new location, and use imperial.
        TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint();
@@ -188,7 +183,7 @@ public class ChartFragmentTest {
         */
        Location.distanceBetween(trackPoint2.getLatitude(), trackPoint2.getLongitude(), trackPoint3.getLatitude(), trackPoint3.getLongitude(), results);
        double distance2 = results[0] * UnitConversions.M_TO_KM * UnitConversions.KM_TO_MI;
-        assertEquals(distance1 + distance2, point.getTimeOrDistance(), 0.01);
+        Assert.assertEquals(distance1 + distance2, point.getTimeOrDistance(), 0.01);
    }

    /**
@@ -196,36 +191,30 @@ 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);
-        Duration timeSpan = Duration.ofMillis(222);
+        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        long timeSpan = 222;
        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint2.setTime(Instant.ofEpochMilli(TrackStubUtils.INITIAL_TIME).plus(timeSpan));
+        trackPoint2.setTime(trackPoint1.getTime() + timeSpan);
        point = chartFragment.createPendingPoint(trackPoint2);
-        assertEquals(timeSpan, Duration.ofMillis((long) point.getTimeOrDistance()));
+        Assert.assertEquals((double) timeSpan, point.getTimeOrDistance(), 0.01);
    }

    /**
-     * Tests the logic to get the value of altitude in {@link ChartFragment#createPendingPoint(TrackPoint)} by one and two points.
+     * Tests the logic to get the value of elevation in {@link ChartFragment#createPendingPoint(TrackPoint)} by one and two points.
     */
    @Test
-    public void testCreatePendingPoint_altitude() {
+    public void testCreatePendingPoint_elevation() {
        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();

        /*
-         * At first, clear old points of altitude, so give true to the second parameter.
+         * At first, clear old points of elevation, so give true to the second parameter.
         * Then only one value INITIAL_ALTITUDE in buffer.
         */
        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point.getAltitude(), 0.01);
+        Assert.assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point.getElevation(), 0.01);

        /*
         * Send another value to buffer, now there are two values, INITIAL_ALTITUDE and INITIAL_ALTITUDE * 2.
@@ -233,7 +222,7 @@ public class ChartFragmentTest {
        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
        trackPoint2.setAltitude(TrackStubUtils.INITIAL_ALTITUDE * 2);
        point = chartFragment.createPendingPoint(trackPoint2);
-        assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0, point.getAltitude(), 0.01);
+        Assert.assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0, point.getElevation(), 0.01);
    }

    /**
@@ -248,9 +237,9 @@ public class ChartFragmentTest {
         * It will not be filled in to the speed buffer.
         */
        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint1.setSpeed(Speed.of(128.5f));
+        trackPoint1.setSpeed(128.5f);
        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        assertEquals(0.0, point.getSpeed(), 0.01);
+        Assert.assertEquals(0.0, point.getSpeed(), 0.01);

        /*
         * Tests the logic when both metricUnits and reportSpeed are true.
@@ -261,10 +250,10 @@ 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().plusMillis(222));
-        trackPoint2.setSpeed(Speed.of(130f));
+        trackPoint2.setTime(trackPoint1.getTime() + 222);
+        trackPoint2.setSpeed(130);
        point = chartFragment.createPendingPoint(trackPoint2);
-        assertEquals(130.0 * UnitConversions.MPS_TO_KMH, point.getSpeed(), 0.01);
+        Assert.assertEquals(130.0 * UnitConversions.MPS_TO_KMH, point.getSpeed(), 0.01);
    }

    /**
@@ -276,9 +265,9 @@ public class ChartFragmentTest {

        // First data point is not added to the speed buffer
        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint1.setSpeed(Speed.of(100.0f));
+        trackPoint1.setSpeed(100.0f);
        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        assertEquals(0.0, point.getSpeed(), 0.01);
+        Assert.assertEquals(0.0, point.getSpeed(), 0.01);

        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();

@@ -286,10 +275,10 @@ 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().plusMillis(222));
-        trackPoint2.setSpeed(Speed.of(102f));
+        trackPoint2.setTime(trackPoint2.getTime() + 222);
+        trackPoint2.setSpeed(102);
        point = chartFragment.createPendingPoint(trackPoint2);
-        assertEquals(102.0 * UnitConversions.MPS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01);
+        Assert.assertEquals(102.0 * UnitConversions.MPS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01);
    }

    /**
@@ -301,9 +290,9 @@ public class ChartFragmentTest {

        // First data point is not added to the speed buffer
        TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint1.setSpeed(Speed.of(100.0f));
+        trackPoint1.setSpeed(100.0f);
        ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        assertEquals(0.0, point.getSpeed(), 0.01);
+        Assert.assertEquals(0.0, point.getSpeed(), 0.01);

        TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();

@@ -311,10 +300,10 @@ 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().plusMillis(222));
-        trackPoint2.setSpeed(Speed.of(102f));
+        trackPoint2.setTime(trackPoint2.getTime() + 222);
+        trackPoint2.setSpeed(102);
        point = chartFragment.createPendingPoint(trackPoint2);
-        assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MPS_TO_KMH), point.getPace(), 0.01);
+        Assert.assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MPS_TO_KMH), point.getPace(), 0.01);
    }

    /**
@@ -324,8 +313,8 @@ public class ChartFragmentTest {
    public void testCreatePendingPoint_pace_zeroSpeed() {
        chartFragment.setReportSpeed(false);
        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
-        trackPoint.setSpeed(Speed.of(0f));
+        trackPoint.setSpeed(0);
        ChartPoint point = chartFragment.createPendingPoint(trackPoint);
-        assertEquals(0.0, point.getPace(), 0.01);
+        Assert.assertEquals(0.0, point.getPace(), 0.01);
    }
 }
@@ -1,53 +0,0 @@
-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());
-    }
-}
@@ -0,0 +1,131 @@
+/*
+ * 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.junit.Assert;
+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.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
+import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+
+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(WaypointsColumns.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.insertWaypoint(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) {
+        Assert.assertEquals(name, track.getName());
+        Assert.assertEquals(description, track.getDescription());
+        if (time != -1L) {
+            Assert.assertEquals(time, track.getTrackStatistics().getStartTime_ms());
+        }
+    }
+}
@@ -1,20 +1,14 @@
 package de.dennisguse.opentracks.io.file.importer;

 import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Looper;
 import android.util.Log;
+import android.util.Pair;

-import androidx.preference.PreferenceManager;
 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.BeforeClass;
-import org.junit.Rule;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -22,56 +16,36 @@ import org.junit.runners.JUnit4;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.time.Instant;
 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.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
-import de.dennisguse.opentracks.services.TrackRecordingService;
 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 SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);

    private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);

@@ -79,72 +53,60 @@ public class ExportImportTest {
    private static final String TRACK_CATEGORY = "the category";
    private static final String TRACK_DESCRIPTION = "the description";

-    private Track track;
-    private List<Marker> markers = new ArrayList<>();
-    private List<TrackPoint> trackPoints = new ArrayList<>();
+    private final List<Waypoint> waypoints = new ArrayList<>();
+    private final List<TrackPoint> trackPoints = new ArrayList<>();

-    private Track.Id trackId;
    private Track.Id importTrackId;
+    private final Track.Id trackId = new Track.Id(System.currentTimeMillis());

-    public void setUp(boolean hasSensorDistance) throws TimeoutException {
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
-                .getService();
+    @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());

+        trackPoints.clear();
+        trackPoints.addAll(Arrays.asList(track.second));

-        trackId = service.startNewTrack();
-        //TODO Workaround as those managers overwrite input data; We need to refactor TrackRecordingService to make it actually testable
-        service.setAltitudeSumManager(null);
-        service.setRemoteSensorManager(null);
+        for (int i = 0; i < 3; i++) {
+            Waypoint waypoint = new Waypoint(track.second[i].getLocation());
+            waypoint.setName("the waypoint " + i);
+            waypoint.setDescription("the waypoint description " + i);
+            waypoint.setCategory("the waypoint category" + i);
+            waypoint.setIcon("the waypoing icon" + i);
+            waypoint.setPhotoUrl("the photo url" + i);
+            waypoint.setTrackId(trackId);
+            contentProviderUtils.insertWaypoint(waypoint);

-        Distance sensorDistance = hasSensorDistance ? Distance.of(5) : null;
+            waypoints.add(waypoint);
+        }

-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance), 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, sensorDistance), 0);
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
-        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);
-        service.pauseCurrentTrack();
-
-        service.resumeCurrentTrack();
-        //TODO Workaround as those managers overwrite input data; We need to refactor TrackRecordingService to make it actually testable
-        service.setAltitudeSumManager(null);
-        service.setRemoteSensorManager(null);
-
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
-        service.newTrackPoint(createTrackPoint(System.currentTimeMillis(), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance), 0);
-        service.endCurrentTrack();
-
-        track = contentProviderUtils.getTrack(trackId);
-        track.setIcon(TRACK_ICON);
-        track.setCategory(TRACK_CATEGORY);
-        track.setDescription(TRACK_DESCRIPTION);
-        contentProviderUtils.updateTrack(track);
-
-        track = contentProviderUtils.getTrack(trackId);
-        trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        markers = contentProviderUtils.getMarkers(trackId);
-        assertEquals(10, trackPoints.size());
-        assertEquals(2, markers.size());
+        assertEquals(waypoints.size(), contentProviderUtils.getWaypointCount(trackId));
    }

    @After
    public void tearDown() {
        contentProviderUtils.deleteTrack(context, trackId);
-        if (importTrackId != null) {
-            contentProviderUtils.deleteTrack(context, importTrackId);
-        }
+        contentProviderUtils.deleteTrack(context, importTrackId);
    }

    @LargeTest
    @Test
-    public void kml_with_trackdetail() throws TimeoutException {
-        setUp(false);
+    public void kml_only_track() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }

+    @LargeTest
+    @Test
+    public void kml_with_trackdetail() {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL.newTrackExporter(context);

        // when
        // 1. export
@@ -155,7 +117,7 @@ public class ExportImportTest {
        // 2. import
        InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
        AbstractFileTrackImporter trackImporter = new KmlFileTrackImporter(context);
-        importTrackId = trackImporter.importFile(inputStream).get(0);
+        importTrackId = trackImporter.importFile(inputStream);

        // then
        // 1. track
@@ -167,25 +129,20 @@ public class ExportImportTest {
        assertEquals(track.getIcon(), importedTrack.getIcon());
        assertEquals(track.getUuid(), importedTrack.getUuid());

-        // 2. trackpoints
-        assertTrackpoints(trackPoints, false, false, false, false, false, false);
+        // 2. waypoints
+        assertWaypoints();

-        // 3. trackstatistics
-        assertTrackStatistics(false, false, true);
-
-        // 4. markers
-        assertMarkers();
+        // 3. trackpoints
+        assertTrackpoints(false, false, false);
    }

    @LargeTest
    @Test
-    public void kml_with_trackdetail_and_sensordata() throws TimeoutException {
-        setUp(true);
-
+    public void kml_with_trackdetail_and_sensordata() {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.newTrackExporter(context);

        // when
        // 1. export
@@ -196,7 +153,7 @@ public class ExportImportTest {
        // 2. import
        InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
        AbstractFileTrackImporter trackImporter = new KmlFileTrackImporter(context);
-        importTrackId = trackImporter.importFile(inputStream).get(0);
+        importTrackId = trackImporter.importFile(inputStream);

        // then
        // 1. track
@@ -207,28 +164,21 @@ public class ExportImportTest {
        assertEquals(track.getName(), importedTrack.getName());
        assertEquals(track.getIcon(), importedTrack.getIcon());

-        // 2. trackpoints
-        assertTrackpoints(trackPoints, true, true, true, true, true, true);
+        // 2. waypoints
+        assertWaypoints();

-        // 2. trackstatistics
-        assertTrackStatistics(false, true, true);
-
-        // 4. markers
-        assertMarkers();
+        // 3. trackpoints
+        assertTrackpoints(true, true, true);
    }

    @LargeTest
-    @Test(expected = ImportAlreadyExistsException.class)
-    public void kml_with_trackdetail_and_sensordata_duplicate_trackUUID() throws TimeoutException {
-        setUp(false);
-
+    @Test
+    public void kml_with_trackdetail_and_sensordata_duplicate_trackUUID() {
        // given
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putBoolean(context.getString(R.string.import_prevent_reimport_key), true);
-        editor.commit();
+        PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.newTrackExporter(context);

        // when
        // 1. export
@@ -238,7 +188,7 @@ public class ExportImportTest {
        // 2. import
        InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
        AbstractFileTrackImporter trackImporter = new KmlFileTrackImporter(context);
-        importTrackId = trackImporter.importFile(inputStream).get(0);
+        importTrackId = trackImporter.importFile(inputStream);

        // then
        Track importedTrack = contentProviderUtils.getTrack(importTrackId);
@@ -247,13 +197,39 @@ public class ExportImportTest {

    @LargeTest
    @Test
-    public void gpx() throws TimeoutException {
-        setUp(true);
+    public void kmz_only_track() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }

+    @LargeTest
+    @Test
+    public void kmz_with_trackdetail() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void kmz_with_trackdetail_and_sensordata() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void kmz_with_trackdetail_and_sensordata_and_pictures() {
+        // TODO
+        Log.e(TAG, "Test not implemented.");
+    }
+
+    @LargeTest
+    @Test
+    public void gpx() {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.newTrackExporter(context);

        // when
        // 1. export
@@ -264,7 +240,7 @@ public class ExportImportTest {
        // 2. import
        InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
        AbstractFileTrackImporter trackImporter = new GpxFileTrackImporter(context, contentProviderUtils);
-        importTrackId = trackImporter.importFile(inputStream).get(0);
+        importTrackId = trackImporter.importFile(inputStream);

        // then
        // 1. track
@@ -277,34 +253,21 @@ public class ExportImportTest {
        //TODO exporting and importing a track icon is not yet supported by GpxTrackWriter.
        //assertEquals(track.getIcon(), trackImported.getIcon());

-        // 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);
+        // 2. waypoints
+        assertWaypoints();

-        assertTrackpoints(trackPointsWithCoordinates, true, true, true, true, true, false);
-
-        // 3. trackstatistics
-        assertTrackStatistics(true, true, false);
-
-        // 4. markers
-        assertMarkers();
+        // 3. trackpoints
+        assertTrackpoints(false, true, true);
    }

    @LargeTest
-    @Test(expected = ImportAlreadyExistsException.class)
-    public void gpx_duplicate_trackUUID() throws TimeoutException {
-        setUp(false);
-
+    @Test
+    public void gpx_duplicate_trackUUID() {
        // given
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putBoolean(context.getString(R.string.import_prevent_reimport_key), true);
-        editor.commit();
+        PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.newTrackExporter(context);

        // when
        // 1. export
@@ -314,7 +277,7 @@ public class ExportImportTest {
        // 2. import
        InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
        AbstractFileTrackImporter trackImporter = new GpxFileTrackImporter(context, contentProviderUtils);
-        importTrackId = trackImporter.importFile(inputStream).get(0);
+        importTrackId = trackImporter.importFile(inputStream);

        // then
        // 1. track
@@ -322,131 +285,51 @@ public class ExportImportTest {
        assertNull(trackImported);
    }

-    private void assertMarkers() {
-        assertEquals(markers.size(), contentProviderUtils.getMarkerCount(importTrackId));
+    private void assertWaypoints() {
+        assertEquals(waypoints.size(), contentProviderUtils.getWaypointCount(importTrackId));

-        List<Marker> importedMarkers = contentProviderUtils.getMarkers(importTrackId);
-        for (int i = 0; i < markers.size(); i++) {
-            Marker marker = markers.get(i);
-            Marker importMarker = importedMarkers.get(i);
-            assertEquals(marker.getCategory(), importMarker.getCategory());
-            assertEquals(marker.getDescription(), importMarker.getDescription());
-            // assertEquals(marker.getIcon(), importMarker.getIcon()); // TODO for KML
-            assertEquals(marker.getName(), importMarker.getName());
-            assertEquals("", importMarker.getPhotoUrl());
+        List<Waypoint> importedWaypoints = contentProviderUtils.getWaypoints(importTrackId);
+        for (int i = 0; i < waypoints.size(); i++) {
+            Waypoint waypoint = waypoints.get(i);
+            Waypoint importedWaypoint = importedWaypoints.get(i);
+            assertEquals(waypoint.getCategory(), importedWaypoint.getCategory());
+            assertEquals(waypoint.getDescription(), importedWaypoint.getDescription());
+            // assertEquals(waypoint.getIcon(), importedWaypoint.getIcon()); // TODO for KML
+            assertEquals(waypoint.getName(), importedWaypoint.getName());
+            assertEquals("", importedWaypoint.getPhotoUrl());

-            assertEquals(marker.getLocation().getLatitude(), importMarker.getLocation().getLatitude(), 0.001);
-            assertEquals(marker.getLocation().getLongitude(), importMarker.getLocation().getLongitude(), 0.001);
-            assertEquals(marker.getLocation().getAltitude(), importMarker.getLocation().getAltitude(), 0.001);
+            assertEquals(waypoint.getLocation().getLatitude(), importedWaypoint.getLocation().getLatitude(), 0.001);
+            assertEquals(waypoint.getLocation().getLongitude(), importedWaypoint.getLocation().getLongitude(), 0.001);
+            assertEquals(waypoint.getLocation().getAltitude(), importedWaypoint.getLocation().getAltitude(), 0.001);
        }
    }

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

        for (int i = 0; i < trackPoints.size(); i++) {
            TrackPoint trackPoint = trackPoints.get(i);
            TrackPoint importedTrackPoint = importedTrackPoints.get(i);

-            assertEquals(trackPoint.getTime(), importedTrackPoint.getTime());
-            TrackPoint.Type type = trackPoint.getType();
-            Log.e(TAG, "" + importedTrackPoint.getType().equals(type));
-            assertEquals("" + i, type, importedTrackPoint.getType());
+            assertEquals(trackPoint.getTime(), importedTrackPoint.getTime(), 0.01);

            // TODO Not exported for GPX/KML
            //   assertEquals(trackPoint.getAccuracy(), importedTrackPoint.getAccuracy(), 0.01);

-            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().toMPS(), importedTrackPoint.getSpeed().toMPS(), 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;
-            }
-
+            assertEquals(trackPoint.getLatitude(), importedTrackPoint.getLatitude(), 0.001);
+            assertEquals(trackPoint.getLongitude(), importedTrackPoint.getLongitude(), 0.001);
+            assertEquals(trackPoint.getAltitude(), importedTrackPoint.getAltitude(), 0.001);
+            assertEquals(trackPoint.getSpeed(), importedTrackPoint.getSpeed(), 0.001);
            if (verifyHeartrate) {
-                assertEquals("" + trackPoint, trackPoint.getHeartRate_bpm(), importedTrackPoint.getHeartRate_bpm(), 0.01);
+                assertEquals(trackPoint.getHeartRate_bpm(), importedTrackPoint.getHeartRate_bpm(), 0.01);
            }
            if (verifyCadence) {
-                assertEquals("" + trackPoint, trackPoint.getCyclingCadence_rpm(), importedTrackPoint.getCyclingCadence_rpm(), 0.01);
+                assertEquals(trackPoint.getCyclingCadence_rpm(), importedTrackPoint.getCyclingCadence_rpm(), 0.01);
            }
            if (verifyPower) {
-                assertEquals("" + trackPoint, trackPoint.getPower(), importedTrackPoint.getPower(), 0.01);
-            }
-            if (verifyAltitudeGain) {
-                assertEquals(trackPoint.getAltitudeGain(), importedTrackPoint.getAltitudeGain(), 0.01);
-            }
-            if (verifyAltitudeLoss) {
-                assertEquals(trackPoint.getAltitudeLoss(), importedTrackPoint.getAltitudeLoss(), 0.01);
-            }
-            if (verifyDistance) {
-                assertEquals(trackPoint.getSensorDistance(), importedTrackPoint.getSensorDistance());
+                assertEquals(trackPoint.getPower(), importedTrackPoint.getPower(), 0.01);
            }
        }
    }
-
-    private void assertTrackStatistics(boolean isGpx, boolean verifyAltitudeGainAndLoss, boolean verifyDistance) {
-        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
-            if (verifyDistance) {
-                assertEquals(trackStatistics.getTotalDistance(), importedTrackStatistics.getTotalDistance());
-            }
-
-            // Speed
-            assertEquals(trackStatistics.getMaxSpeed(), importedTrackStatistics.getMaxSpeed());
-            assertEquals(trackStatistics.getAverageSpeed(), importedTrackStatistics.getAverageSpeed());
-            assertEquals(trackStatistics.getAverageMovingSpeed(), importedTrackStatistics.getAverageMovingSpeed());
-        }
-
-        // Altitude
-        assertEquals(trackStatistics.getMinAltitude(), importedTrackStatistics.getMinAltitude(), 0.01);
-        assertEquals(trackStatistics.getMaxAltitude(), importedTrackStatistics.getMaxAltitude(), 0.01);
-        if (verifyAltitudeGainAndLoss) {
-            assertEquals(trackStatistics.getTotalAltitudeGain(), importedTrackStatistics.getTotalAltitudeGain(), 0.01);
-            assertEquals(trackStatistics.getTotalAltitudeLoss(), importedTrackStatistics.getTotalAltitudeLoss(), 0.01);
-        } else {
-            assertFalse(importedTrackStatistics.hasTotalAltitudeGain());
-            assertFalse(importedTrackStatistics.hasTotalAltitudeLoss());
-        }
-    }
-
-    private static TrackPoint createTrackPoint(long time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) {
-        TrackPoint tp = new TrackPoint(latitude, longitude, (double) altitude, Instant.ofEpochMilli(time));
-        tp.setAccuracy(accuracy);
-        tp.setSpeed(Speed.of(speed));
-        tp.setHeartRate_bpm(heartRate);
-        tp.setCyclingCadence_rpm(cyclingCadence);
-        tp.setPower(power);
-        tp.setAltitudeGain(altitudeGain);
-        tp.setAltitudeLoss(altitudeGain); //TODO
-        tp.setSensorDistance(distance);
-        return tp;
-    }
 }
@@ -1,158 +0,0 @@
-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.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.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).get(0);
-
-        // 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 = TestDataUtil.getTrackPoints(contentProviderUtils, 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).get(0);
-    }
-
-    /**
-     * 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).get(0);
-
-        // 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 = TestDataUtil.getTrackPoints(contentProviderUtils, 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());
-        }
-
-    }
-}
@@ -15,17 +15,14 @@
 */
 package de.dennisguse.opentracks.services;

+import org.junit.Assert;
 import org.junit.Before;
 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;
-
 /**
 * Tests the {@link AdaptiveLocationListenerPolicy}.
 *
@@ -34,13 +31,13 @@ import static org.junit.Assert.assertEquals;
@RunWith(JUnit4.class)
 public class AdaptiveLocationListenerPolicyTest {

-    private static final Duration MIN = Duration.ofMillis(1000);
-    private static final Duration MAX = Duration.ofMillis(3000);
+    private static final long MIN = 1000;
+    private static final long MAX = 3000;
    private static final int MIN_DISTANCE = 10;
-    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 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 AdaptiveLocationListenerPolicy adaptiveLocationListenerPolicy;

    @Before
@@ -60,17 +57,17 @@ public class AdaptiveLocationListenerPolicyTest {
    @Test
    public void testGetDesiredPollingInterval() {
        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_BIG);
-        assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        Assert.assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval());

        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.dividedBy(2).getSeconds(), adaptiveLocationListenerPolicy.getDesiredPollingInterval().getSeconds());
+        Assert.assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000, adaptiveLocationListenerPolicy.getDesiredPollingInterval());

        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL);
-        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        Assert.assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());

        adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_LESS_THAN_MIN);
-        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        Assert.assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
    }

    /**
@@ -78,6 +75,6 @@ public class AdaptiveLocationListenerPolicyTest {
     */
    @Test
    public void testGetMinDistance() {
-        assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m());
+        Assert.assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m());
    }
 }
@@ -11,12 +11,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;

-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.stats.TrackStatistics;

 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,10 +25,7 @@ public class TrackRecordingServiceNotificationManagerTest {
    private final Context context = ApplicationProvider.getApplicationContext();

    @Mock
-    private TrackPoint trackPointMock;
-
-    @Mock
-    private TrackStatistics trackStatisticsMock;
+    private TrackPoint locationMock;

    @Mock
    private NotificationCompat.Builder notificationCompatBuilder;
@@ -40,20 +35,18 @@ public class TrackRecordingServiceNotificationManagerTest {

    @Test
    public void updateLocation_triggersAlertOnlyOnFirstInaccurateLocation() {
-        when(trackPointMock.hasAccuracy()).thenReturn(true);
-        when(trackPointMock.getAccuracy()).thenReturn(999f);
-        when(trackPointMock.getSpeed()).thenReturn(Speed.of(0));
-        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
+        when(locationMock.hasAccuracy()).thenReturn(true);
+        when(locationMock.getAccuracy()).thenReturn(999f);
+        when(notificationCompatBuilder.setContentText(anyString())).thenReturn(notificationCompatBuilder);
        when(notificationCompatBuilder.setOnlyAlertOnce(anyBoolean())).thenReturn(notificationCompatBuilder);

        TrackRecordingServiceNotificationManager subject = new TrackRecordingServiceNotificationManager(notificationManager, notificationCompatBuilder);
-        subject.setMetricUnits(true);

        // when
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 100);
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 100);
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 1000);
-        subject.updateTrackPoint(context, trackStatisticsMock, trackPointMock, 100);
+        subject.updateTrackPoint(context, locationMock, 100);
+        subject.updateTrackPoint(context, locationMock, 100);
+        subject.updateTrackPoint(context, locationMock, 1000);
+        subject.updateTrackPoint(context, locationMock, 100);

        // then
        verify(notificationCompatBuilder, times(6)).setOnlyAlertOnce(true);
@@ -25,41 +25,35 @@ import android.os.Looper;

 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;

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

-import java.time.Instant;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

 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.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 /**
 * Tests for the track recording service.
 *
@@ -85,7 +79,6 @@ public class TrackRecordingServiceTest {


    private final Context context = ApplicationProvider.getApplicationContext();
-    private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
    private ContentProviderUtils contentProviderUtils;

    private final Track.Id trackId = new Track.Id(Math.abs(new Random().nextLong()));
@@ -104,6 +97,7 @@ public class TrackRecordingServiceTest {
        contentProviderUtils = new ContentProviderUtils(context);

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

        // Ensure that the database is empty before every test
@@ -113,8 +107,7 @@ public class TrackRecordingServiceTest {
    @After
    public void tearDown() throws TimeoutException {
        // Reset service (if some previous test failed)
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
        if (service.isRecording() || service.isPaused()) {
            service.endCurrentTrack();
        }
@@ -127,282 +120,239 @@ public class TrackRecordingServiceTest {
    @Test
    public void testStartable() throws TimeoutException {
        mServiceRule.startService(createStartIntent(context));
-        assertNotNull(mServiceRule.bindService(createStartIntent(context)));
+        Assert.assertNotNull(mServiceRule.bindService(createStartIntent(context)));
    }

    @MediumTest
    @Test
    public void testBindable() throws TimeoutException {
        IBinder service = mServiceRule.bindService(createStartIntent(context));
-        assertNotNull(service);
+        Assert.assertNotNull(service);
    }

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

        // when
        Intent startIntent = createStartIntent(context);
        mServiceRule.startService(startIntent);
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(startIntent))
-                .getService();
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(startIntent));

        // then
        // Test if we start in no-recording mode by default.
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());
+        Assert.assertNull(service.getRecordingTrackId());
    }

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

        // when
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());
+        Assert.assertNull(service.getRecordingTrackId());
    }

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

        //when
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        service.resumeTrack(trackId);
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));

        // then
-        assertTrue(service.isRecording());
+        Assert.assertTrue(service.isRecording());
    }

    @MediumTest
    @Test
-    public void testRecording_start() throws TimeoutException {
+    public void testRecording_pauseAndResume() throws Exception {
        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-
-        // when
-        Track.Id trackId = service.startNewTrack();
-
-        // then
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-
-        assertEquals(1, trackPoints.size());
-        assertEquals(TrackPoint.Type.SEGMENT_START_MANUAL, trackPoints.get(0).getType());
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_stop() throws TimeoutException {
-        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        Track.Id trackId = service.startNewTrack();
-
-        // when
-        service.endCurrentTrack();
-
-        // then
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, 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
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        Track.Id trackId = service.startNewTrack();
+        createDummyTrack(trackId, -1L, true);
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        newTrackPoint(service);

        // when
        service.pauseCurrentTrack();

        // then
-        assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
+        Assert.assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size());

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

        // then
-        assertTrue(service.isRecording());
+        Assert.assertTrue(service.isRecording());
+        Assert.assertEquals(trackId, service.getRecordingTrackId());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        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());
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(5, trackPoints.size());
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(3).getLatitude(), 0.01);
    }

    @MediumTest
    @Test
-    public void testRecording_resumeStoppedTrack() throws TimeoutException, InterruptedException {
+    public void testRecording_resumeStoppedTrack() throws Exception {
        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        Track.Id trackId = service.startNewTrack();
-        assertTrue(service.isRecording());
+        createDummyTrack(trackId, -1L, true);
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        newTrackPoint(service);
        service.endCurrentTrack();

-        assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
+        Assert.assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size());

        // when
        service.resumeTrack(trackId);
        newTrackPoint(service);

        // then
-        assertTrue(service.isRecording());
+        Assert.assertTrue(service.isRecording());
+        Assert.assertEquals(trackId, service.getRecordingTrackId());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        assertEquals(4, 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());
-        assertEquals(TrackPoint.Type.TRACKPOINT, trackPoints.get(3).getType());
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(4, trackPoints.size());
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
    }

+    @FlakyTest(detail = "Sometimes fails on CI.")
    @MediumTest
    @Test
-    public void testRecording_stopPausedTrack() throws TimeoutException {
+    public void testRecording_orphanedRecordingTrack() throws Exception {
        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        Track.Id trackId = service.startNewTrack();
-        assertTrue(service.isRecording());
-        service.pauseCurrentTrack();
-
-        assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));

        // when
-        service.endCurrentTrack();
+        // Just set recording track to a bogus value.
+        // Make sure that the service will not start recording and will clear the bogus track.
+        PreferencesUtils.setLong(context, R.string.recording_track_id_key, 123L);

        // then
-        assertFalse(service.isRecording());
-
-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, 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());
+        Assert.assertFalse(service.isRecording());
+        Assert.assertNull(service.getRecordingTrackId());
    }

    @MediumTest
    @Test
-    public void testStartNewTrack_alreadyRecording() throws TimeoutException {
+    public void testStartNewTrack_alreadyRecording() throws Exception {
        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        Track.Id trackId = service.startNewTrack();
-        assertTrue(service.isRecording());
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        service.startNewTrack();
+        Assert.assertTrue(service.isRecording());
+
+        Track.Id trackId = service.getRecordingTrackId();

        // when
        Track.Id newTrackId = service.startNewTrack();

        // then
-        assertNotNull(trackId);
-        assertNull(newTrackId);
+        Assert.assertNull(newTrackId);
+
+        Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
+        Assert.assertEquals(trackId, service.getRecordingTrackId());
    }

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

        // when
        // Ending the current track when there is no recording should not result in any error.
        service.endCurrentTrack();

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(PreferencesUtils.isRecording(context));
+        Assert.assertNull(service.getRecordingTrackId());
    }

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

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

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

    @MediumTest
    @Test
-    public void testInsertWaypointMarker_validWaypoint() throws TimeoutException, InterruptedException {
+    public void testInsertWaypointMarker_validWaypoint() throws Exception {
        // given
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
-                .getService();
-        Track.Id trackId = service.startNewTrack();
-        assertTrue(service.isRecording());
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
+        service.startNewTrack();
+        Assert.assertTrue(service.isRecording());
        newTrackPoint(service);
+        Track.Id trackId = service.getRecordingTrackId();

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

        // then
-        assertNotEquals(new Marker.Id(-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());
-        assertEquals(0.0, wpt.getLength().toM(), 0.01);
-        assertNotNull(wpt.getLocation());
+        Assert.assertNotEquals(-1L, waypointId);
+        Waypoint wpt = contentProviderUtils.getWaypoint(waypointId);
+        Assert.assertEquals(context.getString(R.string.marker_waypoint_icon_url), wpt.getIcon());
+        Assert.assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName());
+        Assert.assertEquals(trackId, wpt.getTrackId());
+        Assert.assertEquals(0.0, wpt.getLength(), 0.01);
+        Assert.assertNotNull(wpt.getLocation());

        service.endCurrentTrack();
    }

-    private void addTrack(Track track) {
-        assertNotNull(track.getId());
+    private void addTrack(Track track, boolean isRecording) {
+        Assert.assertTrue(track.getId().isValid());
        contentProviderUtils.insertTrack(track);
-        assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId());
+        Assert.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);
+        PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, !isRecording);
    }

    // NOTE: Do not use to create a track that is currently recording.
-    private void createDummyTrack(Track.Id id) {
+    private void createDummyTrack(Track.Id id, long stopTime, boolean isRecording) {
        Track dummyTrack = new Track();
        dummyTrack.setId(id);
        dummyTrack.setName("Dummy Track");
        TrackStatistics trackStatistics = new TrackStatistics();
-        Instant now = Instant.now();
-        trackStatistics.setStartTime(now.minusSeconds(5L));
-        trackStatistics.setStopTime(now.minusSeconds(1L));
+        trackStatistics.setStopTime_ms(stopTime);
        dummyTrack.setTrackStatistics(trackStatistics);
-        addTrack(dummyTrack);
+        addTrack(dummyTrack, isRecording);
    }

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

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

    /**
     * Inserts a location and waits for 200ms.
     */
-    private static void newTrackPoint(TrackRecordingService trackRecordingService, double latitude, double longitude, float accuracy, long speed, long time) {
-        Location location = new Location("");
+    private static void newTrackPoint(TrackRecordingServiceInterface trackRecordingService, double latitude, double longitude, float accuracy, long speed, long time) throws InterruptedException {
+        Location location = new Location("gps");
        location.setLongitude(longitude);
        location.setLatitude(latitude);
        location.setAccuracy(accuracy);
@@ -410,6 +360,10 @@ public class TrackRecordingServiceTest {
        location.setTime(time);
        location.setBearing(3.0f);
        TrackPoint trackPoint = new TrackPoint(location);
-        trackRecordingService.newTrackPoint(trackPoint, 50);
+        int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(ApplicationProvider.getApplicationContext());
+        trackRecordingService.newTrackPoint(trackPoint, prefAccuracy);
+
+        //TODO Needed?
+        Thread.sleep(200);
    }
 }
@@ -4,7 +4,6 @@ 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;
@@ -13,6 +12,7 @@ import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;

 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -23,9 +23,9 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

-import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
@@ -33,10 +33,6 @@ import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 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.
 * <p>
@@ -55,7 +51,7 @@ public class TrackRecordingServiceTestLocation {
    private final Context context = ApplicationProvider.getApplicationContext();
    private ContentProviderUtils contentProviderUtils;

-    private TrackRecordingService service;
+    private TrackRecordingServiceInterface service;

    @BeforeClass
    public static void preSetUp() {
@@ -71,18 +67,21 @@ public class TrackRecordingServiceTestLocation {
        customContentProvider.attachInfo(context, null);

        contentProviderUtils = new ContentProviderUtils(context);
-        tearDown();

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

-        service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
-                .getService();
+        service = ((TrackRecordingServiceInterface) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)));
    }

    @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);
    }
@@ -94,30 +93,21 @@ public class TrackRecordingServiceTestLocation {
        Track.Id trackId = service.startNewTrack();

        // when
-        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.0, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0001, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0002, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0003, 35.0, 5, 15);
        TrackRecordingServiceTest.newTrackPoint(service, 45.0004, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.0005, 35.0, 6, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0005, 35.0, 5, 15);

        service.endCurrentTrack();

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        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);
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(6, trackPoints.size());
+        Assert.assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01);
    }

    @MediumTest
@@ -125,29 +115,23 @@ 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, 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.0, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000001, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000002, 35.0, 5, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000003, 35.0, 5, 15);
        TrackRecordingServiceTest.newTrackPoint(service, 45.000004, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000005, 35.0, 6, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.000005, 35.0, 5, 15);

        service.endCurrentTrack();

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        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);
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(2, trackPoints.size());
+        Assert.assertEquals(45.000005, trackPoints.get(1).getLatitude(), 0.01);
    }

 //    @MediumTest
@@ -185,16 +169,13 @@ public class TrackRecordingServiceTestLocation {
        service.endCurrentTrack();

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        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);
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(3, trackPoints.size());
+        Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
+        Assert.assertEquals(6, trackPoints.get(2).getAccuracy(), 0.01);
    }

    @MediumTest
@@ -214,20 +195,17 @@ public class TrackRecordingServiceTestLocation {
        service.endCurrentTrack();

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        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);
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(4, trackPoints.size());
+        Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
+        Assert.assertEquals(5, trackPoints.get(2).getAccuracy(), 0.01); //TODO Check why this trackPoint is inserted.
+        Assert.assertEquals(6, trackPoints.get(3).getAccuracy(), 0.01);
    }

+
    @MediumTest
    @Test
    public void testOnLocationChangedAsync_idle_withSensorData() throws Exception {
@@ -250,30 +228,26 @@ 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();

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        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);
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(6, trackPoints.size());
+        Assert.assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(1, trackPoints.get(1).getAccuracy(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
+        Assert.assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
+        Assert.assertEquals(4, trackPoints.get(4).getAccuracy(), 0.01);
+        Assert.assertEquals(5, trackPoints.get(5).getAccuracy(), 0.01);
    }

    @MediumTest
@@ -292,30 +266,16 @@ public class TrackRecordingServiceTestLocation {
        service.endCurrentTrack();

        // then
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());

-        List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        assertEquals(7, trackPoints.size());
-        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);
-            }
-        }
+        List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
+        Assert.assertEquals(7, trackPoints.size());
+        Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        Assert.assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
+        Assert.assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
+        Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(4).getLatitude(), 0.01);
+        Assert.assertEquals(4, trackPoints.get(5).getAccuracy(), 0.01);
+        Assert.assertEquals(5, trackPoints.get(6).getAccuracy(), 0.01);
    }
 }
@@ -6,7 +6,6 @@ import android.content.SharedPreferences;
 import android.location.Location;
 import android.os.Looper;

-import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
@@ -14,13 +13,13 @@ import androidx.test.rule.ServiceTestRule;

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

-import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -33,11 +32,6 @@ import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 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.assertTrue;
-
 /**
 * Tests for the track recording service, which require a {@link Looper}.
 *
@@ -53,7 +47,6 @@ public class TrackRecordingServiceTestLooper {
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);

    private final Context context = ApplicationProvider.getApplicationContext();
-    private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);

    private ContentProviderUtils contentProviderUtils;

@@ -78,6 +71,7 @@ public class TrackRecordingServiceTestLooper {
        contentProviderUtils = new ContentProviderUtils(context);

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

        // Ensure that the database is empty before every test
@@ -87,8 +81,7 @@ public class TrackRecordingServiceTestLooper {
    @After
    public void tearDown() throws TimeoutException {
        // Reset service (if some previous test failed)
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
-                .getService();
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)));
        if (service.isRecording() || service.isPaused()) {
            service.endCurrentTrack();
        }
@@ -100,36 +93,28 @@ public class TrackRecordingServiceTestLooper {
    @MediumTest
    @Test
    public void testWithProperties_minRequiredAccuracy() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_gps_accuracy_key), 500);
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, 500);
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_voiceFrequencyDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default)));
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.voice_frequency_key, Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default)));
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_voiceFrequencyByDistance() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), -1);
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.voice_frequency_key, -1);
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_voiceFrequencyByTime() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.voice_frequency_key), 1);
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.voice_frequency_key, 1);
        fullRecordingSession();
    }

@@ -137,77 +122,65 @@ public class TrackRecordingServiceTestLooper {
    @MediumTest
    @Test
    public void testWithProperties_maxRecordingDistanceDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.max_recording_distance_key), Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default)));
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.max_recording_distance_key, Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default)));
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_maxRecordingDistance() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.max_recording_distance_key), 50);
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.max_recording_distance_key, 50);
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_minRecordingDistanceDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_distance_interval_key), Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)));
-        editor.commit();
+        int minRecordingIntervalDefault = Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default));
+        PreferencesUtils.setInt(context, R.string.recording_distance_interval_key, minRecordingIntervalDefault);
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_minRecordingDistance() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_distance_interval_key), 2);
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.recording_distance_interval_key, 2);
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_metricUnitsDefault() throws TimeoutException {
-        PreferencesUtils.setString(sharedPreferences, context, R.string.stats_units_key, context.getString(R.string.stats_units_default));
+        PreferencesUtils.setString(context, R.string.stats_units_key, context.getString(R.string.stats_units_default));
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_metricUnitsDisabled() throws TimeoutException {
-        PreferencesUtils.setString(sharedPreferences, context, R.string.stats_units_key, context.getString(R.string.stats_units_imperial));
+        PreferencesUtils.setString(context, R.string.stats_units_key, context.getString(R.string.stats_units_imperial));
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_minRecordingIntervalDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.min_recording_interval_key), Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)));
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.min_recording_interval_key, Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)));
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_minRecordingInterval() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.min_recording_interval_key), 2);
-        editor.commit();
+        PreferencesUtils.setInt(context, R.string.min_recording_interval_key, 2);
        fullRecordingSession();
    }

    @MediumTest
    @Test
    public void testWithProperties_minRequiredAccuracyDefault() throws TimeoutException {
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putInt(context.getString(R.string.recording_gps_accuracy_key), Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default)));
-        editor.commit();
+        int recordingGPSAccuracyDefault = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default));
+        PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, recordingGPSAccuracyDefault);
        fullRecordingSession();
    }

@@ -215,22 +188,23 @@ public class TrackRecordingServiceTestLooper {
    @Test
    public void testIntegration_completeRecordingSession() throws TimeoutException {
        List<Track> tracks = contentProviderUtils.getTracks();
-        assertTrue(tracks.isEmpty());
+        Assert.assertTrue(tracks.isEmpty());
        fullRecordingSession();
    }

    private void fullRecordingSession() throws TimeoutException {
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
-                .getService();
-        assertFalse(service.isRecording());
+        TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)));
+        Assert.assertFalse(service.isRecording());

        // Start a track.
        Track.Id trackId = service.startNewTrack();
-        assertNotNull(trackId);
-        assertTrue(service.isRecording());
+        Assert.assertTrue(trackId.isValid());
+        Assert.assertTrue(service.isRecording());
        Track track = contentProviderUtils.getTrack(trackId);
-        assertNotNull(track);
-        assertEquals(trackId, track.getId());
+        Assert.assertNotNull(track);
+        Assert.assertEquals(trackId, track.getId());
+        Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
+        Assert.assertEquals(trackId, service.getRecordingTrackId());

        // Insert a few points, markers and statistics.
        long startTime = System.currentTimeMillis();
@@ -243,23 +217,24 @@ public class TrackRecordingServiceTestLooper {
            location.setTime(startTime + i * 10000);
            location.setBearing(3.0f);
            TrackPoint trackPoint = new TrackPoint(location);
-            int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(sharedPreferences, context);
+            int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);
            service.newTrackPoint(trackPoint, prefAccuracy);

            if (i % 7 == 0) {
-                service.insertMarker(null, null, null, null);
+                service.insertWaypoint(null, null, null, null);
            }
        }

        // Stop the track. Validate if it has correct data.
        service.endCurrentTrack();
-        assertFalse(service.isRecording());
+        Assert.assertFalse(service.isRecording());
+        Assert.assertNull(service.getRecordingTrackId());
        track = contentProviderUtils.getTrack(trackId);
-        assertNotNull(track);
-        assertEquals(trackId, track.getId());
+        Assert.assertNotNull(track);
+        Assert.assertEquals(trackId, track.getId());
        TrackStatistics trackStatistics = track.getTrackStatistics();
-        assertNotNull(trackStatistics);
-        assertTrue(trackStatistics.getStartTime().isAfter(Instant.ofEpochMilli(0)));
-        assertTrue(trackStatistics.getStopTime().isAfter(trackStatistics.getStartTime()));
+        Assert.assertNotNull(trackStatistics);
+        Assert.assertTrue(trackStatistics.getStartTime_ms() > 0);
+        Assert.assertTrue(trackStatistics.getStopTime_ms() >= trackStatistics.getStartTime_ms());
    }
 }
@@ -1,7 +1,6 @@
 package de.dennisguse.opentracks.services.handlers;

 import android.content.Context;
-import android.content.SharedPreferences;

 import org.junit.After;
 import org.junit.Before;
@@ -26,9 +25,6 @@ public class HandlerServerTest {
    @Mock
    private LocationHandler locationHandler;

-    @Mock
-    private SharedPreferences sharedPreferences;
-
    private HandlerServer subject;

    @Before
@@ -45,16 +41,16 @@ public class HandlerServerTest {
    @Test
    public void onSharedPreferenceChanged() {
        // when
-        subject.onSharedPreferenceChanged(context, sharedPreferences, null);
+        subject.onSharedPreferenceChanged(null, null, null);

        // then
-        verify(locationHandler).onSharedPreferenceChanged(context, sharedPreferences, null);
+        verify(locationHandler).onSharedPreferenceChanged(null, null, null);
    }

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

        // when
@@ -3,12 +3,10 @@ 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;
@@ -27,7 +25,6 @@ import static org.mockito.Mockito.verify;
 public class LocationHandlerTest {

    private final Context context = ApplicationProvider.getApplicationContext();
-    private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);

    @Mock
    private HandlerServer handlerServer;
@@ -35,19 +32,14 @@ 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.
+        SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
        sharedPreferences.edit().clear().commit();

-        locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.recording_gps_accuracy_key));
-        locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.min_recording_interval_key));
+        locationHandler.onSharedPreferenceChanged(context, PreferencesUtils.getSharedPreferences(context), context.getString(R.string.recording_gps_accuracy_key));
+        locationHandler.onSharedPreferenceChanged(context, PreferencesUtils.getSharedPreferences(context), context.getString(R.string.min_recording_interval_key));
        locationHandler.onStart(context);
    }

@@ -85,9 +77,10 @@ public class LocationHandlerTest {
    @Test
    public void testOnLocationChanged_poorAccuracy() {
        // given
-        int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(sharedPreferences, context);
+        int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(context);

        // when
+        // poor latitude
        locationHandler.onLocationChanged(createLocation(45f, 35f, prefAccuracy + 1, 5, System.currentTimeMillis()));

        // then
@@ -1,50 +0,0 @@
-package de.dennisguse.opentracks.services.sensors;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * NOTE: Test data is completely artificial.
- */
-public class AltitudeSumManagerTest {
-
-    private final AltitudeSumManager subject = new AltitudeSumManager();
-
-    private static void addSensorValue(AltitudeSumManager altitudeSumManager, float[] values) {
-        for (float f : values) {
-            altitudeSumManager.onSensorValueChanged(f);
-        }
-    }
-
-    @Before
-    public void setUp() {
-        subject.reset();
-    }
-
-    @Test
-    public void getAltitudeGainLoss_downhill() {
-        // given
-        subject.setConnected(true);
-
-        // then
-        addSensorValue(subject, new float[]{1015f, 1015.01f, 1015.02f, 1015.03f, 1015.04f, 1015.05f, 1015.06f, 1015.07f, 1015.08f, 1015.09f, 1015.10f, 1015.11f, 1015.12f, 1015.13f, 1015.14f, 1015.15f});
-
-        // then
-        Assert.assertEquals(0f, subject.getAltitudeGain_m(), 0.01);
-        Assert.assertEquals(48.0, subject.getAltitudeLoss_m(), 0.01);
-    }
-
-    @Test
-    public void sensorUnavailable() {
-        // given
-        subject.setConnected(false);
-
-        // then
-        subject.onSensorValueChanged(999f);
-
-        // then
-        Assert.assertNull(subject.getAltitudeGain_m());
-        Assert.assertNull(subject.getAltitudeLoss_m());
-    }
-}
@@ -23,12 +23,11 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

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

-import static org.junit.Assert.assertTrue;
-
 /**
 * Tests for {@link AnnouncementPeriodicTaskFactory}.
 *
@@ -54,6 +53,6 @@ public class AnnouncementPeriodicTaskFactoryTest {
    public void testCreate() {
        PeriodicTaskFactory factory = new AnnouncementPeriodicTaskFactory();
        PeriodicTask task = factory.create(context);
-        assertTrue(task instanceof AnnouncementPeriodicTask);
+        Assert.assertTrue(task instanceof AnnouncementPeriodicTask);
    }
 }
@@ -15,20 +15,11 @@
 */
 package de.dennisguse.opentracks.stats;

-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
-import java.time.Duration;
-import java.time.Instant;
-
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import org.junit.runners.JUnit4;

 /**
 * Tests for {@link TrackStatistics}.
@@ -36,7 +27,7 @@ import static org.junit.Assert.assertNull;
 *
 * @author Rodrigo Damazio
 */
-@RunWith(AndroidJUnit4.class)
+@RunWith(JUnit4.class)
 public class TrackStatisticsTest {

    private TrackStatistics statistics;
@@ -46,78 +37,52 @@ public class TrackStatisticsTest {
        statistics = new TrackStatistics();
    }

-    @Test
-    public void testMerge_no_data() {
-        // given
-        TrackStatistics statistics2 = new TrackStatistics();
-
-        // 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.getTotalAltitudeGain());
-        assertNull(statistics.getTotalAltitudeLoss());
-        assertEquals(Double.NEGATIVE_INFINITY, statistics.getMaxAltitude(), 0.0);
-        assertEquals(Double.POSITIVE_INFINITY, statistics.getMinAltitude(), 0.0);
-        assertEquals(0.0, statistics.getMaxSpeed().toMPS(), 0.0);
-        assertEquals(0.0, statistics.getAverageSpeed().toMPS(), 0.0);
-        assertEquals(0.0, statistics.getAverageMovingSpeed().toMPS(), 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(Distance.of(750.0));
-        statistics2.setTotalDistance(Distance.of(350.0));  // Result: 750+350
-        statistics.setTotalAltitudeGain(50.0f);
-        statistics2.setTotalAltitudeGain(850.0f);  // Result: 850+50
-        statistics.setMaxSpeed(Speed.of(60.0));  // Resulting max speed
-        statistics2.setMaxSpeed(Speed.of(30.0));
-        statistics.setMaxAltitude(1250.0);
-        statistics.setMinAltitude(1200.0);  // Resulting min altitude
-        statistics2.setMaxAltitude(3575.0);  // Resulting max altitude
-        statistics2.setMinAltitude(2800.0);
+        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
+        statistics.setTotalDistance(750.0);
+        statistics2.setTotalDistance(350.0);  // Result: 750+350
+        statistics.setTotalElevationGain(50.0);
+        statistics2.setTotalElevationGain(850.0);  // Result: 850+50
+        statistics.setMaxSpeed(60.0);  // Resulting max speed
+        statistics2.setMaxSpeed(30.0);
+        statistics.setMaxElevation(1250.0);
+        statistics.setMinElevation(1200.0);  // Resulting min elevation
+        statistics2.setMaxElevation(3575.0);  // Resulting max elevation
+        statistics2.setMinElevation(2800.0);

-        // when
        statistics.merge(statistics2);

-        // 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().toM(), 0.001);
-        assertEquals(900.0, statistics.getTotalAltitudeGain(), 0.001);
-        assertEquals(Speed.of(statistics.getTotalDistance(), statistics.getMovingTime()).toMPS(), statistics.getMaxSpeed().toMPS(), 0.001);
-        assertEquals(1200.0, statistics.getMinAltitude(), 0.001);
-        assertEquals(3575.0, statistics.getMaxAltitude(), 0.001);
+        Assert.assertEquals(1000L, statistics.getStartTime_ms());
+        Assert.assertEquals(4000L, statistics.getStopTime_ms());
+        Assert.assertEquals(2500L, statistics.getTotalTime());
+        Assert.assertEquals(1300L, statistics.getMovingTime());
+        Assert.assertEquals(1100.0, statistics.getTotalDistance(), 0.001);
+        Assert.assertEquals(900.0, statistics.getTotalElevationGain(), 0.001);
+        Assert.assertEquals(statistics.getTotalDistance() / (statistics.getMovingTime() / 1000.0), statistics.getMaxSpeed(), 0.001);
+        Assert.assertEquals(1200.0, statistics.getMinElevation(), 0.001);
+        Assert.assertEquals(3575.0, statistics.getMaxElevation(), 0.001);
    }

    @Test
    public void testGetAverageSpeed() {
-        statistics.setTotalDistance(Distance.of(1000.0));
-        statistics.setTotalTime(Duration.ofMillis(50000));
-        assertEquals(20.0, statistics.getAverageSpeed().toMPS(), 0.001);
+        statistics.setTotalDistance(1000.0);
+        statistics.setTotalTime(50000);  // in milliseconds
+        Assert.assertEquals(20.0, statistics.getAverageSpeed(), 0.001);
    }

    @Test
    public void testGetAverageMovingSpeed() {
-        statistics.setTotalDistance(Distance.of(1000.0));
-        statistics.setMovingTime(Duration.ofMillis(20000));
-        assertEquals(50.0, statistics.getAverageMovingSpeed().toMPS(), 0.001);
+        statistics.setTotalDistance(1000.0);
+        statistics.setMovingTime(20000);  // in milliseconds
+        Assert.assertEquals(50.0, statistics.getAverageMovingSpeed(), 0.001);
    }
 }
@@ -1,167 +0,0 @@
-package de.dennisguse.opentracks.stats;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.time.Duration;
-import java.time.Instant;
-
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(AndroidJUnit4.class)
-public class TrackStatisticsUpdaterTest {
-
-    private static final Distance GPS_DISTANCE = Distance.of(50);
-
-    @Test
-    public void addTrackPoint_TestingTrack() {
-        // given
-        TestDataUtil.TrackData data = TestDataUtil.createTestingTrack(new Track.Id(1));
-
-        // when
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-        data.trackPoints.forEach(it -> subject.addTrackPoint(it, GPS_DISTANCE));
-
-        // then
-        TrackStatistics statistics = subject.getTrackStatistics();
-        assertEquals(99.58, statistics.getTotalDistance().toM(), 0.01);
-        assertEquals(Duration.ofSeconds(14), statistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(7), statistics.getMovingTime());
-
-        assertEquals(2.5, statistics.getMinAltitude(), 0.01);
-        assertEquals(27.5, statistics.getMaxAltitude(), 0.01);
-        assertEquals(36, statistics.getTotalAltitudeGain(), 0.01);
-        assertEquals(36, statistics.getTotalAltitudeLoss(), 0.01);
-
-        assertEquals(14.226, statistics.getMaxSpeed().toMPS(), 0.01);
-        assertEquals(14.226, statistics.getAverageMovingSpeed().toMPS(), 0.01);
-        assertEquals(7.11, statistics.getAverageSpeed().toMPS(), 0.01);
-    }
-
-    @Test
-    public void addTrackPoint_distance_from_GPS_not_moving() {
-        // given
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochMilli(1000));
-        TrackPoint tp2 = new TrackPoint(0, 0, 5.0, Instant.ofEpochMilli(2000));
-        TrackPoint tp3 = new TrackPoint(0.00001, 0, 5.0, Instant.ofEpochMilli(3000));
-
-        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
-
-        // then
-        assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-    }
-
-    @Test
-    public void addTrackPoint_distance_from_GPS_moving() {
-        // given
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochMilli(1000));
-        TrackPoint tp2 = new TrackPoint(0, 0, 5.0, Instant.ofEpochMilli(2000));
-        TrackPoint tp3 = new TrackPoint(0.00001, 0, 5.0, Instant.ofEpochMilli(3000));
-        tp3.setSpeed(Speed.of(5f));
-
-        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
-
-        // then
-        assertEquals(1.10, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-    }
-
-    @Test
-    public void addTrackPoint_distance_from_GPS_moving_and_sensor_moving() {
-        // given
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochMilli(1000));
-        TrackPoint tp2 = new TrackPoint(0, 0, 5.0, Instant.ofEpochMilli(2000));
-        tp2.setSpeed(Speed.of(5f));
-        TrackPoint tp3 = new TrackPoint(0.001, 0, 5.0, Instant.ofEpochMilli(3000));
-        tp2.setSpeed(Speed.of(5f));
-        TrackPoint tp4 = new TrackPoint(0.001, 0, 5.0, Instant.ofEpochMilli(4000));
-        tp2.setSpeed(Speed.of(5f));
-        tp4.setSensorDistance(Distance.of(5f));
-        TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000));
-        tp5.setSensorDistance(Distance.of(10f));
-
-        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
-
-        // then
-        assertEquals(110.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-
-        // when
-        subject.addTrackPoint(tp4, GPS_DISTANCE);
-        subject.addTrackPoint(tp5, GPS_DISTANCE);
-
-        // then
-        assertEquals(125.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-    }
-
-    @Test
-    public void addTrackPoint_distance_from_GPS_not_moving_and_sensor_moving() {
-        // given
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochMilli(1000));
-        TrackPoint tp2 = new TrackPoint(0, 0, 5.0, Instant.ofEpochMilli(2000));
-        TrackPoint tp3 = new TrackPoint(0.00001, 0, 5.0, Instant.ofEpochMilli(3000));
-        TrackPoint tp4 = new TrackPoint(0.00001, 0, 5.0, Instant.ofEpochMilli(4000));
-        tp4.setSensorDistance(Distance.of(5f));
-        TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000));
-        tp5.setSensorDistance(Distance.of(10f));
-
-        // when
-        subject.addTrackPoint(tp1, GPS_DISTANCE);
-        subject.addTrackPoint(tp2, GPS_DISTANCE);
-        subject.addTrackPoint(tp3, GPS_DISTANCE);
-
-        // then
-        assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-
-        // when
-        subject.addTrackPoint(tp4, GPS_DISTANCE);
-        subject.addTrackPoint(tp5, GPS_DISTANCE);
-
-        // then
-        assertEquals(15, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_not_moving() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_moving() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_not_moving_and_sensor_speed() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_moving_and_sensor_speed() {
-    }
-}
@@ -5,21 +5,11 @@ import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import java.time.Duration;
-import java.util.List;
-
-import de.dennisguse.opentracks.content.data.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
-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.stats.TrackStatistics;
-import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
-
-import static org.junit.Assert.assertEquals;

@RunWith(AndroidJUnit4.class)
 public class AnnouncementUtilsTest {
@@ -27,38 +17,18 @@ public class AnnouncementUtilsTest {
    private final Context context = ApplicationProvider.getApplicationContext();

    @Test
-    public void getAnnouncement_metric() {
+    public void getAnnouncement() {
        TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(20000));
-        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
-        stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
-        stats.setMaxSpeed(Speed.of(100));
-        stats.setTotalAltitudeGain(6000f);
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setTotalElevationGain(6000);

        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, true, null);
+        String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane");

        // then
-        assertEquals("OpenTracks total distance 20.00 kilometers in 1 hour 5 minutes 10 seconds at 18.4 kilometers per hour", announcement);
-    }
-
-    @Test
-    public void getAnnouncement_withInterval_metric() {
-        TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(20000));
-        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
-        stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
-        stats.setMaxSpeed(Speed.of(100));
-        stats.setTotalAltitudeGain(6000f);
-
-        List<TrackPoint> trackPoints = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 10).second;
-        IntervalStatistics intervalStatistics = new IntervalStatistics(trackPoints, Distance.of(1000));
-        IntervalStatistics.Interval lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
-
-        // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, true, lastInterval);
-
-        // then
-        assertEquals("OpenTracks total distance 20.00 kilometers in 1 hour 5 minutes 10 seconds at 18.4 kilometers per hour Lap speed of 51.2 kilometers per hour", announcement);
+        Assert.assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement);
    }
 }
--- a/Show More
+++ b/Show More