Cleanup: export/import renaming.

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -312,7 +312,7 @@ public class ExportImportTest {
         contentProviderUtils.deleteTrack(context, trackId);
 
         // 2. import
-        KmzTrackImporter importer = new KmzTrackImporter(context, trackImporter);
+        KMZTrackImporter importer = new KMZTrackImporter(context, trackImporter);
         importTrackId = importer.importFile(tmpFileUri).get(0);
 
         // then
@@ -358,7 +358,7 @@ public class ExportImportTest {
 
         // 2. import
         InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri);
-        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new KMLTrackImporter(context, trackImporter));
         importTrackId = importer.importFile(inputStream).get(0);
 
         // then
@@ -383,7 +383,7 @@ public class ExportImportTest {
 
         // 2. import
         InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri);
-        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
         importTrackId = importer.importFile(inputStream).get(0);
 
         // then
@@ -503,7 +503,7 @@ public class ExportImportTest {
 
         // 2. import
         InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri);
-        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
         importTrackId = importer.importFile(inputStream).get(0);
 
         // then

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java

@@ -68,7 +68,7 @@ public class GPXTrackImporterTest {
     @Test
     public void gpx_with_pause_resume() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.legacy_gpx_pause_resume);
 
         // when
@@ -132,7 +132,7 @@ public class GPXTrackImporterTest {
     @Test
     public void gpx_without_speed() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx11_without_speed);
 
         // when
@@ -187,7 +187,7 @@ public class GPXTrackImporterTest {
     @Test
     public void gpx_speed_no_namespace() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx11_with_speed_no_namespace);
 
         // when
@@ -246,7 +246,7 @@ public class GPXTrackImporterTest {
     @Test
     public void gpx_legacy_trackpointextension() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.legacy_gpx_trackpointextensions_incorrect);
 
         // when
@@ -317,7 +317,7 @@ public class GPXTrackImporterTest {
     @Test
     public void importExportTest_timezone() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new GpxTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new GPXTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx_timezone);
         InputStream inputStreamExpected = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.gpx_timezone);
 

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java

@@ -62,7 +62,7 @@ public class KMLTrackImporterTest {
     @Test
     public void kml22_order_location_and_when() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new KMLTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_order_location_and_when);
 
         // when
@@ -118,7 +118,7 @@ public class KMLTrackImporterTest {
     @Test
     public void kml22_time_decreases() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new KMLTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_time_decreases);
 
         // when
@@ -159,7 +159,7 @@ public class KMLTrackImporterTest {
     @Test
     public void kml22_with_statistics_marker() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new KMLTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.legacy_kml22_statistics_marker);
 
         // when
@@ -243,7 +243,7 @@ public class KMLTrackImporterTest {
     @Test(expected = ImportParserException.class)
     public void kml_without_locations() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new KMLTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_without_locations);
 
         // when
@@ -254,7 +254,7 @@ public class KMLTrackImporterTest {
     @Test(expected = ImportParserException.class)
     public void kml_when_locations_different() throws IOException {
         // given
-        XMLImporter importer = new XMLImporter(new KmlTrackImporter(context, trackImporter));
+        XMLImporter importer = new XMLImporter(new KMLTrackImporter(context, trackImporter));
         InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.test.R.raw.kml22_when_locations_different);
 
         // when

src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java

@@ -15,7 +15,7 @@ import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.io.file.exporter.CSVTrackExporter;
 import de.dennisguse.opentracks.io.file.exporter.GPXTrackExporter;
 import de.dennisguse.opentracks.io.file.exporter.KMLTrackExporter;
-import de.dennisguse.opentracks.io.file.exporter.KmzTrackExporter;
+import de.dennisguse.opentracks.io.file.exporter.KMZTrackExporter;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
 
 /**
@@ -33,7 +33,7 @@ public enum TrackFileFormat {
 
         @Override
         public String getMimeType() {
-            return MIME_KML;
+            return "application/vnd.google-earth.kml+xml";
         }
 
         public String getExtension() {
@@ -49,12 +49,12 @@ public enum TrackFileFormat {
         @Override
         public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
             KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
-            return new KmzTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
+            return new KMZTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
         }
 
         @Override
         public String getMimeType() {
-            return MIME_KMZ;
+            return "application/vnd.google-earth.kmz";
         }
 
         public String getExtension() {
@@ -74,12 +74,12 @@ public enum TrackFileFormat {
         @Override
         public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
             KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
-            return new KmzTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
+            return new KMZTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
         }
 
         @Override
         public String getMimeType() {
-            return MIME_KMZ;
+            return KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.getMimeType();
         }
 
         public String getExtension() {
@@ -126,17 +126,13 @@ public enum TrackFileFormat {
         }
     };
 
-    private static final String MIME_KMZ = "application/vnd.google-earth.kmz";
-
-    private static final String MIME_KML = "application/vnd.google-earth.kml+xml";
-
     private final String preferenceId;
 
     TrackFileFormat(String preferenceId) {
         this.preferenceId = preferenceId;
     }
 
-    public static Map<String, String> toPreferenceIdLabelMap(final Resources resources, final TrackFileFormat ... trackFileFormats) {
+    public static Map<String, String> toPreferenceIdLabelMap(final Resources resources, final TrackFileFormat... trackFileFormats) {
         Map<String, String> preferenceIdLabelMap = new LinkedHashMap<>(trackFileFormats.length);
         for (TrackFileFormat trackFileFormat : trackFileFormats) {
             String trackFileFormatUpperCase = trackFileFormat.getExtension().toUpperCase(Locale.US); //ASCII upper case

src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java

@@ -102,7 +102,6 @@ public class GPXTrackExporter implements TrackExporter {
         try {
             prepare(outputStream);
             writeHeader();
-
             for (Track track : tracks) {
                 writeMarkers(track);
             }
@@ -200,17 +199,17 @@ public class GPXTrackExporter implements TrackExporter {
         }
     }
 
-    public void prepare(OutputStream outputStream) {
+    private void prepare(OutputStream outputStream) {
         this.printWriter = new PrintWriter(outputStream);
     }
 
-    public void close() {
+    private void close() {
         printWriter.flush();
         printWriter = null;
     }
 
 
-    public void writeHeader() {
+    private void writeHeader() {
         printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
         printWriter.println("<gpx");
         printWriter.println("version=\"1.1\"");
@@ -233,7 +232,7 @@ public class GPXTrackExporter implements TrackExporter {
                 + " http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd\">");
     }
 
-    public void writeFooter() {
+    private void writeFooter() {
         printWriter.println("</gpx>");
     }
 
@@ -253,7 +252,7 @@ public class GPXTrackExporter implements TrackExporter {
         }
     }
 
-    public void writeMarker(ZoneOffset zoneOffset, Marker marker) {
+    private void writeMarker(ZoneOffset zoneOffset, Marker marker) {
         printWriter.println("<wpt " + formatLocation(marker.getLatitude(), marker.getLongitude()) + ">");
         if (marker.hasAltitude()) {
             printWriter.println("<ele>" + ALTITUDE_FORMAT.format(marker.getAltitude().toM()) + "</ele>");
@@ -265,7 +264,7 @@ public class GPXTrackExporter implements TrackExporter {
         printWriter.println("</wpt>");
     }
 
-    public void writeBeginTrack(Track track) {
+    private void writeBeginTrack(Track track) {
         printWriter.println("<trk>");
         printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
         printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
@@ -297,19 +296,19 @@ public class GPXTrackExporter implements TrackExporter {
         printWriter.println("</extensions>");
     }
 
-    public void writeEndTrack() {
+    private void writeEndTrack() {
         printWriter.println("</trk>");
     }
 
-    public void writeOpenSegment() {
+    private void writeOpenSegment() {
         printWriter.println("<trkseg>");
     }
 
-    public void writeCloseSegment() {
+    private void writeCloseSegment() {
         printWriter.println("</trkseg>");
     }
 
-    public Distance writeTrackPoint(ZoneOffset zoneOffset, TrackPoint trackPoint, List<TrackPoint> sensorPoints, Distance trackDistance) {
+    private Distance writeTrackPoint(ZoneOffset zoneOffset, TrackPoint trackPoint, List<TrackPoint> sensorPoints, Distance trackDistance) {
         Distance cumulativeDistance;
 
         printWriter.println("<trkpt " + formatLocation(trackPoint.getLatitude(), trackPoint.getLongitude()) + ">");

src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java

@@ -107,6 +107,7 @@ public class KMLTrackExporter implements TrackExporter {
         this.contentProviderUtils = contentProviderUtils;
     }
 
+    @Override
     public boolean writeTrack(List<Track> tracks, @NonNull OutputStream outputStream) {
         try {
             prepare(outputStream);
@@ -444,7 +445,7 @@ public class KMLTrackExporter implements TrackExporter {
         writeTypeLocalized(marker.getCategory());
 
         if (exportPhotos) {
-            printWriter.println("<Icon><href>" + KmzTrackExporter.buildKmzImageFilePath(marker) + "</href></Icon>");
+            printWriter.println("<Icon><href>" + KMZTrackExporter.buildKmzImageFilePath(marker) + "</href></Icon>");
         }
 
         printWriter.print("<ViewVolume>");

src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java

@@ -43,12 +43,12 @@ import de.dennisguse.opentracks.util.FileUtils;
  *
  * @author Jimmy Shih
  */
-public class KmzTrackExporter implements TrackExporter {
+public class KMZTrackExporter implements TrackExporter {
 
     private static final String KMZ_IMAGES_DIR = "images";
     public static final String KMZ_KML_FILE = "doc.kml";
 
-    private static final String TAG = KmzTrackExporter.class.getSimpleName();
+    private static final String TAG = KMZTrackExporter.class.getSimpleName();
     private static final int BUFFER_SIZE = 4096;
 
     private final ContentProviderUtils contentProviderUtils;
@@ -57,7 +57,7 @@ public class KmzTrackExporter implements TrackExporter {
     private final boolean exportPhotos;
     private final Context context;
 
-    public KmzTrackExporter(Context context, ContentProviderUtils contentProviderUtils, KMLTrackExporter trackExporter, boolean exportPhotos) {
+    public KMZTrackExporter(Context context, ContentProviderUtils contentProviderUtils, KMLTrackExporter trackExporter, boolean exportPhotos) {
         this.context = context;
         this.contentProviderUtils = contentProviderUtils;
         this.fileTrackExporter = trackExporter;

src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java

@@ -52,9 +52,9 @@ import de.dennisguse.opentracks.util.StringUtils;
  *
  * @author Jimmy Shih
  */
-public class GpxTrackImporter extends DefaultHandler implements XMLImporter.TrackParser {
+public class GPXTrackImporter extends DefaultHandler implements XMLImporter.TrackParser {
 
-    private static final String TAG = GpxTrackImporter.class.getSimpleName();
+    private static final String TAG = GPXTrackImporter.class.getSimpleName();
 
     private static final String TAG_DESCRIPTION = "desc";
     private static final String TAG_ALTITUDE = "ele";
@@ -123,7 +123,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
 
     private final TrackImporter trackImporter;
 
-    public GpxTrackImporter(Context context, TrackImporter trackImporter) {
+    public GPXTrackImporter(Context context, TrackImporter trackImporter) {
         this.context = context;
         this.trackImporter = trackImporter;
     }

src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java

@@ -54,17 +54,16 @@ public class ImportService extends JobIntentService {
         String fileExtension = FileUtils.getExtension(file);
         try {
             Distance maxRecordingDistance = PreferencesUtils.getMaxRecordingDistance();
-            Distance recordingDistanceInterval = PreferencesUtils.getRecordingDistanceInterval();
             boolean preventReimport = PreferencesUtils.getPreventReimportTracks();
 
             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()));
+                trackIds.addAll(new XMLImporter(new GPXTrackImporter(this, trackImporter)).importFile(this, file.getUri()));
             } else if (TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.getExtension().equals(fileExtension)) {
-                trackIds.addAll(new XMLImporter(new KmlTrackImporter(this, trackImporter)).importFile(this, file.getUri()));
+                trackIds.addAll(new XMLImporter(new KMLTrackImporter(this, trackImporter)).importFile(this, file.getUri()));
             } else if (TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES.getExtension().equals(fileExtension)) {
-                trackIds.addAll(new KmzTrackImporter(this, trackImporter).importFile(file.getUri()));
+                trackIds.addAll(new KMZTrackImporter(this, trackImporter).importFile(file.getUri()));
             } else {
                 Log.d(TAG, "Unsupported file format.");
                 sendResult(ImportServiceResultReceiver.RESULT_CODE_ERROR, null, file, getString(R.string.import_unsupported_format));

src/main/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporter.java

@@ -47,9 +47,9 @@ import de.dennisguse.opentracks.util.StringUtils;
  *
  * @author Jimmy Shih
  */
-public class KmlTrackImporter extends DefaultHandler implements XMLImporter.TrackParser {
+public class KMLTrackImporter extends DefaultHandler implements XMLImporter.TrackParser {
 
-    private static final String TAG = KmlTrackImporter.class.getSimpleName();
+    private static final String TAG = KMLTrackImporter.class.getSimpleName();
 
     private static final String MARKER_STYLE = "#" + KMLTrackExporter.MARKER_STYLE;
 
@@ -128,7 +128,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
 
     private final TrackImporter trackImporter;
 
-    public KmlTrackImporter(Context context, TrackImporter trackImporter) {
+    public KMLTrackImporter(Context context, TrackImporter trackImporter) {
         this.context = context;
         this.trackImporter = trackImporter;
     }

src/main/java/de/dennisguse/opentracks/io/file/importer/KMZTrackImporter.java

@@ -44,9 +44,9 @@ import de.dennisguse.opentracks.util.FileUtils;
  *
  * @author Jimmy Shih
  */
-public class KmzTrackImporter {
+public class KMZTrackImporter {
 
-    private static final String TAG = KmzTrackImporter.class.getSimpleName();
+    private static final String TAG = KMZTrackImporter.class.getSimpleName();
 
     private static final String KML_FILE_EXTENSION = ".kml";
 
@@ -55,7 +55,7 @@ public class KmzTrackImporter {
     private final Context context;
     private final TrackImporter trackImporter;
 
-    public KmzTrackImporter(Context context, TrackImporter trackImporter) {
+    public KMZTrackImporter(Context context, TrackImporter trackImporter) {
         this.context = context;
         this.trackImporter = trackImporter;
     }
@@ -211,7 +211,7 @@ public class KmzTrackImporter {
     }
 
     private List<Track.Id> parseKml(ZipInputStream zipInputStream) throws IOException {
-        XMLImporter kmlFileTrackImporter = new XMLImporter(new KmlTrackImporter(context, trackImporter));
+        XMLImporter kmlFileTrackImporter = new XMLImporter(new KMLTrackImporter(context, trackImporter));
 
         InputStream nonClosableInputStream = new FilterInputStream(zipInputStream) {
             @Override

src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java

@@ -233,7 +233,7 @@ public class TrackImporter {
      * @param externalPhotoUrl the file name
      */
     private Uri getInternalPhotoUrl(@NonNull Track.Id trackId, @NonNull Uri externalPhotoUrl) {
-        String importFileName = KmzTrackImporter.importNameForFilename(externalPhotoUrl.toString());
+        String importFileName = KMZTrackImporter.importNameForFilename(externalPhotoUrl.toString());
         File file = MarkerUtils.buildInternalPhotoFile(context, trackId, Uri.parse(importFileName));
         if (file != null) {
             return FileUtils.getUriForFile(context, file);

src/main/java/de/dennisguse/opentracks/io/file/importer/XMLImporter.java

@@ -47,7 +47,7 @@ public class XMLImporter {
             return parser.getImportTrackIds();
         } catch (SAXException | ParserConfigurationException | ParsingException e) {
             Log.e(TAG, "Unable to import file", e);
-            if (parser.getImportTrackIds().size() > 0) {
+            if (!parser.getImportTrackIds().isEmpty()) {
                 parser.cleanImport();
             }
             throw new ImportParserException(e);