upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 17:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: fileformat template was not loaded (NPE).

Browse Source 
Fixes #1232.
This commit is contained in:
Dennis Guse
2022-05-13 19:22:09 +02:00
parent de01157964
commit e421164282
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
+2 -2
View File
@@ -83,7 +83,7 @@ public class TrackFilenameGenerator {
try {
getExample();
return !template.isEmpty();
} catch (TemplateInvalidException e) {
} catch (TemplateInvalidException | NullPointerException e) {
return false;
}
}
@@ -94,7 +94,7 @@ public class TrackFilenameGenerator {
track.setUuid(UUID.fromString("fefefefefe-0000-1000-8000-00805f9b34fb"));
track.getTrackStatistics().setStartTime(Instant.ofEpochMilli(0));
return format(track, TrackFileFormat.GPX);
return format(track, TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES);
}
public static class TemplateInvalidException extends RuntimeException {
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+1 -1
View File
@@ -575,7 +575,7 @@ public class PreferencesUtils {
}
public static TrackFilenameGenerator getTrackFileformatGenerator() {
String DEFAULT = getString(R.string.export_filename_format_default, null);
String DEFAULT = resources.getString(R.string.export_filename_format_default);
TrackFilenameGenerator generator = new TrackFilenameGenerator(getString(R.string.export_filename_format_key, DEFAULT));
if (generator.isValid()) {
return generator;