Compare commits

..

110 Commits

Author SHA1 Message Date
Dennis Guse b43dfd05ef Release: v4.17.2 2024-12-25 17:56:33 +01:00
Dennis Guse c011fd4e60 Reproducible build: F-Droid needs build flavors (not build types).
Part of #418.
2024-12-25 17:49:51 +01:00
Dennis Guse a03825e10e Release: v4.17.1 2024-12-24 15:04:02 +01:00
Dennis Guse e230fb42b8 Reproducible build: prepare using the PlayStore key for reproducible builds.
Part of #418.
2024-12-24 15:01:23 +01:00
dependabot[bot] 82c0f3dcc5 Bump com.android.tools:desugar_jdk_libs from 2.1.3 to 2.1.4
Bumps [com.android.tools:desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 2.1.3 to 2.1.4.
- [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/desugar_jdk_libs/commits)

---
updated-dependencies:
- dependency-name: com.android.tools:desugar_jdk_libs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-23 07:42:01 +01:00
Dennis Guse a5296c4cd9 Release: v4.17.0 2024-12-21 20:49:12 +01:00
Dennis Guse 522d9ebe2e Public API: allow marker creation.
Fixes #2031.
2024-12-21 20:46:09 +01:00
Dennis Guse 26c660ec5b Dashboard API: check if parameters are present before forwarding them.
Part of #2030.
2024-12-18 19:18:37 +01:00
Dennis Guse fd9646bb1f Bugfix: on idle detection reset movement-based sensor data.
Fixes #1995.
2024-12-17 07:18:24 +01:00
Aindriú Mac Giolla Eoin 4966ba8868 Translated using Weblate (Irish)
Currently translated at 100.0% (149 of 149 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ga/
2024-12-14 20:00:49 +01:00
Patrick Santa Maria 6a8861b41b Translated using Weblate (Corsican)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/co/
2024-12-12 23:01:02 +01:00
Stephan Paternotte 8dc20c48b7 Translated using Weblate (Dutch)
Currently translated at 100.0% (149 of 149 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/
2024-12-12 23:01:01 +01:00
Fjuro f2b8dc2e07 Translated using Weblate (Czech)
Currently translated at 100.0% (149 of 149 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/cs/
2024-12-12 23:00:45 +01:00
Aindriú Mac Giolla Eoin 41ce088a0e Translated using Weblate (Irish)
Currently translated at 100.0% (148 of 148 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ga/
2024-12-11 22:10:56 +01:00
Stephan Paternotte 782cefb4ff Translated using Weblate (Dutch)
Currently translated at 100.0% (148 of 148 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/
2024-12-11 22:10:55 +01:00
Fjuro 35a02a2f81 Translated using Weblate (Czech)
Currently translated at 100.0% (148 of 148 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/cs/
2024-12-11 22:10:54 +01:00
ovl-1 8c35bd6f4f Translated using Weblate (Norwegian Bokmål)
Currently translated at 97.1% (517 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nb_NO/
2024-12-11 22:10:53 +01:00
Simon Artus ad26ce795a Translated using Weblate (French)
Currently translated at 19.0% (28 of 147 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/fr/
2024-12-11 22:10:53 +01:00
Fjuro ed1e47213d Translated using Weblate (Czech)
Currently translated at 100.0% (147 of 147 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/cs/
2024-12-11 22:10:52 +01:00
Simon Artus cbb88fd1ae Translated using Weblate (French)
Currently translated at 94.7% (504 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/fr/
2024-12-11 22:10:52 +01:00
Aindriú Mac Giolla Eoin a6b808d5cf Translated using Weblate (Irish)
Currently translated at 100.0% (147 of 147 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ga/
2024-12-11 22:10:51 +01:00
Aindriú Mac Giolla Eoin 9718377307 Translated using Weblate (Irish)
Currently translated at 100.0% (532 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ga/
2024-12-11 22:10:50 +01:00
Patrick Santa Maria dbf0c3bfc9 Translated using Weblate (Corsican)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/co/
2024-12-11 22:10:50 +01:00
Stephan Paternotte 8dff211a26 Translated using Weblate (Dutch)
Currently translated at 100.0% (147 of 147 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/
2024-12-11 22:10:49 +01:00
Stephan Paternotte 319079162c Translated using Weblate (Dutch)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nl/
2024-12-11 22:10:48 +01:00
Stephan Paternotte 731c182a12 Translated using Weblate (Dutch)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nl/
2024-12-11 22:10:48 +01:00
Ghost of Sparta 6c4bb8d536 Translated using Weblate (Hungarian)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/hu/
2024-12-11 22:10:47 +01:00
josé m a42aefa752 Translated using Weblate (Galician)
Currently translated at 99.6% (530 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/gl/
2024-12-11 22:10:47 +01:00
gallegonovato 2f489d73b0 Translated using Weblate (Spanish)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/es/
2024-12-11 22:10:46 +01:00
Fjuro babd59f0ea Translated using Weblate (Czech)
Currently translated at 100.0% (532 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/cs/
2024-12-11 22:10:46 +01:00
Stephan Paternotte 37b7277f1a Translated using Weblate (Dutch)
Currently translated at 99.8% (530 of 531 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nl/
2024-12-11 22:10:45 +01:00
Aindriú Mac Giolla Eoin ecb421248c Translated using Weblate (Irish)
Currently translated at 100.0% (531 of 531 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ga/
2024-12-11 22:10:44 +01:00
Cloud Esp 42f53199a3 Translated using Weblate (French)
Currently translated at 94.7% (503 of 531 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/fr/
2024-12-11 22:10:44 +01:00
Fjuro 530b906f73 Translated using Weblate (Czech)
Currently translated at 100.0% (531 of 531 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/cs/
2024-12-11 22:10:43 +01:00
Fjuro e4ebf97c27 Translated using Weblate (Czech)
Currently translated at 100.0% (531 of 531 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/cs/
2024-12-11 22:10:43 +01:00
Dennis Guse e3cdc952a2 Release: v4.16.1 2024-12-11 22:10:30 +01:00
Dennis Guse aaf78e0b74 Settings: language chooser is now available for all Android versions.
Part of #1974
2024-12-11 22:06:09 +01:00
Dennis Guse c3a2c0d6d0 Github actions: checkout won't fetch tags unless we do a full clone. 2024-12-06 07:58:35 +01:00
Dennis Guse 05fbfcb914 Nightly build: provide details on build failure. 2024-12-06 07:24:13 +01:00
Dennis Guse 721b54b06f Release: v4.16.0 2024-12-05 18:03:58 +01:00
Dennis Guse b65230bc5d Bugfix: PublicAPI StartRecording recorded no data.
Problem was that the TrackRecordingService was not started as a ForegroundService anymore.

Fixes #1904.
2024-12-05 17:50:32 +01:00
dependabot[bot] 7c8fae66ef Bump com.android.tools.build:gradle from 8.7.2 to 8.7.3
Bumps com.android.tools.build:gradle from 8.7.2 to 8.7.3.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-03 07:31:42 +01:00
Dennis Guse ef73f89fc9 Release: v4.15.0 2024-12-01 11:01:47 +01:00
Dennis Guse c4579eb91f Settings: language chooser can be used from Android 14/SDK34.
Part of #1974.
2024-12-01 10:52:50 +01:00
Dennis Guse a015b87cc3 UI: interval list uses gain/loss as caption (instead of elevation).
Fixes #2003.
2024-11-30 14:47:04 +01:00
Dennis Guse 27e38410d7 READMEs: add Flybeeper's Pressure Sensor (a BLE barometer). 2024-11-30 13:23:44 +01:00
Dennis Guse 714f1e715a Merge remote-tracking branch 'weblate/main' 2024-11-30 12:07:44 +01:00
Dennis Guse c8183949e2 Github action: use ubuntu for tests. 2024-11-30 10:03:20 +01:00
Dennis Guse 4313b51e1e Settings: add custom language/locale chooser (SDK33+).
Corsican was not available using Android's per-app-language-chooser.

Fixes #1974.
2024-11-30 09:46:57 +01:00
Anonymous e4eebb92d3 Translated using Weblate (Kannada)
Currently translated at 97.1% (515 of 530 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/kn/
2024-11-30 09:36:45 +01:00
Simon Artus 61f496926a Translated using Weblate (French)
Currently translated at 17.8% (26 of 146 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/fr/
2024-11-30 09:36:44 +01:00
Anonymous ba3c8f6a2d Translated using Weblate (Turkish)
Currently translated at 96.9% (514 of 530 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/tr/
2024-11-30 09:36:44 +01:00
Anonymous a5ba6fb0dc Translated using Weblate (Japanese)
Currently translated at 48.4% (257 of 530 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ja/
2024-11-30 09:36:43 +01:00
Anonymous e0a28923fe Translated using Weblate (Indonesian)
Currently translated at 58.6% (311 of 530 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/id/
2024-11-30 09:36:43 +01:00
Aindriú Mac Giolla Eoin 4f05b65f32 Translated using Weblate (Irish)
Currently translated at 100.0% (530 of 530 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ga/
2024-11-30 09:36:42 +01:00
Aindriú Mac Giolla Eoin bec9be8402 Translated using Weblate (Irish)
Currently translated at 100.0% (146 of 146 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ga/
2024-11-30 09:36:42 +01:00
Cloud Esp a46de8f872 Translated using Weblate (French)
Currently translated at 94.7% (504 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/fr/
2024-11-30 09:36:41 +01:00
Stephan Paternotte 993c2a1617 Translated using Weblate (Dutch)
Currently translated at 100.0% (146 of 146 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/
2024-11-30 09:36:41 +01:00
Fjuro cddfbf8b80 Translated using Weblate (Czech)
Currently translated at 100.0% (146 of 146 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/cs/
2024-11-30 09:36:40 +01:00
Dennis Guse cba55eab74 Upgrade to Gradlew 8.11.1 2024-11-30 09:36:20 +01:00
Dennis Guse 0b4a18deb4 Move about page from settings to TrackList menu 2024-11-30 09:30:06 +01:00
dependabot[bot] 7cd054f591 Bump com.android.tools.build:gradle from 8.6.1 to 8.7.2
Bumps com.android.tools.build:gradle from 8.6.1 to 8.7.2.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-28 23:27:21 +01:00
Dennis Guse 2cc4218dc6 Removal of the "show on map"-feature using KML/GPX.
Dashboard API is nicer and easier.

Fixes #2012.
2024-11-24 10:57:55 +01:00
Dennis Guse d9de56be33 Release: v4.14.2 2024-11-20 21:18:43 +01:00
Stephan Paternotte fa1496d130 Translated using Weblate (Dutch)
Currently translated at 100.0% (145 of 145 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/
2024-11-19 18:38:56 +01:00
Aindriú Mac Giolla Eoin 89059caec2 Translated using Weblate (Irish)
Currently translated at 100.0% (145 of 145 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ga/
2024-11-19 18:38:55 +01:00
Fjuro 8f1d8e2881 Translated using Weblate (Czech)
Currently translated at 100.0% (145 of 145 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/cs/
2024-11-19 18:38:54 +01:00
gallegonovato 54e456046e Translated using Weblate (Spanish)
Currently translated at 8.2% (12 of 145 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/es/
2024-11-19 18:38:54 +01:00
Dennis Guse 1775c52291 Bugfix: layouts need inset (edge-to-edge)
Part of #2008 and #1955 (Android 15 upgrade).
2024-11-19 18:38:47 +01:00
Dennis Guse b50965f0e8 Bugfix: AppBarLayout needs inset (edge-to-edge)
Part of #2008 and #1955 (Android 15 upgrade).
2024-11-19 18:38:47 +01:00
Dennis Guse d9bba7852c Cleanup: removed unused drawables. 2024-11-19 18:38:47 +01:00
Dennis Guse 5ff91a98f4 Release: v4.14.1 2024-11-17 15:07:14 +01:00
Simon Artus 79f62bd3db Translated using Weblate (French)
Currently translated at 17.3% (25 of 144 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/fr/
2024-11-16 17:00:29 +00:00
Simon Artus c387729301 Translated using Weblate (French)
Currently translated at 92.8% (494 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/fr/
2024-11-16 17:00:24 +00:00
dependabot[bot] 1094059fb8 Bump com.android.tools:desugar_jdk_libs from 2.1.2 to 2.1.3
Bumps [com.android.tools:desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 2.1.2 to 2.1.3.
- [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/desugar_jdk_libs/commits)

---
updated-dependencies:
- dependency-name: com.android.tools:desugar_jdk_libs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-08 07:32:48 +01:00
dependabot[bot] affb4e1053 Bump androidx.core:core from 1.13.1 to 1.15.0
Bumps androidx.core:core from 1.13.1 to 1.15.0.

---
updated-dependencies:
- dependency-name: androidx.core:core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-31 05:34:40 +01:00
dependabot[bot] 0547a14fbd Bump androidx.constraintlayout:constraintlayout from 2.1.4 to 2.2.0
Bumps androidx.constraintlayout:constraintlayout from 2.1.4 to 2.2.0.

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-31 05:32:05 +01:00
Dennis Guse 39d6c9a298 Revert "Bump com.android.tools.build:gradle from 8.6.1 to 8.7.1"
This reverts commit 9c51a31b01.
2024-10-19 08:46:55 +02:00
dependabot[bot] 9c51a31b01 Bump com.android.tools.build:gradle from 8.6.1 to 8.7.1
Bumps com.android.tools.build:gradle from 8.6.1 to 8.7.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-18 19:57:37 +02:00
Dennis Guse f7f58141de Added settings for disabling idle functionality. 2024-10-18 19:57:10 +02:00
Hosted Weblate e46d3cd06c Update translation files
Updated by "Remove blank strings" hook in Weblate.

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/
2024-10-18 17:15:56 +00:00
Aindriú Mac Giolla Eoin a40b87efb6 Translated using Weblate (Irish)
Currently translated at 100.0% (532 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ga/
2024-10-18 17:15:53 +00:00
Stephan Paternotte e98dff55ae Translated using Weblate (Dutch)
Currently translated at 100.0% (144 of 144 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/
2024-10-17 04:41:48 +00:00
Fjuro f0b7de4c7c Translated using Weblate (Czech)
Currently translated at 100.0% (144 of 144 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/cs/
2024-10-17 04:41:47 +00:00
Aindriú Mac Giolla Eoin f0f571480b Translated using Weblate (Irish)
Currently translated at 100.0% (144 of 144 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ga/
2024-10-17 04:41:47 +00:00
dependabot[bot] 072fdb12ed Bump androidx.core:core-location-altitude
Bumps androidx.core:core-location-altitude from 1.0.0-alpha02 to 1.0.0-alpha03.

---
updated-dependencies:
- dependency-name: androidx.core:core-location-altitude
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-17 06:41:42 +02:00
dependabot[bot] fda2fae02b Bump androidx.test:orchestrator from 1.5.0 to 1.5.1
Bumps androidx.test:orchestrator from 1.5.0 to 1.5.1.

---
updated-dependencies:
- dependency-name: androidx.test:orchestrator
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-17 06:38:36 +02:00
dependabot[bot] a09fa93887 Bump org.mockito:mockito-android from 5.14.1 to 5.14.2
Bumps [org.mockito:mockito-android](https://github.com/mockito/mockito) from 5.14.1 to 5.14.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.14.1...v5.14.2)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-16 07:04:01 +02:00
dependabot[bot] 8f0ed91f80 Bump reactivecircus/android-emulator-runner from 2.32.0 to 2.33.0
Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.32.0 to 2.33.0.
- [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases)
- [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/reactivecircus/android-emulator-runner/compare/v2.32.0...v2.33.0)

---
updated-dependencies:
- dependency-name: reactivecircus/android-emulator-runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-14 07:05:10 +02:00
Dennis Guse e5a60a8141 Bugfix: UI for adding photos to marker was invisible.
Introduced in 00258fd93e

Fixes #1996.
2024-10-12 20:41:33 +02:00
Dennis Guse c7d3c19919 Revert "Bump com.android.tools.build:gradle from 8.6.1 to 8.7.0"
This reverts commit 95b070bb58.
2024-10-12 13:33:35 +02:00
Dennis Guse 594a34980b Release: v4.14.0 2024-10-04 07:32:25 +02:00
dependabot[bot] 95b070bb58 Bump com.android.tools.build:gradle from 8.6.1 to 8.7.0
Bumps com.android.tools.build:gradle from 8.6.1 to 8.7.0.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-01 23:06:26 +02:00
dependabot[bot] 66e3f000e9 Bump org.mockito:mockito-android from 5.14.0 to 5.14.1
Bumps [org.mockito:mockito-android](https://github.com/mockito/mockito) from 5.14.0 to 5.14.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.14.0...v5.14.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-01 07:01:27 +02:00
dependabot[bot] 1a381562e5 Bump org.mockito:mockito-android from 5.13.0 to 5.14.0
Bumps [org.mockito:mockito-android](https://github.com/mockito/mockito) from 5.13.0 to 5.14.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.13.0...v5.14.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-30 17:03:58 +02:00
josé m b72bd60586 Translated using Weblate (Galician)
Currently translated at 18.1% (26 of 143 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/gl/
2024-09-29 16:42:59 +02:00
jakobend 4e9c27af6f Translated using Weblate (German)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/de/
2024-09-29 16:42:58 +02:00
ovl-1 1638fab0df Translated using Weblate (Norwegian Bokmål)
Currently translated at 2.7% (4 of 143 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nb_NO/
2024-09-29 16:42:57 +02:00
Patrick Santa Maria e3cba91bf1 Translated using Weblate (Corsican)
Currently translated at 99.6% (530 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/co/
2024-09-29 16:42:57 +02:00
Stephan Paternotte bf1746fcd1 Translated using Weblate (Dutch)
Currently translated at 100.0% (143 of 143 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/
2024-09-29 16:42:56 +02:00
Aindriú Mac Giolla Eoin d19ca3851c Translated using Weblate (Irish)
Currently translated at 100.0% (143 of 143 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ga/
2024-09-29 16:42:55 +02:00
Fjuro 1b868bd71d Translated using Weblate (Czech)
Currently translated at 100.0% (143 of 143 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/cs/
2024-09-29 16:42:54 +02:00
Fjuro d8bcbcc183 Translated using Weblate (Czech)
Currently translated at 100.0% (532 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/cs/
2024-09-29 16:42:54 +02:00
Aindriú Mac Giolla Eoin 294cbc12ef Translated using Weblate (Irish)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ga/
2024-09-29 16:42:53 +02:00
gallegonovato 1d2abf07bf Translated using Weblate (Spanish)
Currently translated at 7.7% (11 of 142 strings)

Translation: OpenTracks/App store metadata files
Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/es/
2024-09-29 16:42:52 +02:00
Ghost of Sparta 86dfa5df67 Translated using Weblate (Hungarian)
Currently translated at 99.8% (531 of 532 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/hu/
2024-09-29 16:42:51 +02:00
Dennis Guse ed70b0d982 Upgrade to Gradlew 8.10.2 2024-09-29 16:42:37 +02:00
dependabot[bot] 0afe4c5149 Bump com.android.tools.build:gradle from 8.6.0 to 8.6.1
Bumps com.android.tools.build:gradle from 8.6.0 to 8.6.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-18 07:13:10 +02:00
Dennis Guse 2e7a3b7465 Use AltitudeConverterCompat instead of custom solution.
Fixes #1920.
2024-09-14 16:05:32 +02:00
Dennis Guse ca92666176 Target Android 14/API34.
Fixes #1955.
2024-09-08 13:51:41 +02:00
156 changed files with 1267 additions and 39146 deletions
+4 -1
View File
@@ -9,6 +9,9 @@ jobs:
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0 #TODO See https://github.com/actions/checkout/issues/1471
- uses: actions/setup-java@v4 - uses: actions/setup-java@v4
with: with:
@@ -19,7 +22,7 @@ jobs:
shell: bash shell: bash
run: | run: |
echo ${NIGHTLY_STORE_FILE} | base64 -d > KEY_NIGHTLY.jks echo ${NIGHTLY_STORE_FILE} | base64 -d > KEY_NIGHTLY.jks
./gradlew assembleNightly -Dnightly_store_file=KEY_NIGHTLY.jks -Dnightly_store_password="${NIGHTLY_STORE_PASSWORD}" -Dnightly_key_alias="${NIGHTLY_KEY_ALIAS}" -Dnightly_key_password="${NIGHTLY_STORE_PASSWORD}" ./gradlew assembleNightlyRelease -Dnightly_store_file=KEY_NIGHTLY.jks -Dnightly_store_password="${NIGHTLY_STORE_PASSWORD}" -Dnightly_key_alias="${NIGHTLY_KEY_ALIAS}" -Dnightly_key_password="${NIGHTLY_STORE_PASSWORD}"
env: env:
NIGHTLY_STORE_FILE: ${{ secrets.NIGHTLY_STORE_FILE }} NIGHTLY_STORE_FILE: ${{ secrets.NIGHTLY_STORE_FILE }}
NIGHTLY_STORE_PASSWORD: ${{ secrets.NIGHTLY_STORE_PASSWORD }} NIGHTLY_STORE_PASSWORD: ${{ secrets.NIGHTLY_STORE_PASSWORD }}
+5 -3
View File
@@ -1,5 +1,4 @@
name: Linting name: Linting
on: on:
push: push:
pull_request: pull_request:
@@ -10,12 +9,15 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0 #TODO See https://github.com/actions/checkout/issues/1471
- uses: actions/setup-java@v4 - uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: 'adopt'
java-version: '17' java-version: '17'
- run: ./gradlew lint - run: ./gradlew lint
+11 -2
View File
@@ -7,18 +7,27 @@ on:
jobs: jobs:
test: test:
timeout-minutes: 45 timeout-minutes: 45
runs-on: macos-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0 #TODO See https://github.com/actions/checkout/issues/1471
- uses: actions/setup-java@v4 - uses: actions/setup-java@v4
with: with:
distribution: 'adopt' distribution: 'adopt'
java-version: '17' java-version: '17'
- name: Enable KVM
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
- name: run tests - name: run tests
uses: reactivecircus/android-emulator-runner@v2.32.0 uses: reactivecircus/android-emulator-runner@v2.33.0
with: with:
arch: x86_64 arch: x86_64
api-level: 34 api-level: 34
+9 -8
View File
@@ -109,19 +109,20 @@ The API can be invoked by sending an explicit Intent to start an activity.
* Debug: `de.dennisguse.opentracks.debug` * Debug: `de.dennisguse.opentracks.debug`
* Nightly: `de.dennisguse.opentracks.nightly` * Nightly: `de.dennisguse.opentracks.nightly`
`Class`: `Classes`:
* **Start a recording:** `de.dennisguse.opentracks.publicapi.StartRecording` * **Start a recording:** `de.dennisguse.opentracks.publicapi.StartRecording`
* Set track data: `TRACK_NAME`, `TRACK_DESCRIPTION`, `TRACK_CATEGORY`, and `TRACK_ICON` (
non-localized identifier
see [/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38](/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38)).
NOTE: if `TRACK_ICON` is not present, `TRACK_CATEGORY` will be used to determine the icon (
localized).
* Send recorded data to another application via _Dashboard API_: `STATS_TARGET_PACKAGE` and
`STATS_TARGET_CLASS`
* **Stop a recording:** `de.dennisguse.opentracks.publicapi.StopRecording` * **Stop a recording:** `de.dennisguse.opentracks.publicapi.StopRecording`
* **Create a marker:** `de.dennisguse.opentracks.publicapi.CreateMarker`
For testing via adb: `adb shell am start -e someParameter someValue -n "package/class"` For testing via adb: `adb shell am start -e someParameter someValue -n "package/class"`
`StartRecording` supports the following parameters:
* Set track data: `TRACK_NAME`, `TRACK_DESCRIPTION`, `TRACK_CATEGORY`, and `TRACK_ICON` (non-localized identifier see [/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38](/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java#L38)).
NOTE: if `TRACK_ICON` is not present, `TRACK_CATEGORY` will be used to determine the icon (localized).
* Send recorded data to another application via _Dashboard API_: `STATS_TARGET_PACKAGE` and `STATS_TARGET_CLASS`
The Public API is disabled by default to protect the user's privacy, but it can easily be enabled in the settings. The Public API is disabled by default to protect the user's privacy, but it can easily be enabled in the settings.
## File formats compatibility with open-source software ## File formats compatibility with open-source software
+1
View File
@@ -66,6 +66,7 @@ We do not support type of movement (i.e., walking vs running).
### 0x2A6D: Environmental Sensing Service ### 0x2A6D: Environmental Sensing Service
Sadly, Bluetooth sensors providing _air pressure_ via Environmental Sensing Service seem to be very rare. Sadly, Bluetooth sensors providing _air pressure_ via Environmental Sensing Service seem to be very rare.
* [Flybeeper Pressure Sensor](https://market.flybeeper.com/device/ps1)
* NoTrustIssues: https://github.com/OpenTracksApp/NoTrustIssues * NoTrustIssues: https://github.com/OpenTracksApp/NoTrustIssues
An Android app that exposes the internal barometer via Environmental Sensing Service. An Android app that exposes the internal barometer via Environmental Sensing Service.
+52 -35
View File
@@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.6.0' classpath 'com.android.tools.build:gradle:8.7.3'
} }
} }
@@ -26,7 +26,7 @@ def getVersionName = { ->
} }
return stdout.toString().trim() return stdout.toString().trim()
} catch (ignored) { } catch (ignored) {
return null throw new GradleException('VersionName could not be read:' + ignored.message)
} }
} }
@@ -39,7 +39,7 @@ def getVersionCode = { ->
} }
return Integer.valueOf(stdout.toString().trim()) return Integer.valueOf(stdout.toString().trim())
} catch (ignored) { } catch (ignored) {
return null throw new GradleException('VersionCode could not be read:' + ignored.message)
} }
} }
@@ -51,7 +51,7 @@ android {
targetCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17
} }
compileSdk 34 compileSdk 35
buildFeatures { buildFeatures {
viewBinding true viewBinding true
@@ -63,25 +63,25 @@ android {
} }
defaultConfig { defaultConfig {
applicationId "de.dennisguse.opentracks" applicationId 'de.dennisguse.opentracks'
versionCode 5870 versionCode 5980
versionName "v4.13.1" versionName "v4.17.2"
buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\"" buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
minSdk 26 minSdk 26
targetSdk 34 targetSdk 35
testInstrumentationRunner "de.dennisguse.opentracks.TestRunner" testInstrumentationRunner 'de.dennisguse.opentracks.TestRunner'
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
} }
signingConfigs { signingConfigs {
nightly { nightly {
if (System.getProperty("nightly_store_file") != null) { if (System.getProperty('nightly_store_file') != null) {
storeFile file(System.getProperty("nightly_store_file")) storeFile file(System.getProperty('nightly_store_file'))
storePassword System.getProperty("nightly_store_password") storePassword System.getProperty('nightly_store_password')
keyAlias System.getProperty("nightly_key_alias") keyAlias System.getProperty('nightly_key_alias')
keyPassword System.getProperty("nightly_key_password") keyPassword System.getProperty('nightly_key_password')
} }
} }
} }
@@ -90,59 +90,76 @@ android {
buildTypes { buildTypes {
debug { debug {
applicationIdSuffix ".debug" applicationIdSuffix '.debug'
versionNameSuffix "-debug" versionNameSuffix '-debug'
} }
nightly {
signingConfig signingConfigs.nightly
applicationIdSuffix ".nightly"
}
release { release {
crunchPngs false crunchPngs false
minifyEnabled false minifyEnabled false
} }
}
releasePlayStore {
applicationIdSuffix ".playstore" flavorDimensions 'version'
versionNameSuffix "-PlayStore" productFlavors {
signingConfig signingConfigs.debug nightly {
dimension 'version'
applicationIdSuffix '.nightly'
signingConfig signingConfigs.nightly
}
irreproducible {
// Non-reproducible: https://f-droid.org/de/packages/de.dennisguse.opentracks/
dimension 'version'
applicationId 'de.dennisguse.opentracks'
versionNameSuffix 'irreproducible'
}
reproducible {
// Developer Binaries: https://github.com/OpenTracksApp/OSMDashboard/releases/download/v%v/de.dennisguse.opentracks.playstore_%v.apk
// FDroid: https://f-droid.org/de/packages/de.dennisguse.opentracks.playstore
// PlayStore: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
dimension 'version'
applicationId 'de.dennisguse.opentracks.playstore'
} }
} }
applicationVariants.configureEach { variant -> applicationVariants.configureEach { variant ->
variant.resValue "string", "applicationId", variant.applicationId variant.resValue 'string', 'applicationId', variant.applicationId
if (variant.buildType.name == 'nightly') { variant.outputs.configureEach {
variant.outputs.configureEach { if (variant.buildType.name == 'reproducible') {
outputFileName = '${applicationId}_${variant.buildType.name}_${variant.versionName}.apk'
} else {
outputFileName = '${applicationId}_${variant.buildType.name}_${variant.versionCode}.apk'
}
if (variant.buildType.name == 'nightly') {
setVersionCodeOverride(getVersionCode()) setVersionCodeOverride(getVersionCode())
setVersionNameOverride(getVersionName()) setVersionNameOverride(getVersionName())
outputFileName = "${applicationId}_${variant.versionCode}.apk"
} }
} }
} }
} }
dependencies { dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.preference:preference:1.2.1' implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'com.google.android.material:material:1.12.0' implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
implementation 'androidx.core:core:1.13.1' implementation 'androidx.core:core:1.15.0'
implementation 'androidx.core:core-splashscreen:1.0.1' implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'androidx.mediarouter:mediarouter:1.7.0' implementation 'androidx.mediarouter:mediarouter:1.7.0'
implementation 'androidx.core:core-location-altitude:1.0.0-alpha03'
androidTestImplementation 'androidx.test:core:1.6.1' androidTestImplementation 'androidx.test:core:1.6.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2' androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'org.mockito:mockito-android:5.13.0' androidTestImplementation 'org.mockito:mockito-android:5.14.2'
androidTestUtil 'androidx.test:orchestrator:1.5.0' androidTestUtil 'androidx.test:orchestrator:1.5.1'
} }
-41
View File
@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
height="188"
id="svg2"
version="1.1"
viewBox="0 0 78 188"
width="78"
xmlns="http://www.w3.org/2000/svg">
<defs id="defs6" />
<g id="layer1" />
<g
style="display:inline"
id="layer2" />
<metadata id="metadata8">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:title />
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<path
style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
d="m 1,150 38,37 39,-37 H 50 V 97 L 29,81 v 69 z"
id="path31161" />
<path
style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
d="M 29,51 V 70 L 50,86 V 67 Z"
id="path31169" />
<path
style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
d="M 29,23 V 40 L 50,56 V 39 Z"
id="path31192" />
<path
style="fill:#cccccc;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.7019608"
d="M 29,0 V 14 L 50,29 V 16 Z"
id="path31194" />
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

@@ -0,0 +1,9 @@
v4.13.1: OpenTracks
Změny:
- Kalendář agregovaných statistik využívá regionální preference (Android 14+)
Opravy chyb:
- KML 2.3: standardizovaný název pole pro srdeční tep
- Seznam stop: stav nahrávání nebyl správně aktualizován
- Opravy rozhraní související s Material 3
@@ -0,0 +1,7 @@
v4.14.0: OpenTracks
Změny:
- Použití dat Androidx EGM2008 (namísto přibalení našeho vlastního řešení).
Vývojář:
- Cíl Android 15 / SDK 35
@@ -0,0 +1,7 @@
v4.14.1: OpenTracks
Změny:
- Detekce zastavení může být zakázána
Oprava chyby:
- Rozhraní přidávání obrázků ke značkám bylo skryto
@@ -0,0 +1,4 @@
v4.14.2: OpenTracks
Oprava chyby:
- Android 15: rozhraní již nepřetéká (edge-to-edge)
@@ -0,0 +1,8 @@
v4.15.0: OpenTracks
Změny:
- Výběr jazyka v aplikaci (Android 14 nebo novější)
- Funkce zobrazit na mapě podporuje pouze aplikaci OSM Dashboard (odstraněno KML/KMZ nebo GPX)
Vývojář:
- GitHub Actions nyní používají Ubuntu
@@ -0,0 +1,4 @@
v4.16.0: OpenTracks
Oprava chyby:
- PublicAPI: spuštění záznamu nezaznamenalo žádná data
@@ -0,0 +1,8 @@
v4.16.1: OpenTracks
Změny:
- Výběr jazyka v aplikaci je nyní k dispozici pro všechny verze systému Android
(na základě velké poptávky)
Vývojář:
- GitHub Actions: při checkoutu se nestahovaly značky (noční aktualizace)
@@ -0,0 +1,7 @@
v4.14.0: OpenTracks
Changes:
- Use Androidx' EGM2008 data (instead of bundling our custom solution).
Developer:
- Target Android15/ SDK35
@@ -0,0 +1,8 @@
v4.14.1: OpenTracks
Changes:
- Idle detection can be disabled
Bugfix:
- UI for adding pictures to markers was hidden
@@ -0,0 +1,4 @@
v4.14.2: OpenTracks
Bugfix:
- Android 15: UI is not overflowing anymore (edge-to-edge)
@@ -0,0 +1,8 @@
v4.15.0: OpenTracks
Changes:
- In-app language selector (Android 14 or later)
- Show-on-map-feature only supports OSM Dashboard (removed KML/KMZ or GPX)
Developer:
- Github actions now uses Ubuntu
@@ -0,0 +1,5 @@
v4.16.0: OpenTracks
Bugfix:
- PublicAPI: starting a recording didn't record no data
@@ -0,0 +1,8 @@
v4.16.1: OpenTracks
Changes:
- In-app language selector now available for all Android versions
(due to some popular demand)
Developer:
- Github actions: checkout was not fetching tags (nightly)
@@ -0,0 +1,8 @@
v4.17.0: OpenTracks
Changes:
- Public API to create markers (while recording)
Bugfix:
- Sensors: on idle, set movement-based sensor data to 0
@@ -0,0 +1,5 @@
v4.17.1: OpenTracks
Changes:
- Reproducible build: let's see if it works.
The PlayStore variant will be submitted to F-Droid, verified and published them.
@@ -0,0 +1,9 @@
v4.17.2: OpenTracks
Changes:
- Reproducible build: let's see if it works.
The PlayStore variant will be submitted to F-Droid, verified and published them.
Developer:
- F-Droid requires to use Product Flavors (instead of Build Types)
@@ -0,0 +1,15 @@
v3.0.0: OpenTracks
Primer lanzamiento de OpenTracks (es decir, una bifurcación de MyTracks)
Cambios:
- Cambio de nombre de MyTracks a OpenTracks
- Se agregó un sensor de frecuencia cardíaca Bluetooth LE
- Se eliminaron todas las funciones que requieren acceso a Internet.
- Se eliminó la integración de Google Maps
- Se eliminó el uso de los servicios de Google Play.
- Se eliminaron los sensores ANT+
- Se eliminaron los sensores clásicos de Bluetooth.
- Se eliminó Protobuf
- Se eliminaron la estimación de calorías y la estimación de actividad.
- Se eliminó la API del servicio MyTracks (es decir, no hay integración con otras aplicaciones)
@@ -0,0 +1,7 @@
v4.14.1: OpenTracks
Cambios:
- Detección de inactividad se puede desactivar
Correcciones de errores:
- UI para añadir imágenes a los marcadores estaba oculto
@@ -0,0 +1,15 @@
v3.0.0 : OpenTracks
Première édition de OpenTracks (c'est-à-dire bifurcation du dépôt depuis MyTracks)
Changements:
- Renommé de MyTracks à OpenTracks
- Capteur de fréquence cardiaque par Bluetooth LE ajouté
- Toutes les fonctionnalités nécessitant une connexion Internet ont été enlevées
- Intégration Google Maps enlevée
- Toutes les utilisations des services Google Play ont été enlevées
- Capteurs ANT+ enlevés
- Capteurs Bluetooth classiques enlevés
- Protobuf enlevé
- Estimations de calories et d'activité enlevés
- API Service MyTracks enlevée (c'est-à-dire, pas d'intégration avec les autres applications)
@@ -0,0 +1,17 @@
v3.0.1 : OpenTracks
Changements :
− Partage des marqueurs
− Restructuration des paramètres
− Suppression du bouton retour de la barre d'action
− Exportation : suppression de l'option de paramétrage de la taille de photo
− Exportation : KML est désormais sélectionnable en tant que format
Correction de bogues :
− Le répertoire d'export est désormais /OpenTracks/
− Le mode paysage ne plante plus
− Correction de l'export KML/KMZ
Développeurs :
− Les tests sont exécutables (mais beaucoup d'échecs)
− Activation de l'intégration continue avec TravisCI (pas de tests)
@@ -0,0 +1,14 @@
v3.1.0 : OpenTracks
Changements :
− Ajout de l'option pour montrer les traces sur une application de carte (testé avec OsmAnd et Maps.ME)
− Ajout des statistiques de la trace sans débloquer l'appareil, durant le tracé
− Suppression du mode paysage pour la vue détaillée de la trace (était bogué)
− Suppression des suggestions pour l'historique de recherche
Correction de bogue :
− Demande des permissions de stockage pour tout importer / tout exporter
Développeurs :
− Mise à niveau vers Gradle 5.6
− Ne pas minifier les compilations release
@@ -0,0 +1,16 @@
v3.2.0 : OpenTracks
Changements :
− Suppression Widget
− Introduction des icons material design
− Suppression du snowboard et du ski (besoin de nouveaux icons)
Correction de bogue :
− Correction de la fonctionnalité de recherche
Développeurs :
− Correction de (quelques) cas de test
− Suppression de fonctionnalités parcelable
− Nettoyage majeur et reformatage
− Ne pas utiliser la diffusion pour la communication app widget
− stats_content.xml ne contient pas d'autres fichiers
@@ -0,0 +1,7 @@
v3.2.1 : OpenTracks
Changements :
− Les paramètres sont désormais une page unique
Développeurs :
− Paramètres passé à Androidx compat (utilisation de fragments)
@@ -0,0 +1,13 @@
v3.2.2 : OpenTracks
Changements :
− Suppression des statistiques agrégées
− Migré vers Material Design
Correction de bogues :
− Correction de l'export de données de capteurs
− Correction de l'import de données de capteurs incomplètes
Développeurs :
− Remplacement de la barre d'action par une barre d'outil
− Migré vers androidx appcompat (incluant Material Design)
@@ -0,0 +1,14 @@
v3.2.3 : OpenTracks
Changements :
− Partage : utilise Android Sharesheet
− Partage : partage de plusieurs tracés en tant que fichier individuel
− Utilisation d'Android ShareSheet
− Capteur de fréquence cardiaque (Bluetooth LE) : reconnexion automatique
Correction de bogues :
− Capteur de fréquence cardiaque (Bluetooth LE) : déconnecte correctement
− La fréquence cardiaque n'était pas toujours montrée lors de l'enregistrement
Développeurs :
− Activation des tests d'instrumentation de TravisCI
@@ -0,0 +1,5 @@
v3.2.4 : OpenTracks
Correction de bogue :
− Plantage activité paramètres
Suppression de la possibilité de change la voix / la fréquence de division depuis le menu contextuel
@@ -0,0 +1,15 @@
v3.2.5 : OpenTracks
Changements :
− Désactivation du changement d'activité
− Ajout des permissions pour Android 10 : enregistrement des données de localisation
Correction de bogue :
− Correction des paramètres de réinitialisation
Développeurs :
− Préférences
− Si les paramètres ne peuvent être chargés, remise à zéro de toutes les préférences
− Déplacement de l'accès des préférences vers PreferencesUtil
− Déplacement paramètres défaut préférences de code à XML
− Utilise SummaryProvider
@@ -0,0 +1,8 @@
v3.2.6 : OpenTracks
Changements :
− Moniteur de fréquence cardiaque : scanne les appareils disponibles
− Suppression du raccourci vers les paramètres Bluetooth
Développeurs :
− Préférences : défaut de préférences déplacé de code à XML
@@ -0,0 +1,10 @@
v3.2.7 : OpenTracks
Changements :
− Notification montre la précision GPS
− Montre une notification d'avertissement si la précision GPS descend en dessous du seuil
− Montre toujours les graphiques en fonction du temps, ainsi que par la distance
− Ajout de l'aide (dans les paramètres)
Correction de bogue :
- TrackDetailActivity : désactivation du mode paysage non fonctionnel (temporaire)
@@ -0,0 +1,10 @@
v3.2.8 : OpenTracks
Changements :
− Graphique : zoom en effectuant des gestes
Correction de bogues :
− L'export via KMZ n'exportait pas le nom des images correctement
− Le partage de plusieurs tracés n'incluait pas les fichiers KMZ
− L'IU de MarkerDetailActivity n'était pas montré
− Les paramètres plantaient si les préférences pour le rythme cardiaque n'étaient pas initialisées
@@ -0,0 +1,10 @@
v3.2.9 : OpenTracks
Changements :
− Option pour garder l'écran allumé lors de l'enregistrement
− Marqueurs : suppression des marqueurs divisés
− L'annonceur vocal fonctionne désormais sans la permission READ_PHONE_STATE
Correction de bogues :
− Statistiques : le rythme cardiaque n'était pas montré
− Statistiques : le temps était brièvement remis à 0s
@@ -0,0 +1,11 @@
v3.2.10 : OpenTracks
Changements :
− ChartView n'est désormais plus configurable
− Après redémarrage : suppression du redémarrage automatique d'un enregistrement incomplet
Correction de bogues :
− L'annonceur vocal utilise MAY_DUCK (à nouveau)
− ChartView montre les marqueurs (à nouveau)
− Correction du paysage de recordingLayout pour TrackListActivity
− Demande du comportement de l'API des fichiers obsolètes (nécessaire pour Android 10)
@@ -0,0 +1,12 @@
v3.2.11 : OpenTracks
Bogues :
− La vitesse maximale est égale à la vitesse moyenne
Correction de bogue :
− Plantage lors de la sélection du capteur de rythme cardiaque
Développeurs :
− Remplacement de TabHost par TabsLayout
− Suppression premier point de cheminement spécial
− Suppression des traductions dupliquées
@@ -0,0 +1,12 @@
v3.3.1 : OpenTracks
Changements :
− Android 10 : lors de la désinstallation, permet la conservation des données de l'app
− Introduction de l'API du tableau de bord : l'icon de la carte peut être utilisé pour ouvrir le tracé actuel dans une app externe
(nécessite l'installation d'une app comme OSMDashboard)
Correction de bogue :
− Le label de l'app était cassé (introduit en v3.3.0)
Développeurs :
− La documentation pour l'API du tableau de bord se situe dans README_DEVELOPER.md
@@ -0,0 +1,11 @@
v3.3.2 : OpenTracks
Changements :
− Export : écrase désormais les fichiers
Correction de bogue :
− Supprime toujours la notification d'enregistrement
Développeurs :
− Sur l'API 26+, java.time est utilisé pour analyser et écrire les dates
− Réusinage de TrackRecordingService
@@ -0,0 +1,12 @@
v3.4.0 : OpenTracks
Changements :
− API tableau de bord : plusieurs tracés
− Mise à jour de l'aide
Correction de bogues :
− Correction du plantage lors de la recréation de fragment
− Lors d'une pause : empêche l'app de s'arrêter
Développeurs :
− Activation de tests via CI (Github Actions et TravisCI)
@@ -0,0 +1,14 @@
v3.5.0 : OpenTracks
Changements :
− Marqueur : sélection d'une image depuis la galerie
− Marqueur : partager une image
− Utilisation du nom de la trace lors du partage
− Suppression de l’élévation min et max (était imprécise)
Correction de bogue :
− Les graphiques utilisent les unités et quantités préférées
Développeurs :
− Base de données : suppression des colonnes inutilisées
− Base de données : Ajout d'index
@@ -0,0 +1,10 @@
v3.6.0 : OpenTracks
Changements :
− Les traces arrêtées peuvent être reprises
Correction de bogue :
− L'import de KMZ ne traitait pas les URL de photos correctement
Développeurs :
− Simplification du traitement des données
@@ -0,0 +1,7 @@
v4.14.0 : OpenTracks
Changements :
− Utilisation des données EGM2008 d'Androidx (au lieu d'empaqueter notre propre solution).
Développeurs :
− Cible Android15/ SDK35
@@ -0,0 +1,7 @@
v4.14.1 : OpenTracks
Changements :
− La détection d’immobilité peut être désactivée
Correction de bogue :
− L’interface utilisateur pour ajouter des images aux marqueurs était cachée
@@ -0,0 +1,4 @@
v4.14.2 : OpenTracks
Correction de bogue :
− Android 15 : l’interface utilisateur ne débordera plus (bord-à-bord / edge-to-edge)
@@ -0,0 +1,8 @@
v4.15.0 : OpenTracks
Changements :
− Sélection de la langue sur l’application (Android 14 ou plus)
− La fonctionnalité « montrer sur la carte » prend en charge uniquement OSM Dashboard (suppression de KML/KMZ ou GPX)
Développeurs :
− Les actions Github utilisent désormais Ubuntu
@@ -0,0 +1,10 @@
(versionName) : OpenTracks
Changements :
−
Correction de bogue(s) :
−
Développeurs :
−
@@ -0,0 +1,15 @@
v4.13.0: OpenTracks
Athruithe:
- Is féidir marcóirí a chruthú trí API Poiblí
Ligeann sé seo a chruthú Marcóirí ag aon suíomh agus tar éis taifeadadh.
Míbhuntáiste: Ní thaispeántar marcóirí sna léaráidí a thuilleadh.
TABHAIR FAOI DEARA: Tacaíonn OSMDashboard leis an API seo tar éis leagan: v4.1.0
Ceartúchán Bug:
- Ba cheart go mbeadh socrú gníomhaíochta réamhshocraithe ina anuas
- Ar ais saighead nach bhfuil ag obair i socruithe
- Léiríonn an lipéad le haghaidh siúil as cosán anois "siúlóid as cosán"
Forbróir:
- Úsáid Post in ionad Suíomh Android
@@ -0,0 +1,9 @@
v4.13.1: OpenTracks
Athruithe:
- Úsáideann féilire staitisticí comhiomlánaithe roghanna réigiúnacha (Android 14+)
Ceartúchán Bug:
- KML 2.3: bain úsáid as ainm réimse caighdeánaithe le haghaidh ráta croí
- Liosta rianta: níor nuashonraíodh stádas taifeadta i gceart
- Ceartúcháin Chomhéadain a bhaineann le hábhar3
@@ -0,0 +1,7 @@
v4.14.0: OpenTracks
Athruithe:
- Úsáid sonraí Androidx EGM2008 (in ionad ár réiteach saincheaptha a chuachadh).
Forbróir:
- Dírigh ar Android15/ SDK35
@@ -0,0 +1,7 @@
v4.14.1: OpenTracks
Athruithe:
- Is féidir brath díomhaoin a dhíchumasú
Ceartúchán Bug:
- Bhí Chomhéadain chun pictiúir a chur le marcóirí i bhfolach
@@ -0,0 +1,4 @@
v4.14.2: OpenTracks
Ceartúchán Bug:
- Android 15: Níl an Chomhéadain ag cur thar maoil níos mó (ó imeall go himeall)
@@ -0,0 +1,8 @@
v4.15.0: OpenTracks
Athruithe:
- Roghnóir teanga in-app (Android 14 nó níos déanaí)
- Ní thacaíonn an ghné taispeáin-ar-mapa ach le Painéal OSM (bainte KML/KMZ nó GPX)
Forbróir:
- Úsáideann gníomhartha Github anois Ubuntu
@@ -0,0 +1,4 @@
v4.16.0: OpenTracks
Ceartúchán Bug:
- PublicAPI: níor taifeadadh aon sonraí le tosú taifeadta
@@ -0,0 +1,8 @@
v4.16.1: OpenTracks
Athruithe:
- Roghnóir teanga in-app ar fáil anois do gach leagan Android
(mar gheall ar roinnt éileamh coitianta)
Forbróir:
- Gníomhartha Github: ní raibh an tseiceáil amach ag fáil clibeanna (oíche)
@@ -0,0 +1,8 @@
v4.12.4: OpenTracks
Cambios:
- Anuncios: pódense omitir as unidades de medida
- Anuncios: engadida a potencia durante a volta no ciclismo
Arranxo:
- fallo ao eliminar marcadores na lista
@@ -0,0 +1,8 @@
v4.12.5: OpenTracks
Arranxos:
- detección correcta do movemento.
Estragouse na v4.9.0 ao engdir detección da pausa. Mira #1756.
Cambios:
- Soporte para Retroceso Predictivo
@@ -0,0 +1,9 @@
v4.13.1: OpenTracks
Cambios:
- O calendario con estatísticas acumuladas segue os axustes rexionais (Android 14+)
Arranxos:
- KML 2.3: usa o nome de campo estándar para frecuencia cardíaca
- Lista de rutas: non se actualizaba correctamente o estado da gravación
- Arranxos na IU relacionados con Material3
@@ -1,11 +1,14 @@
OpenTracks er en app for opptak av sportsaktivitet som respekterer ditt personvern. OpenTracks er en app for opptak av sportsaktivitet som respekterer personvernet ditt.
Funksjoner: Funksjoner:
* Sportsporing: Registrer dine sports- og utendørsaktiviteter * Registrer dine sports- og utendørsaktiviteter
* Bilder og markører: Marker interessante steder under sporing * Bilder og markører: Marker interessante steder underveis
* Total stigning og nedstigning: via barometersensor * Total stigning og nedstigning: via barometersensor
* Høyde vist i EGM2008 (over havnivå); eksportert som WGS84 * Høyde vist i EGM2008 (over havnivå); eksportert som WGS84
* Talemeldinger * Talemeldinger
* Støtter Blåtann LE-sensorer: puls, hastighet og distanse (sykling), kadens (sykling) og wattmåler (sykling) * Støtter Blåtann LE-sensorer: puls, hastighet og distanse (sykling), kadens (sykling) og wattmåler (sykling)
* Eksport av data: Enten som KMZ (inkl. bilder), KML eller GPX * Eksport av data: Enten som KMZ (inkl. bilder), KML eller GPX
* Ingen internettilgang: Internett brukes ikke * Ingen internettilgang: Internett brukes ikke
* Mørkt og lyst tema, respekterer systeminnstillingene
En åpen kildekode-app uten reklame.
@@ -0,0 +1,9 @@
v4.13.1: OpenTracks
Veranderingen:
- Geaggregeerde statistieken calender 'gebruikt regionale voorkeuren (Android 14 +)
Bugfix:
- KML 2.3: gebruik gestandaardiseerde veldnaam voor hartslag
- Tracklijst: opnamestatus is niet correct bijgewerkt
- Material3 gerelateerde UI-fixes
@@ -0,0 +1,7 @@
v4.14.0: OpenTracks
Veranderingen:
- Gebruik de EGM2008-gegevens van Androidx (in plaats van onze aangepaste oplossing te bundelen).
Ontwikkelaar:
- Target Android15 / SDK35
@@ -0,0 +1,7 @@
v4.14.1: OpenTracks
Veranderingen:
- Detectie van inactiviteit kan worden uitgeschakeld
Opgeloste probleemoplossing:
- Gebruikersinterface voor het toevoegen van afbeeldingen aan markeringen is verborgen
@@ -0,0 +1,4 @@
v4.14.2: OpenTracks
Bugfix:
- Android 15: gebruikersinterface loopt niet meer over (rand tot rand)
@@ -0,0 +1,8 @@
v4.15.0: OpenTracks
Wijzigingen:
- In-app taalkiezer (Android 14 of hoger)
- Show-on-map-functie ondersteunt alleen OSM Dashboard (verwijderd KML/KMZ of GPX)
Ontwikkelaar:
- Github-acties gebruiken nu Ubuntu
@@ -0,0 +1,4 @@
v4.16.0: OpenTracks
Opgelost probleem:
- PublicAPI: bij het starten van een opname zijn geen gegevens vastgelegd
@@ -0,0 +1,8 @@
v4.16.1: OpenTracks
Veranderingen:
- In-app taalkiezer nu beschikbaar voor alle Android-versies
(op veler verzoek)
Ontwikkelaar:
- Github-acties: checkout was not fetching tags (nightly)
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
Vendored
+5 -2
View File
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
Vendored
+2
View File
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@@ -482,7 +482,7 @@ public class CustomContentProviderUtilsTest {
assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1); assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1);
// Get marker id that needs to delete. // Get marker id that needs to delete.
Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1))); Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);
// Delete // Delete
contentProviderUtils.deleteMarker(context, marker1Id); contentProviderUtils.deleteMarker(context, marker1Id);
@@ -509,7 +509,7 @@ public class CustomContentProviderUtilsTest {
assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1); assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1);
// Get marker id that needs to delete. // Get marker id that needs to delete.
Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1))); Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);
// Check marker has photo and it's in the external storage. // Check marker has photo and it's in the external storage.
assertTrue(marker1.hasPhoto()); assertTrue(marker1.hasPhoto());
@@ -553,11 +553,11 @@ public class CustomContentProviderUtilsTest {
// Insert at first. // Insert at first.
Marker marker1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId)); Marker marker1 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
marker1.setDescription(MOCK_DESC); marker1.setDescription(MOCK_DESC);
Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1))); Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);
Marker marker2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId)); Marker marker2 = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
marker2.setDescription(MOCK_DESC); marker2.setDescription(MOCK_DESC);
Marker.Id marker2Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker2))); Marker.Id marker2Id = contentProviderUtils.insertMarker(marker2);
// Delete // Delete
assertNotNull(contentProviderUtils.getMarker(marker1Id)); assertNotNull(contentProviderUtils.getMarker(marker1Id));
@@ -598,7 +598,7 @@ public class CustomContentProviderUtilsTest {
Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId)); Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
marker.setDescription(TEST_DESC); marker.setDescription(TEST_DESC);
Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker))); Marker.Id markerId = contentProviderUtils.insertMarker(marker);
assertEquals(TEST_DESC, contentProviderUtils.getMarker(markerId).getDescription()); assertEquals(TEST_DESC, contentProviderUtils.getMarker(markerId).getDescription());
} }
@@ -614,7 +614,7 @@ public class CustomContentProviderUtilsTest {
// Insert at first. // Insert at first.
Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId)); Marker marker = new Marker(trackId, contentProviderUtils.getLastValidTrackPoint(trackId));
marker.setDescription(TEST_DESC); marker.setDescription(TEST_DESC);
Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker))); Marker.Id markerId = contentProviderUtils.insertMarker(marker);
// Update // Update
marker = contentProviderUtils.getMarker(markerId); marker = contentProviderUtils.getMarker(markerId);
@@ -638,7 +638,7 @@ public class CustomContentProviderUtilsTest {
TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId); TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint); Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
marker.setDescription(TEST_DESC); marker.setDescription(TEST_DESC);
Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker))); Marker.Id markerId = contentProviderUtils.insertMarker(marker);
File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id()); File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
assertTrue(dir.exists()); assertTrue(dir.exists());
@@ -673,7 +673,7 @@ public class CustomContentProviderUtilsTest {
TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId); TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint); Marker marker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
marker.setDescription(TEST_DESC); marker.setDescription(TEST_DESC);
Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker))); Marker.Id markerId = contentProviderUtils.insertMarker(marker);
File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id()); File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
assertTrue(dir.exists()); assertTrue(dir.exists());
@@ -709,7 +709,7 @@ public class CustomContentProviderUtilsTest {
marker.setDescription(TEST_DESC); marker.setDescription(TEST_DESC);
Marker otherMarker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint); Marker otherMarker = TestDataUtil.createMarkerWithPhoto(context, trackId, trackPoint);
otherMarker.setDescription(TEST_DESC); otherMarker.setDescription(TEST_DESC);
Marker.Id markerId = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker))); Marker.Id markerId = contentProviderUtils.insertMarker(marker);
contentProviderUtils.insertMarker(otherMarker); contentProviderUtils.insertMarker(otherMarker);
File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id()); File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.id());
@@ -31,13 +31,7 @@ public class PublicApiTest {
private final Context context = ApplicationProvider.getApplicationContext(); private final Context context = ApplicationProvider.getApplicationContext();
@Test //NOTE: this doesn't check if the TrackRecordingService was started in foreground.
public void StartTest() {
PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true);
context.startActivity(IntentUtils.newIntent(context, StartRecording.class));
}
@Test @Test
public void StartStopTest() throws InterruptedException { public void StartStopTest() throws InterruptedException {
PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true); PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true);
@@ -0,0 +1,148 @@
package de.dennisguse.opentracks.services.handlers;
import static org.junit.Assert.assertEquals;
import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import java.io.IOException;
import java.time.Instant;
import de.dennisguse.opentracks.data.models.TrackPoint;
/**
* Expectation is EGM2008 from <a href="https://geographiclib.sourceforge.io/">GeographicLib</a>] EGM2008 5minute undulation data.
*/
@RunWith(JUnit4.class)
public class AltitudeCorrectionManagerTest {
private static final double MAX_ERROR = 0.4;
private final Context context = ApplicationProvider.getApplicationContext();
@Test
public void data_Northpole() {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(90);
trackPoint.setLongitude(0.1);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(-14.8980, trackPoint.getAltitude().toM(), 2 * MAX_ERROR); //TODO For some reason, the Northpole is more off.
}
@Test
public void data_Southpole() {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(0);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(30.15, trackPoint.getAltitude().toM(), MAX_ERROR);
}
@Test
public void data_Southpole2() {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(180);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(30.15, trackPoint.getAltitude().toM(), MAX_ERROR);
}
@Test
public void data_Southpole3() {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(-180);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(30.15, trackPoint.getAltitude().toM(), MAX_ERROR);
}
@Test
public void data_0() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(0);
trackPoint.setLongitude(0);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(-17.2260, trackPoint.getAltitude().toM(), MAX_ERROR);
}
@Test
public void data_Berlin_Germany_() {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(52.530644);
trackPoint.setLongitude(13.383068);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(-39.4865, trackPoint.getAltitude().toM(), MAX_ERROR);
}
@Test
public void data_Seattle_USA() {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(47.63153);
trackPoint.setLongitude(-122.30938);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(22.99, trackPoint.getAltitude().toM(), MAX_ERROR);
}
@Test
public void data_MaxUndulation() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-8.417);
trackPoint.setLongitude(147.367);
trackPoint.setAltitude(0);
// when
new AltitudeCorrectionManager().correctAltitude(context, trackPoint);
// then
assertEquals(-85.824, trackPoint.getAltitude().toM(), MAX_ERROR);
}
}
@@ -1,247 +0,0 @@
package de.dennisguse.opentracks.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import java.io.DataInputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import de.dennisguse.opentracks.data.models.TrackPoint;
@RunWith(JUnit4.class)
public class EGM2008UtilsTest {
private static final double MAX_BILINEAR_ERROR = 0.478;
private final Context context = ApplicationProvider.getApplicationContext();
@Test
public void fileVerification() throws IOException {
// given
int expectedLength = 18671444;
int expectedHeaderLength = 404;
String expectedHeader = """
P5
# Geoid file in PGM format for the GeographicLib::Geoid class
# Description WGS84 EGM2008, 5-minute grid
# URL http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008
# DateTime 2009-08-29 18:45:00
# MaxBilinearError 0.478
# RMSBilinearError 0.012
# MaxCubicError 0.294
# RMSCubicError 0.005
# Offset -108
# Scale 0.003
# Origin 90N 0E
# AREA_OR_POINT Point
# Vertical_Datum WGS84
4320 2161
65535
""";
// when
try (InputStream inputStream = context.getResources().openRawResource(EGM2008Utils.EGM2008_5_DATA)) {
assertEquals(expectedLength, inputStream.available());
InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.US_ASCII);
char[] data = new char[expectedHeaderLength];
int length = reader.read(data);
// then
assertEquals(expectedHeaderLength, length);
assertEquals(expectedHeader, new String(data));
}
}
@Test
public void data_Northpole() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(90);
trackPoint.setLongitude(0.1);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(-14.8980, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void data_Southpole() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(0);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void data_Southpole2() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(180);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void data_Southpole3() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(-180);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(30.15, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void data_0() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(0);
trackPoint.setLongitude(0);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(-17.2260, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void data_Berlin_Germany_() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(52.530644);
trackPoint.setLongitude(13.383068);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(-39.4865, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void data_Berlin_Germany_Caching() throws IOException {
// given
TrackPoint trackPoint1 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint1.setLatitude(52.530644);
trackPoint1.setLongitude(13.383068);
trackPoint1.setAltitude(0);
TrackPoint trackPoint2 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint2.setLatitude(52.530000);
trackPoint2.setLongitude(13.380000);
trackPoint2.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint1.getLocation());
// then
assertNotEquals(altitude_egm2008.correctAltitude(trackPoint1.getLocation()).toM(), altitude_egm2008.correctAltitude(trackPoint2.getLocation()).toM(), 0.0001);
}
@Test
public void data_Seattle_USA() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(47.63153);
trackPoint.setLongitude(-122.30938);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(22.99, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void data_MaxUndulation() throws IOException {
// given
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(-8.417);
trackPoint.setLongitude(147.367);
trackPoint.setAltitude(0);
// when
EGM2008Utils.EGM2008Correction altitude_egm2008 = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
// then
assertEquals(-85.824, altitude_egm2008.correctAltitude(trackPoint.getLocation()).toM(), MAX_BILINEAR_ERROR);
}
@Test
public void getIndices() {
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0));
trackPoint.setLatitude(90);
trackPoint.setLongitude(0);
assertEquals(new EGM2008Utils.Indices(0, 0), EGM2008Utils.getIndices(trackPoint.getLocation()));
trackPoint.setLatitude(0);
trackPoint.setLongitude(0);
assertEquals(new EGM2008Utils.Indices(1080, 0), EGM2008Utils.getIndices(trackPoint.getLocation()));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(180);
assertEquals(new EGM2008Utils.Indices(2160, 4320 / 2), EGM2008Utils.getIndices(trackPoint.getLocation()));
trackPoint.setLatitude(-90);
trackPoint.setLongitude(-180);
assertEquals(new EGM2008Utils.Indices(2160, 2160), EGM2008Utils.getIndices(trackPoint.getLocation()));
}
@Test
public void getUndulationRaw_ok() throws IOException {
try (DataInputStream dataInputStream = new DataInputStream(context.getResources().openRawResource(EGM2008Utils.EGM2008_5_DATA))) {
assertEquals(40966, EGM2008Utils.getUndulationRaw(dataInputStream, new EGM2008Utils.Indices(0, 0)));
assertEquals(41742, EGM2008Utils.getUndulationRaw(dataInputStream, new EGM2008Utils.Indices(1081, 0)));
assertEquals(25950, EGM2008Utils.getUndulationRaw(dataInputStream, new EGM2008Utils.Indices(2160, 4319)));
}
}
@Test(expected = EOFException.class)
public void getUndulationRaw_error() throws IOException {
try (DataInputStream dataInputStream = new DataInputStream(context.getResources().openRawResource(EGM2008Utils.EGM2008_5_DATA))) {
assertEquals(0, EGM2008Utils.getUndulationRaw(dataInputStream, new EGM2008Utils.Indices(2161, 4320)), 0.01);
}
}
}
+18
View File
@@ -98,6 +98,14 @@ limitations under the License.
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".publicapi.CreateMarker"
android:exported="true"
android:theme="@style/SplashTheme">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<!-- NOTE: the name of the MAIN/LAUNCHER is used by icon packs; if this is changed, icon packs break.--> <!-- NOTE: the name of the MAIN/LAUNCHER is used by icon packs; if this is changed, icon packs break.-->
<activity <activity
@@ -401,6 +409,16 @@ limitations under the License.
android:name=".services.TrackDeleteService" android:name=".services.TrackDeleteService"
android:exported="false" android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/> android:permission="android.permission.BIND_JOB_SERVICE"/>
<!--Necessary for SDK < 33 to (re-)store per app locale information-->
<service
android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
android:enabled="false"
android:exported="false">
<meta-data
android:name="autoStoreLocales"
android:value="true" />
</service>
</application> </application>
<queries> <queries>
@@ -286,6 +286,11 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
return true; return true;
} }
if (item.getItemId() == R.id.track_list_about) {
startActivity(IntentUtils.newIntent(this, AboutActivity.class));
return true;
}
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@@ -487,12 +487,11 @@ public class ContentProviderUtils {
return markers; return markers;
} }
/** // TODO Merge with updateMarker
* @return the content provider URI of the inserted marker. public Marker.Id insertMarker(@NonNull Marker marker) {
*/
public Uri insertMarker(@NonNull Marker marker) {
marker.setId(null); marker.setId(null);
return contentResolver.insert(MarkerColumns.CONTENT_URI, createContentValues(marker)); Uri uri = contentResolver.insert(MarkerColumns.CONTENT_URI, createContentValues(marker));
return new Marker.Id(ContentUris.parseId(uri));
} }
private void deleteMarkerPhoto(Context context, Marker marker) { private void deleteMarkerPhoto(Context context, Marker marker) {
@@ -33,6 +33,7 @@ import java.util.Optional;
* Time is created using the {@link de.dennisguse.opentracks.services.handlers.MonotonicClock}, because system time jump backwards. * Time is created using the {@link de.dennisguse.opentracks.services.handlers.MonotonicClock}, because system time jump backwards.
* GPS time is ignored as for non-GPS events, we could not create timestamps. * GPS time is ignored as for non-GPS events, we could not create timestamps.
*/ */
//TODO Should be a record (with final properties)
public class TrackPoint { public class TrackPoint {
private static final Duration MAX_LOCATION_AGE = Duration.ofMinutes(1); private static final Duration MAX_LOCATION_AGE = Duration.ofMinutes(1);
@@ -13,7 +13,7 @@ import de.dennisguse.opentracks.services.TrackRecordingService;
import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.PreferencesUtils;
public abstract class AbstractAPIActivity extends AppCompatActivity { abstract class AbstractAPIActivity extends AppCompatActivity {
private final String TAG = AbstractAPIActivity.class.getSimpleName(); private final String TAG = AbstractAPIActivity.class.getSimpleName();
@@ -33,11 +33,15 @@ public abstract class AbstractAPIActivity extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
SplashScreen splashScreen = SplashScreen.installSplashScreen(this); SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
splashScreen.setKeepOnScreenCondition(() -> true ); splashScreen.setKeepOnScreenCondition(() -> true);
if (PreferencesUtils.isPublicAPIenabled()) { if (PreferencesUtils.isPublicAPIenabled()) {
Log.i(TAG, "Received and trying to execute requested action."); Log.i(TAG, "Received and trying to execute requested action.");
TrackRecordingServiceConnection.execute(this, serviceConnectedCallback); if (requiresForeground()) {
TrackRecordingServiceConnection.executeForeground(this, serviceConnectedCallback);
} else {
TrackRecordingServiceConnection.execute(this, serviceConnectedCallback);
}
} else { } else {
Toast.makeText(this, getString(R.string.settings_public_api_disabled_toast), Toast.LENGTH_LONG).show(); Toast.makeText(this, getString(R.string.settings_public_api_disabled_toast), Toast.LENGTH_LONG).show();
Log.w(TAG, "Public API is disabled; ignoring request."); Log.w(TAG, "Public API is disabled; ignoring request.");
@@ -48,4 +52,8 @@ public abstract class AbstractAPIActivity extends AppCompatActivity {
protected abstract void execute(TrackRecordingService service); protected abstract void execute(TrackRecordingService service);
protected abstract boolean isPostExecuteStopService(); protected abstract boolean isPostExecuteStopService();
protected boolean requiresForeground() {
return false;
}
} }
@@ -0,0 +1,16 @@
package de.dennisguse.opentracks.publicapi;
import de.dennisguse.opentracks.services.TrackRecordingService;
public class CreateMarker extends AbstractAPIActivity {
@Override
protected void execute(TrackRecordingService service) {
service.createMarker();
}
@Override
protected boolean isPostExecuteStopService() {
return false;
}
}
@@ -12,7 +12,7 @@ import de.dennisguse.opentracks.ui.markers.MarkerEditActivity;
import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.IntentUtils;
/** /**
* Public API to creates a Marker for a given track with a given location * INTERNAL: only meant for clients of OSMDashboard API.
*/ */
public class CreateMarkerActivity extends AppCompatActivity { public class CreateMarkerActivity extends AppCompatActivity {
@@ -23,8 +23,11 @@ public class CreateMarkerActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Track.Id trackId = new Track.Id(getIntent().getLongExtra(EXTRA_TRACK_ID, 0L)); Track.Id trackId = new Track.Id(getIntent().getLongExtra(EXTRA_TRACK_ID, -1L));
Location location = getIntent().getParcelableExtra(EXTRA_LOCATION); Location location = getIntent().getParcelableExtra(EXTRA_LOCATION);
if (!getIntent().hasExtra(EXTRA_TRACK_ID) || location == null) {
throw new IllegalStateException("Parameter 'track_id' and/or 'location' missing or invalid.");
}
TrackRecordingServiceConnection.execute(this, (service, self) -> { TrackRecordingServiceConnection.execute(this, (service, self) -> {
Intent intent = IntentUtils Intent intent = IntentUtils
@@ -1,34 +1,19 @@
package de.dennisguse.opentracks.publicapi; package de.dennisguse.opentracks.publicapi;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import de.dennisguse.opentracks.AbstractActivity;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.data.models.Marker;
import de.dennisguse.opentracks.databinding.MarkerDetailActivityBinding; import de.dennisguse.opentracks.databinding.MarkerDetailActivityBinding;
import de.dennisguse.opentracks.ui.markers.DeleteMarkerDialogFragment.DeleteMarkerCaller;
import de.dennisguse.opentracks.ui.markers.MarkerDetailActivity; import de.dennisguse.opentracks.ui.markers.MarkerDetailActivity;
import de.dennisguse.opentracks.ui.markers.MarkerDetailFragment;
import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.IntentUtils;
/** /**
* Public api to show an existing marker * INTERNAL: only meant for clients of OSMDashboard API.
*/ */
public class ShowMarkerActivity extends AppCompatActivity { public class ShowMarkerActivity extends AppCompatActivity {
@@ -44,10 +29,11 @@ public class ShowMarkerActivity extends AppCompatActivity {
protected void onCreate(Bundle bundle) { protected void onCreate(Bundle bundle) {
super.onCreate(bundle); super.onCreate(bundle);
Marker.Id markerId = new Marker.Id(getIntent().getLongExtra(EXTRA_MARKER_ID, 0)); if (!getIntent().hasExtra(EXTRA_MARKER_ID)) {
if (markerId.id() == 0) { throw new IllegalStateException("Parameter 'markerId' missing");
throw new IllegalStateException("No valid markerId provided");
} }
Marker.Id markerId = new Marker.Id(getIntent().getLongExtra(EXTRA_MARKER_ID, -1));
Intent intent = IntentUtils.newIntent(this, MarkerDetailActivity.class) Intent intent = IntentUtils.newIntent(this, MarkerDetailActivity.class)
.putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, markerId); .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, markerId);
startActivity(intent); startActivity(intent);
@@ -62,4 +62,9 @@ public class StartRecording extends AbstractAPIActivity {
protected boolean isPostExecuteStopService() { protected boolean isPostExecuteStopService() {
return false; return false;
} }
@Override
protected boolean requiresForeground() {
return true;
}
} }
@@ -55,7 +55,9 @@ public abstract class Aggregator<Input, Output> {
/** /**
* Reset long term aggregated values (more than derived from previous SensorData). e.g. overall distance. * Reset long term aggregated values (more than derived from previous SensorData). e.g. overall distance.
*/ */
public void reset() {} public void reset() {
value = getNoneValue();
}
/** /**
* Is the data recent considering the current time. * Is the data recent considering the current time.
@@ -37,10 +37,5 @@ public class AggregatorBarometer extends Aggregator<AtmosphericPressure, Altitud
return new AltitudeGainLoss(0f, 0f); return new AltitudeGainLoss(0f, 0f);
} }
@Override
public void reset() {
value = getNoneValue();
}
public record Data(Altitude gain, Altitude loss) {} public record Data(Altitude gain, Altitude loss) {}
} }
@@ -16,11 +16,6 @@ public class AggregatorGPS extends Aggregator<Position, Position> {
value = current.value(); value = current.value();
} }
@Override
public void reset() {
value = null;
}
@NonNull @NonNull
@Override @Override
protected Position getNoneValue() { protected Position getNoneValue() {
@@ -15,6 +15,11 @@ public class AggregatorHeartRate extends Aggregator<HeartRate, HeartRate> {
this.value = current.value(); this.value = current.value();
} }
@Override
public void reset() {
// We don't need to reset the heart rate as this value is valid for a certain amount of time: and it is not an aggregate.
}
@NonNull @NonNull
@Override @Override
protected HeartRate getNoneValue() { protected HeartRate getNoneValue() {
@@ -170,8 +170,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
if (trackPoint.hasLocation() && lastStoredTrackPointWithLocation == null) { if (trackPoint.hasLocation() && lastStoredTrackPointWithLocation == null) {
insertTrackPoint(trackPoint, true); insertTrackPoint(trackPoint, true);
handler.removeCallbacks(ON_IDLE); scheduleNewIdleTimeout();
handler.postDelayed(ON_IDLE, idleDuration.toMillis());
return true; return true;
} }
@@ -199,16 +198,14 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC); trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
insertTrackPoint(trackPoint, true); insertTrackPoint(trackPoint, true);
handler.removeCallbacks(ON_IDLE); scheduleNewIdleTimeout();
handler.postDelayed(ON_IDLE, idleDuration.toMillis());
return true; return true;
} }
if (distanceToLastStoredTrackPoint.greaterOrEqualThan(recordingDistanceInterval)) { if (distanceToLastStoredTrackPoint.greaterOrEqualThan(recordingDistanceInterval)) {
insertTrackPoint(trackPoint, false); insertTrackPoint(trackPoint, false);
handler.removeCallbacks(ON_IDLE); scheduleNewIdleTimeout();
handler.postDelayed(ON_IDLE, idleDuration.toMillis());
return true; return true;
} }
@@ -218,6 +215,15 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
return false; return false;
} }
private void scheduleNewIdleTimeout() {
if (idleDuration.isZero()) {
Log.d(TAG, "idle functionality is disabled");
return;
}
handler.removeCallbacks(ON_IDLE);
handler.postDelayed(ON_IDLE, idleDuration.toMillis());
}
TrackStatistics getTrackStatistics() { TrackStatistics getTrackStatistics() {
return trackStatisticsUpdater == null ? null : trackStatisticsUpdater.getTrackStatistics(); return trackStatisticsUpdater == null ? null : trackStatisticsUpdater.getTrackStatistics();
} }
@@ -36,7 +36,9 @@ import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.time.Duration; import java.time.Duration;
import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Distance;
import de.dennisguse.opentracks.data.models.Marker;
import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
@@ -243,6 +245,20 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
gpsStatusObservable.postValue(STATUS_GPS_DEFAULT); gpsStatusObservable.postValue(STATUS_GPS_DEFAULT);
} }
public Marker.Id createMarker() {
if (!isRecording()) {
return null;
}
//TODO This contains some duplication to TrackRecodingActivity's Marker creation
TrackPoint trackPoint = trackRecordingManager.getLastStoredTrackPointWithLocation();
if (trackPoint == null) {
return null;
}
Marker marker = new Marker(recordingStatus.trackId(), trackPoint);
return new ContentProviderUtils(this).insertMarker(marker);
}
@Override @Override
public boolean newTrackPoint(TrackPoint trackPoint, Distance thresholdHorizontalAccuracy) { public boolean newTrackPoint(TrackPoint trackPoint, Distance thresholdHorizontalAccuracy) {
if (!isRecording()) { if (!isRecording()) {
@@ -2,15 +2,15 @@ package de.dennisguse.opentracks.services.handlers;
import android.content.Context; import android.content.Context;
import android.location.Location; import android.location.Location;
import android.location.altitude.AltitudeConverter;
import android.os.Build;
import android.util.Log; import android.util.Log;
import androidx.core.location.LocationCompat;
import androidx.core.location.altitude.AltitudeConverterCompat;
import java.io.IOException; import java.io.IOException;
import de.dennisguse.opentracks.data.models.Altitude; import de.dennisguse.opentracks.data.models.Altitude;
import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.util.EGM2008Utils;
/** /**
* More infos regarding Android 34's <a href="https://issuetracker.google.com/issues/195660815#comment1">AltitudeConverter</a>. * More infos regarding Android 34's <a href="https://issuetracker.google.com/issues/195660815#comment1">AltitudeConverter</a>.
@@ -19,52 +19,28 @@ public class AltitudeCorrectionManager {
private static final String TAG = AltitudeCorrectionManager.class.getSimpleName(); private static final String TAG = AltitudeCorrectionManager.class.getSimpleName();
private AltitudeConverter altitudeConverter;
private final EGM2008Internal altitudeConverterFallback;
public AltitudeCorrectionManager() {
this.altitudeConverterFallback = new EGM2008Internal();
this.altitudeConverter = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE ? new AltitudeConverter() : null;
}
public void correctAltitude(Context context, TrackPoint trackPoint) { public void correctAltitude(Context context, TrackPoint trackPoint) {
if (!trackPoint.hasLocation() || !trackPoint.hasAltitude()) { if (!trackPoint.hasLocation() || !trackPoint.hasAltitude()) {
return; return;
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && altitudeConverter != null) {
// TODO The following is doing IO and should not be done in main thread.
// AltitudeConverterCompat uses internally a RoomDatabase that cannot be access from main thread and thus fails on version <= 34.
Thread t = new Thread(() -> {
try { try {
Location loc = trackPoint.getLocation(); Location loc = trackPoint.getLocation();
altitudeConverter.addMslAltitudeToLocation(context, loc); AltitudeConverterCompat.addMslAltitudeToLocation(context, loc);
trackPoint.setAltitude(Altitude.EGM2008.of(loc.getMslAltitudeMeters())); trackPoint.setAltitude(Altitude.EGM2008.of(LocationCompat.getMslAltitudeMeters(loc)));
return;
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Android's AltitudeConverter crashed; falling back to internal."); Log.w(TAG, "Android's AltitudeConverterCompat failed with " + e.getMessage());
altitudeConverter = null;
// Should we fallback
} }
} });
t.start();
altitudeConverterFallback.correctAltitude(context, trackPoint); try {
} t.join(); // wait for thread to finish
} catch (InterruptedException e) {
private static class EGM2008Internal { Log.w(TAG, "Android's AltitudeConverterCompat failed with " + e.getMessage());
private static final String TAG = EGM2008Internal.class.getSimpleName();
private EGM2008Utils.EGM2008Correction egm2008Correction;
public void correctAltitude(Context context, TrackPoint trackPoint) {
if (egm2008Correction == null || !egm2008Correction.canCorrect(trackPoint.getLocation())) {
try {
egm2008Correction = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
} catch (IOException e) {
Log.e(TAG, "Could not load altitude correction for " + trackPoint, e);
return;
}
}
trackPoint.setAltitude(egm2008Correction.correctAltitude(trackPoint.getLocation()));
} }
} }
} }
@@ -0,0 +1,149 @@
package de.dennisguse.opentracks.settings;
import android.annotation.SuppressLint;
import android.app.LocaleConfig;
import android.content.Context;
import android.os.Build;
import android.os.LocaleList;
import android.util.AttributeSet;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.app.LocaleManagerCompat;
import androidx.core.os.LocaleListCompat;
import androidx.preference.ListPreference;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
import de.dennisguse.opentracks.R;
public class LocalePreference extends ListPreference {
private String TAG = LocalePreference.class.getSimpleName();
public LocalePreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init(context);
}
public LocalePreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init(context);
}
public LocalePreference(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
init(context);
}
public LocalePreference(@NonNull Context context) {
super(context);
init(context);
}
// /data/user/0/de.dennisguse.opentracks.debug/files/androidx.appcompat.app.AppCompatDelegate.application_locales_record_file: open failed: ENOENT (No such file or directory)
private void init(Context context) {
setPersistent(false);
LocaleItem systemDefaultLocale = new LocaleItem("", context.getString(R.string.settings_locale_system_default));
LocaleItem currentLocale = new LocaleItem(Locale.getDefault().toLanguageTag(), Locale.getDefault().getDisplayName());
// All available options
LocaleList supportedLocales = getLocaleListCompat();
ArrayList<LocaleItem> localeItemsSorting = new ArrayList<>();
for (int i = 0; i < supportedLocales.size(); i++) {
Locale current = supportedLocales.get(i);
localeItemsSorting.add(new LocaleItem(current.toLanguageTag(), current.getDisplayName()));
}
localeItemsSorting.removeIf(current -> current.languageTag.equals(currentLocale.languageTag));
localeItemsSorting.sort(Comparator.comparing(o -> o.displayName));
ArrayList<LocaleItem> localeItemList = new ArrayList<>();
localeItemList.add(systemDefaultLocale);
localeItemList.add(currentLocale);
localeItemList.addAll(localeItemsSorting);
ArrayList<String> entries = new ArrayList<>();
ArrayList<String> entryValues = new ArrayList<>();
for (LocaleItem current : localeItemList) {
entries.add(current.displayName);
entryValues.add(current.languageTag);
}
setEntries(entries.toArray(new String[]{}));
setEntryValues(entryValues.toArray(new String[]{}));
if (AppCompatDelegate.getApplicationLocales().equals(LocaleListCompat.getEmptyLocaleList())) {
setValue(systemDefaultLocale.languageTag);
} else {
setValue(currentLocale.languageTag);
}
}
@Override
public void setOnPreferenceChangeListener(@Nullable OnPreferenceChangeListener onPreferenceChangeListener) {
super.setOnPreferenceChangeListener(onPreferenceChangeListener);
}
@Override
public boolean callChangeListener(Object newValue) {
LocaleListCompat newLocale = LocaleListCompat.getEmptyLocaleList();
if (!newValue.equals("")) {
newLocale = LocaleListCompat.forLanguageTags((String) newValue);
}
AppCompatDelegate.setApplicationLocales(newLocale);
return super.callChangeListener(newValue);
}
record LocaleItem(
String languageTag,
String displayName
) {
}
// TODO Get this functionality from any Androidx compat library: should be in LocaleListCompat or LocaleManagerCompat
// 2024-12-12: on Android 14-: LocaleManagerCompat.getApplicationLocales(getContext()) returned "[]"
// See: https://stackoverflow.com/questions/78116375/per-app-language-preferences-get-list-of-apps-available-language-programmatic
@Deprecated
private LocaleList getLocaleListCompat() {
var a = LocaleManagerCompat.getApplicationLocales(getContext());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
return LocaleConfig.fromContextIgnoringOverride(getContext()).getSupportedLocales();
}
@SuppressLint("DiscouragedApi") int localesConfigId = getContext().getResources().getIdentifier("_generated_res_locale_config", "xml", getContext().getPackageName());
List<String> localeList = new ArrayList<>();
XmlPullParser xpp = getContext().getResources().getXml(localesConfigId);
try {
while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
if (xpp.getEventType() == XmlPullParser.START_TAG) {
if ("locale".equals(xpp.getName()) && xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("name")) {
localeList.add(xpp.getAttributeValue(0));
}
}
xpp.next();
}
} catch (IOException | XmlPullParserException e) {
Log.e(TAG, "Could not load locales: " + e.getMessage());
}
Optional<String> locales = localeList.stream().reduce((s1, s2) -> s1 + "," + s2);
return locales
.map(LocaleList::forLanguageTags)
.orElseGet(LocaleList::getEmptyLocaleList);
}
}
@@ -52,7 +52,6 @@ import de.dennisguse.opentracks.sensors.SensorType;
import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils; import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils;
import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout; import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO; import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;
import de.dennisguse.opentracks.util.IntentDashboardUtils;
/** /**
* Utilities to access preferences stored in {@link SharedPreferences}. * Utilities to access preferences stored in {@link SharedPreferences}.
@@ -344,17 +343,17 @@ public class PreferencesUtils {
} }
static String[] getVoiceAnnouncementFrequencyEntries() { static String[] getVoiceAnnouncementFrequencyEntries() {
String[] values = resources.getStringArray(R.array.voice_announcement_frequency_values); String[] entryValues = resources.getStringArray(R.array.voice_announcement_frequency_values);
String[] options = new String[values.length]; String[] entries = new String[entryValues.length];
for (int i = 0; i < values.length; i++) { for (int i = 0; i < entryValues.length; i++) {
if (resources.getString(R.string.announcement_off).equals(values[i])) { if (resources.getString(R.string.announcement_off).equals(entryValues[i])) {
options[i] = resources.getString(R.string.value_off); entries[i] = resources.getString(R.string.value_off);
} else { } else {
int value = Integer.parseInt(values[i]); int value = Integer.parseInt(entryValues[i]);
options[i] = resources.getString(R.string.value_integer_minute, Duration.ofSeconds(value).toMinutes()); entries[i] = resources.getString(R.string.value_integer_minute, Duration.ofSeconds(value).toMinutes());
} }
} }
return options; return entries;
} }
/** /**
@@ -370,23 +369,23 @@ public class PreferencesUtils {
* @return Result depends on getUnitSystem * @return Result depends on getUnitSystem
*/ */
static String[] getVoiceAnnouncementDistanceEntries() { static String[] getVoiceAnnouncementDistanceEntries() {
String[] values = resources.getStringArray(R.array.voice_announcement_distance_values); String[] entryValues = resources.getStringArray(R.array.voice_announcement_distance_values);
String[] options = new String[values.length]; String[] entries = new String[entryValues.length];
UnitSystem unitSystem = getUnitSystem(); UnitSystem unitSystem = getUnitSystem();
DistanceFormatter formatter = DistanceFormatter.Builder() DistanceFormatter formatter = DistanceFormatter.Builder()
.setDecimalCount(0) .setDecimalCount(0)
.setUnit(unitSystem) .setUnit(unitSystem)
.build(resources); .build(resources);
for (int i = 0; i < values.length; i++) { for (int i = 0; i < entryValues.length; i++) {
if (resources.getString(R.string.announcement_off).equals(values[i])) { if (resources.getString(R.string.announcement_off).equals(entryValues[i])) {
options[i] = resources.getString(R.string.value_off); entries[i] = resources.getString(R.string.value_off);
} else { } else {
Distance distance = Distance.one(unitSystem).multipliedBy(Double.parseDouble(values[i])); Distance distance = Distance.one(unitSystem).multipliedBy(Double.parseDouble(entryValues[i]));
options[i] = formatter.formatDistance(distance); entries[i] = formatter.formatDistance(distance);
} }
} }
return options; return entries;
} }
public static float getVoiceSpeedRate() { public static float getVoiceSpeedRate() {
@@ -642,7 +641,9 @@ public class PreferencesUtils {
for (int i = 0; i < entryValues.length; i++) { for (int i = 0; i < entryValues.length; i++) {
int value = Integer.parseInt(entryValues[i]); int value = Integer.parseInt(entryValues[i]);
if (value == idleDurationDefault) { if (resources.getString(R.string.announcement_off).equals(entryValues[i])) {
entries[i] = resources.getString(R.string.value_off);
} else if (value == idleDurationDefault) {
entries[i] = resources.getString(R.string.value_int_seconds, value); entries[i] = resources.getString(R.string.value_int_seconds, value);
} else { } else {
entries[i] = value < 60 ? resources.getString(R.string.value_integer_second, value) : resources.getString(R.string.value_integer_minute, value / 60); entries[i] = value < 60 ? resources.getString(R.string.value_integer_second, value) : resources.getString(R.string.value_integer_minute, value / 60);
@@ -858,14 +859,6 @@ public class PreferencesUtils {
sharedPreferences.edit().clear().commit(); sharedPreferences.edit().clear().commit();
} }
public static void setShowOnMapFormat(final String showOnMapFormat) {
setString(R.string.show_on_map_format_key, showOnMapFormat);
}
public static String getShowOnMapFormat() {
return getString(R.string.show_on_map_format_key, IntentDashboardUtils.PREFERENCE_ID_ASK);
}
public static int getTotalRowsDeleted() { public static int getTotalRowsDeleted() {
return getInt(R.string.total_rows_deleted_key, 0); return getInt(R.string.total_rows_deleted_key, 0);
} }
@@ -7,15 +7,10 @@ import android.os.Bundle;
import android.widget.Toast; import android.widget.Toast;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import androidx.preference.ListPreference;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
import java.util.Map;
import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.io.file.TrackFileFormat;
import de.dennisguse.opentracks.util.IntentDashboardUtils;
public class UserInterfaceSettingsFragment extends PreferenceFragmentCompat { public class UserInterfaceSettingsFragment extends PreferenceFragmentCompat {
@@ -41,8 +36,6 @@ public class UserInterfaceSettingsFragment extends PreferenceFragmentCompat {
Preference dynamicColors = findPreference(getString(R.string.settings_ui_dynamic_colors_key)); Preference dynamicColors = findPreference(getString(R.string.settings_ui_dynamic_colors_key));
dynamicColors.setEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU); dynamicColors.setEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU);
setShowOnMapFormatOptions();
} }
@Override @Override
@@ -79,14 +72,4 @@ public class UserInterfaceSettingsFragment extends PreferenceFragmentCompat {
super.onDisplayPreferenceDialog(preference); super.onDisplayPreferenceDialog(preference);
} }
private void setShowOnMapFormatOptions() {
Map<String, String> options = TrackFileFormat.toPreferenceIdLabelMap(getResources(), IntentDashboardUtils.SHOW_ON_MAP_TRACK_FILE_FORMATS);
options.put(IntentDashboardUtils.PREFERENCE_ID_DASHBOARD, getString(R.string.show_on_dashboard));
options.put(IntentDashboardUtils.PREFERENCE_ID_ASK, getString(R.string.show_on_map_format_ask));
ListPreference listPreference = findPreference(getString(R.string.show_on_map_format_key));
listPreference.setEntries(options.values().toArray(new String[0]));
listPreference.setEntryValues(options.keySet().toArray(new String[0]));
}
} }
@@ -164,6 +164,8 @@ public class MarkerEditActivity extends AbstractActivity {
} else { } else {
loadMarkerData(markerId); loadMarkerData(markerId);
} }
setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
} }
private LiveData<Marker> createNewMarker() { private LiveData<Marker> createNewMarker() {
@@ -1,156 +0,0 @@
package de.dennisguse.opentracks.util;
import android.content.Context;
import android.location.Location;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import java.io.DataInputStream;
import java.io.IOException;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.models.Altitude;
/**
* Converts WGS84 altitude to EGM2008 (should be close to height above sea level).
* <p>
* Uses <a href="https://geographiclib.sourceforge.io/">GeographicLib</a>] EGM2008 5minute undulation data.
* <a href="https://geographiclib.sourceforge.io/html/geoid.html">...</a>
* <p>
* File starts at 90N, 0E (North pole) and is encoded in parallel bands as unsigned shorts.
*/
public class EGM2008Utils {
static final int EGM2008_5_DATA = R.raw.egm2008_5;
private static final int HEADER_LENGTH = 404;
private static final int RESOLUTION_IN_MINUTES = 60 / 5;
private static final int LATITUDE_CORRECTION = 360 * RESOLUTION_IN_MINUTES;
private EGM2008Utils() {
}
public static EGM2008Correction createCorrection(Context context, Location location) throws IOException {
Indices indices = getIndices(location);
try (DataInputStream dataInputStream = new DataInputStream(context.getResources().openRawResource(EGM2008_5_DATA))) {
return new EGM2008Correction(indices, dataInputStream);
}
}
@VisibleForTesting
static int getUndulationRaw(DataInputStream dataInputStream, Indices indices) throws IOException {
dataInputStream.reset();
int absoluteIndex = indices.getAbsoluteIndex();
return getUndulationRaw(dataInputStream, absoluteIndex);
}
private static int getUndulationRaw(DataInputStream dataInputStream, int undulationIndex) throws IOException {
dataInputStream.reset();
int index = HEADER_LENGTH + undulationIndex * 2; //byte size is 2
long ignored = dataInputStream.skip(index);
return dataInputStream.readUnsignedShort();
}
@VisibleForTesting
static Indices getIndices(Location location) {
double latitude = -location.getLatitude() + 90;
int latitudeIndex = (int) (latitude * RESOLUTION_IN_MINUTES);
double longitude;
if (location.getLongitude() >= 0) {
longitude = location.getLongitude();
} else {
longitude = 360 + location.getLongitude();
}
int longitudeIndex = (int) (longitude * RESOLUTION_IN_MINUTES);
if (longitudeIndex >= 360 * RESOLUTION_IN_MINUTES) {
longitudeIndex = 0;
}
return new Indices(latitudeIndex, longitudeIndex);
}
public static class EGM2008Correction {
protected final Indices indices;
protected final int v00;
protected final int v10;
protected final int v01;
protected final int v11;
private EGM2008Correction(Indices indices, DataInputStream dataInputStream) throws IOException {
this.indices = indices;
v00 = getUndulationRaw(dataInputStream, indices);
if (!isSouthPole()) {
v10 = getUndulationRaw(dataInputStream, indices.offset(0, 1));
v01 = getUndulationRaw(dataInputStream, indices.offset(1, 0));
v11 = getUndulationRaw(dataInputStream, indices.offset(1, 1));
} else {
v10 = 0;
v01 = 0;
v11 = 0;
}
}
public boolean canCorrect(@NonNull Location location) {
return indices.getAbsoluteIndex() == getIndices(location).getAbsoluteIndex();
}
public Altitude.EGM2008 correctAltitude(@NonNull Location location) {
if (!canCorrect(location))
throw new RuntimeException("Undulation data not loaded for this location.");
if (!location.hasAltitude())
throw new RuntimeException("Location has no altitude");
double undulationRaw;
if (isSouthPole()) {
// No bilinear interpolation on South Pole (not worth the time)
undulationRaw = v00;
} else {
double fLongitude = location.getLongitude() * RESOLUTION_IN_MINUTES -
(int) (location.getLongitude() * RESOLUTION_IN_MINUTES);
double fLatitude = (-location.getLatitude() + 90) * RESOLUTION_IN_MINUTES
- (int) ((-location.getLatitude() + 90) * RESOLUTION_IN_MINUTES);
// Bilinear interpolation (optimized; taken from GeopgrahicLib/Geoid.cpp)
double
a = (1 - fLongitude) * v00 + fLongitude * v01,
b = (1 - fLongitude) * v10 + fLongitude * v11;
undulationRaw = (1 - fLatitude) * a + fLatitude * b;
}
// Bilinear interpolation (not optimized)
//undulationRaw = v00 * (1 - fLongitude) * (1 - fLatitude)
// + v10 * fLongitude * (1 - fLatitude)
// + v01 * (1 - fLongitude) * fLatitude
// + v11 * fLongitude * fLatitude;
double h = 0.003 * undulationRaw - 108;
return Altitude.EGM2008.of(location.getAltitude() - h);
}
private boolean isSouthPole() {
return indices.latitudeIndex == 2160;
}
}
@VisibleForTesting
record Indices(int latitudeIndex, int longitudeIndex) {
Indices offset(int latitudeOffset, int longitudeOffset) {
return new Indices(latitudeIndex + latitudeOffset, longitudeIndex + longitudeOffset);
}
int getAbsoluteIndex() {
return latitudeIndex * LATITUDE_CORRECTION + longitudeIndex;
}
}
}
@@ -6,25 +6,18 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
import android.util.Pair;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.ShareContentProvider;
import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.data.tables.MarkerColumns;
import de.dennisguse.opentracks.data.tables.TrackPointsColumns; import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.data.tables.TracksColumns;
import de.dennisguse.opentracks.io.file.TrackFileFormat;
import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.PreferencesUtils;
/** /**
@@ -39,14 +32,6 @@ public class IntentDashboardUtils {
private static final String ACTION_DASHBOARD_PAYLOAD = ACTION_DASHBOARD + ".Payload"; private static final String ACTION_DASHBOARD_PAYLOAD = ACTION_DASHBOARD + ".Payload";
public static final TrackFileFormat[] SHOW_ON_MAP_TRACK_FILE_FORMATS = new TrackFileFormat[] {
TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES,
TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA,
TrackFileFormat.GPX};
public static final String PREFERENCE_ID_DASHBOARD = ACTION_DASHBOARD;
public static final String PREFERENCE_ID_ASK = "ASK";
/** /**
* Assume "v1" if not present. * Assume "v1" if not present.
*/ */
@@ -73,59 +58,13 @@ public class IntentDashboardUtils {
/** /**
* Send intent to show tracks on a map (needs an another app) as resource URIs. * Send intent to show tracks on a map (needs an another app) as resource URIs.
* Shows an AlertDialog with different format option if none is defined as preference.
* *
* @param context the context * @param context the context
* @param isRecording are we currently recording? * @param isRecording are we currently recording?
* @param trackIds the track ids * @param trackIds the track ids
*/ */
public static void showTrackOnMap(Context context, boolean isRecording, Track.Id... trackIds) { public static void showTrackOnMap(Context context, boolean isRecording, Track.Id... trackIds) {
Map<String, String> options = TrackFileFormat.toPreferenceIdLabelMap(context.getResources(), IntentDashboardUtils.SHOW_ON_MAP_TRACK_FILE_FORMATS); startDashboard(context, isRecording, null, null, trackIds);
options.put(IntentDashboardUtils.PREFERENCE_ID_DASHBOARD, context.getString(R.string.show_on_dashboard));
final String[] optionLabels = options.values().toArray(new String[0]);
final String[] optionValues = options.keySet().toArray(new String[0]);
final AtomicInteger checkedItem = new AtomicInteger(NONE_SELECTED);
String preferenceValue = PreferencesUtils.getShowOnMapFormat();
for (int i = 0; i < optionValues.length; i++) {
if (optionValues[i].equals(preferenceValue)) {
checkedItem.set(i);
}
}
if (checkedItem.get() == NONE_SELECTED) {
checkedItem.set(0); // set first option as default
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.select_show_on_map_behavior);
builder.setSingleChoiceItems(optionLabels, checkedItem.get(), (dialog, which) -> checkedItem.set(which));
builder.setPositiveButton(android.R.string.ok, (dialog, which) -> onFormatSelected(context, isRecording, optionValues[checkedItem.get()], trackIds, false));
builder.setNeutralButton(R.string.always, ((dialog, which) -> onFormatSelected(context, isRecording, optionValues[checkedItem.get()], trackIds, true)));
builder.setNegativeButton(android.R.string.cancel, null);
AlertDialog dialog = builder.create();
dialog.show();
} else {
onFormatSelected(context, isRecording, preferenceValue, trackIds, true);
}
}
/**
* A format was selected, remember if <code>always</code> is true and start the necessary action
*
* @param context the context
* @param isRecording are we currently recording?
* @param selectedValue the chosen format
* @param trackIds the track ids
* @param always set the selectedValue as default preference
*/
private static void onFormatSelected(final Context context, final boolean isRecording, final String selectedValue, final Track.Id[] trackIds, final boolean always) {
if (always) {
PreferencesUtils.setShowOnMapFormat(selectedValue);
}
TrackFileFormat trackFileFormat = TrackFileFormat.valueOfPreferenceId(selectedValue);
if (trackFileFormat != null) {
showTrackOnMapWithFileFormat(context, trackFileFormat, Set.of(trackIds));
} else {
startDashboard(context, isRecording, null, null, trackIds);
}
} }
/** /**
@@ -183,28 +122,4 @@ public class IntentDashboardUtils {
Toast.makeText(context, R.string.show_on_dashboard_not_installed, Toast.LENGTH_SHORT).show(); Toast.makeText(context, R.string.show_on_dashboard_not_installed, Toast.LENGTH_SHORT).show();
} }
} }
/**
* Send intent to show tracks on a map (needs an another app) to support specific trackFileFormat.
*
* @param context the context
* @param trackFileFormat the track file format
* @param trackIds the track ids
*/
private static void showTrackOnMapWithFileFormat(Context context, TrackFileFormat trackFileFormat, Set<Track.Id> trackIds) {
if (trackIds.isEmpty()) {
return;
}
Intent intent = new Intent(android.content.Intent.ACTION_VIEW);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Pair<Uri, String> uriAndMime = ShareContentProvider.createURI(trackIds, "SharingTrack", trackFileFormat);
intent.setDataAndType(uriAndMime.first, uriAndMime.second);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
context.startActivity(Intent.createChooser(intent, context.getString(R.string.open_track_as_trackfileformat, trackFileFormat.getExtension())));
}
} }
@@ -1,42 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="188dp"
android:height="78dp"
android:viewportWidth="188"
android:viewportHeight="78">
<path
android:fillAlpha="0.70196078"
android:fillColor="#cccccc"
android:pathData="m37.804,0.731 l-37,38 37,39L37.804,49.731L90.804,49.731L106.804,28.731l-69,0z"
android:strokeWidth="1"
android:strokeAlpha="1"
android:strokeColor="#00000000"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
<path
android:fillAlpha="0.70196078"
android:fillColor="#cccccc"
android:pathData="M136.804,28.731L117.804,28.731L101.804,49.731L120.804,49.731Z"
android:strokeWidth="1"
android:strokeAlpha="1"
android:strokeColor="#00000000"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
<path
android:fillAlpha="0.70196078"
android:fillColor="#cccccc"
android:pathData="M164.804,28.731L147.804,28.731L131.804,49.731L148.804,49.731Z"
android:strokeWidth="1"
android:strokeAlpha="1"
android:strokeColor="#00000000"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
<path
android:fillAlpha="0.70196078"
android:fillColor="#cccccc"
android:pathData="M187.804,28.731L173.804,28.731L158.804,49.731L171.804,49.731Z"
android:strokeWidth="1"
android:strokeAlpha="1"
android:strokeColor="#00000000"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
</vector>

Some files were not shown because too many files have changed in this diff Show More