Release: v3.14.0

Swiping between tabs work. Fixes #105.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,13 @@
 # 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.
 

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.idea/codeStyles/Project.xml

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

.idea/misc.xml

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

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# 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. 

LICENSE

@@ -0,0 +1,201 @@
+                                     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.

LICENSE.md

@@ -1,194 +0,0 @@
-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.

README.md

@@ -2,77 +2,100 @@
 
 _OpenTracks_ is a sport tracking application that completely respects your privacy.
 
+[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
+
 <table>
     <tr>
         <th>Free</th>
-        <th>Paid (same as free)</th>
         <th>Donations</th>
         <th>Translations</th>
     </tr>
     <tr>
-        <td>
+        <td align="center">
             <a href="https://f-droid.org/packages/de.dennisguse.opentracks">
                 <img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle">
             </a>
         </td>
-        <td>
-            <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">
-                <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle">
-            </a>
-        </td>
-        <td>
+        <td align="center">
             <a href="https://liberapay.com/OpenTracks/donate">
                 <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45" align="middle">
             </a>
         </td>
-        <td>
-            <a href="https://www.transifex.com/opentracks/opentracks/">
-                Transifex
+        <td align="center">
+            <a href="https://weblate.bubu1.eu/engage/OpenTracks/">
+                <img src="https://weblate.bubu1.eu/widgets/OpenTracks/-/opentracks/svg-badge.svg" alt="Translation status" />
             </a>
         </td>
     </tr>
+    <tr>
+        <td align="center">
+            <img alt="OpenTracks version published on F-Droid" src="https://img.shields.io/f-droid/v/de.dennisguse.opentracks.svg" align="middle" >
+        </td>
+        <td align="center">
+            <a href="bitcoin:bc1qckpls3lpjlcpyxzm66hcy65hnesas9zgacy6yc">
+                <img alt="bitcoin:bc1qckpls3lpjlcpyxzm66hcy65hnesas9zgacy6yc" src="promotion/donations-bitcoin.png" height="90" align="middle">
+            </a>
+        </td align="center">
+        <td></td>
+    </tr>
+    <tr>
+        <td></td>
+        <td align="center">
+            <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">
+                <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle">
+            </a>
+        </td>
+        <td></td>
+    </tr>
 </table>
 
 ## Features:
-* __Tracking:__ track your sport and outdoor activities 
+* __Tracking:__ track your sport and outdoor activities
 * __Photos and Markers:__ mark interesting locations while tracking (also with photos)
-* __Bluetooth LE sensors:__ 
+* __Bluetooth LE sensors:__
   * heart rate
   * cycling: speed and cadence
+  * cycling: power meter
 * __Export data:__ export tracks either as KMZ (incl. photos), KML or GPX
 * __No Internet access:__ Internet is not used
 * __Voice announcements__
 * __No advertising__
 * __Privacy:__
     * _does not contain any in-app analytics_
-    * _does not use Google Play Services_ 
+    * _does not use Google Play Services_
     * _has no cloud integration_
-    
+
 __Only required permissions:__
 * _ACCESS_FINE_LOCATION_: required to use the GPS.
 
 An overview of Bluetooth LE sensors that are known to work with OpenTracks is in [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md).
 
 _Please note:_
-_OpenTracks_ does not contain a _map_ (as this would required Internet access).
+_OpenTracks_ does not contain a _map_ (as this would require internet access).
 
 ## Custom Dashboards (incl. Map)
 As of v3.3.1 OpenTracks enables to use custom dashboards.
 The reference implementation is [OSMDashboard](https://github.com/OpenTracksApp/OSMDashboard), which presents an OpenStreetMap map (showing the current track, incl. updates).
 The developer documentation is in [README_API.md](README_API.md).
 
-Alternatively, recorded tracks can be shared as KMZ/GPX to installed applications (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand) or [MAPS.ME](https://play.google.com/store/apps/details?id=com.mapswithme.maps.pro)).
+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)).
 However, this is rather slow and does not provide updates while recording.
 
 
 ## Screenshots
 <div>
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_5.png">
-    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_6.png">
+    <img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
+    <img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
+    <img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
+    <img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
+    <img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_5.png">
+</div>
+<div>
+	<img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_6.png">
+    <img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_7.png">
+	<img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_8.png">
+	<img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_9.png">
+	<img width="18%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_10.png">
 </div>
 
 ## Project history
@@ -85,8 +108,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,
@@ -96,7 +119,7 @@ Rework of _OpenTracks_ included:
 * removing Protobuf (store sensosensorr data in SQLite columns directly), and
 * removing Android Service API for other apps.
 
-Artwork, logos and user interface remained more or less unchanged. 
+Artwork, logos and user interface remained more or less unchanged.
 
 More information about _Google My Tracks_:
 * [Wikipedia page](https://en.wikipedia.org/wiki/MyTracks)

README_RELEASE.md

@@ -34,4 +34,4 @@ Requirement: `gem install fastlane`
 
 ## Translations (localization)
 
-Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).
+Translations of the OpenTracks are handled in Weblate: [https://weblate.bubu1.eu/projects/OpenTracks/](https://weblate.bubu1.eu/projects/OpenTracks/).

README_TESTED_SENSORS.md

@@ -1,20 +1,44 @@
 # Overview of tested Bluetooth LE sensors
 
 ## HRS: Heartrate Service
+
 * Decathlon|Geonaute|Kalenji Dual HRM Belt
+* moofit heart rate monitor
 * Polar H7
+* Polar H10
 * Polar OH1
   Has updatable firmware that requires a user account at polar.com
 * Wahoo Tickr (Model: WFBTHR02)
+* Mi Band 3, Amazfit Band 5, Amazfit Bip. These devices are manufactured by Huami, and other Huami devices will very likely work. Theoretically, this sensor must be enabled, but testing reveals that it works even without enabling. For details on how to enable see [Gadgetbridge wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Huami-Heartrate-measurement#bluetooth-heart-rate-sensor)
 
 ## CSCP: Cycling Cadence and Speed Service
+
 Please note that the according to the specification these sensors _may_ provide speed as well as cadence.
 However, often only one value is provided.
 
 ### Speed
+
+* Garmin Speed Sensor 2
 * Wahoo Speed (Model: WFRPMSPD)
 
-### Cadence 
+### Cadence
+
+* Garmin Cadence Sensor 2
 * Wahoo Cadence (Model: WFPODCAD2)
   This sensor reports cadence data as speed.
-  A workaround is in place. 
+  A workaround is in place.
+
+## Cycling Power Measurement
+
+We only support _Instantaneous Power_.
+
+_WARNING_: we only support physically movements with valid GPS coordinates.
+Using a device indoors (no GPS available) will only show the current power values, but won't store anything.
+Also the distance is not computed.
+
+* Assioma Duo Powermeter
+* Elite drivo II
+* QUARQ Red DZero Powermeter
+* Tacx Satori Smart
+* Wahoo Kickr v4.0
+

RELEASE.sh

@@ -0,0 +1,51 @@
+#!/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"

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 
@@ -45,10 +45,14 @@ android {
 
     compileSdkVersion 30
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 3541
-        versionName "v3.9.2"
+        versionCode 3761
+        versionName "v3.14.0"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -82,17 +86,17 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'com.google.android.material:material:1.2.0'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.1'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 
     androidTestImplementation 'androidx.test:core:1.3.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'org.mockito:mockito-android:3.4.6'
+    androidTestImplementation 'org.mockito:mockito-android:3.6.28'
 }

doc/activities.txt

@@ -10,15 +10,11 @@ endlegend
 
 [*] --> TrackListActivity
 TrackListActivity --> TrackRecordingActivity : Start recording
-TrackListActivity --> SearchListActivity
+TrackListActivity --> TrackRecordedActivity : Show track
 TrackListActivity --> MarkerListActivity : Show all markers
 TrackListActivity --> AggregatedStatisticsActivity : Aggregated stats
-TrackListActivity --> TrackRecordedActivity : Show track
 TrackListActivity --> TrackDeleteActivity
 
-SearchListActivity --> MarkerDetailActivity : Search result
-SearchListActivity --> TrackRecordedActivity : Search result
-
 TrackRecordedActivity --> TrackDeleteActivity
 TrackRecordedActivity --> TrackEditActivity
 TrackRecordedActivity --> MarkerListActivity
@@ -46,10 +42,14 @@ MarkerDetailActivity --> CoordinateOnMapIntent : URI
 
 SettingsActivity --> AboutActivity
 SettingsActivity --> HelpActivity
+SettingsActivity --> ImportActivity
 SettingsActivity --> ExportActivity
-SettingsActivity --> DirectoryChooserActivity
-SettingsActivity --> DirectoryChooserActivity
-DirectoryChooserActivity$ImportDirectoryChooserActivity --> ImportActivity
-DirectoryChooserActivity$ExportDirectoryChooserActivity --> ExportActivity
+SettingsActivity --> DirectoryChooserActivity.ImportDirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity.ExportDirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity.DefaultTrackExportDirectoryChooserActivity
+DirectoryChooserActivity.ImportDirectoryChooserActivity --> ImportActivity
+DirectoryChooserActivity.ExportDirectoryChooserActivity --> ExportActivity
+
+FileImportIntent --> ImportActivity
 
 @enduml

doc/data-flow.txt

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

doc/data-structure.txt

@@ -8,7 +8,7 @@ class Track {
     -icon
 }
 Track o-- TrackPoint
-Track o-- Waypoint
+Track o-- Marker
 Track "1" - "1" TripStatistics
 
 class TripStatistics {
@@ -21,7 +21,12 @@ class TripStatistics {
     - totalElevationGain
 }
 
-class TrackPoint extends android.location.Location {
+note left of TripStatistics
+The time is based upon device time.
+end note
+
+
+class TrackPoint {
     - id
     - trackId
     - longitude
@@ -36,7 +41,32 @@ class TrackPoint extends android.location.Location {
     - sensor_power
 }
 
-class Waypoint {
+note right of TrackPoint
+TODO
+TrackPoints are mixing two concepts:
+1. a GPS measurement provided by the GPS hardware
+2. and also segment markers.
+   These are marked by PAUSE / RESUME TrackPoints.
+
+While exporting PAUSE/RESUME are not used to create these segments and these are partly recreated when imported.
+However, the timestamp of PAUSE/RESUME is not exported and can therefore not be restored.
+This prevents us from restoring the exact TripStatistics.
+It is also noteworthy that neither PAUSE/RESUME TrackPoints are used for computing the TrackStatistics.
+Only the timestamp to _create_ those is used.
+end note
+
+note left of TrackPoint
+TODO
+The time stored in TrackPoints is either:
+1. created via GPS: provided by the GPS hardware
+2. created by the user (pause/resume): device time.
+
+We know that the GPS time and device time are often not in sync.
+end note
+
+TrackPoint "1" - "1" android.location.Location
+
+class Marker {
     - id
     - trackId
     - name

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

@@ -5,6 +5,6 @@ Funktionen & Features:
 * zeichnet Sport und andere Outdooraktivitäten auf
 * unterstützt das Markieren interessanter Orte, inkl. Foto-Funktion
 * zeichnet deine Herzfrequenz auf (Bluetooth LE)
-* nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren (Bluetooth LE)
+* nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren sowie Leistungsmesser (Bluetooth LE)
 * exportiert deine Daten als KML oder GPX
 * funktioniert ganz ohne Internet

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

@@ -0,0 +1,4 @@
+v3.9.3: OpenTracks
+
+Bugfixes:
+- Fixed export all tracks bug.

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

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

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

@@ -0,0 +1,8 @@
+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)

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

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

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

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

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

@@ -0,0 +1,4 @@
+v3.11.1: OpenTracks
+
+Bugfix:
+- Voice announcements reported wrong statistics

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

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

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

@@ -0,0 +1,10 @@
+v3.13.0: OpenTracks
+
+Changes:
+- Sensor: support for powermeter (BLE)
+- Search by track and marker (in lists)
+- Combined search removed
+
+Bugfix:
+- Import crashed in UI
+- Images of markers were not imported

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

@@ -0,0 +1,5 @@
+v3.13.1: OpenTracks
+
+Bugfix:
+- Crash on record start: minify/shrink removed a drawable
+- Automatic export failed silently (mainly remote destinations)

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

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

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

@@ -0,0 +1,10 @@
+v3.14.0: OpenTracks
+
+Changes:
+- Properly support for right-to-left
+- Import: faster cleanup after import failure
+- Text in charts scales according to Android settings
+- Heart rate: support for Huami devices (requires Gadgetbridge)
+
+Developer:
+- Import is now handled in-memory

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

@@ -1,4 +1,4 @@
-(tbd): OpenTracks
+(versionName): OpenTracks
 
 Changes:
 -

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

@@ -6,5 +6,6 @@ Features:
 * Supports Bluetooth LE sensors:
   * heart rate
   * cycling: speed and cadence
+  * cycling: power meter
 * Export data: export tracks either as KML or GPX
 * No Internet access: Internet is not used

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

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

@@ -19,13 +19,16 @@ 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,7 +48,9 @@ public class ChartValueSeriesTest {
                 R.string.description_elevation_metric,
                 R.string.description_elevation_imperial,
                 R.color.chart_elevation_fill,
-                R.color.chart_elevation_border) {
+                R.color.chart_elevation_border,
+                15,
+                18) {
             @Override
             double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getElevation();
@@ -60,16 +65,16 @@ public class ChartValueSeriesTest {
 
     @Test
     public void testInitialConditions() {
-        Assert.assertEquals(1, series.getInterval());
-        Assert.assertEquals(0, series.getMinMarkerValue());
-        Assert.assertEquals(5, series.getMaxMarkerValue());
-        Assert.assertTrue(series.isEnabled());
+        assertEquals(1, series.getInterval());
+        assertEquals(0, series.getMinMarkerValue());
+        assertEquals(5, series.getMaxMarkerValue());
+        assertTrue(series.isEnabled());
     }
 
     @Test
     public void testEnabled() {
         series.setEnabled(false);
-        Assert.assertFalse(series.isEnabled());
+        assertFalse(series.isEnabled());
     }
 
     @Test
@@ -77,9 +82,9 @@ public class ChartValueSeriesTest {
         series.update(new ChartPoint(0));
         series.update(new ChartPoint(10));
         series.updateDimension();
-        Assert.assertEquals(100, series.getInterval());
-        Assert.assertEquals(0, series.getMinMarkerValue());
-        Assert.assertEquals(500, series.getMaxMarkerValue());
+        assertEquals(100, series.getInterval());
+        assertEquals(0, series.getMinMarkerValue());
+        assertEquals(500, series.getMaxMarkerValue());
     }
 
     @Test
@@ -87,9 +92,9 @@ public class ChartValueSeriesTest {
         series.update(new ChartPoint(0));
         series.update(new ChartPoint(901));
         series.updateDimension();
-        Assert.assertEquals(1000, series.getInterval());
-        Assert.assertEquals(0, series.getMinMarkerValue());
-        Assert.assertEquals(5000, series.getMaxMarkerValue());
+        assertEquals(1000, series.getInterval());
+        assertEquals(0, series.getMinMarkerValue());
+        assertEquals(5000, series.getMaxMarkerValue());
     }
 
     @Test
@@ -97,8 +102,8 @@ public class ChartValueSeriesTest {
         series.update(new ChartPoint(220));
         series.update(new ChartPoint(250));
         series.updateDimension();
-        Assert.assertEquals(100, series.getInterval());
-        Assert.assertEquals(200, series.getMinMarkerValue());
-        Assert.assertEquals(700, series.getMaxMarkerValue());
+        assertEquals(100, series.getInterval());
+        assertEquals(200, series.getMinMarkerValue());
+        assertEquals(700, series.getMaxMarkerValue());
     }
 }

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

@@ -21,7 +21,6 @@ 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;
@@ -31,6 +30,8 @@ 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}.
  *
@@ -85,7 +86,7 @@ public class DescriptionGeneratorTest {
                 + "Elevation gain: 6000 m (19685 ft)<br>"
                 + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
 
-        Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
+        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
     }
 
     @Test
@@ -119,7 +120,7 @@ public class DescriptionGeneratorTest {
                         + "Elevation gain: 6000 m (19685 ft)<br>"
                         + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
 
-        Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
+        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
     }
 
 
@@ -130,7 +131,7 @@ public class DescriptionGeneratorTest {
     public void testWriteDistance() {
         StringBuilder builder = new StringBuilder();
         descriptionGenerator.writeDistance(1100, builder, R.string.description_total_distance, "<br>");
-        Assert.assertEquals("Total distance: 1.10 km (0.7 mi)<br>", builder.toString());
+        assertEquals("Total distance: 1.10 km (0.7 mi)<br>", builder.toString());
     }
 
     /**
@@ -140,7 +141,7 @@ public class DescriptionGeneratorTest {
     public void testWriteTime() {
         StringBuilder builder = new StringBuilder();
         descriptionGenerator.writeTime(1000, builder, R.string.description_total_time, "<br>");
-        Assert.assertEquals("Total time: 00:01<br>", builder.toString());
+        assertEquals("Total time: 00:01<br>", builder.toString());
     }
 
     /**
@@ -150,7 +151,7 @@ public class DescriptionGeneratorTest {
     public void testWriteSpeed() {
         StringBuilder builder = new StringBuilder();
         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());
+        assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString());
     }
 
     /**
@@ -160,7 +161,7 @@ public class DescriptionGeneratorTest {
     public void testWriteElevation() {
         StringBuilder builder = new StringBuilder();
         descriptionGenerator.writeElevation(4.2, builder, R.string.description_min_elevation, "<br>");
-        Assert.assertEquals("Min elevation: 4 m (14 ft)<br>", builder.toString());
+        assertEquals("Min elevation: 4 m (14 ft)<br>", builder.toString());
     }
 
     /**
@@ -170,6 +171,6 @@ public class DescriptionGeneratorTest {
     public void testWritePace() {
         StringBuilder builder = new StringBuilder();
         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());
+        assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString());
     }
 }

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

@@ -1,319 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.content;
-
-import android.content.ContentUris;
-import android.location.Location;
-import android.net.Uri;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.provider.ProviderTestRule;
-
-import org.junit.After;
-import org.junit.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());
-        }
-    }
-}

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

@@ -16,6 +16,7 @@ public class TestDataUtil {
     public static final double INITIAL_LATITUDE = 37.0;
     public static final double INITIAL_LONGITUDE = -57.0;
     public static final double ALTITUDE_INTERVAL = 2.5;
+    public static final float ELEVATION_GAIN = 3;
 
     /**
      * Create a track without any trackPoints.
@@ -68,9 +69,9 @@ public class TestDataUtil {
         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.setElevationGain(ELEVATION_GAIN);
         return trackPoint;
     }
 
@@ -93,12 +94,12 @@ public class TestDataUtil {
      * @param location The location.
      * @return the Waypoint created.
      */
-    public static Waypoint createWaypointWithPhoto(Context context, Track.Id trackId, Location location) throws IOException {
+    public static Marker 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();
 
-        return new Waypoint("Waypoint name", "Waypoint description", "Waypoint category", "", trackId, 0.0, 0, location, photoUrl);
+        return new Marker("Waypoint name", "Waypoint description", "Waypoint category", "", trackId, 0.0, 0, location, photoUrl);
     }
 }

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

@@ -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(WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
-        assertEquals(WaypointsColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(WaypointsColumns.CONTENT_URI.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()));
     }
 }

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

@@ -25,7 +25,6 @@ import android.util.Pair;
 
 import androidx.test.core.app.ApplicationProvider;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,17 +38,22 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
+import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.content.data.MarkerColumns;
 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.TracksColumns;
-import de.dennisguse.opentracks.content.data.Waypoint;
-import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.UUIDUtils;
 
+import static org.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;
 import static org.mockito.Mockito.when;
 
 /**
@@ -122,13 +126,13 @@ public class CustomContentProviderUtilsTest {
         try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(trackId, -1L, descending)) {
             while (it.hasNext()) {
                 TrackPoint loc = it.next();
-                Assert.assertNotNull(loc);
+                assertNotNull(loc);
                 locations.add(loc);
                 // Make sure the IDs are returned in the right order.
-                Assert.assertEquals(descending ? lastPointId - locations.size() + 1
+                assertEquals(descending ? lastPointId - locations.size() + 1
                         : lastPointId - numPoints + locations.size(), it.getTrackPointId());
             }
-            Assert.assertEquals(numPoints, locations.size());
+            assertEquals(numPoints, locations.size());
         }
     }
 
@@ -138,7 +142,7 @@ public class CustomContentProviderUtilsTest {
         track.setName("Test: " + id.getId());
         contentProviderUtils.insertTrack(track);
         track = contentProviderUtils.getTrack(id);
-        Assert.assertNotNull(track);
+        assertNotNull(track);
 
         TrackPoint[] trackPoints = new TrackPoint[numPoints];
         for (int i = 0; i < numPoints; ++i) {
@@ -162,8 +166,8 @@ public class CustomContentProviderUtilsTest {
             }
         }
 
-        Assert.assertTrue(numPoints == 0 || lastPointId > 0);
-        Assert.assertEquals(numPoints, counter);
+        assertTrue(numPoints == 0 || lastPointId > 0);
+        assertEquals(numPoints, counter);
 
         return lastPointId;
     }
@@ -195,8 +199,8 @@ public class CustomContentProviderUtilsTest {
         when(cursorMock.getString(columnIndex)).thenReturn(name);
 
         Track track = contentProviderUtils.createTrack(cursorMock);
-        Assert.assertEquals(trackId, track.getId());
-        Assert.assertEquals(name, track.getName());
+        assertEquals(trackId, track.getId());
+        assertEquals(name, track.getName());
     }
 
     /**
@@ -208,25 +212,25 @@ public class CustomContentProviderUtilsTest {
         Track.Id trackId = new Track.Id(System.currentTimeMillis());
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
-        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
-        contentProviderUtils.insertWaypoint(waypoint);
+        Marker waypoint = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        contentProviderUtils.insertMarker(waypoint);
 
         ContentResolver contentResolver = context.getContentResolver();
         Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(1, tracksCursor.getCount());
+        assertEquals(1, tracksCursor.getCount());
         Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(10, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(1, waypointCursor.getCount());
+        assertEquals(10, tracksPointsCursor.getCount());
+        Cursor waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(1, waypointCursor.getCount());
         // Delete all.
         contentProviderUtils.deleteAllTracks(context);
         // Check whether all have been deleted.
         tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(0, tracksCursor.getCount());
+        assertEquals(0, tracksCursor.getCount());
         tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(0, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(0, waypointCursor.getCount());
+        assertEquals(0, tracksPointsCursor.getCount());
+        waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(0, waypointCursor.getCount());
     }
 
     /**
@@ -239,32 +243,32 @@ public class CustomContentProviderUtilsTest {
         Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
         TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        contentProviderUtils.insertWaypoint(waypoint);
+        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        contentProviderUtils.insertMarker(waypoint);
 
         ContentResolver contentResolver = context.getContentResolver();
         Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(1, tracksCursor.getCount());
+        assertEquals(1, tracksCursor.getCount());
         Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(10, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(1, waypointCursor.getCount());
+        assertEquals(10, tracksPointsCursor.getCount());
+        Cursor waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(1, waypointCursor.getCount());
         // Check waypoint has photo and it's in the external storage.
-        Assert.assertTrue(waypoint.hasPhoto());
+        assertTrue(waypoint.hasPhoto());
         File dir = FileUtils.getPhotoDir(context, trackId);
-        Assert.assertTrue(dir.isDirectory());
-        Assert.assertEquals(1, dir.list().length);
-        Assert.assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+        assertEquals(1, dir.list().length);
+        assertTrue(dir.exists());
         // Delete all.
         contentProviderUtils.deleteAllTracks(context);
         // Check whether all have been deleted.
         tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(0, tracksCursor.getCount());
+        assertEquals(0, tracksCursor.getCount());
         tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(0, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(0, waypointCursor.getCount());
-        Assert.assertFalse(dir.exists());
+        assertEquals(0, tracksPointsCursor.getCount());
+        waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(0, waypointCursor.getCount());
+        assertFalse(dir.exists());
     }
 
     /**
@@ -283,26 +287,25 @@ public class CustomContentProviderUtilsTest {
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId2, 10);
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId3, 10);
 
-        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId2));
-        waypoint.setTrackId(trackId1);
-        contentProviderUtils.insertWaypoint(waypoint);
+        Marker waypoint = new Marker(trackId1, contentProviderUtils.getLastValidTrackPoint(trackId2));
+        contentProviderUtils.insertMarker(waypoint);
 
         ContentResolver contentResolver = context.getContentResolver();
         Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(3, tracksCursor.getCount());
+        assertEquals(3, tracksCursor.getCount());
         Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(20, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(1, waypointCursor.getCount());
+        assertEquals(20, tracksPointsCursor.getCount());
+        Cursor waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(1, waypointCursor.getCount());
         // Delete one track.
         contentProviderUtils.deleteTrack(context, trackId1);
         // Check whether all data of a track has been deleted.
         tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(2, tracksCursor.getCount());
+        assertEquals(2, tracksCursor.getCount());
         tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(20, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(0, waypointCursor.getCount());
+        assertEquals(20, tracksPointsCursor.getCount());
+        waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(0, waypointCursor.getCount());
     }
 
     /**
@@ -322,41 +325,41 @@ public class CustomContentProviderUtilsTest {
 
         // Insert a waypoint in tracks trackId and trackId + 1.
         TrackPoint trackPoint1 = contentProviderUtils.getLastValidTrackPoint(trackId1);
-        Waypoint waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId1, trackPoint1.getLocation());
-        contentProviderUtils.insertWaypoint(waypoint1);
+        Marker waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId1, trackPoint1.getLocation());
+        contentProviderUtils.insertMarker(waypoint1);
         File dir1 = FileUtils.getPhotoDir(context, trackId1);
 
         TrackPoint trackPoint2 = contentProviderUtils.getLastValidTrackPoint(trackId2);
-        Waypoint waypoint2 = TestDataUtil.createWaypointWithPhoto(context, trackId2, trackPoint2.getLocation());
-        contentProviderUtils.insertWaypoint(waypoint2);
+        Marker waypoint2 = TestDataUtil.createWaypointWithPhoto(context, trackId2, trackPoint2.getLocation());
+        contentProviderUtils.insertMarker(waypoint2);
         File dir2 = FileUtils.getPhotoDir(context, trackId2);
 
         // Check.
         ContentResolver contentResolver = context.getContentResolver();
         Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(3, tracksCursor.getCount());
+        assertEquals(3, tracksCursor.getCount());
         Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(30, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(2, waypointCursor.getCount());
-        Assert.assertTrue(waypoint1.hasPhoto());
-        Assert.assertTrue(dir1.isDirectory());
-        Assert.assertEquals(1, dir1.list().length);
-        Assert.assertTrue(dir1.exists());
-        Assert.assertTrue(dir2.isDirectory());
-        Assert.assertEquals(1, dir2.list().length);
-        Assert.assertTrue(dir2.exists());
+        assertEquals(30, tracksPointsCursor.getCount());
+        Cursor waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(2, waypointCursor.getCount());
+        assertTrue(waypoint1.hasPhoto());
+        assertTrue(dir1.isDirectory());
+        assertEquals(1, dir1.list().length);
+        assertTrue(dir1.exists());
+        assertTrue(dir2.isDirectory());
+        assertEquals(1, dir2.list().length);
+        assertTrue(dir2.exists());
         // Delete one track.
         contentProviderUtils.deleteTrack(context, trackId1);
         // Check whether all data of a track has been deleted.
         tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(2, tracksCursor.getCount());
+        assertEquals(2, tracksCursor.getCount());
         tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(20, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(1, waypointCursor.getCount());
-        Assert.assertFalse(dir1.exists());
-        Assert.assertTrue(dir2.exists());
+        assertEquals(20, tracksPointsCursor.getCount());
+        waypointCursor = contentResolver.query(MarkerColumns.CONTENT_URI, null, null, null, MarkerColumns._ID);
+        assertEquals(1, waypointCursor.getCount());
+        assertFalse(dir1.exists());
+        assertTrue(dir2.exists());
     }
 
     /**
@@ -373,8 +376,8 @@ public class CustomContentProviderUtilsTest {
         List<Track> allTracks = contentProviderUtils.getTracks();
 
         // then
-        Assert.assertEquals(initialTrackNumber + 1, allTracks.size());
-        Assert.assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
+        assertEquals(initialTrackNumber + 1, allTracks.size());
+        assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
     }
 
     /**
@@ -384,7 +387,7 @@ public class CustomContentProviderUtilsTest {
     public void testGetLastTrack() {
         Track.Id trackId = new Track.Id(System.currentTimeMillis());
         contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId));
-        Assert.assertEquals(trackId, contentProviderUtils.getLastTrack().getId());
+        assertEquals(trackId, contentProviderUtils.getLastTrack().getId());
     }
 
     /**
@@ -397,7 +400,7 @@ public class CustomContentProviderUtilsTest {
         contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId));
 
         // when / then
-        Assert.assertNotNull(contentProviderUtils.getTrack(trackId));
+        assertNotNull(contentProviderUtils.getTrack(trackId));
     }
 
     /**
@@ -411,7 +414,7 @@ public class CustomContentProviderUtilsTest {
         contentProviderUtils.insertTrack(track);
 
         // when / then
-        Assert.assertNotNull(contentProviderUtils.getTrack(track.getUuid()));
+        assertNotNull(contentProviderUtils.getTrack(track.getUuid()));
     }
 
     /**
@@ -428,14 +431,14 @@ public class CustomContentProviderUtilsTest {
 
         // when / then
         contentProviderUtils.insertTrack(track);
-        Assert.assertEquals(nameOld, contentProviderUtils.getTrack(trackId).getName());
+        assertEquals(nameOld, contentProviderUtils.getTrack(trackId).getName());
         track.setName(nameNew);
         contentProviderUtils.updateTrack(track);
-        Assert.assertEquals(nameNew, contentProviderUtils.getTrack(trackId).getName());
+        assertEquals(nameNew, contentProviderUtils.getTrack(trackId).getName());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#createContentValues(Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#createContentValues(Marker)}.
      */
     @Test
     public void testCreateContentValues_waypoint() {
@@ -451,7 +454,7 @@ public class CustomContentProviderUtilsTest {
         statistics.setTotalTime(1500L);
         statistics.setMovingTime(700L);
         statistics.setTotalDistance(750.0);
-        statistics.setTotalElevationGain(50.0);
+        statistics.setTotalElevationGain(50.0f);
         statistics.setMaxSpeed(60.0);
         statistics.setMaxElevation(1250.0);
         statistics.setMinElevation(1200.0);
@@ -459,30 +462,30 @@ public class CustomContentProviderUtilsTest {
         track.first.setTrackStatistics(statistics);
         contentProviderUtils.insertTrack(track.first);
 
-        Waypoint waypoint = new Waypoint(track.second[0]);
+        Marker waypoint = new Marker(trackId, track.second[0]);
         waypoint.setDescription(TEST_DESC);
-        contentProviderUtils.insertWaypoint(waypoint);
+        contentProviderUtils.insertMarker(waypoint);
 
         ContentProviderUtils contentProviderUtils = new ContentProviderUtils(contentResolverMock);
 
-        Waypoint.Id waypointId = new Waypoint.Id(System.currentTimeMillis());
+        Marker.Id waypointId = new Marker.Id(System.currentTimeMillis());
         waypoint.setId(waypointId);
         ContentValues contentValues = contentProviderUtils.createContentValues(waypoint);
-        Assert.assertEquals(waypointId.getId(), contentValues.get(WaypointsColumns._ID));
-        Assert.assertEquals((int) (TestDataUtil.INITIAL_LONGITUDE * 1000000), contentValues.get(WaypointsColumns.LONGITUDE));
-        Assert.assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION));
+        assertEquals(waypointId.getId(), contentValues.get(MarkerColumns._ID));
+        assertEquals((int) (TestDataUtil.INITIAL_LONGITUDE * 1000000), contentValues.get(MarkerColumns.LONGITUDE));
+        assertEquals(TEST_DESC, contentValues.get(MarkerColumns.DESCRIPTION));
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#createWaypoint(Cursor)}.
+     * Tests the method {@link ContentProviderUtils#createMarker(Cursor)}.
      */
     @Test
     public void testCreateWaypoint() {
         int startColumnIndex = 1;
         int columnIndex = startColumnIndex;
-        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns._ID)).thenReturn(columnIndex++);
-        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns.NAME)).thenReturn(columnIndex++);
-        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns.TRACKID)).thenReturn(columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(MarkerColumns._ID)).thenReturn(columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(MarkerColumns.NAME)).thenReturn(columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(MarkerColumns.TRACKID)).thenReturn(columnIndex++);
         columnIndex = startColumnIndex;
         // Id
         when(cursorMock.isNull(columnIndex++)).thenReturn(false);
@@ -501,15 +504,15 @@ public class CustomContentProviderUtilsTest {
         long trackId = 11L;
         when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
 
-        Waypoint waypoint = contentProviderUtils.createWaypoint(cursorMock);
-        Assert.assertEquals(id, waypoint.getId().getId());
-        Assert.assertEquals(name, waypoint.getName());
-        Assert.assertEquals(trackId, waypoint.getTrackId().getId());
+        Marker waypoint = contentProviderUtils.createMarker(cursorMock);
+        assertEquals(id, waypoint.getId().getId());
+        assertEquals(name, waypoint.getName());
+        assertEquals(trackId, waypoint.getTrackId().getId());
     }
 
     /**
      * Tests the method
-     * {@link ContentProviderUtils#deleteWaypoint(Context, Waypoint.Id)}
+     * {@link ContentProviderUtils#deleteMarker(Context, Marker.Id)}
      * when there is only one waypoint in the track.
      */
     @Test
@@ -518,26 +521,25 @@ public class CustomContentProviderUtilsTest {
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
         // Insert at first.
-        Waypoint waypoint1 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint1.setDescription(TEST_DESC);
-        waypoint1.setTrackId(trackId);
-        contentProviderUtils.insertWaypoint(waypoint1);
+        contentProviderUtils.insertMarker(waypoint1);
 
         // Check insert was done.
-        Assert.assertEquals(contentProviderUtils.getWaypointCount(trackId), 1);
+        assertEquals(contentProviderUtils.getMarkerCount(trackId), 1);
 
         // Get waypoint id that needs to delete.
-        Waypoint.Id waypoint1Id = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1)));
+        Marker.Id waypoint1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint1)));
 
         // Delete
-        contentProviderUtils.deleteWaypoint(context, waypoint1Id);
+        contentProviderUtils.deleteMarker(context, waypoint1Id);
 
-        Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id));
+        assertNull(contentProviderUtils.getMarker(waypoint1Id));
     }
 
     /**
      * Tests the method
-     * {@link ContentProviderUtils#deleteWaypoint(Context, Waypoint.Id)}
+     * {@link ContentProviderUtils#deleteMarker(Context, Marker.Id)}
      * when there is only one waypoint in the track.
      */
     @Test
@@ -547,32 +549,32 @@ public class CustomContentProviderUtilsTest {
 
         // Insert at first.
         TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Waypoint waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
-        contentProviderUtils.insertWaypoint(waypoint1);
+        Marker waypoint1 = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        contentProviderUtils.insertMarker(waypoint1);
 
         // Check insert was done.
-        Assert.assertEquals(contentProviderUtils.getWaypointCount(trackId), 1);
+        assertEquals(contentProviderUtils.getMarkerCount(trackId), 1);
 
         // Get waypoint id that needs to delete.
-        Waypoint.Id waypoint1Id = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1)));
+        Marker.Id waypoint1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint1)));
 
         // Check waypoint has photo and it's in the external storage.
-        Assert.assertTrue(waypoint1.hasPhoto());
+        assertTrue(waypoint1.hasPhoto());
         File dir = FileUtils.getPhotoDir(context, trackId);
-        Assert.assertTrue(dir.isDirectory());
-        Assert.assertEquals(1, dir.list().length);
-        Assert.assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+        assertEquals(1, dir.list().length);
+        assertTrue(dir.exists());
 
         // Delete
-        contentProviderUtils.deleteWaypoint(context, waypoint1Id);
+        contentProviderUtils.deleteMarker(context, waypoint1Id);
 
         // Check waypoint doesn't exists and photo folder was deleted.
-        Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id));
-        Assert.assertFalse(dir.exists());
+        assertNull(contentProviderUtils.getMarker(waypoint1Id));
+        assertFalse(dir.exists());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#deleteWaypoint(Context, Waypoint.Id)} when there is more than one waypoint in the track.
+     * Tests the method {@link ContentProviderUtils#deleteMarker(Context, Marker.Id)} when there is more than one waypoint in the track.
      */
     @Test
     public void testDeleteWaypoint_hasNextWayPoint() {
@@ -596,67 +598,60 @@ public class CustomContentProviderUtilsTest {
 //        TestDataUtil.insertTrackWithLocations(contentProviderUtils, track);
 
         // Insert at first.
-        Waypoint waypoint1 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint1.setDescription(MOCK_DESC);
-        waypoint1.setTrackId(trackId);
-        Waypoint.Id waypoint1Id = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1)));
+        Marker.Id waypoint1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint1)));
 
-        Waypoint waypoint2 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint2.setDescription(MOCK_DESC);
-        waypoint2.setTrackId(trackId);
-        Waypoint.Id waypoint2Id = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint2)));
+        Marker.Id waypoint2Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint2)));
 
         // Delete
-        Assert.assertNotNull(contentProviderUtils.getWaypoint(waypoint1Id));
-        contentProviderUtils.deleteWaypoint(context, waypoint1Id);
-        Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id));
+        assertNotNull(contentProviderUtils.getMarker(waypoint1Id));
+        contentProviderUtils.deleteMarker(context, waypoint1Id);
+        assertNull(contentProviderUtils.getMarker(waypoint1Id));
 
-        Assert.assertEquals(MOCK_DESC, contentProviderUtils.getWaypoint(waypoint2Id).getDescription());
+        assertEquals(MOCK_DESC, contentProviderUtils.getMarker(waypoint2Id).getDescription());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#getNextWaypointNumber(Track.Id)}.
+     * Tests the method {@link ContentProviderUtils#getNextMarkerNumber(Track.Id)}.
      */
     @Test
     public void testGetNextWaypointNumber() {
         Track.Id trackId = new Track.Id(System.currentTimeMillis());
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
-        Waypoint waypoint1 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint1.setTrackId(trackId);
-        Waypoint waypoint2 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint2.setTrackId(trackId);
-        Waypoint waypoint3 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint3.setTrackId(trackId);
-        Waypoint waypoint4 = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
-        waypoint4.setTrackId(trackId);
-        contentProviderUtils.insertWaypoint(waypoint1);
-        contentProviderUtils.insertWaypoint(waypoint2);
-        contentProviderUtils.insertWaypoint(waypoint3);
-        contentProviderUtils.insertWaypoint(waypoint4);
+        Marker waypoint1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint3 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint4 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
+        contentProviderUtils.insertMarker(waypoint1);
+        contentProviderUtils.insertMarker(waypoint2);
+        contentProviderUtils.insertMarker(waypoint3);
+        contentProviderUtils.insertMarker(waypoint4);
 
-        Assert.assertEquals(4, contentProviderUtils.getNextWaypointNumber(trackId));
+        assertEquals(4, contentProviderUtils.getNextMarkerNumber(trackId));
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#insertWaypoint(Waypoint)} and
-     * {@link ContentProviderUtils#getWaypoint(Waypoint.Id)}.
+     * Tests the method {@link ContentProviderUtils#insertMarker(Marker)} and
+     * {@link ContentProviderUtils#getMarker(Marker.Id)}.
      */
     @Test
     public void testInsertAndGetWaypoint() {
         Track.Id trackId = new Track.Id(System.currentTimeMillis());
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
-        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint)));
+        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
 
-        Assert.assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription());
+        assertEquals(TEST_DESC, contentProviderUtils.getMarker(waypointId).getDescription());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
      */
     @Test
     public void testUpdateWaypoint() {
@@ -664,21 +659,20 @@ public class CustomContentProviderUtilsTest {
         TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
         // Insert at first.
-        Waypoint waypoint = new Waypoint(contentProviderUtils.getLastValidTrackPoint(trackId));
+        Marker waypoint = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
         waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint)));
+        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
 
         // Update
-        waypoint = contentProviderUtils.getWaypoint(waypointId);
+        waypoint = contentProviderUtils.getMarker(waypointId);
         waypoint.setDescription(TEST_DESC_NEW);
-        contentProviderUtils.updateWaypoint(context, waypoint);
+        contentProviderUtils.updateMarker(context, waypoint);
 
-        Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription());
+        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(waypointId).getDescription());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
      */
     @Test
     public void testUpdateWaypoint_withPhoto() throws IOException {
@@ -689,32 +683,31 @@ public class CustomContentProviderUtilsTest {
 
         // Insert at first.
         TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
         waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint)));
+        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
 
         File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
-        Assert.assertTrue(dir.exists());
-        Assert.assertTrue(dir.isDirectory());
-        Assert.assertEquals(1, dir.list().length);
+        assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+        assertEquals(1, dir.list().length);
 
         // Update
-        waypoint = contentProviderUtils.getWaypoint(waypointId);
+        waypoint = contentProviderUtils.getMarker(waypointId);
         waypoint.setName(TEST_NAME_NEW);
         waypoint.setDescription(TEST_DESC_NEW);
-        contentProviderUtils.updateWaypoint(context, waypoint);
+        contentProviderUtils.updateMarker(context, waypoint);
 
-        Assert.assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName());
-        Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription());
-        Assert.assertTrue(waypoint.hasPhoto());
-        Assert.assertTrue(dir.exists());
-        Assert.assertTrue(dir.isDirectory());
-        Assert.assertEquals(1, dir.list().length);
+        assertEquals(TEST_NAME_NEW, contentProviderUtils.getMarker(waypointId).getName());
+        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(waypointId).getDescription());
+        assertTrue(waypoint.hasPhoto());
+        assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+        assertEquals(1, dir.list().length);
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
      */
     @Test
     public void testUpdateWaypoint_delPhotoAndDir() throws IOException {
@@ -725,31 +718,30 @@ public class CustomContentProviderUtilsTest {
 
         // Insert at first.
         TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
         waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint)));
+        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
 
         File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
-        Assert.assertTrue(dir.exists());
-        Assert.assertTrue(dir.isDirectory());
-        Assert.assertEquals(1, dir.list().length);
+        assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+        assertEquals(1, dir.list().length);
 
         // Update
-        waypoint = contentProviderUtils.getWaypoint(waypointId);
+        waypoint = contentProviderUtils.getMarker(waypointId);
         waypoint.setName(TEST_NAME_NEW);
         waypoint.setDescription(TEST_DESC_NEW);
         waypoint.setPhotoUrl(null);
-        contentProviderUtils.updateWaypoint(context, waypoint);
+        contentProviderUtils.updateMarker(context, waypoint);
 
-        Assert.assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName());
-        Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription());
-        Assert.assertFalse(waypoint.hasPhoto());
-        Assert.assertFalse(dir.exists());
+        assertEquals(TEST_NAME_NEW, contentProviderUtils.getMarker(waypointId).getName());
+        assertEquals(TEST_DESC_NEW, contentProviderUtils.getMarker(waypointId).getDescription());
+        assertFalse(waypoint.hasPhoto());
+        assertFalse(dir.exists());
     }
 
     /**
-     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#updateMarker(Context, Marker)}.
      */
     @Test
     public void testUpdateWaypoint_delPhotoNotDir() throws IOException {
@@ -760,30 +752,28 @@ public class CustomContentProviderUtilsTest {
 
         // Insert two waypoints with photos.
         TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
-        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        Marker waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
         waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        Waypoint otherWaypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        Marker otherWaypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
         otherWaypoint.setDescription(TEST_DESC);
-        otherWaypoint.setTrackId(trackId);
-        Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint)));
-        contentProviderUtils.insertWaypoint(otherWaypoint);
+        Marker.Id waypointId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(waypoint)));
+        contentProviderUtils.insertMarker(otherWaypoint);
 
         File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId());
-        Assert.assertTrue(dir.exists());
-        Assert.assertTrue(dir.isDirectory());
-        Assert.assertEquals(2, dir.list().length);
+        assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+        assertEquals(2, dir.list().length);
 
         // Update one waypoint deleting photo.
-        waypoint = contentProviderUtils.getWaypoint(waypointId);
+        waypoint = contentProviderUtils.getMarker(waypointId);
         waypoint.setPhotoUrl(null);
-        contentProviderUtils.updateWaypoint(context, waypoint);
+        contentProviderUtils.updateMarker(context, waypoint);
 
-        Assert.assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription());
-        Assert.assertFalse(waypoint.hasPhoto());
-        Assert.assertTrue(dir.exists());
-        Assert.assertTrue(dir.isDirectory());
-        Assert.assertEquals(1, dir.list().length);
+        assertEquals(TEST_DESC, contentProviderUtils.getMarker(waypointId).getDescription());
+        assertFalse(waypoint.hasPhoto());
+        assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+        assertEquals(1, dir.list().length);
     }
 
     /**
@@ -798,9 +788,9 @@ public class CustomContentProviderUtilsTest {
 
         // when / then
         contentProviderUtils.bulkInsertTrackPoint(track.second, trackId);
-        Assert.assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
+        assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
         contentProviderUtils.bulkInsertTrackPoint(Arrays.copyOfRange(track.second, 0, 8), trackId);
-        Assert.assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
+        assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
     }
 
     /**
@@ -839,11 +829,11 @@ public class CustomContentProviderUtilsTest {
         TrackPoint trackPoint = contentProviderUtils.createTrackPoint(cursorMock);
 
         // then
-        Assert.assertEquals(longitude, trackPoint.getLongitude(), 0.01);
-        Assert.assertEquals(latitude, trackPoint.getLatitude(), 0.01);
-        Assert.assertEquals(time, trackPoint.getTime(), 0.01);
-        Assert.assertEquals(speed, trackPoint.getSpeed(), 0.01);
-        Assert.assertFalse(trackPoint.hasHeartRate());
+        assertEquals(longitude, trackPoint.getLongitude(), 0.01);
+        assertEquals(latitude, trackPoint.getLatitude(), 0.01);
+        assertEquals(time, trackPoint.getTime(), 0.01);
+        assertEquals(speed, trackPoint.getSpeed(), 0.01);
+        assertFalse(trackPoint.hasHeartRate());
     }
 
     /**
@@ -857,7 +847,7 @@ public class CustomContentProviderUtilsTest {
         Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
 
         contentProviderUtils.insertTrackPoint(TestDataUtil.createTrackPoint(22), trackId);
-        Assert.assertEquals(11, contentProviderUtils.getTrackPoints(trackId).size());
+        assertEquals(11, contentProviderUtils.getTrackPoints(trackId).size());
     }
 
     @Test
@@ -876,10 +866,10 @@ public class CustomContentProviderUtilsTest {
 
         // then
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        Assert.assertTrue(trackPoints.get(10).hasHeartRate());
-        Assert.assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01);
-        Assert.assertEquals(trackPoint.getCyclingCadence_rpm(), trackPoints.get(10).getCyclingCadence_rpm(), 0.01);
-        Assert.assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01);
+        assertTrue(trackPoints.get(10).hasHeartRate());
+        assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01);
+        assertEquals(trackPoint.getCyclingCadence_rpm(), trackPoints.get(10).getCyclingCadence_rpm(), 0.01);
+        assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01);
     }
 
     /**
@@ -914,7 +904,7 @@ public class CustomContentProviderUtilsTest {
         Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[1], 5, true);
 
         // then
-        Assert.assertEquals(2, cursor.getCount());
+        assertEquals(2, cursor.getCount());
     }
 
     /**
@@ -936,7 +926,7 @@ public class CustomContentProviderUtilsTest {
         Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[8], 5, false);
 
         // then
-        Assert.assertEquals(2, cursor.getCount());
+        assertEquals(2, cursor.getCount());
     }
 
     /**
@@ -960,12 +950,12 @@ public class CustomContentProviderUtilsTest {
 
         // then
         for (int i = 0; i < trackpointIds.length; i++) {
-            Assert.assertTrue(trackPointIterator.hasNext());
+            assertTrue(trackPointIterator.hasNext());
             TrackPoint trackPoint = trackPointIterator.next();
-            Assert.assertEquals(startTrackPointId - i, trackPointIterator.getTrackPointId());
+            assertEquals(startTrackPointId - i, trackPointIterator.getTrackPointId());
             checkLocation((trackpointIds.length - 1) - i, trackPoint.getLocation());
         }
-        Assert.assertFalse(trackPointIterator.hasNext());
+        assertFalse(trackPointIterator.hasNext());
     }
 
     /**
@@ -990,13 +980,13 @@ public class CustomContentProviderUtilsTest {
 
         // then
         for (int i = 0; i < trackpointIds.length; i++) {
-            Assert.assertTrue(trackPointIterator.hasNext());
+            assertTrue(trackPointIterator.hasNext());
             TrackPoint trackPoint = trackPointIterator.next();
-            Assert.assertEquals(startTrackPointId + i, trackPointIterator.getTrackPointId());
+            assertEquals(startTrackPointId + i, trackPointIterator.getTrackPointId());
 
             checkLocation(i, trackPoint.getLocation());
         }
-        Assert.assertFalse(trackPointIterator.hasNext());
+        assertFalse(trackPointIterator.hasNext());
     }
 
     /**
@@ -1006,16 +996,16 @@ public class CustomContentProviderUtilsTest {
      * @param location the location to be checked
      */
     private void checkLocation(int i, Location location) {
-        Assert.assertEquals(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01);
-        Assert.assertEquals(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01);
-        Assert.assertEquals((float) i / 100.0f, location.getAccuracy(), 0.01);
-        Assert.assertEquals(i * TestDataUtil.ALTITUDE_INTERVAL, location.getAltitude(), 0.01);
+        assertEquals(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01);
+        assertEquals(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01);
+        assertEquals((float) i / 100.0f, location.getAccuracy(), 0.01);
+        assertEquals(i * TestDataUtil.ALTITUDE_INTERVAL, location.getAltitude(), 0.01);
     }
 
     @Test
     public void testFormatIdListForUri() {
-        Assert.assertEquals("", ContentProviderUtils.formatIdListForUri());
-        Assert.assertEquals("12", ContentProviderUtils.formatIdListForUri(new Track.Id(12)));
-        Assert.assertEquals("42,43,44", ContentProviderUtils.formatIdListForUri(new Track.Id(42), new Track.Id(43), new Track.Id(44)));
+        assertEquals("", ContentProviderUtils.formatIdListForUri());
+        assertEquals("12", ContentProviderUtils.formatIdListForUri(new Track.Id(12)));
+        assertEquals("42,43,44", ContentProviderUtils.formatIdListForUri(new Track.Id(42), new Track.Id(43), new Track.Id(44)));
     }
 }

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

@@ -6,7 +6,6 @@ import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import androidx.annotation.VisibleForTesting;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -18,9 +17,9 @@ import org.junit.runner.RunWith;
 import java.util.HashMap;
 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;
@@ -38,39 +37,21 @@ public class CustomSQLiteOpenHelperTest {
     private final Context context = ApplicationProvider.getApplicationContext();
 
     /**
-     * Get the SQL create statements for all tables (ordered by name).
+     * Get the SQL create statements for all SQLite elements of type (ordered by name).
      *
-     * @return Map(TableName, SQL)
+     * @param type index, table
+     * @return Map(name, SQL)
      */
-    @VisibleForTesting
-    public static Map<String, String> getTableSQL(SQLiteDatabase db) {
-        HashMap<String, String> tableSQL = new HashMap<>();
-        try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "name IN ('" + TracksColumns.TABLE_NAME + "', '" + TrackPointsColumns.TABLE_NAME + "', '" + WaypointsColumns.TABLE_NAME + "')", null, null, null, "name")) {
+    public static Map<String, String> getSQL(SQLiteDatabase db, String type) {
+        HashMap<String, String> sqlMap = new HashMap<>();
+        try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "type=?", new String[]{type}, null, null, "name")) {
             if (cursor != null) {
                 while (cursor.moveToNext()) {
-                    tableSQL.put(cursor.getString(0), cursor.getString(1));
+                    sqlMap.put(cursor.getString(0), cursor.getString(1));
                 }
             }
         }
-        return tableSQL;
-    }
-
-    /**
-     * Get the SQL create statements for all indices (ordered by name).
-     *
-     * @return Map(tableName, SQL)
-     */
-    @VisibleForTesting
-    public static Map<String, String> getIndexSQL(SQLiteDatabase db) {
-        HashMap<String, String> indexSQL = new HashMap<>();
-        try (Cursor cursor = db.rawQuery("SELECT tbl_name, SQL FROM sqlite_master WHERE type = 'index'", null)) {
-            if (cursor != null) {
-                while (cursor.moveToNext()) {
-                    indexSQL.put(cursor.getString(0), cursor.getString(1));
-                }
-            }
-        }
-        return indexSQL;
+        return sqlMap;
     }
 
     /**
@@ -106,10 +87,10 @@ public class CustomSQLiteOpenHelperTest {
             assertTrue(hasSqlCreate(db, TrackPointsColumns.CREATE_TABLE));
             assertTrue(hasSqlCreate(db, TrackPointsColumns.CREATE_TABLE_INDEX));
 
-            assertTrue(hasSqlCreate(db, WaypointsColumns.CREATE_TABLE));
-            assertTrue(hasSqlCreate(db, WaypointsColumns.CREATE_TABLE_INDEX));
+            assertTrue(hasSqlCreate(db, MarkerColumns.CREATE_TABLE));
+            assertTrue(hasSqlCreate(db, MarkerColumns.CREATE_TABLE_INDEX));
         } catch (Exception e) {
-            fail();
+            fail("Database could not be created: " + e);
         }
     }
 
@@ -121,8 +102,8 @@ public class CustomSQLiteOpenHelperTest {
         Map<String, String> tableByUpgrade;
         Map<String, String> indicesByUpgrade;
         try (SQLiteDatabase dbUpgraded = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
-            tableByUpgrade = getTableSQL(dbUpgraded);
-            indicesByUpgrade = getIndexSQL(dbUpgraded);
+            tableByUpgrade = getSQL(dbUpgraded, "table");
+            indicesByUpgrade = getSQL(dbUpgraded, "index");
         }
         context.deleteDatabase(DATABASE_NAME);
 
@@ -130,23 +111,25 @@ public class CustomSQLiteOpenHelperTest {
         Map<String, String> tablesByCreate;
         Map<String, String> indicesByCreate;
         try (SQLiteDatabase dbCreated = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
-            tablesByCreate = getTableSQL(dbCreated);
-            indicesByCreate = getIndexSQL(dbCreated);
+            tablesByCreate = getSQL(dbCreated, "table");
+            indicesByCreate = getSQL(dbCreated, "index");
         }
 
+
         // then - verify table structure
-        assertEquals(3, tableByUpgrade.size());
+        int tableCount = 3 + 2; //Three with data tables + two SQLite
+        assertEquals(tableCount, tableByUpgrade.size());
         assertEquals(tableByUpgrade.size(), tablesByCreate.size());
 
         assertEquals(tablesByCreate.get(TracksColumns.TABLE_NAME), tableByUpgrade.get(TracksColumns.TABLE_NAME));
         assertEquals(tablesByCreate.get(TrackPointsColumns.TABLE_NAME), tableByUpgrade.get(TrackPointsColumns.TABLE_NAME));
-        assertEquals(tablesByCreate.get(WaypointsColumns.TABLE_NAME), tableByUpgrade.get(WaypointsColumns.TABLE_NAME));
+        assertEquals(tablesByCreate.get(MarkerColumns.TABLE_NAME), tableByUpgrade.get(MarkerColumns.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(WaypointsColumns.TABLE_NAME), indicesByCreate.get(WaypointsColumns.TABLE_NAME));
+        assertEquals(indicesByUpgrade.get(MarkerColumns.TABLE_NAME), indicesByCreate.get(MarkerColumns.TABLE_NAME));
     }
 
     @Test
@@ -158,8 +141,8 @@ public class CustomSQLiteOpenHelperTest {
         Map<String, String> tablesByDowngrade;
         Map<String, String> indicesByDowngrade;
         try (SQLiteDatabase db = new CustomSQLiteOpenHelper(context, DATABASE_NAME, 23).getReadableDatabase()) {
-            tablesByDowngrade = getTableSQL(db);
-            indicesByDowngrade = getIndexSQL(db);
+            tablesByDowngrade = getSQL(db, "table");
+            indicesByDowngrade = getSQL(db, "index");
         }
 
         // then - verify table structure

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

@@ -3,7 +3,6 @@ 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;
@@ -12,17 +11,19 @@ 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");
 
-        Assert.assertEquals(0, ShareContentProvider.parseURI(uri).size());
+        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));
@@ -30,7 +31,7 @@ public class ShareContentProviderTest {
 
         Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "TrackName", TrackFileFormat.KML_ONLY_TRACK);
 
-        Assert.assertEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first));
+        assertEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first));
     }
 
     @Test
@@ -39,6 +40,6 @@ public class ShareContentProviderTest {
         trackIds.add(new Track.Id(1));
         Pair<Uri, String> shareURIandMIME = ShareContentProvider.createURI(trackIds, "../../&1=1", TrackFileFormat.KML_ONLY_TRACK);
 
-        Assert.assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/kml_only_track/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first);
+        assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/kml_only_track/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first);
     }
 }

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

@@ -2,12 +2,15 @@ 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 {
 
@@ -21,7 +24,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
+        assertEquals(60, current.getCadence_rpm(), 0.01);
     }
 
     @Test
@@ -34,7 +37,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        Assert.assertEquals(33.53, current.getCadence_rpm(), 0.01);
+        assertEquals(33.53, current.getCadence_rpm(), 0.01);
     }
 
     @Test
@@ -47,7 +50,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        Assert.assertEquals(0, current.getCadence_rpm(), 0.01);
+        assertEquals(0, current.getCadence_rpm(), 0.01);
     }
 
 
@@ -61,7 +64,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        Assert.assertFalse(current.hasCadence_rpm());
+        assertFalse(current.hasCadence_rpm());
     }
 
     @Test
@@ -74,7 +77,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
+        assertEquals(60, current.getCadence_rpm(), 0.01);
     }
 
     @Test
@@ -87,7 +90,7 @@ public class SensorDataCyclingTest {
         current.compute(previous);
 
         // then
-        Assert.assertEquals(60, current.getCadence_rpm(), 0.01);
+        assertEquals(60, current.getCadence_rpm(), 0.01);
     }
 
     @Test
@@ -100,7 +103,7 @@ public class SensorDataCyclingTest {
         current.compute(previous, 2150);
 
         // then
-        Assert.assertEquals(1.20, current.getSpeed_mps(), 0.01);
+        assertEquals(1.20, current.getSpeed_mps(), 0.01);
     }
 
     @Test
@@ -113,6 +116,34 @@ public class SensorDataCyclingTest {
         current.compute(previous, 2000);
 
         // then
-        Assert.assertEquals(2, current.getSpeed_mps(), 0.01);
+        assertEquals(2, current.getSpeed_mps(), 0.01);
+    }
+
+    @Test
+    public void equals_speed_with_no_data() {
+        // given
+        SensorDataCycling.Speed previous = new SensorDataCycling.Speed("sensorAddress");
+        SensorDataCycling.Speed current = new SensorDataCycling.Speed("sensorAddress", "sensorName", 0, 2048);
+
+        // when
+        previous.toString();
+
+        // then
+        assertNotEquals(previous, current);
+        assertNotEquals(previous, previous);
+    }
+
+    @Test
+    public void equals_cadence_with_no_data() {
+        // given
+        SensorDataCycling.Cadence previous = new SensorDataCycling.Cadence("sensorAddress");
+        SensorDataCycling.Cadence current = new SensorDataCycling.Cadence("sensorAddress", "sensorName", 0, 2048);
+
+        // when
+        previous.toString();
+
+        // then
+        assertNotEquals(previous, current);
+        assertNotEquals(previous, previous);
     }
 }

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

@@ -23,7 +23,6 @@ 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;
@@ -35,6 +34,8 @@ import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.UnitConversions;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests {@link ChartFragment}.
  *
@@ -78,9 +79,9 @@ public class ChartFragmentTest {
         ChartPoint point = chartFragment.createPendingPoint(trackPoint);
 
         // then
-        Assert.assertEquals(Float.NaN, point.getHeartRate(), 0.01);
-        Assert.assertEquals(Float.NaN, point.getCadence(), 0.01);
-        Assert.assertEquals(Float.NaN, point.getPower(), 0.01);
+        assertEquals(Float.NaN, point.getHeartRate(), 0.01);
+        assertEquals(Float.NaN, point.getCadence(), 0.01);
+        assertEquals(Float.NaN, point.getPower(), 0.01);
     }
 
     /**
@@ -98,9 +99,9 @@ public class ChartFragmentTest {
         ChartPoint point = chartFragment.createPendingPoint(trackPoint);
 
         // then
-        Assert.assertEquals(100.0, point.getHeartRate(), 0.01);
-        Assert.assertEquals(101.0, point.getCadence(), 0.01);
-        Assert.assertEquals(102.0, point.getPower(), 0.01);
+        assertEquals(100.0, point.getHeartRate(), 0.01);
+        assertEquals(101.0, point.getCadence(), 0.01);
+        assertEquals(102.0, point.getPower(), 0.01);
     }
 
     /**
@@ -112,12 +113,12 @@ public class ChartFragmentTest {
         // Resets last location and writes first location.
         TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        assertEquals(0.0, point.getTimeOrDistance(), 0.01);
 
         // The second is a same location, just different time.
         TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
         point = chartFragment.createPendingPoint(trackPoint2);
-        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        assertEquals(0.0, point.getTimeOrDistance(), 0.01);
 
         // The third location is a new location, and use metric.
         TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint();
@@ -129,7 +130,7 @@ public class ChartFragmentTest {
         Location.distanceBetween(trackPoint2.getLatitude(), trackPoint2.getLongitude(),
                 trackPoint3.getLatitude(), trackPoint3.getLongitude(), results);
         double distance1 = results[0] * UnitConversions.M_TO_KM;
-        Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01);
+        assertEquals(distance1, point.getTimeOrDistance(), 0.01);
 
         // The fourth location is a new location, and use metric.
         TrackPoint trackPoint4 = TrackStubUtils.createDefaultTrackPoint();
@@ -140,7 +141,7 @@ public class ChartFragmentTest {
         Location.distanceBetween(trackPoint3.getLatitude(), trackPoint3.getLongitude(),
                 trackPoint4.getLatitude(), trackPoint4.getLongitude(), results);
         double distance2 = results[0] * UnitConversions.M_TO_KM;
-        Assert.assertEquals((distance1 + distance2), point.getTimeOrDistance(), 0.01);
+        assertEquals((distance1 + distance2), point.getTimeOrDistance(), 0.01);
     }
 
     /**
@@ -156,7 +157,7 @@ public class ChartFragmentTest {
         // The first is a same location, just different time.
         TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        assertEquals(0.0, point.getTimeOrDistance(), 0.01);
 
         // The second location is a new location, and use imperial.
         TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
@@ -170,7 +171,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;
-        Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01);
+        assertEquals(distance1, point.getTimeOrDistance(), 0.01);
 
         // The third location is a new location, and use imperial.
         TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint();
@@ -183,7 +184,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;
-        Assert.assertEquals(distance1 + distance2, point.getTimeOrDistance(), 0.01);
+        assertEquals(distance1 + distance2, point.getTimeOrDistance(), 0.01);
     }
 
     /**
@@ -194,12 +195,12 @@ public class ChartFragmentTest {
         chartFragment.setChartByDistance(false);
         TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01);
+        assertEquals(0.0, point.getTimeOrDistance(), 0.01);
         long timeSpan = 222;
         TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
         trackPoint2.setTime(trackPoint1.getTime() + timeSpan);
         point = chartFragment.createPendingPoint(trackPoint2);
-        Assert.assertEquals((double) timeSpan, point.getTimeOrDistance(), 0.01);
+        assertEquals((double) timeSpan, point.getTimeOrDistance(), 0.01);
     }
 
     /**
@@ -214,7 +215,7 @@ public class ChartFragmentTest {
          * Then only one value INITIAL_ALTITUDE in buffer.
          */
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        Assert.assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point.getElevation(), 0.01);
+        assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point.getElevation(), 0.01);
 
         /*
          * Send another value to buffer, now there are two values, INITIAL_ALTITUDE and INITIAL_ALTITUDE * 2.
@@ -222,7 +223,7 @@ public class ChartFragmentTest {
         TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
         trackPoint2.setAltitude(TrackStubUtils.INITIAL_ALTITUDE * 2);
         point = chartFragment.createPendingPoint(trackPoint2);
-        Assert.assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0, point.getElevation(), 0.01);
+        assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0, point.getElevation(), 0.01);
     }
 
     /**
@@ -239,7 +240,7 @@ public class ChartFragmentTest {
         TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
         trackPoint1.setSpeed(128.5f);
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        Assert.assertEquals(0.0, point.getSpeed(), 0.01);
+        assertEquals(0.0, point.getSpeed(), 0.01);
 
         /*
          * Tests the logic when both metricUnits and reportSpeed are true.
@@ -253,7 +254,7 @@ public class ChartFragmentTest {
         trackPoint2.setTime(trackPoint1.getTime() + 222);
         trackPoint2.setSpeed(130);
         point = chartFragment.createPendingPoint(trackPoint2);
-        Assert.assertEquals(130.0 * UnitConversions.MPS_TO_KMH, point.getSpeed(), 0.01);
+        assertEquals(130.0 * UnitConversions.MPS_TO_KMH, point.getSpeed(), 0.01);
     }
 
     /**
@@ -267,7 +268,7 @@ public class ChartFragmentTest {
         TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
         trackPoint1.setSpeed(100.0f);
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        Assert.assertEquals(0.0, point.getSpeed(), 0.01);
+        assertEquals(0.0, point.getSpeed(), 0.01);
 
         TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
 
@@ -278,7 +279,7 @@ public class ChartFragmentTest {
         trackPoint2.setTime(trackPoint2.getTime() + 222);
         trackPoint2.setSpeed(102);
         point = chartFragment.createPendingPoint(trackPoint2);
-        Assert.assertEquals(102.0 * UnitConversions.MPS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01);
+        assertEquals(102.0 * UnitConversions.MPS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01);
     }
 
     /**
@@ -292,7 +293,7 @@ public class ChartFragmentTest {
         TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint();
         trackPoint1.setSpeed(100.0f);
         ChartPoint point = chartFragment.createPendingPoint(trackPoint1);
-        Assert.assertEquals(0.0, point.getSpeed(), 0.01);
+        assertEquals(0.0, point.getSpeed(), 0.01);
 
         TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint();
 
@@ -303,7 +304,7 @@ public class ChartFragmentTest {
         trackPoint2.setTime(trackPoint2.getTime() + 222);
         trackPoint2.setSpeed(102);
         point = chartFragment.createPendingPoint(trackPoint2);
-        Assert.assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MPS_TO_KMH), point.getPace(), 0.01);
+        assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MPS_TO_KMH), point.getPace(), 0.01);
     }
 
     /**
@@ -315,6 +316,6 @@ public class ChartFragmentTest {
         TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
         trackPoint.setSpeed(0);
         ChartPoint point = chartFragment.createPendingPoint(trackPoint);
-        Assert.assertEquals(0.0, point.getPace(), 0.01);
+        assertEquals(0.0, point.getPace(), 0.01);
     }
 }

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

@@ -24,7 +24,6 @@ import android.net.Uri;
 
 import androidx.test.core.app.ApplicationProvider;
 
-import org.junit.Assert;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 
@@ -34,11 +33,12 @@ import java.util.Locale;
 import java.util.SimpleTimeZone;
 import java.util.TimeZone;
 
+import de.dennisguse.opentracks.content.data.MarkerColumns;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
@@ -70,7 +70,7 @@ public abstract class AbstractTestFileTrackImporter {
     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();
+    private static final Uri WAYPOINT_ID_O_URI = ContentUris.appendId(MarkerColumns.CONTENT_URI.buildUpon(), WAYPOINT_ID_0).build();
 
     protected final Context context = ApplicationProvider.getApplicationContext();
 
@@ -114,7 +114,7 @@ public abstract class AbstractTestFileTrackImporter {
     protected void expectTrackUpdate(ArgumentCaptor<Track> trackCaptor, boolean lastTrack, Track.Id trackId) {
         contentProviderUtils.updateTrack(trackCaptor.capture());
 
-        when(contentProviderUtils.insertWaypoint(any())).thenReturn(WAYPOINT_ID_O_URI);
+        when(contentProviderUtils.insertMarker(any())).thenReturn(WAYPOINT_ID_O_URI);
         if (lastTrack) {
             // Return null to not add waypoints
             when(contentProviderUtils.getTrack(trackId)).thenReturn(null);
@@ -122,10 +122,10 @@ public abstract class AbstractTestFileTrackImporter {
     }
 
     protected void verifyTrack(Track track, String name, String description, long time) {
-        Assert.assertEquals(name, track.getName());
-        Assert.assertEquals(description, track.getDescription());
+        assertEquals(name, track.getName());
+        assertEquals(description, track.getDescription());
         if (time != -1L) {
-            Assert.assertEquals(time, track.getTrackStatistics().getStartTime_ms());
+            assertEquals(time, track.getTrackStatistics().getStartTime_ms());
         }
     }
 }

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

@@ -9,6 +9,7 @@ import androidx.test.filters.LargeTest;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -21,10 +22,10 @@ import java.util.Arrays;
 import java.util.List;
 
 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.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
@@ -53,7 +54,7 @@ public class ExportImportTest {
     private static final String TRACK_CATEGORY = "the category";
     private static final String TRACK_DESCRIPTION = "the description";
 
-    private final List<Waypoint> waypoints = new ArrayList<>();
+    private final List<Marker> markers = new ArrayList<>();
     private final List<TrackPoint> trackPoints = new ArrayList<>();
 
     private Track.Id importTrackId;
@@ -72,25 +73,26 @@ public class ExportImportTest {
         trackPoints.addAll(Arrays.asList(track.second));
 
         for (int i = 0; i < 3; i++) {
-            Waypoint waypoint = new Waypoint(track.second[i].getLocation());
-            waypoint.setName("the waypoint " + i);
-            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);
+            Marker marker = new Marker(trackId, track.second[i].getLocation());
+            marker.setName("the marker " + i);
+            marker.setDescription("the marker description " + i);
+            marker.setCategory("the marker category" + i);
+            marker.setIcon("the marker icon" + i);
+            marker.setPhotoUrl("the photo url" + i);
+            contentProviderUtils.insertMarker(marker);
 
-            waypoints.add(waypoint);
+            markers.add(marker);
         }
 
-        assertEquals(waypoints.size(), contentProviderUtils.getWaypointCount(trackId));
+        assertEquals(markers.size(), contentProviderUtils.getMarkerCount(trackId));
     }
 
     @After
     public void tearDown() {
         contentProviderUtils.deleteTrack(context, trackId);
-        contentProviderUtils.deleteTrack(context, importTrackId);
+        if (importTrackId != null) {
+            contentProviderUtils.deleteTrack(context, importTrackId);
+        }
     }
 
     @LargeTest
@@ -129,11 +131,11 @@ public class ExportImportTest {
         assertEquals(track.getIcon(), importedTrack.getIcon());
         assertEquals(track.getUuid(), importedTrack.getUuid());
 
-        // 2. waypoints
-        assertWaypoints();
+        // 2. markers
+        assertMarkers();
 
         // 3. trackpoints
-        assertTrackpoints(false, false, false);
+        assertTrackpoints(false, false, false, false);
     }
 
     @LargeTest
@@ -164,15 +166,15 @@ public class ExportImportTest {
         assertEquals(track.getName(), importedTrack.getName());
         assertEquals(track.getIcon(), importedTrack.getIcon());
 
-        // 2. waypoints
-        assertWaypoints();
+        // 2. markers
+        assertMarkers();
 
         // 3. trackpoints
-        assertTrackpoints(true, true, true);
+        assertTrackpoints(true, true, true, true);
     }
 
     @LargeTest
-    @Test
+    @Test(expected = ImportAlreadyExistsException.class)
     public void kml_with_trackdetail_and_sensordata_duplicate_trackUUID() {
         // given
         PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
@@ -195,6 +197,7 @@ public class ExportImportTest {
         assertNull(importedTrack);
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_only_track() {
@@ -202,6 +205,7 @@ public class ExportImportTest {
         Log.e(TAG, "Test not implemented.");
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_with_trackdetail() {
@@ -209,6 +213,7 @@ public class ExportImportTest {
         Log.e(TAG, "Test not implemented.");
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_with_trackdetail_and_sensordata() {
@@ -216,6 +221,7 @@ public class ExportImportTest {
         Log.e(TAG, "Test not implemented.");
     }
 
+    @Ignore
     @LargeTest
     @Test
     public void kmz_with_trackdetail_and_sensordata_and_pictures() {
@@ -253,15 +259,15 @@ public class ExportImportTest {
         //TODO exporting and importing a track icon is not yet supported by GpxTrackWriter.
         //assertEquals(track.getIcon(), trackImported.getIcon());
 
-        // 2. waypoints
-        assertWaypoints();
+        // 2. markers
+        assertMarkers();
 
         // 3. trackpoints
-        assertTrackpoints(false, true, true);
+        assertTrackpoints(false, true, true, false);
     }
 
     @LargeTest
-    @Test
+    @Test(expected = ImportAlreadyExistsException.class)
     public void gpx_duplicate_trackUUID() {
         // given
         PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
@@ -285,26 +291,26 @@ public class ExportImportTest {
         assertNull(trackImported);
     }
 
-    private void assertWaypoints() {
-        assertEquals(waypoints.size(), contentProviderUtils.getWaypointCount(importTrackId));
+    private void assertMarkers() {
+        assertEquals(markers.size(), contentProviderUtils.getMarkerCount(importTrackId));
 
-        List<Waypoint> importedWaypoints = contentProviderUtils.getWaypoints(importTrackId);
-        for (int i = 0; i < waypoints.size(); i++) {
-            Waypoint waypoint = waypoints.get(i);
-            Waypoint importedWaypoint = importedWaypoints.get(i);
-            assertEquals(waypoint.getCategory(), importedWaypoint.getCategory());
-            assertEquals(waypoint.getDescription(), importedWaypoint.getDescription());
-            // assertEquals(waypoint.getIcon(), importedWaypoint.getIcon()); // TODO for KML
-            assertEquals(waypoint.getName(), importedWaypoint.getName());
-            assertEquals("", importedWaypoint.getPhotoUrl());
+        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());
 
-            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);
+            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);
         }
     }
 
-    private void assertTrackpoints(boolean verifyPower, boolean verifyHeartrate, boolean verifyCadence) {
+    private void assertTrackpoints(boolean verifyPower, boolean verifyHeartrate, boolean verifyCadence, boolean verifyElevationGain) {
         List<TrackPoint> importedTrackPoints = contentProviderUtils.getTrackPoints(importTrackId);
         assertEquals(trackPoints.size(), importedTrackPoints.size());
 
@@ -330,6 +336,9 @@ public class ExportImportTest {
             if (verifyPower) {
                 assertEquals(trackPoint.getPower(), importedTrackPoint.getPower(), 0.01);
             }
+            if (verifyElevationGain) {
+                assertEquals(trackPoint.getElevationGain(), importedTrackPoint.getElevationGain(), 0.01);
+            }
         }
     }
 }

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

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

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

@@ -15,7 +15,6 @@
  */
 package de.dennisguse.opentracks.services;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,6 +22,8 @@ import org.junit.runners.JUnit4;
 
 import de.dennisguse.opentracks.services.handlers.AdaptiveLocationListenerPolicy;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests the {@link AdaptiveLocationListenerPolicy}.
  *
@@ -57,17 +58,17 @@ public class AdaptiveLocationListenerPolicyTest {
     @Test
     public void testGetDesiredPollingInterval() {
         adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_BIG);
-        Assert.assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        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.
-        Assert.assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
 
         adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL);
-        Assert.assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
 
         adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_LESS_THAN_MIN);
-        Assert.assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
+        assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval());
     }
 
     /**
@@ -75,6 +76,6 @@ public class AdaptiveLocationListenerPolicyTest {
      */
     @Test
     public void testGetMinDistance() {
-        Assert.assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m());
+        assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m());
     }
 }

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

@@ -25,16 +25,15 @@ 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.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,15 +44,22 @@ 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.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.
  *
@@ -120,14 +126,14 @@ public class TrackRecordingServiceTest {
     @Test
     public void testStartable() throws TimeoutException {
         mServiceRule.startService(createStartIntent(context));
-        Assert.assertNotNull(mServiceRule.bindService(createStartIntent(context)));
+        assertNotNull(mServiceRule.bindService(createStartIntent(context)));
     }
 
     @MediumTest
     @Test
     public void testBindable() throws TimeoutException {
         IBinder service = mServiceRule.bindService(createStartIntent(context));
-        Assert.assertNotNull(service);
+        assertNotNull(service);
     }
 
     @MediumTest
@@ -135,7 +141,7 @@ public class TrackRecordingServiceTest {
     public void testRecording_noTracks() throws Exception {
         // given
         List<Track> tracks = contentProviderUtils.getTracks();
-        Assert.assertTrue(tracks.isEmpty());
+        assertTrue(tracks.isEmpty());
 
         // when
         Intent startIntent = createStartIntent(context);
@@ -144,8 +150,8 @@ public class TrackRecordingServiceTest {
 
         // then
         // Test if we start in no-recording mode by default.
-        Assert.assertFalse(service.isRecording());
-        Assert.assertNull(service.getRecordingTrackId());
+        assertFalse(service.isRecording());
+        assertNull(service.getRecordingTrackId());
     }
 
     @MediumTest
@@ -158,8 +164,8 @@ public class TrackRecordingServiceTest {
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
 
         // then
-        Assert.assertFalse(service.isRecording());
-        Assert.assertNull(service.getRecordingTrackId());
+        assertFalse(service.isRecording());
+        assertNull(service.getRecordingTrackId());
     }
 
     @MediumTest
@@ -172,7 +178,7 @@ public class TrackRecordingServiceTest {
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
 
         // then
-        Assert.assertTrue(service.isRecording());
+        assertTrue(service.isRecording());
     }
 
     @MediumTest
@@ -187,21 +193,21 @@ public class TrackRecordingServiceTest {
         service.pauseCurrentTrack();
 
         // then
-        Assert.assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size());
+        assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size());
 
         //when
         service.resumeTrack(trackId);
         newTrackPoint(service);
 
         // then
-        Assert.assertTrue(service.isRecording());
-        Assert.assertEquals(trackId, service.getRecordingTrackId());
+        assertTrue(service.isRecording());
+        assertEquals(trackId, service.getRecordingTrackId());
 
         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);
+        assertEquals(5, trackPoints.size());
+        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
+        assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(3).getLatitude(), 0.01);
     }
 
     @MediumTest
@@ -213,23 +219,23 @@ public class TrackRecordingServiceTest {
         newTrackPoint(service);
         service.endCurrentTrack();
 
-        Assert.assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size());
+        assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size());
 
         // when
         service.resumeTrack(trackId);
         newTrackPoint(service);
 
         // then
-        Assert.assertTrue(service.isRecording());
-        Assert.assertEquals(trackId, service.getRecordingTrackId());
+        assertTrue(service.isRecording());
+        assertEquals(trackId, service.getRecordingTrackId());
 
         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);
+        assertEquals(4, trackPoints.size());
+        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(2).getLatitude(), 0.01);
     }
 
-    @FlakyTest(detail = "Sometimes fails on CI.")
+    @Ignore("Sometimes fails on CI.")
     @MediumTest
     @Test
     public void testRecording_orphanedRecordingTrack() throws Exception {
@@ -242,8 +248,8 @@ public class TrackRecordingServiceTest {
         PreferencesUtils.setLong(context, R.string.recording_track_id_key, 123L);
 
         // then
-        Assert.assertFalse(service.isRecording());
-        Assert.assertNull(service.getRecordingTrackId());
+        assertFalse(service.isRecording());
+        assertNull(service.getRecordingTrackId());
     }
 
     @MediumTest
@@ -252,7 +258,7 @@ public class TrackRecordingServiceTest {
         // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         service.startNewTrack();
-        Assert.assertTrue(service.isRecording());
+        assertTrue(service.isRecording());
 
         Track.Id trackId = service.getRecordingTrackId();
 
@@ -260,10 +266,10 @@ public class TrackRecordingServiceTest {
         Track.Id newTrackId = service.startNewTrack();
 
         // then
-        Assert.assertNull(newTrackId);
+        assertNull(newTrackId);
 
-        Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
-        Assert.assertEquals(trackId, service.getRecordingTrackId());
+        assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
+        assertEquals(trackId, service.getRecordingTrackId());
     }
 
     @MediumTest
@@ -271,15 +277,15 @@ public class TrackRecordingServiceTest {
     public void testEndCurrentTrack_noRecording() throws Exception {
         // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         // when
         // Ending the current track when there is no recording should not result in any error.
         service.endCurrentTrack();
 
         // then
-        Assert.assertFalse(PreferencesUtils.isRecording(context));
-        Assert.assertNull(service.getRecordingTrackId());
+        assertFalse(PreferencesUtils.isRecording(context));
+        assertNull(service.getRecordingTrackId());
     }
 
     @MediumTest
@@ -287,13 +293,13 @@ public class TrackRecordingServiceTest {
     public void testInsertWaypointMarker_noRecordingTrack() throws Exception {
         // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         // when
-        Waypoint.Id waypointId = service.insertWaypoint(null, null, null, null);
+        Marker.Id waypointId = service.insertMarker(null, null, null, null);
 
         // then
-        Assert.assertNull(waypointId);
+        assertNull(waypointId);
     }
 
     @MediumTest
@@ -302,29 +308,29 @@ public class TrackRecordingServiceTest {
         // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         service.startNewTrack();
-        Assert.assertTrue(service.isRecording());
+        assertTrue(service.isRecording());
         newTrackPoint(service);
         Track.Id trackId = service.getRecordingTrackId();
 
         // when
-        Waypoint.Id waypointId = service.insertWaypoint(null, null, null, null);
+        Marker.Id waypointId = service.insertMarker(null, null, null, null);
 
         // then
-        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());
+        assertNotEquals(-1L, waypointId);
+        Marker wpt = contentProviderUtils.getMarker(waypointId);
+        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(), 0.01);
+        assertNotNull(wpt.getLocation());
 
         service.endCurrentTrack();
     }
 
     private void addTrack(Track track, boolean isRecording) {
-        Assert.assertTrue(track.getId().isValid());
+        assertTrue(track.getId().isValid());
         contentProviderUtils.insertTrack(track);
-        Assert.assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId());
+        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);
     }

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

@@ -12,7 +12,6 @@ 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;
@@ -33,6 +32,9 @@ 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;
+
 /**
  * Tests insert location.
  * <p>
@@ -103,11 +105,11 @@ public class TrackRecordingServiceTestLocation {
         service.endCurrentTrack();
 
         // then
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        Assert.assertEquals(6, trackPoints.size());
-        Assert.assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01);
+        assertEquals(6, trackPoints.size());
+        assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01);
     }
 
     @MediumTest
@@ -127,11 +129,11 @@ public class TrackRecordingServiceTestLocation {
         service.endCurrentTrack();
 
         // then
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         List<TrackPoint> trackPoints = contentProviderUtils.getTrackPoints(trackId);
-        Assert.assertEquals(2, trackPoints.size());
-        Assert.assertEquals(45.000005, trackPoints.get(1).getLatitude(), 0.01);
+        assertEquals(2, trackPoints.size());
+        assertEquals(45.000005, trackPoints.get(1).getLatitude(), 0.01);
     }
 
 //    @MediumTest
@@ -169,13 +171,13 @@ public class TrackRecordingServiceTestLocation {
         service.endCurrentTrack();
 
         // then
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         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);
+        assertEquals(3, trackPoints.size());
+        assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
+        assertEquals(6, trackPoints.get(2).getAccuracy(), 0.01);
     }
 
     @MediumTest
@@ -195,14 +197,14 @@ public class TrackRecordingServiceTestLocation {
         service.endCurrentTrack();
 
         // then
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         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);
+        assertEquals(4, trackPoints.size());
+        assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01);
+        assertEquals(5, trackPoints.get(2).getAccuracy(), 0.01); //TODO Check why this trackPoint is inserted.
+        assertEquals(6, trackPoints.get(3).getAccuracy(), 0.01);
     }
 
 
@@ -238,16 +240,16 @@ public class TrackRecordingServiceTestLocation {
         service.endCurrentTrack();
 
         // then
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         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);
+        assertEquals(6, trackPoints.size());
+        assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01);
+        assertEquals(1, trackPoints.get(1).getAccuracy(), 0.01);
+        assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
+        assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
+        assertEquals(4, trackPoints.get(4).getAccuracy(), 0.01);
+        assertEquals(5, trackPoints.get(5).getAccuracy(), 0.01);
     }
 
     @MediumTest
@@ -266,16 +268,16 @@ public class TrackRecordingServiceTestLocation {
         service.endCurrentTrack();
 
         // then
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         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);
+        assertEquals(7, trackPoints.size());
+        assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01);
+        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01);
+        assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01);
+        assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01);
+        assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(4).getLatitude(), 0.01);
+        assertEquals(4, trackPoints.get(5).getAccuracy(), 0.01);
+        assertEquals(5, trackPoints.get(6).getAccuracy(), 0.01);
     }
 }

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

@@ -13,7 +13,6 @@ 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;
@@ -32,6 +31,12 @@ 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.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests for the track recording service, which require a {@link Looper}.
  *
@@ -188,23 +193,23 @@ public class TrackRecordingServiceTestLooper {
     @Test
     public void testIntegration_completeRecordingSession() throws TimeoutException {
         List<Track> tracks = contentProviderUtils.getTracks();
-        Assert.assertTrue(tracks.isEmpty());
+        assertTrue(tracks.isEmpty());
         fullRecordingSession();
     }
 
     private void fullRecordingSession() throws TimeoutException {
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)));
-        Assert.assertFalse(service.isRecording());
+        assertFalse(service.isRecording());
 
         // Start a track.
         Track.Id trackId = service.startNewTrack();
-        Assert.assertTrue(trackId.isValid());
-        Assert.assertTrue(service.isRecording());
+        assertTrue(trackId.isValid());
+        assertTrue(service.isRecording());
         Track track = contentProviderUtils.getTrack(trackId);
-        Assert.assertNotNull(track);
-        Assert.assertEquals(trackId, track.getId());
-        Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
-        Assert.assertEquals(trackId, service.getRecordingTrackId());
+        assertNotNull(track);
+        assertEquals(trackId, track.getId());
+        assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context));
+        assertEquals(trackId, service.getRecordingTrackId());
 
         // Insert a few points, markers and statistics.
         long startTime = System.currentTimeMillis();
@@ -221,20 +226,20 @@ public class TrackRecordingServiceTestLooper {
             service.newTrackPoint(trackPoint, prefAccuracy);
 
             if (i % 7 == 0) {
-                service.insertWaypoint(null, null, null, null);
+                service.insertMarker(null, null, null, null);
             }
         }
 
         // Stop the track. Validate if it has correct data.
         service.endCurrentTrack();
-        Assert.assertFalse(service.isRecording());
-        Assert.assertNull(service.getRecordingTrackId());
+        assertFalse(service.isRecording());
+        assertNull(service.getRecordingTrackId());
         track = contentProviderUtils.getTrack(trackId);
-        Assert.assertNotNull(track);
-        Assert.assertEquals(trackId, track.getId());
+        assertNotNull(track);
+        assertEquals(trackId, track.getId());
         TrackStatistics trackStatistics = track.getTrackStatistics();
-        Assert.assertNotNull(trackStatistics);
-        Assert.assertTrue(trackStatistics.getStartTime_ms() > 0);
-        Assert.assertTrue(trackStatistics.getStopTime_ms() >= trackStatistics.getStartTime_ms());
+        assertNotNull(trackStatistics);
+        assertTrue(trackStatistics.getStartTime_ms() > 0);
+        assertTrue(trackStatistics.getStopTime_ms() >= trackStatistics.getStartTime_ms());
     }
 }

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

@@ -0,0 +1,50 @@
+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 ElevationSumManagerTest {
+
+    private final ElevationSumManager elevationSumManager = new ElevationSumManager();
+
+    private static void addSensorValue(ElevationSumManager elevationSumManager, float[] values) {
+        for (float f : values) {
+            elevationSumManager.onSensorValueChanged(f);
+        }
+    }
+
+    @Before
+    public void setUp() {
+        elevationSumManager.reset();
+    }
+
+    @Test
+    public void getElevationGainLoss_downhill() {
+        // given
+        elevationSumManager.setConnected(true);
+
+        // then
+        addSensorValue(elevationSumManager, 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, elevationSumManager.getElevationGain_m(), 0.01);
+        Assert.assertEquals(-48.0, elevationSumManager.getElevationLoss_m(), 0.01);
+    }
+
+    @Test
+    public void sensorUnavailable() {
+        // given
+        elevationSumManager.setConnected(false);
+
+        // then
+        elevationSumManager.onSensorValueChanged(999f);
+
+        // then
+        Assert.assertNull(elevationSumManager.getElevationGain_m());
+        Assert.assertNull(elevationSumManager.getElevationLoss_m());
+    }
+}

src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java

@@ -23,11 +23,12 @@ 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}.
  *
@@ -53,6 +54,6 @@ public class AnnouncementPeriodicTaskFactoryTest {
     public void testCreate() {
         PeriodicTaskFactory factory = new AnnouncementPeriodicTaskFactory();
         PeriodicTask task = factory.create(context);
-        Assert.assertTrue(task instanceof AnnouncementPeriodicTask);
+        assertTrue(task instanceof AnnouncementPeriodicTask);
     }
 }

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

@@ -15,12 +15,13 @@
  */
 package de.dennisguse.opentracks.stats;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests for {@link TrackStatistics}.
  * This only tests non-trivial pieces of that class.
@@ -50,8 +51,8 @@ public class TrackStatisticsTest {
         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.setTotalElevationGain(50.0f);
+        statistics2.setTotalElevationGain(850.0f);  // Result: 850+50
         statistics.setMaxSpeed(60.0);  // Resulting max speed
         statistics2.setMaxSpeed(30.0);
         statistics.setMaxElevation(1250.0);
@@ -61,28 +62,28 @@ public class TrackStatisticsTest {
 
         statistics.merge(statistics2);
 
-        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);
+        assertEquals(1000L, statistics.getStartTime_ms());
+        assertEquals(4000L, statistics.getStopTime_ms());
+        assertEquals(2500L, statistics.getTotalTime());
+        assertEquals(1300L, statistics.getMovingTime());
+        assertEquals(1100.0, statistics.getTotalDistance(), 0.001);
+        assertEquals(900.0, statistics.getTotalElevationGain(), 0.001);
+        assertEquals(statistics.getTotalDistance() / (statistics.getMovingTime() / 1000.0), statistics.getMaxSpeed(), 0.001);
+        assertEquals(1200.0, statistics.getMinElevation(), 0.001);
+        assertEquals(3575.0, statistics.getMaxElevation(), 0.001);
     }
 
     @Test
     public void testGetAverageSpeed() {
         statistics.setTotalDistance(1000.0);
         statistics.setTotalTime(50000);  // in milliseconds
-        Assert.assertEquals(20.0, statistics.getAverageSpeed(), 0.001);
+        assertEquals(20.0, statistics.getAverageSpeed(), 0.001);
     }
 
     @Test
     public void testGetAverageMovingSpeed() {
         statistics.setTotalDistance(1000.0);
         statistics.setMovingTime(20000);  // in milliseconds
-        Assert.assertEquals(50.0, statistics.getAverageMovingSpeed(), 0.001);
+        assertEquals(50.0, statistics.getAverageMovingSpeed(), 0.001);
     }
 }

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

@@ -5,11 +5,20 @@ 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.util.Arrays;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+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 {
@@ -26,9 +35,50 @@ public class AnnouncementUtilsTest {
         stats.setTotalElevationGain(6000);
 
         // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane");
+        String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", null);
 
         // then
-        Assert.assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement);
+        assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement);
+    }
+
+    @Test
+    public void getAnnouncement_withInterval() {
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setTotalElevationGain(6000);
+
+        IntervalStatistics intervalStatistics = new IntervalStatistics();
+        List<TrackPoint> trackPoints = Arrays.asList(TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 10).second);
+        intervalStatistics.build(trackPoints, 1000);
+        IntervalStatistics.Interval lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
+
+        int speedId = R.plurals.voiceSpeedKilometersPerHour;
+        double kmPerHour = lastInterval.getSpeed_ms() * UnitConversions.MPS_TO_KMH;
+
+        String firstPartMsg = "OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour";
+        String rateMsg = " Lap speed of " + context.getResources().getQuantityString(speedId, getQuantityCount(kmPerHour), kmPerHour);
+        String msg = firstPartMsg + rateMsg;
+
+        // when
+        String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", lastInterval);
+
+        // then
+        assertEquals(msg, announcement);
+    }
+
+    private int getQuantityCount(double d) {
+        if (d == 0) {
+            return 0;
+        } else if (d == 1) {
+            return 1;
+        } else if (d == 2) {
+            return 2;
+        } else {
+            int count = (int) d;
+            return Math.max(count, 3);
+        }
     }
 }

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

@@ -2,11 +2,13 @@ package de.dennisguse.opentracks.util;
 
 import android.bluetooth.BluetoothGattCharacteristic;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 public class BluetoothUtilsTest {
 
     @Test
@@ -19,7 +21,7 @@ public class BluetoothUtilsTest {
         int heartRate = BluetoothUtils.parseHeartRate(characteristic);
 
         // then
-        Assert.assertEquals(60, heartRate);
+        assertEquals(60, heartRate);
     }
 
     @Test
@@ -32,7 +34,7 @@ public class BluetoothUtilsTest {
         int heartRate = BluetoothUtils.parseHeartRate(characteristic);
 
         // then
-        Assert.assertEquals(257, heartRate);
+        assertEquals(257, heartRate);
     }
 
     @Test
@@ -44,8 +46,8 @@ public class BluetoothUtilsTest {
         SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
 
         // then
-        Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
-        Assert.assertNull(sensor.getSpeed());
+        assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
+        assertNull(sensor.getSpeed());
     }
 
     @Test
@@ -57,8 +59,8 @@ public class BluetoothUtilsTest {
         SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
 
         // then
-        Assert.assertNull(sensor.getCadence());
-        Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
+        assertNull(sensor.getCadence());
+        assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
     }
 
     @Test
@@ -70,7 +72,19 @@ public class BluetoothUtilsTest {
         SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
 
         // then
-        Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
-        Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
+        assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
+        assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
+    }
+
+    @Test
+    public void parseCyclingPower_power() {
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER_MEASUREMENT_CHAR_UUID, 0, 0);
+        characteristic.setValue(new byte[]{0, 0, 40, 0});
+
+        // when
+        int power_w = BluetoothUtils.parseCyclingPower(characteristic);
+
+        // then
+        assertEquals(40, power_w);
     }
 }

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

@@ -15,7 +15,6 @@
  */
 package de.dennisguse.opentracks.util;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -23,6 +22,8 @@ import org.junit.runners.JUnit4;
 import java.io.File;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests for {@link FileUtils}.
  *
@@ -37,7 +38,7 @@ public class FileUtilsTest {
     @Test
     public void testBuildUniqueFileName_new() {
         String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext");
-        Assert.assertEquals("Filename.ext", filename);
+        assertEquals("Filename.ext", filename);
     }
 
     /**
@@ -47,7 +48,7 @@ public class FileUtilsTest {
     public void testBuildUniqueFileName_exist() {
         // Expect "/default.prop" to exist on the phone/emulator
         String filename = FileUtils.buildUniqueFileName(new File("/"), "default", "prop");
-        Assert.assertEquals("default(1).prop", filename);
+        assertEquals("default(1).prop", filename);
     }
 
     /**
@@ -58,13 +59,13 @@ public class FileUtilsTest {
     public void testSanitizeFileName() {
         String name = "Swim\10ming-^across:/the/ pacific (ocean).";
         String expected = "Swim_ming-^across_the_ pacific (ocean).";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     @Test
     public void testSanitizeFileNameWithSuffix() {
         String name = "FileName.jpeg";
-        Assert.assertEquals(name, FileUtils.sanitizeFileName(name));
+        assertEquals(name, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -75,7 +76,7 @@ public class FileUtilsTest {
     public void testSanitizeFileName_i18n() {
         String name = "您好-привет";
         String expected = "您好-привет";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -86,7 +87,7 @@ public class FileUtilsTest {
     public void testSanitizeFileName_special_characters() {
         String name = "$%'-_@~`!(){}^#&+,;=[] ";
         String expected = "$%'-_@~`!(){}^#&+,;=[] ";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -97,7 +98,7 @@ public class FileUtilsTest {
     public void testSanitizeFileName_collapse() {
         String name = "hello//there";
         String expected = "hello_there";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -114,8 +115,8 @@ public class FileUtilsTest {
         String truncated = FileUtils.truncateFileName(directory, nameString, suffix);
 
         for (int i = 0; i < truncated.length(); i++) {
-            Assert.assertEquals('a', truncated.charAt(i));
+            assertEquals('a', truncated.charAt(i));
         }
-        Assert.assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH, new File(directory, truncated + suffix).getPath().length());
+        assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH, new File(directory, truncated + suffix).getPath().length());
     }
 }

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

@@ -6,13 +6,14 @@ import android.content.SharedPreferences;
 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 de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(AndroidJUnit4.class)
 public class PreferencesUtilsTest {
 
@@ -29,7 +30,7 @@ public class PreferencesUtilsTest {
         TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context);
 
         // then
-        Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL, trackFileFormat);
+        assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL, trackFileFormat);
     }
 
     @Test
@@ -43,7 +44,7 @@ public class PreferencesUtilsTest {
         TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context);
 
         // then
-        Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
+        assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
     }
 
     @Test
@@ -57,6 +58,6 @@ public class PreferencesUtilsTest {
         TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context);
 
         // then
-        Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
+        assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
     }
 }

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

@@ -0,0 +1,49 @@
+package de.dennisguse.opentracks.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class PressureSensorUtilsTest {
+
+    // real data at 500Hz stationary
+    @Test
+    public void elevationChanges_none() {
+        // given
+        float[] sensorValues_hPa = new float[]{1015.6876f, 1015.699f, 1015.70905f, 1015.71075f, 1015.7224f, 1015.72f, 1015.7373f, 1015.7481f, 1015.74133f, 1015.73553f, 1015.7462f, 1015.74896f, 1015.752f, 1015.754f, 1015.7456f, 1015.73303f, 1015.7288f, 1015.7239f, 1015.7298f, 1015.7387f, 1015.72534f, 1015.72577f, 1015.72797f, 1015.71796f, 1015.7113f, 1015.7097f, 1015.7096f, 1015.7013f, 1015.7072f, 1015.71063f, 1015.7088f, 1015.7115f, 1015.713f, 1015.7121f, 1015.7062f, 1015.7062f, 1015.6994f, 1015.69617f, 1015.68945f, 1015.698f, 1015.6913f, 1015.69696f, 1015.69293f, 1015.6955f, 1015.6928f, 1015.6939f, 1015.68787f, 1015.6881f, 1015.68536f, 1015.68726f, 1015.6879f, 1015.6904f, 1015.6937f, 1015.69476f, 1015.7046f, 1015.7019f, 1015.7079f, 1015.71124f, 1015.71216f, 1015.71436f, 1015.7171f, 1015.7186f, 1015.7186f, 1015.7246f, 1015.72046f, 1015.7211f, 1015.72375f, 1015.7194f, 1015.72125f, 1015.7161f, 1015.71185f, 1015.7188f, 1015.721f, 1015.7252f, 1015.72266f, 1015.7236f, 1015.72614f, 1015.7266f, 1015.7344f, 1015.7376f, 1015.7337f, 1015.7253f, 1015.71875f, 1015.7219f, 1015.7219f, 1015.7317f, 1015.7284f, 1015.73444f, 1015.73584f, 1015.7369f, 1015.73254f, 1015.7369f, 1015.7336f, 1015.73254f, 1015.73676f, 1015.74176f, 1015.74506f, 1015.7478f, 1015.755f, 1015.7515f, 1015.7543f, 1015.7459f, 1015.7468f, 1015.7492f, 1015.74585f, 1015.74756f, 1015.74756f, 1015.75085f, 1015.754f, 1015.75336f, 1015.7568f, 1015.75165f, 1015.761f, 1015.7527f, 1015.75684f, 1015.7635f, 1015.7585f, 1015.7552f, 1015.7475f, 1015.74506f, 1015.7542f, 1015.75586f, 1015.74176f, 1015.74414f, 1015.7501f, 1015.751f, 1015.7478f, 1015.755f, 1015.75836f, 1015.7592f, 1015.75256f, 1015.7559f, 1015.76654f, 1015.76154f, 1015.766f, 1015.77014f, 1015.76904f, 1015.76013f, 1015.7674f, 1015.76514f, 1015.7674f, 1015.7635f, 1015.76404f, 1015.7607f, 1015.754f, 1015.7574f, 1015.7607f, 1015.7607f, 1015.7607f, 1015.754f, 1015.7567f, 1015.7616f, 1015.7643f, 1015.7666f, 1015.7609f, 1015.766f, 1015.76764f, 1015.755f, 1015.75757f, 1015.74927f, 1015.74927f, 1015.7426f, 1015.745f, 1015.745f, 1015.7409f, 1015.7376f, 1015.7326f, 1015.74164f, 1015.74664f, 1015.745f, 1015.7459f, 1015.7502f, 1015.7493f, 1015.7476f, 1015.7493f, 1015.751f, 1015.7601f, 1015.76434f, 1015.766f, 1015.756f, 1015.7617f, 1015.7623f, 1015.76404f, 1015.76733f, 1015.7607f, 1015.7623f, 1015.76337f, 1015.7584f, 1015.7573f, 1015.7502f, 1015.7534f, 1015.7534f, 1015.7601f, 1015.75684f, 1015.7518f, 1015.75574f, 1015.7524f, 1015.7507f, 1015.7484f, 1015.7502f, 1015.7534f, 1015.7623f, 1015.75903f, 1015.75574f, 1015.75574f, 1015.7573f, 1015.7524f, 1015.75574f, 1015.75574f, 1015.7607f, 1015.7573f, 1015.754f, 1015.74677f, 1015.754f, 1015.75574f, 1015.75903f, 1015.7573f, 1015.7551f, 1015.7573f, 1015.754f, 1015.7507f, 1015.7374f, 1015.739f, 1015.73566f, 1015.73566f, 1015.7367f, 1015.7417f, 1015.7417f, 1015.739f, 1015.74835f, 1015.74567f, 1015.7517f, 1015.74066f, 1015.7374f, 1015.739f, 1015.7417f, 1015.73065f, 1015.72894f, 1015.73505f, 1015.73334f, 1015.74005f, 1015.74005f, 1015.7367f, 1015.7434f, 1015.744f, 1015.7423f, 1015.7384f, 1015.739f, 1015.7374f, 1015.7374f, 1015.7374f, 1015.7341f, 1015.73505f, 1015.7341f, 1015.7267f, 1015.72833f, 1015.7234f, 1015.7167f, 1015.725f, 1015.7217f, 1015.7234f, 1015.73004f, 1015.7324f, 1015.7423f, 1015.74005f, 1015.73505f, 1015.73004f, 1015.739f, 1015.7417f, 1015.74567f, 1015.74066f, 1015.74146f, 1015.74146f, 1015.73816f, 1015.7274f, 1015.72906f, 1015.7274f, 1015.7341f, 1015.739f, 1015.744f, 1015.7417f, 1015.7374f, 1015.7324f, 1015.73816f, 1015.74146f, 1015.7374f, 1015.7341f, 1015.7365f, 1015.7365f, 1015.74146f, 1015.74414f, 1015.7475f, 1015.7448f, 1015.74146f, 1015.74585f, 1015.7475f, 1015.75146f, 1015.75146f, 1015.7591f, 1015.75476f, 1015.7614f, 1015.75476f, 1015.7492f, 1015.74817f, 1015.7498f, 1015.7515f, 1015.75586f, 1015.7509f, 1015.7448f, 1015.7525f, 1015.7581f, 1015.7592f};
+        float firstSensorValue = sensorValues_hPa[0];
+
+        // when // then
+        for (float v : sensorValues_hPa) {
+            assertNull(PressureSensorUtils.computeChanges_m(firstSensorValue, v));
+        }
+    }
+
+    // Simulate a sudden drop of elevation.
+    // test data
+    @Test
+    public void computeChanges_downhill() {
+        float[] sensorValues_hPa = 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, 1018f, 1018.1f, 1018.1f, 1018.1f, 1018.1f};
+        float firstSensorValue = sensorValues_hPa[0];
+
+        // when
+        float elevationGain_m = 0;
+        float elevationLoss_m = 0;
+        float lastUsedPressureValue_hPa = firstSensorValue;
+
+        for (float v : sensorValues_hPa) {
+            PressureSensorUtils.ElevationChange elevationChange = PressureSensorUtils.computeChanges_m(lastUsedPressureValue_hPa, v);
+            if (elevationChange != null) {
+                elevationGain_m += elevationChange.getElevationGain_m();
+                elevationLoss_m += elevationChange.getElevationLoss_m();
+                lastUsedPressureValue_hPa = elevationChange.getCurrentSensorValue_hPa();
+            }
+        }
+
+        // then
+        assertEquals(0f, elevationGain_m, 0.01);
+        assertEquals(-15.0f, elevationLoss_m, 0.01);
+        assertEquals(1016.80f, lastUsedPressureValue_hPa, 0.01); //Expect exponential smoothing
+    }
+}

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

@@ -21,13 +21,15 @@ 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.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests for {@link StringUtils}.
  *
@@ -44,7 +46,7 @@ public class StringUtilsTest {
      */
     @Test
     public void testFormatDateTimeIso8601() {
-        Assert.assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345));
+        assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345));
     }
 
     /**
@@ -53,19 +55,19 @@ public class StringUtilsTest {
     @Test
     public void testformatElapsedTime() {
         // 1 second
-        Assert.assertEquals("00:01", StringUtils.formatElapsedTime(1000));
+        assertEquals("00:01", StringUtils.formatElapsedTime(1000));
         // 10 seconds
-        Assert.assertEquals("00:10", StringUtils.formatElapsedTime(10000));
+        assertEquals("00:10", StringUtils.formatElapsedTime(10000));
         // 1 minute
-        Assert.assertEquals("01:00", StringUtils.formatElapsedTime(60000));
+        assertEquals("01:00", StringUtils.formatElapsedTime(60000));
         // 10 minutes
-        Assert.assertEquals("10:00", StringUtils.formatElapsedTime(600000));
+        assertEquals("10:00", StringUtils.formatElapsedTime(600000));
         // 1 hour
-        Assert.assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000));
+        assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000));
         // 10 hours
-        Assert.assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000));
+        assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000));
         // 100 hours
-        Assert.assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000));
+        assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000));
     }
 
     /**
@@ -74,19 +76,19 @@ public class StringUtilsTest {
     @Test
     public void testformatElapsedTimeWithHour() {
         // 1 second
-        Assert.assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000));
+        assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000));
         // 10 seconds
-        Assert.assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000));
+        assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000));
         // 1 minute
-        Assert.assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000));
+        assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000));
         // 10 minutes
-        Assert.assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000));
+        assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000));
         // 1 hour
-        Assert.assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000));
+        assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000));
         // 10 hours
-        Assert.assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000));
+        assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000));
         // 100 hours
-        Assert.assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000));
+        assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000));
     }
 
     /**
@@ -96,13 +98,13 @@ public class StringUtilsTest {
     @Test
     public void testFormatDistance() {
         // A large number in metric
-        Assert.assertEquals("5.00 km", StringUtils.formatDistance(context, 5000, true));
+        assertEquals("5.00 km", StringUtils.formatDistance(context, 5000, true));
         // A large number in imperial
-        Assert.assertEquals("3.11 mi", StringUtils.formatDistance(context, 5000, false));
+        assertEquals("3.11 mi", StringUtils.formatDistance(context, 5000, false));
         // A small number in metric
-        Assert.assertEquals("100.00 m", StringUtils.formatDistance(context, 100, true));
+        assertEquals("100.00 m", StringUtils.formatDistance(context, 100, true));
         // A small number in imperial
-        Assert.assertEquals("328.08 ft", StringUtils.formatDistance(context, 100, false));
+        assertEquals("328.08 ft", StringUtils.formatDistance(context, 100, false));
     }
 
     /**
@@ -110,8 +112,8 @@ public class StringUtilsTest {
      */
     @Test
     public void testFormatCData() {
-        Assert.assertEquals("<![CDATA[hello]]>", StringUtils.formatCData("hello"));
-        Assert.assertEquals("<![CDATA[hello]]]]><![CDATA[>there]]>", StringUtils.formatCData("hello]]>there"));
+        assertEquals("<![CDATA[hello]]>", StringUtils.formatCData("hello"));
+        assertEquals("<![CDATA[hello]]]]><![CDATA[>there]]>", StringUtils.formatCData("hello]]>there"));
     }
 
     /**
@@ -168,7 +170,7 @@ public class StringUtilsTest {
 
         // This comparision tends to be flaky (difference of 1ms)
         // Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime));
-        Assert.assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1);
+        assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1);
     }
 
     /**
@@ -177,9 +179,9 @@ public class StringUtilsTest {
     @Test
     public void testGetTimeParts_positive() {
         int[] parts = StringUtils.getTimeParts(61000);
-        Assert.assertEquals(1, parts[0]);
-        Assert.assertEquals(1, parts[1]);
-        Assert.assertEquals(0, parts[2]);
+        assertEquals(1, parts[0]);
+        assertEquals(1, parts[1]);
+        assertEquals(0, parts[2]);
     }
 
     /**
@@ -188,40 +190,49 @@ public class StringUtilsTest {
     @Test
     public void testGetTimeParts_negative() {
         int[] parts = StringUtils.getTimeParts(-61000);
-        Assert.assertEquals(-1, parts[0]);
-        Assert.assertEquals(-1, parts[1]);
-        Assert.assertEquals(0, parts[2]);
+        assertEquals(-1, parts[0]);
+        assertEquals(-1, parts[1]);
+        assertEquals(0, parts[2]);
     }
 
     @Test
     public void testFormatDecimal() {
-        Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 0));
-        Assert.assertEquals("0", StringUtils.formatDecimal(0.1, 0));
-        Assert.assertEquals("1", StringUtils.formatDecimal(1.1, 0));
-        Assert.assertEquals("10", StringUtils.formatDecimal(10, 0));
-        Assert.assertEquals("10", StringUtils.formatDecimal(10.1, 0));
-        Assert.assertEquals("0", StringUtils.formatDecimal(-0.1, 0));
+        assertEquals("0", StringUtils.formatDecimal(0.0, 0));
+        assertEquals("0", StringUtils.formatDecimal(0.1, 0));
+        assertEquals("1", StringUtils.formatDecimal(1.1, 0));
+        assertEquals("10", StringUtils.formatDecimal(10, 0));
+        assertEquals("10", StringUtils.formatDecimal(10.1, 0));
+        assertEquals("-0", StringUtils.formatDecimal(-0.1, 0));
 
-        Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 2));
-        Assert.assertEquals("0.1", StringUtils.formatDecimal(0.1, 2));
-        Assert.assertEquals("1.1", StringUtils.formatDecimal(1.1, 2));
-        Assert.assertEquals("10", StringUtils.formatDecimal(10, 2));
-        Assert.assertEquals("10.1", StringUtils.formatDecimal(10.1, 2));
-        Assert.assertEquals("10.11", StringUtils.formatDecimal(10.111, 2));
-        Assert.assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2));
+        assertEquals("0", StringUtils.formatDecimal(0.0, 2));
+        assertEquals("0.1", StringUtils.formatDecimal(0.1, 2));
+        assertEquals("1.1", StringUtils.formatDecimal(1.1, 2));
+        assertEquals("10", StringUtils.formatDecimal(10, 2));
+        assertEquals("10.1", StringUtils.formatDecimal(10.1, 2));
+        assertEquals("10.11", StringUtils.formatDecimal(10.111, 2));
+        assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2));
 
-        Assert.assertEquals("1", StringUtils.formatDecimal(0.99, 1));
+        assertEquals("1", StringUtils.formatDecimal(0.99, 1));
     }
 
     @Test
     public void testGetSpeedParts() {
-        Assert.assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first);
-        Assert.assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first);
+        assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first);
+        assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first);
 
-        Assert.assertEquals("11.99", StringUtils.getSpeedParts(context, 3.33, true, true).first);
-        Assert.assertEquals("7.45", StringUtils.getSpeedParts(context, 3.33, false, true).first);
+        assertEquals("11.9", StringUtils.getSpeedParts(context, 3.31, true, true).first);
+        assertEquals("7.5", StringUtils.getSpeedParts(context, 3.34, false, true).first);
 
-        Assert.assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second);
-        Assert.assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second);
+        assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second);
+        assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second);
+    }
+
+    @Test
+    public void testFormatSpeed() {
+        assertEquals("4:59 min/km", StringUtils.formatSpeed(context, 3.34, true, false));
+        assertEquals("8:02 min/mi", StringUtils.formatSpeed(context, 3.34, false, false));
+
+        assertEquals("12.02 km/h", StringUtils.formatSpeed(context, 3.34, true, true));
+        assertEquals("7.47 mph", StringUtils.formatSpeed(context, 3.34, false, true));
     }
 }

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

@@ -21,7 +21,6 @@ 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;
 
@@ -32,6 +31,8 @@ import java.util.Locale;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests {@link TrackNameUtils}.
  *
@@ -51,7 +52,7 @@ public class TrackNameUtilsTest {
     @Test
     public void testTrackName_date_local() {
         PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_local_value));
-        Assert.assertEquals(StringUtils.formatDateTime(CONTEXT, START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals(StringUtils.formatDateTime(CONTEXT, START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 
     /**
@@ -61,7 +62,7 @@ public class TrackNameUtilsTest {
     public void testTrackName_date_iso_8601() {
         PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value));
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(TrackNameUtils.ISO_8601_FORMAT, Locale.US);
-        Assert.assertEquals(simpleDateFormat.format(new Date(START_TIME)), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals(simpleDateFormat.format(new Date(START_TIME)), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 
     /**
@@ -70,6 +71,6 @@ public class TrackNameUtilsTest {
     @Test
     public void testTrackName_number() {
         PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_number_value));
-        Assert.assertEquals("Track " + TRACK_ID.getId(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals("Track " + TRACK_ID.getId(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 }

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

@@ -1,10 +1,11 @@
 package de.dennisguse.opentracks.util;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import de.dennisguse.opentracks.content.data.TrackPoint;
 
+import static org.junit.Assert.assertEquals;
+
 public class TrackPointUtilsTest {
 
     @Test
@@ -18,7 +19,7 @@ public class TrackPointUtilsTest {
         TrackPointUtils.fixTime(trackPoint);
 
         // then
-        Assert.assertEquals(time, trackPoint.getTime());
+        assertEquals(time, trackPoint.getTime());
     }
 
     @Test
@@ -32,7 +33,7 @@ public class TrackPointUtilsTest {
         TrackPointUtils.fixTime(trackPoint);
 
         // then
-        Assert.assertEquals(time, trackPoint.getTime(), 1000);
+        assertEquals(time, trackPoint.getTime(), 1000);
     }
 
     @Test
@@ -46,7 +47,7 @@ public class TrackPointUtilsTest {
         TrackPointUtils.fixTime(trackPoint);
 
         // then
-        Assert.assertEquals(time, trackPoint.getTime());
+        assertEquals(time, trackPoint.getTime());
     }
 
 }

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

@@ -2,12 +2,13 @@ package de.dennisguse.opentracks.util;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.UUID;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(AndroidJUnit4.class)
 public class UUIDUtilsTest {
 
@@ -18,6 +19,6 @@ public class UUIDUtilsTest {
         byte[] bytes = UUIDUtils.toBytes(uuid);
         UUID output = UUIDUtils.fromBytes(bytes);
 
-        Assert.assertEquals(uuid, output);
+        assertEquals(uuid, output);
     }
 }

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

@@ -4,7 +4,6 @@ import android.content.Context;
 
 import androidx.test.core.app.ApplicationProvider;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -14,6 +13,9 @@ import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 @RunWith(JUnit4.class)
 public class AggregatedStatisticsTest {
 
@@ -33,7 +35,7 @@ public class AggregatedStatisticsTest {
         statistics.setTotalTime(totalTime);
         statistics.setMovingTime(totalTime);
         statistics.setTotalDistance(totalDistance);
-        statistics.setTotalElevationGain(50.0);
+        statistics.setTotalElevationGain(50.0f);
         statistics.setMaxSpeed(50.0);  // Resulting max speed
         statistics.setMaxElevation(1250.0);
         statistics.setMinElevation(1200.0);  // Resulting min elevation
@@ -59,13 +61,13 @@ public class AggregatedStatisticsTest {
         aggregatedStatistics.aggregate(track);
 
         // then
-        Assert.assertEquals(1, aggregatedStatistics.getCount());
-        Assert.assertNotNull(aggregatedStatistics.get(biking));
-        Assert.assertEquals(1, aggregatedStatistics.get(biking).getCountTracks());
+        assertEquals(1, aggregatedStatistics.getCount());
+        assertNotNull(aggregatedStatistics.get(biking));
+        assertEquals(1, aggregatedStatistics.get(biking).getCountTracks());
 
         TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
-        Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-        Assert.assertEquals(totalTime, statistics2.getMovingTime());
+        assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+        assertEquals(totalTime, statistics2.getMovingTime());
     }
 
     @Test
@@ -82,7 +84,7 @@ public class AggregatedStatisticsTest {
         aggregatedStatistics.aggregate(track);
 
         // then
-        Assert.assertNotNull(aggregatedStatistics.get(mountainBiking));
+        assertNotNull(aggregatedStatistics.get(mountainBiking));
     }
 
     @Test
@@ -99,7 +101,7 @@ public class AggregatedStatisticsTest {
         aggregatedStatistics.aggregate(track);
 
         // then
-        Assert.assertNotNull(aggregatedStatistics.get(trailRunning));
+        assertNotNull(aggregatedStatistics.get(trailRunning));
     }
 
     @Test
@@ -120,13 +122,13 @@ public class AggregatedStatisticsTest {
         aggregatedStatistics.aggregate(tracks[1]); // biking activity 2.
 
         // then
-        Assert.assertEquals(1, aggregatedStatistics.getCount());
-        Assert.assertNotNull(aggregatedStatistics.get(biking));
-        Assert.assertEquals(2, aggregatedStatistics.get(biking).getCountTracks());
+        assertEquals(1, aggregatedStatistics.getCount());
+        assertNotNull(aggregatedStatistics.get(biking));
+        assertEquals(2, aggregatedStatistics.get(biking).getCountTracks());
 
         TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
-        Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
-        Assert.assertEquals(totalTime * 2L, statistics2.getMovingTime());
+        assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
+        assertEquals(totalTime * 2L, statistics2.getMovingTime());
     }
 
     @Test
@@ -152,30 +154,30 @@ public class AggregatedStatisticsTest {
         aggregatedStatistics.aggregate(tracks[2]); // biking activity 3.
 
         // then
-        Assert.assertEquals(3, aggregatedStatistics.getCount());
-        Assert.assertNotNull(aggregatedStatistics.get(biking));
-        Assert.assertNotNull(aggregatedStatistics.get(running));
-        Assert.assertNotNull(aggregatedStatistics.get(walking));
-        Assert.assertEquals(1, aggregatedStatistics.get(biking).getCountTracks());
-        Assert.assertEquals(1, aggregatedStatistics.get(running).getCountTracks());
-        Assert.assertEquals(1, aggregatedStatistics.get(walking).getCountTracks());
+        assertEquals(3, aggregatedStatistics.getCount());
+        assertNotNull(aggregatedStatistics.get(biking));
+        assertNotNull(aggregatedStatistics.get(running));
+        assertNotNull(aggregatedStatistics.get(walking));
+        assertEquals(1, aggregatedStatistics.get(biking).getCountTracks());
+        assertEquals(1, aggregatedStatistics.get(running).getCountTracks());
+        assertEquals(1, aggregatedStatistics.get(walking).getCountTracks());
 
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
-            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            assertEquals(totalTime, statistics2.getMovingTime());
         }
 
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics();
-            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            assertEquals(totalTime, statistics2.getMovingTime());
         }
 
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics();
-            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            assertEquals(totalTime, statistics2.getMovingTime());
         }
     }
 
@@ -212,46 +214,46 @@ public class AggregatedStatisticsTest {
 
         // then
         // 4 sports.
-        Assert.assertEquals(4, aggregatedStatistics.getCount());
+        assertEquals(4, aggregatedStatistics.getCount());
 
         // There is a map for every sport.
-        Assert.assertNotNull(aggregatedStatistics.get(biking));
-        Assert.assertNotNull(aggregatedStatistics.get(running));
-        Assert.assertNotNull(aggregatedStatistics.get(walking));
-        Assert.assertNotNull(aggregatedStatistics.get(driving));
+        assertNotNull(aggregatedStatistics.get(biking));
+        assertNotNull(aggregatedStatistics.get(running));
+        assertNotNull(aggregatedStatistics.get(walking));
+        assertNotNull(aggregatedStatistics.get(driving));
 
         // Number of tracks by sport.
-        Assert.assertEquals(5, aggregatedStatistics.get(biking).getCountTracks()); // Biking.
-        Assert.assertEquals(2, aggregatedStatistics.get(running).getCountTracks()); // Running.
-        Assert.assertEquals(2, aggregatedStatistics.get(walking).getCountTracks()); // Walking.
-        Assert.assertEquals(1, aggregatedStatistics.get(driving).getCountTracks()); // Driving.
+        assertEquals(5, aggregatedStatistics.get(biking).getCountTracks()); // Biking.
+        assertEquals(2, aggregatedStatistics.get(running).getCountTracks()); // Running.
+        assertEquals(2, aggregatedStatistics.get(walking).getCountTracks()); // Walking.
+        assertEquals(1, aggregatedStatistics.get(driving).getCountTracks()); // Driving.
 
         // Biking.
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics();
-            Assert.assertEquals(totalDistance * 5, statistics2.getTotalDistance(), 0);
-            Assert.assertEquals(totalTime * 5, statistics2.getMovingTime());
+            assertEquals(totalDistance * 5, statistics2.getTotalDistance(), 0);
+            assertEquals(totalTime * 5, statistics2.getMovingTime());
         }
 
         // Running.
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics();
-            Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
-            Assert.assertEquals(totalTime * 2, statistics2.getMovingTime());
+            assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
+            assertEquals(totalTime * 2, statistics2.getMovingTime());
         }
 
         // Walking.
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics();
-            Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
-            Assert.assertEquals(totalTime * 2, statistics2.getMovingTime());
+            assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0);
+            assertEquals(totalTime * 2, statistics2.getMovingTime());
         }
 
         // Driving.
         {
             TrackStatistics statistics2 = aggregatedStatistics.get(driving).getTrackStatistics();
-            Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
-            Assert.assertEquals(totalTime, statistics2.getMovingTime());
+            assertEquals(totalDistance, statistics2.getTotalDistance(), 0);
+            assertEquals(totalTime, statistics2.getMovingTime());
         }
     }
 }

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

@@ -0,0 +1,147 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import android.util.Pair;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.Arrays;
+import java.util.List;
+
+import de.dennisguse.opentracks.content.data.TestDataUtil;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
+import de.dennisguse.opentracks.util.UnitConversions;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(JUnit4.class)
+public class IntervalStatisticsTest {
+
+	private static final String TAG = IntervalStatisticsTest.class.getSimpleName();
+
+	private List<TrackPoint> buildTrackPoints(int numberOfTrackPoints) {
+		Pair<Track, TrackPoint[]> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints);
+		return Arrays.asList(pair.second);
+	}
+
+	private TrackStatistics buildTrackStatistics(List<TrackPoint> trackPoints) {
+		TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoints.get(0).getTime());
+		for (TrackPoint tp : trackPoints) {
+			trackStatisticsUpdater.addTrackPoint(tp, 0);
+		}
+		return trackStatisticsUpdater.getTrackStatistics();
+	}
+
+	/**
+	 * Tests that build method compute the distance correctly comparing the result with TrackStatisticsUpdater result.
+	 */
+	@Test
+	public void testBuild_1() {
+		// With 50 points and interval distance of 1000m.
+
+		// given
+		List<TrackPoint> trackPoints = buildTrackPoints(50);
+		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
+		float distanceInterval = 1000f;
+		IntervalStatistics intervalStatistics = new IntervalStatistics();
+
+		// when and then
+		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+	}
+
+	/**
+	 * Tests that build method compute the distance correctly comparing the result with TrackStatisticsUpdater result.
+	 */
+	@Test
+	public void testBuild_2() {
+		// With 200 points and interval distance of 1000m.
+
+		// given
+		List<TrackPoint> trackPoints = buildTrackPoints(200);
+		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
+		float distanceInterval = 1000f;
+		IntervalStatistics intervalStatistics = new IntervalStatistics();
+
+		// when and then
+		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+	}
+
+	/**
+	 * Tests that build method compute the distance correctly comparing the result with TrackStatisticsUpdater result.
+	 */
+	@Test
+	public void testBuild_3() {
+		// With 200 points and interval distance of 3000m.
+
+		// given
+		List<TrackPoint> trackPoints = buildTrackPoints(200);
+		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
+		float distanceInterval = 3000f;
+		IntervalStatistics intervalStatistics = new IntervalStatistics();
+
+		// when and then
+		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+	}
+
+	/**
+	 * Tests that build method compute the distance correctly comparing the result with TrackStatisticsUpdater result.
+	 */
+	@Test
+	public void testBuild_4() {
+		// With 1000 points and interval distance of 3000m.
+
+		// given
+		List<TrackPoint> trackPoints = buildTrackPoints(1000);
+		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
+		float distanceInterval = 3000f;
+		IntervalStatistics intervalStatistics = new IntervalStatistics();
+
+		// when and then
+		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+	}
+
+	/**
+	 * Tests that build method compute the distance correctly comparing the result with TrackStatisticsUpdater result.
+	 */
+	@Test
+	public void testBuild_5() {
+		// With 10000 points and interval distance of 1000m.
+
+		// given
+		List<TrackPoint> trackPoints = buildTrackPoints(10000);
+		TrackStatistics trackStatistics = buildTrackStatistics(trackPoints);
+		float distanceInterval = 1000f;
+		IntervalStatistics intervalStatistics = new IntervalStatistics();
+
+		// when and then
+		whenAndThen(trackPoints, trackStatistics, distanceInterval, intervalStatistics);
+	}
+
+	private void whenAndThen(List<TrackPoint> trackPoints, TrackStatistics trackStatistics, float distanceInterval, IntervalStatistics intervalStatistics) {
+		intervalStatistics.build(trackPoints, distanceInterval);
+		List<IntervalStatistics.Interval> intervalList = intervalStatistics.getIntervalList();
+		double totalDistance = 0d;
+		long totalTime = 0L;
+		float totalGain = 0f;
+		for (IntervalStatistics.Interval i : intervalList) {
+			totalDistance += i.getDistance_m();
+			totalTime += ((i.getDistance_m() / i.getSpeed_ms()) * UnitConversions.S_TO_MS);
+			totalGain += i.getGain_m();
+		}
+
+		// then
+		assertEquals(trackStatistics.getTotalDistance(), totalDistance, 0.01);
+		assertEquals(trackStatistics.getTotalTime() * UnitConversions.MS_TO_S, totalTime * UnitConversions.MS_TO_S, 0.1);
+		assertEquals(intervalList.size(), (int) Math.ceil(trackStatistics.getTotalDistance() / distanceInterval));
+		assertEquals(totalGain, trackPoints.size() * TestDataUtil.ELEVATION_GAIN, 0.1);
+		for (int i = 0; i < intervalList.size() - 1; i++) {
+			assertEquals(intervalList.get(i).getDistance_m(), distanceInterval, 0.001);
+			totalDistance -= intervalList.get(i).getDistance_m();
+		}
+		assertEquals(intervalList.get(intervalList.size() - 1).getDistance_m(), totalDistance, 0.01);
+	}
+}

src/androidTest/res/raw/legacy_track.kml

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

src/main/AndroidManifest.xml

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="de.dennisguse.opentracks"
     android:installLocation="auto">
 
@@ -51,10 +50,11 @@ limitations under the License.
     <application
         android:name=".Startup"
         android:allowBackup="false"
-        android:hasFragileUserData="true"
         android:hardwareAccelerated="true"
+        android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:supportsRtl="true"
         android:theme="@style/ThemeCustom">
 
         <activity android:name=".AboutActivity" />
@@ -69,44 +69,188 @@ limitations under the License.
 
         <activity android:name=".io.file.importer.DirectoryChooserActivity$ImportDirectoryChooserActivity" />
 
-        <activity
-            android:name=".io.file.importer.ImportActivity"
-            android:theme="@style/ThemeCustomTransparentActivity">
+        <activity android:name=".io.file.importer.ImportActivity">
 
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/vnd.google-earth.kmz" />
-                <data
-                    android:scheme="content"
-                    android:host="*"
-                    android:pathPattern="*kmz" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/vnd.google-earth.kml+xml" />
-                <data
-                    android:scheme="content"
-                    android:host="*"
-                    android:pathPattern="*kml" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="application/gpx+xml" />
-                <data
-                    android:scheme="content"
-                    android:host="*"
-                    android:pathPattern="*gpx" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/gpx" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                android:priority="50">
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+                <data android:pathPattern=".*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                android:priority="50">
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/vnd.google-earth.kmz" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                android:priority="50">
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+                <data android:pathPattern=".*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                android:priority="50">
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/vnd.google-earth.kml+xml" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                android:priority="50">
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+                <data android:pathPattern=".*\\.kml" />
+                <data android:pathPattern=".*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+            </intent-filter>
+
+            <intent-filter
+                android:label="@string/app_name"
+                android:priority="50">
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.kml" />
+                <data android:pathPattern=".*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
             </intent-filter>
         </activity>
 
         <activity android:name=".MarkerDetailActivity">
             <intent-filter>
-                <action android:name="de.dennisguse.opentracks.MarkerDetails"/>
+                <action android:name="de.dennisguse.opentracks.MarkerDetails" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -115,16 +259,24 @@ limitations under the License.
 
         <activity
             android:name=".MarkerListActivity"
-            android:label="@string/menu_markers">
+            android:label="@string/menu_markers"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
             <meta-data
-                android:name="android.app.default_searchable"
-                android:value=".SearchListActivity" />
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
         </activity>
 
         <activity
-            android:name=".SearchListActivity"
-            android:launchMode="singleTop">
+            android:name=".TrackListActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/SplashTheme">
             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
             <meta-data
@@ -138,23 +290,12 @@ limitations under the License.
 
         <activity android:name=".TrackEditActivity" />
 
-        <activity android:name=".TrackListActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:value=".SearchListActivity" />
-        </activity>
-
         <activity android:name=".AggregatedStatisticsActivity" />
 
         <activity android:name=".io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity" />
+        <activity android:name=".io.file.importer.DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity" />
 
-        <activity
-            android:name=".io.file.exporter.ExportActivity"
-            android:theme="@style/ThemeCustomTransparentActivity" />
+        <activity android:name=".io.file.exporter.ExportActivity" />
 
         <activity android:name=".settings.SettingsActivity" />
 
@@ -194,5 +335,15 @@ limitations under the License.
             android:foregroundServiceType="location|connectedDevice"
             android:icon="@drawable/ic_logo_color_24dp"
             android:label="@string/recording_service" />
+
+        <service
+            android:name=".io.file.exporter.ExportService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <service
+            android:name=".io.file.importer.ImportService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
     </application>
 </manifest>

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

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

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

@@ -17,6 +17,7 @@
 package de.dennisguse.opentracks;
 
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -35,14 +36,11 @@ public abstract class AbstractActivity extends AppCompatActivity {
         // Set volume control stream for text to speech
         setVolumeControlStream(TTSUtils.getTTSStream());
 
-        setContentView(getLayoutResId());
+        setContentView(getRootView());
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
     }
 
-    /**
-     * Gets the layout resource id.
-     */
-    protected abstract int getLayoutResId();
+    protected abstract View getRootView();
 }

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

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

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

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

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

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

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

@@ -19,6 +19,7 @@ package de.dennisguse.opentracks;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -30,8 +31,9 @@ import androidx.viewpager.widget.ViewPager;
 import java.util.ArrayList;
 import java.util.List;
 
-import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.MarkerDetailActivityBinding;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.fragments.MarkerDetailFragment;
 
@@ -48,33 +50,35 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
 
     private static final String TAG = MarkerDetailActivity.class.getSimpleName();
 
-    private List<Waypoint.Id> waypointIds;
+    private MarkerDetailActivityBinding viewBinding;
+
+    private List<Marker.Id> markerIds;
 
     @Override
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        Waypoint.Id waypointId = getIntent().getParcelableExtra(EXTRA_MARKER_ID);
-        if (waypointId == null) {
+        Marker.Id markerId = getIntent().getParcelableExtra(EXTRA_MARKER_ID);
+        if (markerId == null) {
             Log.d(TAG, "invalid marker id");
             finish();
             return;
         }
 
         ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);
-        Waypoint waypoint = contentProviderUtils.getWaypoint(waypointId);
+        Marker marker = contentProviderUtils.getMarker(markerId);
 
-        waypointIds = new ArrayList<>();
+        markerIds = new ArrayList<>();
         int markerIndex = -1;
 
-        //TODO Load only waypointIds, not the whole waypoint
-        try (Cursor cursor = contentProviderUtils.getWaypointCursor(waypoint.getTrackId(), null, -1)) {
+        //TODO Load only markerIds, not the whole marker
+        try (Cursor cursor = contentProviderUtils.getMarkerCursor(marker.getTrackId(), null, -1)) {
             if (cursor != null && cursor.moveToFirst()) {
                 for (int i = 0; i < cursor.getCount(); i++) {
-                    Waypoint currentMarker = contentProviderUtils.createWaypoint(cursor);
-                    waypointIds.add(currentMarker.getId());
-                    if (waypointId.equals(currentMarker.getId())) {
-                        markerIndex = waypointIds.size() - 1;
+                    Marker currentMarker = contentProviderUtils.createMarker(cursor);
+                    markerIds.add(currentMarker.getId());
+                    if (markerId.equals(currentMarker.getId())) {
+                        markerIndex = markerIds.size() - 1;
                     }
 
                     cursor.moveToNext();
@@ -82,10 +86,9 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
             }
         }
 
-        final ViewPager viewPager = findViewById(R.id.maker_detail_activity_view_pager);
         final MarkerDetailPagerAdapter markerAdapter = new MarkerDetailPagerAdapter(getSupportFragmentManager());
-        viewPager.setAdapter(markerAdapter);
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        viewBinding.makerDetailActivityViewPager.setAdapter(markerAdapter);
+        viewBinding.makerDetailActivityViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -100,16 +103,17 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
             public void onPageScrollStateChanged(int state) {
             }
         });
-        viewPager.setCurrentItem(markerIndex == -1 ? 0 : markerIndex);
+        viewBinding.makerDetailActivityViewPager.setCurrentItem(markerIndex == -1 ? 0 : markerIndex);
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.marker_detail_activity;
+    protected View getRootView() {
+        viewBinding = MarkerDetailActivityBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
-    public void onDeleteMarkerDone() {
+    public void onMarkerDeleted() {
         runOnUiThread(this::finish);
     }
 
@@ -127,7 +131,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
         @Override
         @NonNull
         public Fragment getItem(int position) {
-            return MarkerDetailFragment.newInstance(waypointIds.get(position));
+            return MarkerDetailFragment.newInstance(markerIds.get(position));
         }
 
         @Nullable
@@ -138,7 +142,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
 
         @Override
         public int getCount() {
-            return waypointIds.size();
+            return markerIds.size();
         }
     }
 }

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

@@ -30,10 +30,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -41,10 +37,13 @@ import androidx.annotation.NonNull;
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
+import de.dennisguse.opentracks.content.data.Marker;
 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.databinding.MarkerEditBinding;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
@@ -66,98 +65,125 @@ public class MarkerEditActivity extends AbstractActivity {
 
     private static final String TAG = MarkerEditActivity.class.getSimpleName();
     private Track.Id trackId;
-    private TrackRecordingServiceConnection trackRecordingServiceConnection = new TrackRecordingServiceConnection();
-    private Waypoint waypoint;
+    private final TrackRecordingServiceConnection trackRecordingServiceConnection = new TrackRecordingServiceConnection();
+    private Marker marker;
 
     private MenuItem insertPhotoMenuItem;
     private MenuItem insertGalleryImgMenuItem;
 
     private Uri photoUri;
+    private Uri photoUriOriginal;
+    private final List<Uri> photoUriDeleteList = new ArrayList<>();
     private boolean hasCamera;
 
+    private boolean isNewMarker;
+
     // UI elements
-    private EditText waypointName;
-    private AutoCompleteTextView waypointMarkerType;
-    private EditText waypointDescription;
-    private ImageView waypointPhoto;
-    private ImageView waypointDeletePhotoBtn;
+    private MarkerEditBinding viewBinding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
-        Waypoint.Id waypointId = getIntent().getParcelableExtra(EXTRA_MARKER_ID);
+        Marker.Id markerId = getIntent().getParcelableExtra(EXTRA_MARKER_ID);
 
         hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
 
         // Setup UI elements
-        waypointName = findViewById(R.id.marker_edit_waypoint_name);
-        waypointMarkerType = findViewById(R.id.marker_edit_waypoint_marker_type);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line);
-        waypointMarkerType.setAdapter(adapter);
-        waypointDescription = findViewById(R.id.marker_edit_waypoint_description);
-        waypointPhoto = findViewById(R.id.marker_edit_waypoint_photo);
-
-        waypointDeletePhotoBtn = findViewById(R.id.marker_edit_waypoint_photo_delete);
-        waypointDeletePhotoBtn.setOnClickListener(v -> {
-            if (waypoint != null && waypoint.hasPhoto()) {
-                waypoint.setPhotoUrl(null);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.marker_types, android.R.layout.simple_dropdown_item_1line);
+        viewBinding.markerEditMarkerType.setAdapter(adapter);
+        viewBinding.markerEditPhotoDelete.setOnClickListener(v -> {
+            if (marker != null && marker.hasPhoto()) {
+                marker.setPhotoUrl(null);
             }
-            waypointPhoto.setImageBitmap(null);
+            viewBinding.markerEditPhoto.setImageBitmap(null);
+            photoUriDeleteList.add(photoUri);
+            photoUriOriginal = photoUriOriginal == null ? photoUri : photoUriOriginal;
             photoUri = null;
             hideAndShowOptions();
         });
 
-        Button cancel = findViewById(R.id.marker_edit_cancel);
-        cancel.setOnClickListener(v -> finish());
+        viewBinding.markerEditCancel.setOnClickListener(v -> {
+            Track.Id trackId = getTrackId();
+            if (isNewMarker && trackId != null) {
+                // new marker and user cancel -> delete all photos from track directory
+                for (Uri photoUriDelete : photoUriDeleteList) {
+                    File photoFile = FileUtils.getPhotoFileIfExists(this, trackId, photoUriDelete);
+                    FileUtils.deleteDirectoryRecurse(photoFile);
+                }
+                if (photoUri != null) {
+                    File photoFile = FileUtils.getPhotoFileIfExists(this, trackId, photoUri);
+                    FileUtils.deleteDirectoryRecurse(photoFile);
+                }
+            } else if (!isNewMarker && trackId != null) {
+                // no new marker, user cancel and photo was changed -> delete all photos but original one
+                for (Uri photoUri : photoUriDeleteList) {
+                    if (photoUriOriginal != photoUri) {
+                        File photoFile = FileUtils.getPhotoFileIfExists(this, trackId, photoUri);
+                        FileUtils.deleteDirectoryRecurse(photoFile);
+                    }
+                }
+                if (photoUri != null && photoUri != photoUriOriginal) {
+                    File photoFile = FileUtils.getPhotoFileIfExists(this, trackId, photoUri);
+                    FileUtils.deleteDirectoryRecurse(photoFile);
+                }
+            }
+            finish();
+        });
 
-        final boolean isNewMarker = waypointId == null;
+        isNewMarker = markerId == null;
 
         setTitle(isNewMarker ? R.string.menu_insert_marker : R.string.menu_edit);
-        Button done = findViewById(R.id.marker_edit_done);
-        done.setText(isNewMarker ? R.string.generic_add : R.string.generic_save);
-        done.setOnClickListener(v -> {
+        viewBinding.markerEditDone.setText(isNewMarker ? R.string.generic_add : R.string.generic_save);
+        viewBinding.markerEditDone.setOnClickListener(v -> {
             if (isNewMarker) {
                 addMarker();
             } else {
                 saveMarker();
             }
+            Track.Id trackId = getTrackId();
+            if (trackId == null) {
+                for (Uri photoUri : photoUriDeleteList) {
+                    File photoFile = FileUtils.getPhotoFileIfExists(this, trackId, photoUri);
+                    FileUtils.deleteDirectoryRecurse(photoFile);
+                }
+            }
             finish();
         });
 
         if (isNewMarker) {
-            int nextWaypointNumber = trackId == null ? -1 : new ContentProviderUtils(this).getNextWaypointNumber(trackId);
-            if (nextWaypointNumber == -1) {
-                nextWaypointNumber = 0;
+            int nextMarkerNumber = trackId == null ? -1 : new ContentProviderUtils(this).getNextMarkerNumber(trackId);
+            if (nextMarkerNumber == -1) {
+                nextMarkerNumber = 0;
             }
-            waypointName.setText(getString(R.string.marker_name_format, nextWaypointNumber));
-            waypointName.selectAll();
-            waypointMarkerType.setText("");
-            waypointDescription.setText("");
+            viewBinding.markerEditName.setText(getString(R.string.marker_name_format, nextMarkerNumber));
+            viewBinding.markerEditName.selectAll();
+            viewBinding.markerEditMarkerType.setText("");
+            viewBinding.markerEditDescription.setText("");
         } else {
-            waypoint = new ContentProviderUtils(this).getWaypoint(waypointId);
-            if (waypoint == null) {
-                Log.d(TAG, "waypoint is null");
+            marker = new ContentProviderUtils(this).getMarker(markerId);
+            if (marker == null) {
+                Log.d(TAG, "marker is null");
                 finish();
                 return;
             }
-            waypointName.setText(waypoint.getName());
-            waypointMarkerType.setText(waypoint.getCategory());
-            waypointDescription.setText(waypoint.getDescription());
-            if (waypoint.hasPhoto()) {
-                photoUri = waypoint.getPhotoURI();
+            viewBinding.markerEditName.setText(marker.getName());
+            viewBinding.markerEditMarkerType.setText(marker.getCategory());
+            viewBinding.markerEditDescription.setText(marker.getDescription());
+            if (marker.hasPhoto()) {
+                photoUri = marker.getPhotoURI();
             }
         }
 
         if (savedInstanceState != null) {
             photoUri = savedInstanceState.getParcelable(BUNDLE_PHOTO_URI);
-            if (waypoint != null) {
-                waypoint.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
+            if (marker != null) {
+                marker.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
             }
         }
         if (photoUri != null) {
-            setWaypointImageView(photoUri);
+            setMarkerImageView(photoUri);
         }
 
         hideAndShowOptions();
@@ -182,8 +208,9 @@ public class MarkerEditActivity extends AbstractActivity {
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.marker_edit;
+    protected View getRootView() {
+        viewBinding = MarkerEditBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
@@ -202,10 +229,10 @@ public class MarkerEditActivity extends AbstractActivity {
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         switch (item.getItemId()) {
             case R.id.marker_edit_insert_photo:
-                createWaypointWithPicture();
+                createMarkerWithPicture();
                 return true;
             case R.id.marker_edit_insert_gallery_img:
-                createWaypointWithGalleryImage();
+                createMarkerWithGalleryImage();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -219,7 +246,7 @@ public class MarkerEditActivity extends AbstractActivity {
                 Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
                 return;
             } else if (resultCode == RESULT_OK) {
-                setWaypointImageView(photoUri);
+                setMarkerImageView(photoUri);
             }
         } else if (requestCode == GALLERY_IMG_REQUEST_CODE) {
             if (resultCode == RESULT_CANCELED) {
@@ -233,7 +260,7 @@ public class MarkerEditActivity extends AbstractActivity {
                     FileUtils.copy(srcFd, dstFile);
 
                     photoUri = FileUtils.getUriForFile(this, dstFile);
-                    setWaypointImageView(photoUri);
+                    setMarkerImageView(photoUri);
                 } catch(Exception e) {
                     Log.e(TAG, e.getMessage());
                     Toast.makeText(this, R.string.marker_add_canceled, Toast.LENGTH_LONG).show();
@@ -250,31 +277,26 @@ public class MarkerEditActivity extends AbstractActivity {
      * If a photo is set then one's options are shown, otherwise another ones are shown.
      */
     private void hideAndShowOptions() {
-        boolean isPhotoSet = (waypoint != null && waypoint.hasPhoto()) || photoUri != null;
+        boolean isPhotoSet = (marker != null && marker.hasPhoto()) || photoUri != null;
         if (insertPhotoMenuItem != null && insertGalleryImgMenuItem != null) {
             insertPhotoMenuItem.setVisible(!isPhotoSet);
             insertGalleryImgMenuItem.setVisible(!isPhotoSet);
         }
-        waypointDeletePhotoBtn.setVisibility(isPhotoSet ? View.VISIBLE : View.GONE);
+        viewBinding.markerEditPhotoDelete.setVisibility(isPhotoSet ? View.VISIBLE : View.GONE);
     }
 
     /**
-     * Returns the trackId. If trackId == -1 then get it from waypoint object.
+     * Returns the trackId; either from track or marker.
      */
     private Track.Id getTrackId() {
-        return trackId == null ? waypoint.getTrackId() : trackId;
+        return trackId == null ? marker.getTrackId() : trackId;
     }
 
-    /**
-     * Sets the ImageView waypointPhoto with the uri photo.
-     *
-     * @param uri the uri photo.
-     */
-    private void setWaypointImageView(@NonNull Uri uri) {
+    private void setMarkerImageView(@NonNull Uri uri) {
         try (ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r")) {
             FileDescriptor fd = pfd.getFileDescriptor();
             Bitmap bitmap = BitmapFactory.decodeFileDescriptor(fd);
-            waypointPhoto.setImageBitmap(bitmap);
+            viewBinding.markerEditPhoto.setImageBitmap(bitmap);
             hideAndShowOptions();
         } catch (IOException e) {
             Log.e(TAG, e.getMessage());
@@ -282,31 +304,31 @@ public class MarkerEditActivity extends AbstractActivity {
         }
     }
 
-    private void createWaypointWithPicture() {
+    private void createMarkerWithPicture() {
         Pair<Intent, Uri> intentAndPhotoUri = IntentUtils.createTakePictureIntent(this, getTrackId());
         photoUri = intentAndPhotoUri.second;
         startActivityForResult(intentAndPhotoUri.first, CAMERA_REQUEST_CODE);
     }
 
-    private void createWaypointWithGalleryImage() {
+    private void createMarkerWithGalleryImage() {
         Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
         startActivityForResult(intent, GALLERY_IMG_REQUEST_CODE);
     }
 
     private void addMarker() {
         trackRecordingServiceConnection.addMarker(this,
-                waypointName.getText().toString(),
-                waypointMarkerType.getText().toString(),
-                waypointDescription.getText().toString(),
+                viewBinding.markerEditName.getText().toString(),
+                viewBinding.markerEditMarkerType.getText().toString(),
+                viewBinding.markerEditDescription.getText().toString(),
                 photoUri != null ? photoUri.toString() : null);
     }
 
     private void saveMarker() {
-        waypoint.setName(waypointName.getText().toString());
-        waypoint.setCategory(waypointMarkerType.getText().toString());
-        waypoint.setDescription(waypointDescription.getText().toString());
-        waypoint.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
+        marker.setName(viewBinding.markerEditName.getText().toString());
+        marker.setCategory(viewBinding.markerEditMarkerType.getText().toString());
+        marker.setDescription(viewBinding.markerEditDescription.getText().toString());
+        marker.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
 
-        new ContentProviderUtils(this).updateWaypoint(this, waypoint);
+        new ContentProviderUtils(this).updateMarker(this, marker);
     }
 }

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

@@ -16,6 +16,7 @@
 
 package de.dennisguse.opentracks;
 
+import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -26,18 +27,19 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ListView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import androidx.loader.app.LoaderManager;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
+import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.content.data.MarkerColumns;
 import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.Waypoint;
-import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.MarkerListBinding;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.util.ActivityUtils;
@@ -67,7 +69,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            // Note that the key can be null
             if (PreferencesUtils.isKey(MarkerListActivity.this, R.string.recording_track_id_key, key)) {
                 recordingTrackId = PreferencesUtils.getRecordingTrackId(MarkerListActivity.this);
             }
@@ -81,8 +82,11 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     };
     private Track track;
     private ResourceCursorAdapter resourceCursorAdapter;
-    // UI elements
-    private ListView listView;
+
+    private MarkerListBinding viewBinding;
+
+    private final MarkerLoaderCallback loaderCallbacks = new MarkerLoaderCallback();
+
     // Callback when an item is selected in the contextual action mode
     private final ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
         @Override
@@ -120,23 +124,20 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
 
         track = trackId != null ? contentProviderUtils.getTrack(trackId) : null;
 
-        listView = findViewById(R.id.marker_list);
-        listView.setEmptyView(findViewById(R.id.marker_list_empty));
-        listView.setOnItemClickListener((parent, view, position, id) -> {
+        viewBinding.markerList.setEmptyView(viewBinding.markerListEmpty);
+        viewBinding.markerList.setOnItemClickListener((parent, view, position, id) -> {
             Intent intent = IntentUtils.newIntent(MarkerListActivity.this, MarkerDetailActivity.class)
-                    .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, new Waypoint.Id(id));
+                    .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, new Marker.Id(id));
             startActivity(intent);
         });
         resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) {
             @Override
             public void bindView(View view, Context context, Cursor cursor) {
-                int nameIndex = cursor.getColumnIndex(WaypointsColumns.NAME);
-                int timeIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.TIME);
-                int categoryIndex = cursor.getColumnIndex(WaypointsColumns.CATEGORY);
-                int descriptionIndex = cursor.getColumnIndex(WaypointsColumns.DESCRIPTION);
-                int photoUrlIndex = cursor.getColumnIndex(WaypointsColumns.PHOTOURL);
-                int latitudeIndex = cursor.getColumnIndex(WaypointsColumns.LATITUDE);
-                int longitudeIndex = cursor.getColumnIndex(WaypointsColumns.LONGITUDE);
+                int nameIndex = cursor.getColumnIndex(MarkerColumns.NAME);
+                int timeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TIME);
+                int categoryIndex = cursor.getColumnIndex(MarkerColumns.CATEGORY);
+                int descriptionIndex = cursor.getColumnIndex(MarkerColumns.DESCRIPTION);
+                int photoUrlIndex = cursor.getColumnIndex(MarkerColumns.PHOTOURL);
 
                 int iconId = MarkerUtils.ICON_ID;
                 String name = cursor.getString(nameIndex);
@@ -144,33 +145,14 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                 String category = cursor.getString(categoryIndex);
                 String description = cursor.getString(descriptionIndex);
                 String photoUrl = cursor.getString(photoUrlIndex);
-                //TODO also show latitude and longitude in list
-                double latitude = cursor.getDouble(latitudeIndex);
-                double longitude = cursor.getDouble(longitudeIndex);
 
                 ListItemUtils.setListItem(MarkerListActivity.this, view, false, true, iconId, R.string.image_marker, name, null, null, 0, time, false, category, description, photoUrl);
             }
         };
-        listView.setAdapter(resourceCursorAdapter);
-        ActivityUtils.configureListViewContextualMenu(listView, contextualActionModeCallback);
+        viewBinding.markerList.setAdapter(resourceCursorAdapter);
+        ActivityUtils.configureListViewContextualMenu(viewBinding.markerList, contextualActionModeCallback);
 
-        LoaderManager.getInstance(this).initLoader(0, null, new LoaderCallbacks<Cursor>() {
-            @NonNull
-            @Override
-            public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-                return ContentProviderUtils.getWaypointsLoader(MarkerListActivity.this, track != null ? track.getId() : null);
-            }
-
-            @Override
-            public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-                resourceCursorAdapter.swapCursor(cursor);
-            }
-
-            @Override
-            public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-                resourceCursorAdapter.swapCursor(null);
-            }
-        });
+        loadData(getIntent());
     }
 
     @Override
@@ -193,8 +175,9 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.marker_list;
+    protected View getRootView() {
+        viewBinding = MarkerListBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
@@ -229,39 +212,36 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     /**
      * Handles a context item selection.
      *
-     * @param itemId          the menu item id
-     * @param longWaypointIds the marker ids
+     * @param itemId        the menu item id
+     * @param longMarkerIds the marker ids
      * @return true if handled.
      */
-    private boolean handleContextItem(int itemId, long... longWaypointIds) {
-        Waypoint.Id[] waypointIds = new Waypoint.Id[longWaypointIds.length];
-        for (int i = 0; i < longWaypointIds.length; i++) {
-            waypointIds[i] = new Waypoint.Id(longWaypointIds[i]);
+    private boolean handleContextItem(int itemId, long... longMarkerIds) {
+        Marker.Id[] markerIds = new Marker.Id[longMarkerIds.length];
+        for (int i = 0; i < longMarkerIds.length; i++) {
+            markerIds[i] = new Marker.Id(longMarkerIds[i]);
         }
 
         Intent intent;
         switch (itemId) {
             case R.id.list_context_menu_show_on_map:
-                if (waypointIds.length == 1) {
-                    IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getWaypoint(waypointIds[0]));
+                if (markerIds.length == 1) {
+                    IntentUtils.showCoordinateOnMap(this, contentProviderUtils.getMarker(markerIds[0]));
                 }
                 return true;
             case R.id.list_context_menu_edit:
-                if (waypointIds.length == 1) {
+                if (markerIds.length == 1) {
                     intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
-                            .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, waypointIds[0]);
+                            .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
                     startActivity(intent);
                 }
                 return true;
             case R.id.list_context_menu_delete:
-                if (waypointIds.length > 1 && waypointIds.length == listView.getCount()) {
-                    waypointIds = null;
-                }
-                DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), waypointIds);
+                DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
                 return true;
             case R.id.list_context_menu_select_all:
-                for (int i = 0; i < listView.getCount(); i++) {
-                    listView.setItemChecked(i, true);
+                for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
+                    viewBinding.markerList.setItemChecked(i, true);
                 }
                 return false;
             default:
@@ -278,7 +258,92 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     }
 
     @Override
-    public void onDeleteMarkerDone() {
+    public void onBackPressed() {
+        if (loaderCallbacks.getSearchQuery() != null) {
+            loaderCallbacks.setSearch(null);
+            return;
+        }
+        SearchView searchView = (SearchView) searchMenuItem.getActionView();
+        if (!searchView.isIconified()) {
+            searchView.setIconified(true);
+            return;
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        loadData(intent);
+    }
+
+    private void loadData(Intent intent) {
+        String searchQuery = null;
+        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+            searchQuery = intent.getStringExtra(SearchManager.QUERY);
+        }
+
+        loaderCallbacks.setSearch(searchQuery);
+    }
+
+    @Override
+    public void onMarkerDeleted() {
         // Do nothing
     }
+
+    private class MarkerLoaderCallback implements LoaderManager.LoaderCallbacks<Cursor> {
+
+        private String searchQuery = null;
+
+        public String getSearchQuery() {
+            return searchQuery;
+        }
+
+        public void setSearch(String searchQuery) {
+            this.searchQuery = searchQuery;
+            restart();
+            if (searchQuery != null) {
+                setTitle(searchQuery);
+            } else {
+                setTitle(R.string.menu_markers);
+            }
+        }
+
+        public void restart() {
+            LoaderManager.getInstance(MarkerListActivity.this).restartLoader(0, null, loaderCallbacks);
+        }
+
+        @NonNull
+        @Override
+        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
+            final String[] PROJECTION = new String[]{MarkerColumns._ID,
+                    MarkerColumns.NAME, MarkerColumns.DESCRIPTION, MarkerColumns.CATEGORY,
+                    MarkerColumns.TIME, MarkerColumns.PHOTOURL};
+
+            if (searchQuery == null) {
+                if (track != null) {
+                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, MarkerColumns.TRACKID + "=?", new String[]{String.valueOf(track.getId().getId())}, null);
+                } else {
+                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, null, null, null);
+                }
+            } else {
+                final String SEARCH_QUERY = MarkerColumns.NAME + " LIKE ? OR " +
+                        MarkerColumns.DESCRIPTION + " LIKE ? OR " +
+                        MarkerColumns.CATEGORY + " LIKE ?";
+                final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
+                return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, MarkerColumns.DEFAULT_SORT_ORDER + " DESC");
+            }
+        }
+
+        @Override
+        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
+            resourceCursorAdapter.swapCursor(cursor);
+        }
+
+        @Override
+        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+            resourceCursorAdapter.swapCursor(null);
+        }
+    }
 }

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

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

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

@@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import java.util.Set;
 
 import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.provider.ShareContentProvider;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
@@ -31,7 +30,7 @@ public abstract class ShowOnMapProxyActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         Set<Track.Id> trackIds = IntentDashboardUtils.extractTrackIdsFromIntent(getIntent());
 
-        showTrackTrackfileFormat(this, trackFileFormat, trackIds);
+        showTrackfileFormat(this, trackFileFormat, trackIds);
 
         finish();
     }
@@ -42,14 +41,14 @@ public abstract class ShowOnMapProxyActivity extends AppCompatActivity {
      * @param context  the context
      * @param trackIds the track ids
      */
-    private static void showTrackTrackfileFormat(Context context, TrackFileFormat trackFileFormat, Set<Track.Id> trackIds) {
+    private static void showTrackfileFormat(Context context, TrackFileFormat trackFileFormat, Set<Track.Id> trackIds) {
         if (trackIds.size() == 0) {
             return;
         }
 
         Intent intent = new Intent(android.content.Intent.ACTION_VIEW);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(TrackPointsColumns.TRACKID, trackIds.toArray(new Track.Id[0])[0]);
+
         Pair<Uri, String> uriAndMime = ShareContentProvider.createURI(trackIds, "SharingTrack", trackFileFormat);
         intent.setDataAndType(uriAndMime.first, uriAndMime.second);
 

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

@@ -6,6 +6,7 @@ import android.util.Log;
 
 import java.util.Locale;
 
+import de.dennisguse.opentracks.util.ActivityUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 /**
@@ -32,6 +33,8 @@ public class Startup extends Application {
             PreferencesUtils.setString(this, R.string.stats_units_key, statsUnits);
         }
 
+        ActivityUtils.applyNightMode(this);
+
         //TODO Workaround to reset recordingTrackId on app startup as the TrackRecordingService (likely) crashed.
         if (PreferencesUtils.isRecording(this)) {
             Log.e(TAG, "Reset recordingTrackId; likely the TrackRecordingService crashed.");

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

@@ -18,19 +18,14 @@ package de.dennisguse.opentracks;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.graphics.drawable.AnimatedVectorDrawable;
-import android.graphics.drawable.Drawable;
+import android.graphics.drawable.TransitionDrawable;
 import android.os.Handler;
-import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
+import android.view.accessibility.AccessibilityEvent;
 import android.widget.ImageButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.core.content.ContextCompat;
 
+import de.dennisguse.opentracks.databinding.TrackControllerBinding;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
 import de.dennisguse.opentracks.util.ActivityUtils;
@@ -42,137 +37,132 @@ import de.dennisguse.opentracks.util.UnitConversions;
  *
  * @author Jimmy Shih
  */
-public class TrackController {
+public class TrackController implements View.OnTouchListener {
 
     private static final String TAG = TrackController.class.getSimpleName();
 
     private final Activity activity;
     private final TrackRecordingServiceConnection trackRecordingServiceConnection;
-    private final Handler handlerUpdateTotalTime;
-    private final View containerView;
-    private final TextView statusTextView;
-    private final TextView totalTimeTextView;
-    private final ImageButton recordImageButton;
-    private final ImageButton stopImageButton;
+    private final Handler handlerUpdateTotalTime = new Handler();
     private final boolean alwaysShow;
-    private ButtonDelay buttonDelay;
+
+    private Runnable buttonDelay;
+    private final int buttonDelayDuration;
+
+    private final TrackControllerBinding viewBinding;
+    private final TransitionDrawable transition;
 
     private boolean isRecording;
     private boolean isPaused;
     private long totalTime = 0;
-
     private long totalTimeTimestamp = 0;
-
     private boolean isResumed = false;
 
+    private final Callback callback;
+
     // A runnable to update the total time.
     private final Runnable updateTotalTimeRunnable = new Runnable() {
         public void run() {
             if (isResumed && isRecording && !isPaused) {
-                totalTimeTextView.setText(StringUtils.formatElapsedTimeWithHour(System.currentTimeMillis() - totalTimeTimestamp + totalTime));
+                viewBinding.trackControllerTotalTime.setText(StringUtils.formatElapsedTimeWithHour(System.currentTimeMillis() - totalTimeTimestamp + totalTime));
                 handlerUpdateTotalTime.postDelayed(this, UnitConversions.ONE_SECOND_MS);
             }
         }
     };
 
     @SuppressLint("ClickableViewAccessibility")
-    TrackController(Activity activity, TrackRecordingServiceConnection trackRecordingServiceConnection, boolean alwaysShow, OnClickListener recordListener, OnClickListener stopListener) {
+    TrackController(Activity activity, TrackControllerBinding viewBinding, TrackRecordingServiceConnection trackRecordingServiceConnection, boolean alwaysShow, Callback callback) {
         this.activity = activity;
+        this.viewBinding = viewBinding;
         this.trackRecordingServiceConnection = trackRecordingServiceConnection;
         this.alwaysShow = alwaysShow;
-        handlerUpdateTotalTime = new Handler();
-        containerView = activity.findViewById(R.id.track_controller_container);
-        statusTextView = activity.findViewById(R.id.track_controller_status);
-        totalTimeTextView = activity.findViewById(R.id.track_controller_total_time);
+        this.callback = callback;
 
-        recordImageButton = activity.findViewById(R.id.track_controller_record);
-        recordImageButton.setOnTouchListener((view, motionEvent) -> onRecordTouch(activity, recordListener, motionEvent));
+        buttonDelayDuration = activity.getResources().getInteger(R.integer.buttonDelayMillis);
 
-        stopImageButton = activity.findViewById(R.id.track_controller_stop);
-        stopImageButton.setOnTouchListener((view, motionEvent) -> onStopTouch(activity, stopListener, motionEvent));
+        viewBinding.trackControllerRecord.setOnTouchListener(this);
+        viewBinding.trackControllerRecord.setOnClickListener((view) -> {
+            if (buttonDelay != null || (isRecording && !isPaused)) {
+                return;
+            }
+
+            callback.recordStart();
+        });
+
+        viewBinding.trackControllerStop.setOnTouchListener(this);
+        transition = (TransitionDrawable) viewBinding.trackControllerContainer.getBackground();
     }
 
-    private boolean onRecordTouch(final Activity activity, final OnClickListener recordListener, final MotionEvent motionEvent) {
-        if (isRecording && !isPaused) {
-            if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                buttonDelay = new ButtonDelay(activity, recordImageButton, R.drawable.ic_button_pause_anim, R.string.hold_to_pause, recordListener);
-                new Thread(buttonDelay).start();
-                return true;
-            } else if (motionEvent.getAction() == MotionEvent.ACTION_UP ) {
-                recordImageButton.setImageResource(R.drawable.ic_button_pause);
-                if (buttonDelay != null) {
-                    buttonDelay.canceled = true;
-                }
-                return true;
-            }
-        } else if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-            recordListener.onClick(null);
+    @SuppressLint("ClickableViewAccessibility") //We do accessibility manually.
+    @Override
+    public boolean onTouch(final View view, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_MOVE) {
+            return false;
+        }
+
+        if (buttonDelay != null && event.getAction() == MotionEvent.ACTION_UP) {
+            handlerUpdateTotalTime.removeCallbacks(buttonDelay);
+            buttonDelay = null;
+            ((ImageButton) view).setPressed(false);
+
+            transition.resetTransition();
+
+            showStatusSetDefaultText();
+
+            return false;
+        }
+
+        //Trigger button pressed animation
+        ((ImageButton) view).setPressed(true);
+
+        //To pause a recording
+        if (viewBinding.trackControllerRecord.equals(view)
+                && event.getAction() == MotionEvent.ACTION_DOWN
+                && isRecording && !isPaused) {
+
+            transition.startTransition(buttonDelayDuration);
+
+            ActivityUtils.vibrate(activity, 150);
+            viewBinding.trackControllerStatus.setText(R.string.hold_to_pause);
+
+            buttonDelay = () -> {
+                view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+                view.performClick();
+                callback.recordStart(); //TODO Should be recordPause();
+
+                transition.resetTransition();
+
+                ActivityUtils.vibrate(activity, 1000);
+            };
+            handlerUpdateTotalTime.postDelayed(buttonDelay, buttonDelayDuration);
             return true;
         }
+
+        //To stop a recording
+        if (viewBinding.trackControllerStop.equals(view)
+                && event.getAction() == MotionEvent.ACTION_DOWN
+                && isRecording) {
+
+
+            transition.startTransition(buttonDelayDuration);
+
+            ActivityUtils.vibrate(activity, 150);
+            viewBinding.trackControllerStatus.setText(R.string.hold_to_stop);
+
+            buttonDelay = () -> {
+                view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+                callback.recordStop();
+                ActivityUtils.vibrate(activity, 1000);
+
+                transition.resetTransition();
+            };
+            handlerUpdateTotalTime.postDelayed(buttonDelay, buttonDelayDuration);
+            return true;
+        }
+
         return false;
     }
 
-    private boolean onStopTouch(final Activity activity, final OnClickListener stopListener, final MotionEvent motionEvent) {
-        if (isRecording) {
-            if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                buttonDelay = new ButtonDelay(activity, stopImageButton, R.drawable.ic_button_stop_anim, R.string.hold_to_stop, stopListener);
-                new Thread(buttonDelay).start();
-                return true;
-            } else if (motionEvent.getAction() == MotionEvent.ACTION_UP ) {
-                stopImageButton.setImageResource(R.drawable.ic_button_stop);
-                if (buttonDelay != null) {
-                    buttonDelay.canceled = true;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static class ButtonDelay implements Runnable {
-
-        private boolean canceled = false;
-
-        private final ImageButton imageButton;
-        private final Activity activity;
-        private final OnClickListener clickListener;
-        private final int delayMillis;
-        private final Drawable drawable;
-        private final int delayMessageId;
-
-        private ButtonDelay(final Activity activity, final ImageButton imageButton, final int animDrawableId, final int delayMessageId, final OnClickListener clickListener) {
-            this.activity = activity;
-            this.clickListener = clickListener;
-            this.delayMillis = activity.getResources().getInteger(R.integer.buttonDelayMillis);
-            this.imageButton = imageButton;
-            this.drawable = ContextCompat.getDrawable(activity, animDrawableId);
-            this.delayMessageId = delayMessageId;
-        }
-
-        @Override
-        public void run() {
-            activity.runOnUiThread(()->{
-                imageButton.setImageDrawable(drawable);
-                if (drawable instanceof AnimatedVectorDrawable) {
-                    ((AnimatedVectorDrawable) drawable).start();
-                }
-                ActivityUtils.vibrate(activity, 150);
-                ActivityUtils.toast(activity, delayMessageId, Toast.LENGTH_SHORT, Gravity.TOP);
-            });
-
-            try {
-                Thread.sleep(delayMillis);
-            } catch (InterruptedException ignored) {
-            }
-            if (!canceled) {
-                activity.runOnUiThread(()-> {
-                    clickListener.onClick(null);
-                    ActivityUtils.vibrate(activity, 1000);
-                });
-            }
-        }
-    }
-
     public void update(boolean recording, boolean paused) {
         if (!isResumed) {
             return;
@@ -180,30 +170,29 @@ public class TrackController {
         isRecording = recording;
         isPaused = paused;
         boolean visible = alwaysShow || isRecording;
-        containerView.setVisibility(visible ? View.VISIBLE : View.GONE);
+        viewBinding.trackControllerContainer.setVisibility(visible ? View.VISIBLE : View.GONE);
 
         if (!visible) {
             handlerUpdateTotalTime.removeCallbacks(updateTotalTimeRunnable);
             return;
         }
 
-        recordImageButton.setImageResource(isRecording && !isPaused ? R.drawable.ic_button_pause : R.drawable.button_record);
-        recordImageButton.setContentDescription(activity.getString(isRecording && !isPaused ? R.string.image_pause : R.string.image_record));
+        viewBinding.trackControllerRecord.setImageResource(isRecording && !isPaused ? R.drawable.ic_button_pause : R.drawable.button_record);
+        viewBinding.trackControllerRecord.setContentDescription(activity.getString(isRecording && !isPaused ? R.string.image_pause : R.string.image_record));
 
-        stopImageButton.setImageResource(isRecording ? R.drawable.ic_button_stop : R.drawable.ic_button_stop_disabled);
-        stopImageButton.setEnabled(isRecording);
+        viewBinding.trackControllerStop.setEnabled(isRecording);
 
-        statusTextView.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
+        viewBinding.trackControllerStatus.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
         if (isRecording) {
-            statusTextView.setTextColor(activity.getResources().getColor(isPaused ? android.R.color.white : R.color.recording_text));
-            statusTextView.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
+            viewBinding.trackControllerStatus.setTextColor(activity.getResources().getColor(isPaused ? android.R.color.white : R.color.recording_text));
+            showStatusSetDefaultText();
         }
 
         handlerUpdateTotalTime.removeCallbacks(updateTotalTimeRunnable);
-        totalTimeTextView.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
+        viewBinding.trackControllerTotalTime.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
         if (isRecording) {
             totalTime = getTotalTime();
-            totalTimeTextView.setText(StringUtils.formatElapsedTimeWithHour(totalTime));
+            viewBinding.trackControllerTotalTime.setText(StringUtils.formatElapsedTimeWithHour(totalTime));
             if (!isPaused) {
                 totalTimeTimestamp = System.currentTimeMillis();
                 handlerUpdateTotalTime.postDelayed(updateTotalTimeRunnable, UnitConversions.ONE_SECOND_MS);
@@ -222,11 +211,11 @@ public class TrackController {
     }
 
     public void hide() {
-        containerView.setVisibility(View.GONE);
+        viewBinding.trackControllerContainer.setVisibility(View.GONE);
     }
 
     public void show() {
-        containerView.setVisibility(View.VISIBLE);
+        viewBinding.trackControllerContainer.setVisibility(View.VISIBLE);
     }
 
     /**
@@ -236,4 +225,14 @@ public class TrackController {
         TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
         return trackRecordingService != null ? trackRecordingService.getTotalTime() : 0L;
     }
+
+    private void showStatusSetDefaultText() {
+        viewBinding.trackControllerStatus.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
+    }
+
+    public interface Callback {
+        void recordStart();
+
+        void recordStop();
+    }
 }

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

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

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

@@ -18,19 +18,14 @@ package de.dennisguse.opentracks;
 
 import android.os.Bundle;
 import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Spinner;
 
 import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.TrackEditBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -55,10 +50,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
     private Track track;
     private String iconValue;
 
-    private EditText nameEditText;
-    private AutoCompleteTextView activityType;
-    private Spinner activityTypeIcon;
-    private EditText description;
+    private TrackEditBinding viewBinding;
 
     @Override
     protected void onCreate(Bundle bundle) {
@@ -75,25 +67,22 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
         contentProviderUtils = new ContentProviderUtils(this);
         track = contentProviderUtils.getTrack(trackId);
         if (track == null) {
-            Log.e(TAG, "No track for " + trackId);
+            Log.e(TAG, "No track for " + trackId.getId());
             finish();
             return;
         }
 
-        nameEditText = findViewById(R.id.track_edit_name);
-        nameEditText.setText(track.getName());
+        viewBinding.trackEditName.setText(track.getName());
 
-        activityType = findViewById(R.id.track_edit_activity_type);
-        activityType.setText(track.getCategory());
+        viewBinding.trackEditActivityType.setText(track.getCategory());
 
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
-        activityType.setAdapter(adapter);
-        activityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(
-                TrackEditActivity.this, (String) activityType.getAdapter().getItem(position))));
-        activityType.setOnFocusChangeListener((v, hasFocus) -> {
+        viewBinding.trackEditActivityType.setAdapter(adapter);
+        viewBinding.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.trackEditActivityType.getAdapter().getItem(position))));
+        viewBinding.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
                 setActivityTypeIcon(TrackIconUtils.getIconValue(
-                        TrackEditActivity.this, activityType.getText().toString()));
+                        TrackEditActivity.this, viewBinding.trackEditActivityType.getText().toString()));
             }
         });
 
@@ -105,40 +94,25 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
             iconValue = track.getIcon();
         }
 
-        activityTypeIcon = findViewById(R.id.track_edit_activity_type_icon);
-        activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue));
-        activityTypeIcon.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_UP) {
-                ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
-            }
-            return true;
-        });
-        activityTypeIcon.setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
-            }
-            return true;
-        });
+        setActivityTypeIcon(iconValue);
+        viewBinding.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.trackEditActivityType.getText().toString()));
 
-        description = findViewById(R.id.track_edit_description);
-        description.setText(track.getDescription());
+        viewBinding.trackEditDescription.setText(track.getDescription());
 
-        Button saveButton = findViewById(R.id.track_edit_save);
-        saveButton.setOnClickListener(v -> {
-            TrackUtils.updateTrack(TrackEditActivity.this, track, nameEditText.getText().toString(),
-                    activityType.getText().toString(), description.getText().toString(),
+        viewBinding.trackEditSave.setOnClickListener(v -> {
+            TrackUtils.updateTrack(TrackEditActivity.this, track, viewBinding.trackEditName.getText().toString(),
+                    viewBinding.trackEditActivityType.getText().toString(), viewBinding.trackEditDescription.getText().toString(),
                     contentProviderUtils);
             finish();
         });
 
-        Button cancel = findViewById(R.id.track_edit_cancel);
         if (getIntent().getBooleanExtra(EXTRA_NEW_TRACK, false)) {
             setTitle(R.string.track_edit_new_track_title);
-            cancel.setVisibility(View.GONE);
+            viewBinding.trackEditCancel.setVisibility(View.GONE);
         } else {
             setTitle(R.string.menu_edit);
-            cancel.setOnClickListener(v -> finish());
-            cancel.setVisibility(View.VISIBLE);
+            viewBinding.trackEditCancel.setOnClickListener(v -> finish());
+            viewBinding.trackEditCancel.setVisibility(View.VISIBLE);
         }
     }
 
@@ -162,18 +136,19 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.track_edit;
+    protected View getRootView() {
+        viewBinding = TrackEditBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
-    private void setActivityTypeIcon(String value) {
-        iconValue = value;
-        TrackIconUtils.setIconSpinner(activityTypeIcon, value);
+    private void setActivityTypeIcon(String iconValue) {
+        this.iconValue = iconValue;
+        viewBinding.trackEditActivityTypeIcon.setImageResource(TrackIconUtils.getIconDrawable(iconValue));
     }
 
     @Override
     public void onChooseActivityTypeDone(String value) {
         setActivityTypeIcon(value);
-        activityType.setText(getString(TrackIconUtils.getIconActivityType(value)));
+        viewBinding.trackEditActivityType.setText(getString(TrackIconUtils.getIconActivityType(value)));
     }
 }

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

@@ -33,8 +33,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ListView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -42,12 +40,12 @@ import androidx.appcompat.widget.SearchView;
 import androidx.core.app.ActivityCompat;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import androidx.loader.app.LoaderManager;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.TrackListBinding;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
@@ -66,35 +64,20 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
  *
  * @author Leif Hendrik Wilden
  */
-public class TrackListActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
+public class TrackListActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackController.Callback {
 
     private static final String TAG = TrackListActivity.class.getSimpleName();
 
     // The following are set in onCreate
-    private ContentProviderUtils contentProviderUtils;
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private TrackController trackController;
-    private ListView listView;
     private ResourceCursorAdapter resourceCursorAdapter;
     private GpsStatusValue gpsStatusValue;
 
-    private final LoaderCallbacks<Cursor> loaderCallbacks = new LoaderCallbacks<Cursor>() {
-        @Override
-        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-            return ContentProviderUtils.getTracksCursorLoader(TrackListActivity.this);
-        }
+    private TrackListBinding viewBinding;
 
-        @Override
-        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-            resourceCursorAdapter.swapCursor(cursor);
-        }
-
-        @Override
-        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-            resourceCursorAdapter.swapCursor(null);
-        }
-    };
+    private final TrackLoaderCallBack loaderCallbacks = new TrackLoaderCallBack();
 
     // Preferences
     private boolean metricUnits = true;
@@ -112,8 +95,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         }
 
         @Override
-        public boolean onClick(int itemId, int[] positions, long[] ids) {
-            return handleContextItem(itemId, ids);
+        public boolean onClick(int itemId, int[] positions, long[] trackIds) {
+            return handleContextItem(itemId, trackIds);
         }
     };
 
@@ -137,7 +120,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
             if (key != null) {
                 runOnUiThread(() -> {
                     TrackListActivity.this.invalidateOptionsMenu();
-                    LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
+                    loaderCallbacks.restart();
                     boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
                     trackController.update(isRecording, recordingTrackPaused);
                 });
@@ -149,14 +132,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     private MenuItem searchMenuItem;
     private MenuItem startGpsMenuItem;
 
-    private final OnClickListener stopListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            updateMenuItems(false, false);
-            trackRecordingServiceConnection.stopRecording(TrackListActivity.this, true);
-        }
-    };
-
     // Callback when the trackRecordingServiceConnection binding changes.
     private final Runnable bindChangedCallback = new Runnable() {
         @Override
@@ -191,42 +166,23 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         }
     };
 
-    private final OnClickListener recordListener = new OnClickListener() {
-        public void onClick(View v) {
-            if (!PreferencesUtils.isRecording(recordingTrackId)) {
-                // Not recording -> Recording
-                updateMenuItems(false, true);
-                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
-                startActivity(newIntent);
-            } else if (recordingTrackPaused) {
-                // Paused -> Resume
-                updateMenuItems(false, true);
-                trackRecordingServiceConnection.resumeTrack();
-                trackController.update(true, false);
-            } else {
-                // Recording -> Paused
-                updateMenuItems(false, true);
-                trackRecordingServiceConnection.pauseTrack();
-                trackController.update(true, true);
-            }
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // Reset theme after splash
+        setTheme(R.style.ThemeCustom);
+
         super.onCreate(savedInstanceState);
+        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         gpsStatusValue = GpsStatusValue.GPS_NONE;
 
         recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
 
-        contentProviderUtils = new ContentProviderUtils(this);
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
-        trackController = new TrackController(this, trackRecordingServiceConnection, true, recordListener, stopListener);
+        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, true, this);
 
-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         // Show trackController when search dialog is dismissed
         SearchManager searchManager = (SearchManager) getSystemService(SEARCH_SERVICE);
@@ -234,9 +190,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
             searchManager.setOnDismissListener(() -> trackController.show());
         }
 
-        listView = findViewById(R.id.track_list);
-        listView.setEmptyView(findViewById(R.id.track_list_empty_view));
-        listView.setOnItemClickListener((parent, view, position, trackId) -> {
+        viewBinding.trackList.setEmptyView(viewBinding.trackListEmptyView);
+        viewBinding.trackList.setOnItemClickListener((parent, view, position, trackId) -> {
             Intent newIntent;
             if (trackId == recordingTrackId.getId()) {
                 // Is recording -> open record activity.
@@ -253,23 +208,24 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) {
             @Override
             public void bindView(View view, Context context, Cursor cursor) {
-                int idIndex = cursor.getColumnIndex(TracksColumns._ID);
-                int iconIndex = cursor.getColumnIndex(TracksColumns.ICON);
-                int nameIndex = cursor.getColumnIndex(TracksColumns.NAME);
+                int idIndex = cursor.getColumnIndexOrThrow(TracksColumns._ID);
+                int iconIndex = cursor.getColumnIndexOrThrow(TracksColumns.ICON);
+                int nameIndex = cursor.getColumnIndexOrThrow(TracksColumns.NAME);
                 int totalTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALTIME);
                 int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
                 int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
-                int categoryIndex = cursor.getColumnIndex(TracksColumns.CATEGORY);
-                int descriptionIndex = cursor.getColumnIndex(TracksColumns.DESCRIPTION);
+                int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
+                int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
+                int markerCountIndex = cursor.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT);
 
                 Track.Id trackId = new Track.Id(cursor.getLong(idIndex));
-                boolean isRecording = trackId == recordingTrackId;
+                boolean isRecording = trackId.equals(recordingTrackId);
                 String icon = cursor.getString(iconIndex);
                 int iconId = TrackIconUtils.getIconDrawable(icon);
                 String name = cursor.getString(nameIndex);
                 String totalTime = StringUtils.formatElapsedTime(cursor.getLong(totalTimeIndex));
                 String totalDistance = StringUtils.formatDistance(TrackListActivity.this, cursor.getDouble(totalDistanceIndex), metricUnits);
-                int markerCount = contentProviderUtils.getWaypointCount(trackId);
+                int markerCount = cursor.getInt(markerCountIndex);
                 long startTime = cursor.getLong(startTimeIndex);
                 String category = icon != null && !icon.equals("") ? null : cursor.getString(categoryIndex);
                 String description = cursor.getString(descriptionIndex);
@@ -279,11 +235,10 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                         startTime, true, category, description, null);
             }
         };
-        listView.setAdapter(resourceCursorAdapter);
+        viewBinding.trackList.setAdapter(resourceCursorAdapter);
+        ActivityUtils.configureListViewContextualMenu(viewBinding.trackList, contextualActionModeCallback);
 
-        ActivityUtils.configureListViewContextualMenu(listView, contextualActionModeCallback);
-
-        LoaderManager.getInstance(this).initLoader(0, null, loaderCallbacks);
+        loadData(getIntent());
 
         requestGPSPermissions();
     }
@@ -297,6 +252,14 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         trackRecordingServiceConnection.startConnection(this);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        // Update UI
+        trackController.onPause();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -307,14 +270,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         trackController.onResume(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused);
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        // Update UI
-        trackController.onPause();
-    }
-
     @Override
     protected void onStop() {
         super.onStop();
@@ -335,8 +290,9 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.track_list;
+    protected View getRootView() {
+        viewBinding = TrackListBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
@@ -412,6 +368,36 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         return super.onKeyUp(keyCode, event);
     }
 
+    @Override
+    public void onBackPressed() {
+        if (loaderCallbacks.getSearchQuery() != null) {
+            loaderCallbacks.setSearch(null);
+            return;
+        }
+        SearchView searchView = (SearchView) searchMenuItem.getActionView();
+        if (!searchView.isIconified()) {
+            searchView.setIconified(true);
+            return;
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        loadData(intent);
+    }
+
+    private void loadData(Intent intent) {
+        String searchQuery = null;
+        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+            searchQuery = intent.getStringExtra(SearchManager.QUERY);
+        }
+
+        loaderCallbacks.setSearch(searchQuery);
+    }
+
     @Override
     public boolean onSearchRequested() {
         // Hide trackController when search dialog is shown
@@ -425,7 +411,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     }
 
     @Override
-    protected void onDeleted() {
+    protected void onTrackDeleted() {
         // Do nothing
     }
 
@@ -500,12 +486,91 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                 deleteTracks(trackIds);
                 return true;
             case R.id.list_context_menu_select_all:
-                int size = listView.getCount();
+                int size = viewBinding.trackList.getCount();
                 for (int i = 0; i < size; i++) {
-                    listView.setItemChecked(i, true);
+                    viewBinding.trackList.setItemChecked(i, true);
                 }
                 return false;
         }
         return false;
     }
+
+    private class TrackLoaderCallBack implements LoaderManager.LoaderCallbacks<Cursor> {
+
+        private String searchQuery = null;
+
+        public String getSearchQuery() {
+            return searchQuery;
+        }
+
+        public void setSearch(String searchQuery) {
+            this.searchQuery = searchQuery;
+            restart();
+            if (searchQuery != null) {
+                setTitle(searchQuery);
+            } else {
+                setTitle(R.string.app_name);
+            }
+        }
+
+        public void restart() {
+            LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
+        }
+
+        @NonNull
+        @Override
+        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
+            final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
+                    TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME,
+                    TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT};
+
+            final String sortOrder = TracksColumns.STARTTIME + " DESC";
+
+            if (searchQuery == null) {
+                return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, null, null, sortOrder);
+            } else {
+                final String SEARCH_QUERY = TracksColumns.NAME + " LIKE ? OR " +
+                        TracksColumns.DESCRIPTION + " LIKE ? OR " +
+                        TracksColumns.CATEGORY + " LIKE ?";
+                final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
+                return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, sortOrder);
+            }
+        }
+
+        @Override
+        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
+            resourceCursorAdapter.swapCursor(cursor);
+        }
+
+        @Override
+        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+            resourceCursorAdapter.swapCursor(null);
+        }
+    }
+
+    @Override
+    public void recordStart() {
+        if (!PreferencesUtils.isRecording(recordingTrackId)) {
+            // Not recording -> Recording
+            updateMenuItems(false, true);
+            Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
+            startActivity(newIntent);
+        } else if (recordingTrackPaused) {
+            // Paused -> Resume
+            updateMenuItems(false, true);
+            trackRecordingServiceConnection.resumeTrack();
+            trackController.update(true, false);
+        } else {
+            // Recording -> Paused
+            updateMenuItems(false, true);
+            trackRecordingServiceConnection.pauseTrack();
+            trackController.update(true, true);
+        }
+    }
+
+    @Override
+    public void recordStop() {
+        updateMenuItems(false, false);
+        trackRecordingServiceConnection.stopRecording(TrackListActivity.this, true);
+    }
 }

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

@@ -21,29 +21,30 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewParent;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 
 import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.content.data.Marker;
 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.databinding.TrackRecordedBinding;
 import de.dennisguse.opentracks.fragments.ChartFragment;
-import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.fragments.IntervalsFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.util.TrackUtils;
 
 /**
  * An activity to show the track detail, record a new track or resumes an existing one.
@@ -51,21 +52,21 @@ import de.dennisguse.opentracks.util.TrackUtils;
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
-public class TrackRecordedActivity extends AbstractListActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackActivityDataHubInterface {
+public class TrackRecordedActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackActivityDataHubInterface {
+
+    private static final String TAG = TrackRecordedActivity.class.getSimpleName();
 
     public static final String EXTRA_TRACK_ID = "track_id";
     public static final String EXTRA_MARKER_ID = "marker_id";
 
-    private static final String TAG = TrackRecordedActivity.class.getSimpleName();
-
     private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key";
 
     // The following are set in onCreate.
     private ContentProviderUtils contentProviderUtils;
     private TrackDataHub trackDataHub;
-    private ViewPager pager;
 
-    // From intent.
+    private TrackRecordedBinding viewBinding;
+
     private Track.Id trackId;
 
     @Override
@@ -77,46 +78,12 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
 
         trackDataHub = new TrackDataHub(this);
 
-        FragmentPagerAdapter adapter = new FragmentPagerAdapter(getSupportFragmentManager(), 1) {
-            @Override
-            public int getCount() {
-                return 3;
-            }
-
-            @NonNull
-            @Override
-            public Fragment getItem(int position) {
-                switch (position) {
-                    case 0:
-                        return new StatisticsRecordedFragment();
-                    case 1:
-                        return ChartFragment.newInstance(false);
-                    case 2:
-                        return ChartFragment.newInstance(true);
-                    default:
-                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-                }
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getString(R.string.track_detail_stats_tab);
-                    case 1:
-                        return getString(R.string.settings_chart_by_time);
-                    case 2:
-                        return getString(R.string.settings_chart_by_distance);
-                }
-                return "Unknown Tab";
-            }
-        };
-        pager = findViewById(R.id.track_detail_activity_view_pager);
-        pager.setAdapter(adapter);
-        TabLayout tabs = findViewById(R.id.track_detail_activity_tablayout);
-        tabs.setupWithViewPager(pager);
+        CustomFragmentPagerAdapter pagerAdapter = new CustomFragmentPagerAdapter(this);
+        viewBinding.trackDetailActivityViewPager.setAdapter(pagerAdapter);
+        new TabLayoutMediator(viewBinding.trackDetailActivityTablayout, viewBinding.trackDetailActivityViewPager,
+                (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position))).attach();
         if (savedInstanceState != null) {
-            pager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
+            viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
         }
     }
 
@@ -133,7 +100,7 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
         // Update UI
         this.invalidateOptionsMenu();
 
-        if (trackId.isValid()) {
+        if (trackId != null) {
             trackDataHub.loadTrack(trackId);
         }
     }
@@ -147,12 +114,13 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(CURRENT_TAB_TAG_KEY, pager.getCurrentItem());
+        outState.putInt(CURRENT_TAB_TAG_KEY, viewBinding.trackDetailActivityViewPager.getCurrentItem());
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.track_detail;
+    protected View getRootView() {
+        viewBinding = TrackRecordedBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
@@ -225,7 +193,7 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
     }
 
     @Override
-    protected void onDeleted() {
+    protected void onTrackDeleted() {
         runOnUiThread(this::finish);
     }
 
@@ -240,15 +208,15 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
     private void handleIntent(Intent intent) {
         trackId = intent.getParcelableExtra(EXTRA_TRACK_ID);
 
-        Waypoint.Id waypointId = intent.getParcelableExtra(EXTRA_MARKER_ID);
-        if (waypointId != null) {
+        Marker.Id markerId = intent.getParcelableExtra(EXTRA_MARKER_ID);
+        if (markerId != null) {
             // Use the trackId from the marker
-            Waypoint waypoint = contentProviderUtils.getWaypoint(waypointId);
-            if (waypoint == null) {
+            Marker marker = contentProviderUtils.getMarker(markerId);
+            if (marker == null) {
                 finish();
                 return;
             }
-            trackId = waypoint.getTrackId();
+            trackId = marker.getTrackId();
         }
 
         if (trackId == null) {
@@ -257,14 +225,47 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
         }
     }
 
-    public void chooseActivityType(String category) {
-        ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), category);
-    }
+    private class CustomFragmentPagerAdapter extends FragmentStateAdapter {
 
-    @Override
-    public void onChooseActivityTypeDone(String iconValue) {
-        Track track = contentProviderUtils.getTrack(trackId);
-        String category = getString(TrackIconUtils.getIconActivityType(iconValue));
-        TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
+        public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
+            super(fa);
+        }
+
+        @NonNull
+        @Override
+        public Fragment createFragment(int position) {
+            switch (position) {
+                case 0:
+                    return StatisticsRecordedFragment.newInstance(trackId);
+                case 1:
+                    return IntervalsFragment.newInstance();
+                case 2:
+                    return ChartFragment.newInstance(false);
+                case 3:
+                    return ChartFragment.newInstance(true);
+                default:
+                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            return 4;
+        }
+
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case 0:
+                    return getString(R.string.track_detail_stats_tab);
+                case 1:
+                    return getString(R.string.track_detail_intervals_tab);
+                case 2:
+                    return getString(R.string.settings_chart_by_time);
+                case 3:
+                    return getString(R.string.settings_chart_by_distance);
+                default:
+                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            }
+        }
     }
 }

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

@@ -9,22 +9,22 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
 import de.dennisguse.opentracks.fragments.ChartFragment;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.fragments.IntervalsFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.TrackRecordingServiceInterface;
@@ -43,7 +43,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
  */
 //NOTE: This activity does NOT react to preference changes of R.string.recording_track_id_key.
 //This mode of communication should be removed anyhow.
-public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface {
+public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface, TrackController.Callback {
 
     public static final String EXTRA_TRACK_ID = "track_id";
 
@@ -56,9 +56,10 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private TrackDataHub trackDataHub;
-    private ViewPager pager;
     private TrackController trackController;
 
+    private TrackRecordingBinding viewBinding;
+
     // Initialized from Intent; if a new track recording is started, a new TrackId will be provided by TrackRecordingService
     private Track.Id trackId;
 
@@ -126,46 +127,17 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     private MenuItem insertMarkerMenuItem;
     private MenuItem markerListMenuItem;
 
-    private final OnClickListener recordListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (recordingTrackPaused) {
-                // Paused -> Resume
-                updateMenuItems(false);
-                trackRecordingServiceConnection.resumeTrack();
-                trackController.update(true, false);
-            } else {
-                // Recording -> Paused
-                updateMenuItems(true);
-                trackRecordingServiceConnection.pauseTrack();
-                trackController.update(true, true);
-            }
-        }
-    };
-
-    private final OnClickListener stopListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this, true);
-            Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackRecordedActivity.class)
-                    .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-            startActivity(newIntent);
-            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-            updateMenuItems(true);
-            finish();
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         contentProviderUtils = new ContentProviderUtils(this);
-
+        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
         trackId = null;
         if (savedInstanceState != null) {
             //Activity was recreated.
             trackId = savedInstanceState.getParcelable(EXTRA_TRACK_ID);
         } else {
+            // Resume a track
             trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
             if (trackId != null && contentProviderUtils.getTrack(trackId) == null) {
                 Log.w(TAG, "TrackId does not exists; cannot continue the recording.");
@@ -174,20 +146,19 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         }
 
         recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
-        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
         trackDataHub = new TrackDataHub(this);
 
-        pager = findViewById(R.id.track_detail_activity_view_pager);
-        pager.setAdapter(new CustomFragmentPagerAdapter(getSupportFragmentManager(), 1));
-        TabLayout tabs = findViewById(R.id.track_detail_activity_tablayout);
-        tabs.setupWithViewPager(pager);
+        CustomFragmentPagerAdapter pagerAdapter = new CustomFragmentPagerAdapter(this);
+        viewBinding.trackDetailActivityViewPager.setAdapter(pagerAdapter);
+        new TabLayoutMediator(viewBinding.trackDetailActivityTablayout, viewBinding.trackDetailActivityViewPager,
+                (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position))).attach();
         if (savedInstanceState != null) {
-            pager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
+            viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
         }
 
-        trackController = new TrackController(this, trackRecordingServiceConnection, false, recordListener, stopListener);
+        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, false, this);
     }
 
     @Override
@@ -265,7 +236,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(CURRENT_TAB_TAG_KEY, pager.getCurrentItem());
+        outState.putInt(CURRENT_TAB_TAG_KEY, viewBinding.trackDetailActivityViewPager.getCurrentItem());
         outState.putParcelable(EXTRA_TRACK_ID, trackId);
     }
 
@@ -284,8 +255,9 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     }
 
     @Override
-    protected int getLayoutResId() {
-        return R.layout.track_record;
+    protected View getRootView() {
+        viewBinding = TrackRecordingBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
     }
 
     @Override
@@ -364,26 +336,49 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
     }
 
-    private class CustomFragmentPagerAdapter extends FragmentPagerAdapter {
-
-        public CustomFragmentPagerAdapter(@NonNull FragmentManager fm, int behavior) {
-            super(fm, behavior);
+    @Override
+    public void recordStart() {
+        if (recordingTrackPaused) {
+            // Paused -> Resume
+            updateMenuItems(false);
+            trackRecordingServiceConnection.resumeTrack();
+            trackController.update(true, false);
+        } else {
+            // Recording -> Paused
+            updateMenuItems(true);
+            trackRecordingServiceConnection.pauseTrack();
+            trackController.update(true, true);
         }
+    }
 
-        @Override
-        public int getCount() {
-            return 3;
+    @Override
+    public void recordStop() {
+        trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this, true);
+        Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackRecordedActivity.class)
+                .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
+        startActivity(newIntent);
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+        updateMenuItems(true);
+        finish();
+    }
+
+    private class CustomFragmentPagerAdapter extends FragmentStateAdapter {
+
+        public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
+            super(fa);
         }
 
         @NonNull
         @Override
-        public Fragment getItem(int position) {
+        public Fragment createFragment(int position) {
             switch (position) {
                 case 0:
-                    return new StatisticsRecordingFragment();
+                    return StatisticsRecordingFragment.newInstance();
                 case 1:
-                    return ChartFragment.newInstance(false);
+                    return IntervalsFragment.IntervalsRecordingFragment.newInstance();
                 case 2:
+                    return ChartFragment.newInstance(false);
+                case 3:
                     return ChartFragment.newInstance(true);
                 default:
                     throw new RuntimeException("There isn't Fragment associated with the position: " + position);
@@ -391,17 +386,23 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         }
 
         @Override
+        public int getItemCount() {
+            return 4;
+        }
+
         public CharSequence getPageTitle(int position) {
             switch (position) {
                 case 0:
                     return getString(R.string.track_detail_stats_tab);
                 case 1:
-                    return getString(R.string.settings_chart_by_time);
+                    return getString(R.string.track_detail_intervals_tab);
                 case 2:
+                    return getString(R.string.settings_chart_by_time);
+                case 3:
                     return getString(R.string.settings_chart_by_distance);
                 default:
                     throw new RuntimeException("There isn't Fragment associated with the position: " + position);
             }
         }
     }
-}
+}

src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java

@@ -0,0 +1,86 @@
+package de.dennisguse.opentracks.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
+
+public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.Interval> {
+
+    private final StackMode stackMode;
+    private final boolean metricUnits;
+    private float sumDistance_m;
+    private final String category;
+
+    public IntervalStatisticsAdapter(Context context, List<IntervalStatistics.Interval> intervalList, String category, StackMode stackMode) {
+        super(context, R.layout.interval_stats_list_item, intervalList);
+        metricUnits = PreferencesUtils.isMetricUnits(context);
+        this.category = category;
+        this.stackMode = stackMode;
+    }
+
+    @NonNull
+    @Override
+    public View getView(int position, @Nullable View intervalView, @NonNull ViewGroup parent) {
+        int actualPosition = stackMode == StackMode.STACK_FROM_TOP ? position : getCount() - 1 - position;
+        IntervalStatistics.Interval interval = getItem(actualPosition);
+        ViewHolder viewHolder;
+
+        if (intervalView == null) {
+            viewHolder = new ViewHolder();
+
+            intervalView = LayoutInflater.from(getContext()).inflate(R.layout.interval_stats_list_item, parent, false);
+
+            viewHolder.distance = intervalView.findViewById(R.id.interval_item_distance);
+            viewHolder.rate = intervalView.findViewById(R.id.interval_item_rate);
+            viewHolder.gain = intervalView.findViewById(R.id.interval_item_gain);
+
+            intervalView.setTag(viewHolder);
+        } else {
+            viewHolder = (ViewHolder) intervalView.getTag();
+        }
+
+        if (actualPosition + 1 == getCount() && actualPosition > 0) {
+            sumDistance_m = actualPosition * getItem(actualPosition - 1).getDistance_m() + interval.getDistance_m();
+        } else {
+            sumDistance_m = (actualPosition + 1) * interval.getDistance_m();
+        }
+        viewHolder.distance.setText(StringUtils.formatDistance(getContext(), sumDistance_m, metricUnits));
+
+        if (PreferencesUtils.isReportSpeed(getContext(), category)) {
+            viewHolder.rate.setText(StringUtils.formatSpeed(getContext(), interval.getSpeed_ms(), metricUnits, true));
+        } else {
+            viewHolder.rate.setText(StringUtils.formatSpeed(getContext(), interval.getSpeed_ms(), metricUnits, false));
+        }
+
+        viewHolder.gain.setText(StringUtils.formatDistance(getContext(), interval.getGain_m(), metricUnits));
+
+        return intervalView;
+    }
+
+    /**
+     * Defines the two modes of list items stacking: from top or from bottom.
+     */
+    public enum StackMode {
+        STACK_FROM_BOTTOM,
+        STACK_FROM_TOP
+    }
+
+    private static class ViewHolder {
+        private TextView distance;
+        private TextView rate;
+        private TextView gain;
+    }
+}

src/main/java/de/dennisguse/opentracks/adapters/SensorsAdapter.java

@@ -0,0 +1,158 @@
+package de.dennisguse.opentracks.adapters;
+
+import android.content.Context;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.sensor.SensorData;
+import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
+import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower;
+import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
+import de.dennisguse.opentracks.util.StringUtils;
+
+public class SensorsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public static final int HEART_RATE_TYPE = 0;
+    public static final int CADENCE_TYPE = 1;
+    public static final int POWER_TYPE = 2;
+
+    private List<Pair<Integer, SensorData>> sensorDataList;
+    private final Context context;
+
+    public SensorsAdapter(Context context) {
+        this.context = context;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sensor_item, parent, false);
+        return new SensorsAdapter.ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        SensorsAdapter.ViewHolder viewHolder = (SensorsAdapter.ViewHolder) holder;
+        int type = sensorDataList.get(position).first;
+        SensorData sensorData = sensorDataList.get(position).second;
+        viewHolder.setData(sensorData, type);
+    }
+
+    @Override
+    public int getItemCount() {
+        if (sensorDataList == null) {
+            return 0;
+        } else {
+            return sensorDataList.size();
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return sensorDataList.get(position).first;
+    }
+
+    public List<Pair<Integer, SensorData>> swapData(List<Pair<Integer, SensorData>> data) {
+        if (sensorDataList == data) {
+            return null;
+        }
+
+        sensorDataList = data;
+
+        if (data != null) {
+            this.notifyDataSetChanged();
+        }
+
+        return data;
+    }
+
+    private class ViewHolder extends RecyclerView.ViewHolder {
+        TextView label;
+        TextView sensorValue;
+        TextView value;
+        TextView unit;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            label = itemView.findViewById(R.id.stats_sensor_label);
+            sensorValue = itemView.findViewById(R.id.stats_sensor_sensor_value);
+            value = itemView.findViewById(R.id.stats_sensor_value);
+            unit = itemView.findViewById(R.id.stats_sensor_unit);
+        }
+
+        public void setData(SensorData sensorData, int type) {
+            switch (type) {
+                case HEART_RATE_TYPE:
+                    setHeartRateSensorData((SensorDataHeartRate) sensorData);
+                    break;
+                case CADENCE_TYPE:
+                    setCadenceSensorData((SensorDataCycling.Cadence) sensorData);
+                    break;
+                case POWER_TYPE:
+                    setPowerSensorData((SensorDataCyclingPower) sensorData);
+                    break;
+                default:
+                    throw new RuntimeException("Unknown sensor type");
+            }
+        }
+
+        private void setHeartRateSensorData(SensorDataHeartRate data) {
+            String sensorValue = context.getString(R.string.value_unknown);
+            String sensorName = context.getString(R.string.value_unknown);
+            if (data != null) {
+                sensorName = data.getSensorNameOrAddress();
+                if (data.hasHeartRate_bpm() && data.isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(data.getHeartRate_bpm(), 0);
+                }
+            }
+
+            this.label.setText(context.getString(R.string.sensor_state_heart_rate));
+            this.sensorValue.setText(sensorName);
+            this.value.setText(sensorValue);
+            this.unit.setText(R.string.sensor_unit_beats_per_minute);
+        }
+
+        private void setCadenceSensorData(SensorDataCycling.Cadence data) {
+            String sensorValue = context.getString(R.string.value_unknown);
+            String sensorName = context.getString(R.string.value_unknown);
+            if (data != null) {
+                sensorName = data.getSensorNameOrAddress();
+
+                if (data.hasCadence_rpm() && data.isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(data.getCadence_rpm(), 0);
+                }
+            }
+
+            this.label.setText(context.getString(R.string.sensor_state_cadence));
+            this.sensorValue.setText(sensorName);
+            this.value.setText(sensorValue);
+            this.unit.setText(R.string.sensor_unit_rounds_per_minute);
+        }
+
+        private void setPowerSensorData(SensorDataCyclingPower data) {
+            String sensorValue = context.getString(R.string.value_unknown);
+            String sensorName = context.getString(R.string.value_unknown);
+            if (data != null) {
+                sensorName = data.getSensorNameOrAddress();
+
+                if (data.hasPower_w() && data.isRecent()) {
+                    sensorValue = StringUtils.formatDecimal(data.getPower_w(), 0);
+                }
+            }
+
+            this.label.setText(context.getString(R.string.sensor_state_power));
+            this.sensorValue.setText(sensorName);
+            this.value.setText(sensorValue);
+            this.unit.setText(R.string.sensor_unit_power);
+        }
+    }
+}

src/main/java/de/dennisguse/opentracks/android/ContentResolverWrapper.java

@@ -1,43 +0,0 @@
-package de.dennisguse.opentracks.android;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Wraps a {@link ContentResolver} and provides access as {@link IContentResolver}.
- */
-public class ContentResolverWrapper implements IContentResolver {
-
-    private final ContentResolver contentResolver;
-
-    public ContentResolverWrapper(ContentResolver contentResolver) {
-        this.contentResolver = contentResolver;
-    }
-
-    @Nullable
-    public Uri insert(@NonNull Uri url, @Nullable ContentValues values) {
-        return contentResolver.insert(url, values);
-    }
-
-    public int bulkInsert(@NonNull Uri url, @NonNull ContentValues[] values) {
-        return contentResolver.bulkInsert(url, values);
-    }
-
-    @Nullable
-    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
-        return contentResolver.query(uri, projection, selection, selectionArgs, sortOrder);
-    }
-
-    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String where, @Nullable String[] selectionArgs) {
-        return contentResolver.update(uri, values, where, selectionArgs);
-    }
-
-    public int delete(@NonNull Uri url, @Nullable String where, @Nullable String[] selectionArgs) {
-        return contentResolver.delete(url, where, selectionArgs);
-    }
-}

src/main/java/de/dennisguse/opentracks/android/IContentResolver.java

@@ -1,27 +0,0 @@
-package de.dennisguse.opentracks.android;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresPermission;
-
-/**
- * Defines the interface actually shared by {@link android.content.ContentProvider} and {@link android.content.ContentResolver}.
- * So, both can be used interchangeably.
- */
-public interface IContentResolver {
-    @Nullable
-    Uri insert(@RequiresPermission.Write @NonNull Uri url, @Nullable ContentValues values);
-
-    int bulkInsert(@RequiresPermission.Write @NonNull Uri url, @NonNull ContentValues[] values);
-
-    @Nullable
-    Cursor query(@RequiresPermission.Read @NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder);
-
-    int update(@RequiresPermission.Write @NonNull Uri uri, @Nullable ContentValues values, @Nullable String where, @Nullable String[] selectionArgs);
-
-    int delete(@RequiresPermission.Write @NonNull Uri url, @Nullable String where, @Nullable String[] selectionArgs);
-}

src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java

@@ -47,9 +47,9 @@ abstract class ChartValueSeries {
     private final Paint strokePaint;
     private final Paint titlePaint;
     private final Paint markerPaint;
-    private final ExtremityMonitor extremityMonitor;
-    private final NumberFormat numberFormat;
-    private final Path path;
+    private final ExtremityMonitor extremityMonitor = new ExtremityMonitor();
+    private final NumberFormat numberFormat = NumberFormat.getIntegerInstance();
+    private final Path path = new Path();
 
     private int interval = 1;
     private int minMarkerValue = 0;
@@ -68,7 +68,7 @@ abstract class ChartValueSeries {
      * @param fillColor       the fill color
      * @param strokeColor     the stroke color
      */
-    ChartValueSeries(Context context, int absoluteMin, int absoluteMax, int[] intervalValues, int metricTitleId, int imperialTitleId, int fillColor, int strokeColor) {
+    ChartValueSeries(Context context, int absoluteMin, int absoluteMax, int[] intervalValues, int metricTitleId, int imperialTitleId, int fillColor, int strokeColor, int fontSizeSmall, int fontSizeMedium) {
         this.absoluteMin = absoluteMin;
         this.absoluteMax = absoluteMax;
         this.intervalValues = intervalValues;
@@ -85,23 +85,19 @@ abstract class ChartValueSeries {
         strokePaint.setColor(context.getResources().getColor(strokeColor));
         strokePaint.setAntiAlias(true);
 
-        float scale = context.getResources().getDisplayMetrics().density;
-
         // Make copies of the stroke paint with the default thickness
         titlePaint = new Paint(strokePaint);
-        titlePaint.setTextSize(ChartView.MEDIUM_TEXT_SIZE * scale);
+        titlePaint.setTextSize(fontSizeMedium);
         titlePaint.setTextAlign(Align.CENTER);
+        titlePaint.setStyle(Style.FILL_AND_STROKE);
 
         markerPaint = new Paint(strokePaint);
-        markerPaint.setTextSize(ChartView.SMALL_TEXT_SIZE * scale);
+        markerPaint.setTextSize(fontSizeSmall);
         markerPaint.setTextAlign(Align.RIGHT);
+        markerPaint.setStyle(Style.FILL_AND_STROKE);
 
         // Set stroke paint thickness
         strokePaint.setStrokeWidth(STROKE_WIDTH);
-
-        extremityMonitor = new ExtremityMonitor();
-        numberFormat = NumberFormat.getIntegerInstance();
-        path = new Path();
     }
 
     /**

src/main/java/de/dennisguse/opentracks/chart/ChartView.java

@@ -19,7 +19,6 @@ package de.dennisguse.opentracks.chart;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
@@ -31,9 +30,11 @@ import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.View;
+import android.view.ViewParent;
 import android.widget.Scroller;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.GestureDetectorCompat;
 
 import java.text.NumberFormat;
@@ -42,11 +43,12 @@ import java.util.List;
 
 import de.dennisguse.opentracks.MarkerDetailActivity;
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.stats.ExtremityMonitor;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.ThemeUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
@@ -58,9 +60,6 @@ import de.dennisguse.opentracks.util.UnitConversions;
  */
 public class ChartView extends View {
 
-    static final float MEDIUM_TEXT_SIZE = 18f;
-    static final float SMALL_TEXT_SIZE = 12f;
-
     static final int Y_AXIS_INTERVALS = 5;
 
     private static final int TARGET_X_AXIS_INTERVALS = 4;
@@ -75,7 +74,7 @@ public class ChartView extends View {
     private static final int Y_AXIS_OFFSET = 16;
 
     //TODO Determine from actual size of the used drawable
-    private static final float WAYPOINT_X_ANCHOR = 13f / 48f;
+    private static final float MARKER_X_ANCHOR = 13f / 48f;
 
     static {
         X_FRACTION_FORMAT.setMaximumFractionDigits(1);
@@ -87,14 +86,15 @@ public class ChartView extends View {
     private final ChartValueSeries paceSeries;
 
     private final List<ChartPoint> chartPoints = new ArrayList<>();
-    private final List<Waypoint> waypoints = new ArrayList<>();
+    private final List<Marker> markers = new ArrayList<>();
     private final ExtremityMonitor xExtremityMonitor = new ExtremityMonitor();
+    private final int backgroundColor;
     private final Paint axisPaint;
     private final Paint xAxisMarkerPaint;
     private final Paint gridPaint;
     private final Paint markerPaint;
     private final Drawable pointer;
-    private final Drawable waypointMarker;
+    private final Drawable markerPin;
     private final int markerWidth;
     private final int markerHeight;
     private final Scroller scroller;
@@ -113,7 +113,7 @@ public class ChartView extends View {
     private int effectiveWidth = 0;
     private int effectiveHeight = 0;
 
-    private boolean chartByDistance;
+    private final boolean chartByDistance;
     private boolean metricUnits = true;
     private boolean reportSpeed = true;
     private boolean showPointer = false;
@@ -150,19 +150,19 @@ public class ChartView extends View {
             // Check if the y event is within markerHeight of the marker center
             if (Math.abs(event.getY() - topBorder - spacer - markerHeight / 2f) < markerHeight) {
                 int minDistance = Integer.MAX_VALUE;
-                Waypoint nearestWaypoint = null;
-                synchronized (waypoints) {
-                    for (Waypoint waypoint : waypoints) {
-                        int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
+                Marker nearestMarker = null;
+                synchronized (markers) {
+                    for (Marker marker : markers) {
+                        int distance = Math.abs(getX(getMarkerXValue(marker)) - (int) event.getX() - getScrollX());
                         if (distance < minDistance) {
                             minDistance = distance;
-                            nearestWaypoint = waypoint;
+                            nearestMarker = marker;
                         }
                     }
                 }
-                if (nearestWaypoint != null && minDistance < markerWidth) {
+                if (nearestMarker != null && minDistance < markerWidth) {
                     Intent intent = IntentUtils.newIntent(getContext(), MarkerDetailActivity.class)
-                            .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestWaypoint.getId());
+                            .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestMarker.getId());
                     getContext().startActivity(intent);
                     return true;
                 }
@@ -191,6 +191,8 @@ public class ChartView extends View {
     public ChartView(Context context, final boolean chartByDistance) {
         super(context);
         this.chartByDistance = chartByDistance;
+        int fontSizeSmall = ThemeUtils.getFontSizeSmallInPx(context);
+        int fontSizeMedium = ThemeUtils.getFontSizeMediumInPx(context);
 
         seriesList.add(new ChartValueSeries(context,
                 Integer.MIN_VALUE,
@@ -199,7 +201,9 @@ public class ChartView extends View {
                 R.string.description_elevation_metric,
                 R.string.description_elevation_imperial,
                 R.color.chart_elevation_fill,
-                R.color.chart_elevation_border) {
+                R.color.chart_elevation_border,
+                fontSizeSmall,
+                fontSizeMedium) {
             @Override
             protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getElevation();
@@ -218,7 +222,9 @@ public class ChartView extends View {
                 R.string.description_speed_metric,
                 R.string.description_speed_imperial,
                 R.color.chart_speed_fill,
-                R.color.chart_speed_border) {
+                R.color.chart_speed_border,
+                fontSizeSmall,
+                fontSizeMedium) {
             @Override
             protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getSpeed();
@@ -238,7 +244,9 @@ public class ChartView extends View {
                 R.string.description_pace_metric,
                 R.string.description_pace_imperial,
                 R.color.chart_pace_fill,
-                R.color.chart_pace_border) {
+                R.color.chart_pace_border,
+                fontSizeSmall,
+                fontSizeMedium) {
             @Override
             protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getPace();
@@ -258,7 +266,9 @@ public class ChartView extends View {
                 R.string.description_sensor_heart_rate,
                 R.string.description_sensor_heart_rate,
                 R.color.chart_heart_rate_fill,
-                R.color.chart_heart_rate_border) {
+                R.color.chart_heart_rate_border,
+                fontSizeSmall,
+                fontSizeMedium) {
             @Override
             protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getHeartRate();
@@ -277,7 +287,9 @@ public class ChartView extends View {
                 R.string.description_sensor_cadence,
                 R.string.description_sensor_cadence,
                 R.color.chart_cadence_fill,
-                R.color.chart_cadence_border) {
+                R.color.chart_cadence_border,
+                fontSizeSmall,
+                fontSizeMedium) {
             @Override
             protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getCadence();
@@ -295,7 +307,9 @@ public class ChartView extends View {
                 R.string.description_sensor_power,
                 R.string.description_sensor_power,
                 R.color.chart_power_fill,
-                R.color.chart_power_border) {
+                R.color.chart_power_border,
+                fontSizeSmall,
+                fontSizeMedium) {
             @Override
             protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getPower();
@@ -307,35 +321,34 @@ public class ChartView extends View {
             }
         });
 
-        float scale = context.getResources().getDisplayMetrics().density;
+        backgroundColor = ThemeUtils.getBackgroundColor(context);
 
         axisPaint = new Paint();
-        axisPaint.setStyle(Style.STROKE);
-        axisPaint.setColor(context.getResources().getColor(android.R.color.black));
+        axisPaint.setStyle(Style.FILL_AND_STROKE);
+        axisPaint.setColor(ThemeUtils.getTextColorPrimary(context));
         axisPaint.setAntiAlias(true);
-        axisPaint.setTextSize(SMALL_TEXT_SIZE * scale);
+        axisPaint.setTextSize(fontSizeSmall);
 
         xAxisMarkerPaint = new Paint(axisPaint);
         xAxisMarkerPaint.setTextAlign(Align.CENTER);
 
         gridPaint = new Paint();
         gridPaint.setStyle(Style.STROKE);
-        gridPaint.setColor(context.getResources().getColor(android.R.color.darker_gray));
+        gridPaint.setColor(ThemeUtils.getTextColorSecondary(context));
         gridPaint.setAntiAlias(false);
         gridPaint.setPathEffect(new DashPathEffect(new float[]{3, 2}, 0));
 
         markerPaint = new Paint();
         markerPaint.setStyle(Style.STROKE);
-        markerPaint.setColor(context.getResources().getColor(android.R.color.darker_gray));
         markerPaint.setAntiAlias(false);
 
-        pointer = context.getResources().getDrawable(R.drawable.ic_logo_color_24dp);
+        pointer = ContextCompat.getDrawable(context, R.drawable.ic_logo_color_24dp);
         pointer.setBounds(0, 0, pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight());
 
-        waypointMarker = MarkerUtils.getDefaultPhoto(context);
-        markerWidth = waypointMarker.getIntrinsicWidth();
-        markerHeight = waypointMarker.getIntrinsicHeight();
-        waypointMarker.setBounds(0, 0, markerWidth, markerHeight);
+        markerPin = MarkerUtils.getDefaultPhoto(context);
+        markerWidth = markerPin.getIntrinsicWidth();
+        markerHeight = markerPin.getIntrinsicHeight();
+        markerPin.setBounds(0, 0, markerWidth, markerHeight);
 
         scroller = new Scroller(context);
         setFocusable(true);
@@ -434,15 +447,15 @@ public class ChartView extends View {
         scrollTo(0, 0);
     }
 
-    public void addWaypoint(Waypoint waypoint) {
-        synchronized (waypoints) {
-            waypoints.add(waypoint);
+    public void addMarker(Marker marker) {
+        synchronized (markers) {
+            markers.add(marker);
         }
     }
 
-    public void clearWaypoints() {
-        synchronized (waypoints) {
-            waypoints.clear();
+    public void clearMarker() {
+        synchronized (markers) {
+            markers.clear();
         }
     }
 
@@ -488,6 +501,18 @@ public class ChartView extends View {
         invalidate();
     }
 
+    /**
+     * Handle parent's view disallow touch event.
+     *
+     * @param disallow Does disallow parent touch event?
+     */
+    private void requestDisallowInterceptTouchEventInParent(boolean disallow) {
+        ViewParent parent = getParent();
+        if (parent != null) {
+            parent.requestDisallowInterceptTouchEvent(disallow);
+        }
+    }
+
     /**
      * Scrolls the view horizontally by a given amount.
      *
@@ -495,13 +520,15 @@ public class ChartView extends View {
      */
     private void scrollBy(int deltaX) {
         int scrollX = getScrollX() + deltaX;
-        if (scrollX < 0) {
+        if (scrollX <= 0) {
             scrollX = 0;
         }
+
         int maxWidth = effectiveWidth * (zoomLevel - 1);
-        if (scrollX > maxWidth) {
+        if (scrollX >= maxWidth) {
             scrollX = maxWidth;
         }
+
         scrollTo(scrollX, 0);
     }
 
@@ -526,6 +553,10 @@ public class ChartView extends View {
     public boolean onTouchEvent(MotionEvent event) {
         boolean isZoom = detectorZoom.onTouchEvent(event);
         boolean isScrollTab = detectorScrollFlingTab.onTouchEvent(event);
+
+        // ChartView handles zoom gestures (more than one pointer) and all gestures when zoomed itself
+        requestDisallowInterceptTouchEventInParent(event.getPointerCount() != 1 || zoomLevel != MIN_ZOOM_LEVEL);
+
         return isZoom || isScrollTab;
     }
 
@@ -540,13 +571,13 @@ public class ChartView extends View {
         synchronized (chartPoints) {
             canvas.save();
 
-            canvas.drawColor(Color.WHITE);
+            canvas.drawColor(backgroundColor);
 
             canvas.save();
 
             clipToGraphArea(canvas);
             drawDataSeries(canvas);
-            drawWaypoints(canvas);
+            drawMarker(canvas);
             drawGrid(canvas);
 
             canvas.restore();
@@ -587,24 +618,19 @@ public class ChartView extends View {
         }
     }
 
-    /**
-     * Draws the waypoints.
-     *
-     * @param canvas the canvas
-     */
-    private void drawWaypoints(Canvas canvas) {
-        synchronized (waypoints) {
-            for (Waypoint waypoint : waypoints) {
-                double xValue = getWaypointXValue(waypoint);
+    private void drawMarker(Canvas canvas) {
+        synchronized (markers) {
+            for (Marker marker : markers) {
+                double xValue = getMarkerXValue(marker);
                 if (xValue > maxX) {
                     continue;
                 }
                 canvas.save();
-                float x = getX(getWaypointXValue(waypoint));
+                float x = getX(getMarkerXValue(marker));
                 canvas.drawLine(x, topBorder + spacer + markerHeight / 2, x, topBorder + effectiveHeight, markerPaint);
-                canvas.translate(x - (markerWidth * WAYPOINT_X_ANCHOR), topBorder + spacer);
+                canvas.translate(x - (markerWidth * MARKER_X_ANCHOR), topBorder + spacer);
 
-                waypointMarker.draw(canvas);
+                markerPin.draw(canvas);
                 canvas.restore();
             }
         }
@@ -885,6 +911,7 @@ public class ChartView extends View {
 
     /**
      * Finds the index of the first data point containing data for a series.
+     *
      * @return -1 if no data point contains data for the series.
      */
     private int getFirstPopulatedChartDataIndex(ChartValueSeries chartValueSeries) {
@@ -904,7 +931,7 @@ public class ChartView extends View {
         for (ChartValueSeries chartValueSeries : seriesList) {
             chartValueSeries.updateDimension();
         }
-        float density = getContext().getResources().getDisplayMetrics().density;
+        float density = getResources().getDisplayMetrics().density;
         spacer = (int) (density * SPACER);
         yAxisOffset = (int) (density * Y_AXIS_OFFSET);
 
@@ -975,17 +1002,12 @@ public class ChartView extends View {
         return topBorder + yAxisOffset + (int) ((1 - percentage) * rangeHeight);
     }
 
-    /**
-     * Gets a waypoint's x value.
-     *
-     * @param waypoint the waypoint
-     */
-    private double getWaypointXValue(Waypoint waypoint) {
+    private double getMarkerXValue(Marker marker) {
         if (chartByDistance) {
-            double lenghtInKm = waypoint.getLength() * UnitConversions.M_TO_KM;
-            return metricUnits ? lenghtInKm : lenghtInKm * UnitConversions.KM_TO_MI;
+            double length_km = marker.getLength() * UnitConversions.M_TO_KM;
+            return metricUnits ? length_km : length_km * UnitConversions.KM_TO_MI;
         } else {
-            return waypoint.getDuration();
+            return marker.getDuration();
         }
     }