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 57c14d512..f28ae7cca 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 @@ -105,7 +105,7 @@ public class ExportImportTest { tmpFile = File.createTempFile("test", "test", context.getFilesDir()); tmpFileUri = Uri.fromFile(tmpFile); - trackImporter = new TrackImporter(context, contentProviderUtils, Distance.of(10), Distance.of(200), true); + trackImporter = new TrackImporter(context, contentProviderUtils, Distance.of(200), true); TrackRecordingServiceTestUtils.resetService(mServiceRule, context); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java index e694cf3e7..205234b12 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java @@ -44,7 +44,7 @@ public class GPXImportTest { @Before public void setUp() { - trackImporter = new TrackImporter(context, contentProviderUtils, Distance.of(10), Distance.of(200), true); + trackImporter = new TrackImporter(context, contentProviderUtils, Distance.of(200), true); } @After diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java index 1f2b06165..1e074c78a 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java @@ -42,7 +42,7 @@ public class KMLImportTest { @Before public void setUp() { - trackImporter = new TrackImporter(context, contentProviderUtils, Distance.of(10), Distance.of(200), true); + trackImporter = new TrackImporter(context, contentProviderUtils, Distance.of(200), true); } @After diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java index d50b5603c..5c05e6284 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java @@ -22,8 +22,6 @@ import de.dennisguse.opentracks.data.models.TrackPoint; @RunWith(AndroidJUnit4.class) public class TrackStatisticsUpdaterTest { - private static final Distance GPS_DISTANCE = Distance.of(50); - @Test public void empty() { // when diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 6e11ae94a..207bf52c4 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -317,10 +317,6 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc setTitle(getString(isPaused ? R.string.generic_paused : R.string.generic_recording)); } - public void chooseActivityType(String category) { - ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), category); - } - @Override public void onChooseActivityTypeDone(String iconValue) { Track track = contentProviderUtils.getTrack(trackId); diff --git a/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java index ecfcd4daf..9105a8878 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java @@ -96,7 +96,7 @@ public class ShareContentProvider extends CustomContentProvider { Uri uri = Uri.parse(TracksColumns.CONTENT_URI + "/" + trackFileFormat.getName() + "/" + trackIdBuilder + "/" + Uri.encode(trackName) + "." + trackFileFormat.getExtension()); String mime = getTypeMime(uri); - Log.d(TAG, "Created uri " + uri.toString() + " with MIME " + mime); + Log.d(TAG, "Created uri " + uri + " with MIME " + mime); return new Pair<>(uri, mime); } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java index 3f11f6b87..3f426118b 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java @@ -57,7 +57,7 @@ public class ImportService extends JobIntentService { Distance recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval(); boolean preventReimport = PreferencesUtils.getPreventReimportTracks(); - TrackImporter trackImporter = new TrackImporter(this, new ContentProviderUtils(this), recordingDistanceInterval, maxRecordingDistance, preventReimport); + TrackImporter trackImporter = new TrackImporter(this, new ContentProviderUtils(this), maxRecordingDistance, preventReimport); if (TrackFileFormat.GPX.getExtension().equals(fileExtension)) { trackIds.addAll(new XMLImporter(new GpxTrackImporter(this, trackImporter)).importFile(this, file.getUri())); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java index e4fde80a6..ac8896640 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java @@ -51,7 +51,6 @@ public class TrackImporter { private final Context context; private final ContentProviderUtils contentProviderUtils; - private final Distance recordingDistanceInterval; private final Distance maxRecordingDistance; private final boolean preventReimport; @@ -62,10 +61,9 @@ public class TrackImporter { private final List trackPoints = new LinkedList<>(); private final List markers = new LinkedList<>(); - public TrackImporter(Context context, ContentProviderUtils contentProviderUtils, Distance recordingDistanceInterval, Distance maxRecordingDistance, boolean preventReimport) { + public TrackImporter(Context context, ContentProviderUtils contentProviderUtils, Distance maxRecordingDistance, boolean preventReimport) { this.context = context; this.contentProviderUtils = contentProviderUtils; - this.recordingDistanceInterval = recordingDistanceInterval; this.maxRecordingDistance = maxRecordingDistance; this.preventReimport = preventReimport; } diff --git a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java index 26efc67b9..ed66fd03c 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java @@ -1,7 +1,5 @@ package de.dennisguse.opentracks.settings; -import android.content.Intent; -import android.content.UriPermission; import android.net.Uri; import android.os.Bundle; @@ -10,7 +8,6 @@ import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; -import java.util.List; import java.util.Locale; import de.dennisguse.opentracks.R; @@ -76,7 +73,7 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat { return getString(R.string.not_set); } - return directoryUri.toString() + (directory.canWrite() ? "" : getString(R.string.export_dir_not_writable)); + return directoryUri + (directory.canWrite() ? "" : getString(R.string.export_dir_not_writable)); }); } }