From e4211642824771ae04b56b3d6e968de18cac0fed Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Fri, 13 May 2022 19:22:09 +0200
Subject: [PATCH] Bugfix: fileformat template was not loaded (NPE).

Fixes #1232.
---
 .../dennisguse/opentracks/io/file/TrackFilenameGenerator.java | 4 ++--
 .../de/dennisguse/opentracks/settings/PreferencesUtils.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
index 91a2baf7e..7301cf040 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
@@ -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 {
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 3ee0e888d..c07f12cbb 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -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;