From d2139d70ad3d82c5dc70602079b3dc448d09cb76 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 11 May 2022 21:38:29 +0200 Subject: [PATCH] Bugfix: sharing track added file suffix twice. Introduced in 0d3cf4ce0d56ec756f1a3b1ff19cbef6cf95275d. --- .../dennisguse/opentracks/data/ShareContentProviderTest.java | 4 ++-- .../de/dennisguse/opentracks/data/ShareContentProvider.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/ShareContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/ShareContentProviderTest.java index ad0b43b63..a8c6f16d2 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/ShareContentProviderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/ShareContentProviderTest.java @@ -29,7 +29,7 @@ public class ShareContentProviderTest { trackIds.add(new Track.Id(3)); trackIds.add(new Track.Id(5)); - Pair shareURIandMIME = ShareContentProvider.createURI(trackIds, "TrackName", TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA); + Pair shareURIandMIME = ShareContentProvider.createURI(trackIds, "filename.suffix", TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA); assertEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first)); } @@ -40,6 +40,6 @@ public class ShareContentProviderTest { trackIds.add(new Track.Id(1)); Pair shareURIandMIME = ShareContentProvider.createURI(trackIds, "../../&1=1", TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA); - assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/KML_WITH_TRACKDETAIL_AND_SENSORDATA/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first); + assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/KML_WITH_TRACKDETAIL_AND_SENSORDATA/1/..%2F..%2F%261%3D1"), shareURIandMIME.first); } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java index db6500994..d2c59f6ae 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java @@ -80,7 +80,7 @@ public class ShareContentProvider extends CustomContentProvider { /** * @return An URI for one file containing all tracks. */ - public static Pair createURI(Set trackIds, String trackName, @NonNull TrackFileFormat trackFileFormat) { + public static Pair createURI(Set trackIds, String filename, @NonNull TrackFileFormat trackFileFormat) { if (trackIds.isEmpty()) { throw new UnsupportedOperationException(); } @@ -91,7 +91,7 @@ public class ShareContentProvider extends CustomContentProvider { } trackIdBuilder.deleteCharAt(trackIdBuilder.lastIndexOf(TRACKID_DELIMITER)); - Uri uri = Uri.parse(TracksColumns.CONTENT_URI + "/" + trackFileFormat.getPreferenceId() + "/" + trackIdBuilder + "/" + Uri.encode(trackName) + "." + trackFileFormat.getExtension()); + Uri uri = Uri.parse(TracksColumns.CONTENT_URI + "/" + trackFileFormat.getPreferenceId() + "/" + trackIdBuilder + "/" + Uri.encode(filename)); String mime = getTypeMime(uri); Log.d(TAG, "Created uri " + uri + " with MIME " + mime);