diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index 069573d51..714669105 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.TestDataUtil; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.data.TrackPoint; @@ -28,6 +29,7 @@ import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.TrackExporter; import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.util.PreferencesUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -173,6 +175,7 @@ public class ExportImportTest { @Test public void kml_with_trackdetail_and_sensordata_duplicate_trackUUID() { // given + PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true); Track track = contentProviderUtils.getTrack(trackId); TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.newTrackExporter(context, new Track[]{track}); @@ -261,6 +264,7 @@ public class ExportImportTest { @Test public void gpx_duplicate_trackUUID() { // given + PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true); Track track = contentProviderUtils.getTrack(trackId); TrackExporter trackExporter = TrackFileFormat.GPX.newTrackExporter(context, new Track[]{track}); diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java index a0e9e511f..d3b812ec1 100644 --- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java @@ -341,8 +341,8 @@ public class PreferencesUtils { } public static boolean getPreventReimportTracks(Context context) { - final boolean defaultValue = getBoolean(context, R.bool.import_prevent_reimport_title_default, false); - return getBoolean(context, R.string.import_prevent_reimport_title_key, defaultValue); + final boolean defaultValue = getBoolean(context, R.bool.import_prevent_reimport_default, false); + return getBoolean(context, R.string.import_prevent_reimport_key, defaultValue); } @Deprecated //Use TrackRecordingService diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index cb370c1ea..dbcf633c8 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -227,8 +227,8 @@ KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES - preventReimportTrackKey - false + preventReimportTrackKey + false settingsRecordingKey \ No newline at end of file diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml index 295ee0798..2bb44b147 100644 --- a/src/main/res/xml/settings.xml +++ b/src/main/res/xml/settings.xml @@ -154,8 +154,8 @@ limitations under the License. android:title="@string/settings_default_trackfileformat" app:useSimpleSummaryProvider="true" />