Cleanup.

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);
     }

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

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

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

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);

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);
     }

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()));

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<TrackPoint> trackPoints = new LinkedList<>();
     private final List<Marker> 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;
     }

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));
         });
     }
 }