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

Cleanup: use explicit preference identifiers for TrackFileFormat.

Browse Source
This commit is contained in:
Dennis Guse
2022-05-08 19:57:07 +02:00
parent 9d64989ef1
commit 3a23a412c8
7 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat {
String trackFileFormatUpperCase = trackFileFormat.getExtension().toUpperCase(Locale.US); //ASCII upper case
int photoMessageId = trackFileFormat.includesPhotos() ? R.string.export_with_photos : R.string.export_without_photos;
entries[i] = String.format("%s (%s)", trackFileFormatUpperCase, getString(photoMessageId));
entryValues[i] = trackFileFormat.name();
entryValues[i] = trackFileFormat.getPreferenceId();
}
ListPreference listPreference = findPreference(getString(R.string.export_trackfileformat_key));
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+3 -5
View File
@@ -587,11 +587,9 @@ public class PreferencesUtils {
public static TrackFileFormat getExportTrackFileFormat() {
final String TRACKFILEFORMAT_NAME_DEFAULT = getString(R.string.export_trackfileformat_default, null);
String trackFileFormatName = getString(R.string.export_trackfileformat_key, TRACKFILEFORMAT_NAME_DEFAULT);
try {
return TrackFileFormat.valueOf(trackFileFormatName);
} catch (Exception e) {
return TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA;
}
return Arrays.stream(TrackFileFormat.values())
.filter(format -> format.getPreferenceId().equals(trackFileFormatName))
.findFirst().orElse(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES);
}
public static boolean getPreventReimportTracks() {