karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Track name: use a short version of ISO8601.

Browse Source 
Fixes #1093.
This commit is contained in:
Dennis Guse
2022-01-23 21:04:08 +01:00
parent 838f3dc622
commit a97bf6b883
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java
+2 -2
View File
@@ -41,7 +41,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
public class TrackNameUtilsTest { public class TrackNameUtilsTest {
private static final Track.Id TRACK_ID = new Track.Id(1L); private static final Track.Id TRACK_ID = new Track.Id(1L);
private static final OffsetDateTime START_TIME = OffsetDateTime.parse("2022-01-02T10:15:30+01:00"); private static final OffsetDateTime START_TIME = OffsetDateTime.parse("2022-01-02T10:15:30.1234+01:00");
private static final Context CONTEXT = ApplicationProvider.getApplicationContext(); private static final Context CONTEXT = ApplicationProvider.getApplicationContext();
@@ -60,7 +60,7 @@ public class TrackNameUtilsTest {
@Test @Test
public void testTrackName_date_iso_8601() { public void testTrackName_date_iso_8601() {
PreferencesUtils.setString(R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value)); PreferencesUtils.setString(R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value));
assertEquals(StringUtils.formatDateTimeIso8601(START_TIME.toInstant(), START_TIME.getOffset()), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME)); assertEquals("2022-01-02T10:15+01", TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
} }
/** /**
src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
+2 -1
View File
@@ -19,6 +19,7 @@ package de.dennisguse.opentracks.util;
import android.content.Context; import android.content.Context;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.Track;
@@ -41,7 +42,7 @@ public class TrackNameUtils {
if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_local_value))) { if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_local_value))) {
return StringUtils.formatDateTimeWithOffset(startTime); return StringUtils.formatDateTimeWithOffset(startTime);
} else if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_iso_8601_value))) { } else if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_iso_8601_value))) {
return StringUtils.formatDateTimeIso8601(startTime.toInstant(), startTime.getOffset()); return startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mmX"));
} else { } else {
return context.getString(R.string.track_name_format, trackId.getId()); return context.getString(R.string.track_name_format, trackId.getId());
} }