Merge pull request #1660 from OpenTracksApp/cleanup

Cleanup
2023-08-08 18:51:44 +02:00
parent 6f8438422a 87bc7be530
commit 8bc781a11a
5 changed files with 253 additions and 328 deletions
@@ -153,24 +153,18 @@ public class CSVTrackExporter implements TrackExporter {
    }

    public void close() {
-        if (printWriter != null) {
-            printWriter.flush();
-            printWriter = null;
-        }
+        printWriter.flush();
+        printWriter = null;
    }

    public void writeHeader(List<Column> columns) {
-        if (printWriter != null) {
-            String columnNames = columns.stream().map(c -> c.columnName).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
-            printWriter.println("#" + columnNames);
-        }
+        String columnNames = columns.stream().map(c -> c.columnName).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
+        printWriter.println("#" + columnNames);
    }

    public void writeTrackPoint(List<Column> columns, TrackPoint trackPoint) {
-        if (printWriter != null) {
-            String columnNames = columns.stream().map(c -> c.extractor.apply(trackPoint)).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
-            printWriter.println(columnNames);
-        }
+        String columnNames = columns.stream().map(c -> c.extractor.apply(trackPoint)).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
+        printWriter.println(columnNames);
    }

    private static class Column {
@@ -199,42 +199,36 @@ public class GPXTrackExporter implements TrackExporter {
    }

    public void close() {
-        if (printWriter != null) {
-            printWriter.flush();
-            printWriter = null;
-        }
+        printWriter.flush();
+        printWriter = null;
    }


    public void writeHeader() {
-        if (printWriter != null) {
-            printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            printWriter.println("<gpx");
-            printWriter.println("version=\"1.1\"");
-            printWriter.println("creator=\"" + creator + "\"");
-            printWriter.println("xmlns=\"http://www.topografix.com/GPX/1/1\"");
-            printWriter.println("xmlns:topografix=\"http://www.topografix.com/GPX/Private/TopoGrafix/0/1\"");
-            printWriter.println("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
-            printWriter.println("xmlns:opentracks=\"http://opentracksapp.com/xmlschemas/v1\"");
-            printWriter.println("xmlns:gpxtpx=\"http://www.garmin.com/xmlschemas/TrackPointExtension/v2\"");
-            printWriter.println("xmlns:gpxtrkx=\"http://www.garmin.com/xmlschemas/TrackStatsExtension/v1\"");
-            printWriter.println("xmlns:cluetrust=\"http://www.cluetrust.com/Schemas/\"");
-            printWriter.println("xmlns:pwr=\"http://www.garmin.com/xmlschemas/PowerExtension/v1\"");
-            printWriter.println("xsi:schemaLocation=" +
-                    "\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
-                    + " http://www.topografix.com/GPX/Private/TopoGrafix/0/1 http://www.topografix.com/GPX/Private/TopoGrafix/0/1/topografix.xsd"
-                    + " http://www.garmin.com/xmlschemas/TrackPointExtension/v2 https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd"
-                    + " http://www.garmin.com/xmlschemas/PowerExtension/v1 https://www8.garmin.com/xmlschemas/PowerExtensionv1.xsd"
-                    + " http://www.garmin.com/xmlschemas/TrackStatsExtension/v1"
-                    + " http://www.cluetrust.com/Schemas http://www.cluetrust.com/Schemas/gpxdata10.xsd"
-                    + " http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd\">");
-        }
+        printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        printWriter.println("<gpx");
+        printWriter.println("version=\"1.1\"");
+        printWriter.println("creator=\"" + creator + "\"");
+        printWriter.println("xmlns=\"http://www.topografix.com/GPX/1/1\"");
+        printWriter.println("xmlns:topografix=\"http://www.topografix.com/GPX/Private/TopoGrafix/0/1\"");
+        printWriter.println("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
+        printWriter.println("xmlns:opentracks=\"http://opentracksapp.com/xmlschemas/v1\"");
+        printWriter.println("xmlns:gpxtpx=\"http://www.garmin.com/xmlschemas/TrackPointExtension/v2\"");
+        printWriter.println("xmlns:gpxtrkx=\"http://www.garmin.com/xmlschemas/TrackStatsExtension/v1\"");
+        printWriter.println("xmlns:cluetrust=\"http://www.cluetrust.com/Schemas/\"");
+        printWriter.println("xmlns:pwr=\"http://www.garmin.com/xmlschemas/PowerExtension/v1\"");
+        printWriter.println("xsi:schemaLocation=" +
+                "\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
+                + " http://www.topografix.com/GPX/Private/TopoGrafix/0/1 http://www.topografix.com/GPX/Private/TopoGrafix/0/1/topografix.xsd"
+                + " http://www.garmin.com/xmlschemas/TrackPointExtension/v2 https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd"
+                + " http://www.garmin.com/xmlschemas/PowerExtension/v1 https://www8.garmin.com/xmlschemas/PowerExtensionv1.xsd"
+                + " http://www.garmin.com/xmlschemas/TrackStatsExtension/v1"
+                + " http://www.cluetrust.com/Schemas http://www.cluetrust.com/Schemas/gpxdata10.xsd"
+                + " http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd\">");
    }

    public void writeFooter() {
-        if (printWriter != null) {
-            printWriter.println("</gpx>");
-        }
+        printWriter.println("</gpx>");
    }

    private void writeMarkers(Track track) throws InterruptedException {
@@ -254,49 +248,43 @@ public class GPXTrackExporter implements TrackExporter {
    }

    public void writeMarker(ZoneOffset zoneOffset, Marker marker) {
-        if (printWriter != null) {
-            printWriter.println("<wpt " + formatLocation(marker.getLatitude(), marker.getLongitude()) + ">");
-            if (marker.hasAltitude()) {
-                printWriter.println("<ele>" + ALTITUDE_FORMAT.format(marker.getAltitude().toM()) + "</ele>");
-            }
-            printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(marker.getTime(), zoneOffset) + "</time>");
-            printWriter.println("<name>" + StringUtils.formatCData(marker.getName()) + "</name>");
-            printWriter.println("<desc>" + StringUtils.formatCData(marker.getDescription()) + "</desc>");
-            printWriter.println("<type>" + StringUtils.formatCData(marker.getCategory()) + "</type>");
-            printWriter.println("</wpt>");
+        printWriter.println("<wpt " + formatLocation(marker.getLatitude(), marker.getLongitude()) + ">");
+        if (marker.hasAltitude()) {
+            printWriter.println("<ele>" + ALTITUDE_FORMAT.format(marker.getAltitude().toM()) + "</ele>");
        }
+        printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(marker.getTime(), zoneOffset) + "</time>");
+        printWriter.println("<name>" + StringUtils.formatCData(marker.getName()) + "</name>");
+        printWriter.println("<desc>" + StringUtils.formatCData(marker.getDescription()) + "</desc>");
+        printWriter.println("<type>" + StringUtils.formatCData(marker.getCategory()) + "</type>");
+        printWriter.println("</wpt>");
    }

    public void writeBeginTrack(Track track) {
-        if (printWriter != null) {
-            printWriter.println("<trk>");
-            printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
-            printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
-            printWriter.println("<type>" + StringUtils.formatCData(track.getActivityTypeLocalized()) + "</type>");
+        printWriter.println("<trk>");
+        printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
+        printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
+        printWriter.println("<type>" + StringUtils.formatCData(track.getActivityTypeLocalized()) + "</type>");

-            printWriter.println("<extensions>");
-            printWriter.println("<topografix:color>c0c0c0</topografix:color>");
-            printWriter.println("<opentracks:trackid>" + track.getUuid() + "</opentracks:trackid>");
+        printWriter.println("<extensions>");
+        printWriter.println("<topografix:color>c0c0c0</topografix:color>");
+        printWriter.println("<opentracks:trackid>" + track.getUuid() + "</opentracks:trackid>");

-            TrackStatistics trackStatistics = track.getTrackStatistics();
-            printWriter.println("<gpxtrkx:TrackStatsExtension>");
-            printWriter.println("<gpxtrkx:Distance>" + trackStatistics.getTotalDistance().toM() + "</gpxtrkx:Distance>");
-            printWriter.println("<gpxtrkx:TimerTime>" + trackStatistics.getTotalTime().getSeconds() + "</gpxtrkx:TimerTime>");
-            printWriter.println("<gpxtrkx:MovingTime>" + trackStatistics.getMovingTime().getSeconds() + "</gpxtrkx:MovingTime>");
-            printWriter.println("<gpxtrkx:StoppedTime>" + trackStatistics.getStoppedTime().getSeconds() + "</gpxtrkx:StoppedTime>");
-            printWriter.println("<gpxtrkx:MaxSpeed>" + trackStatistics.getMaxSpeed().toMPS() + "</gpxtrkx:MaxSpeed>");
-            printWriter.println("<gpxtrkx:Ascent>" + trackStatistics.getTotalAltitudeGain() + "</gpxtrkx:Ascent>");
-            printWriter.println("<gpxtrkx:Descent>" + trackStatistics.getTotalAltitudeLoss() + "</gpxtrkx:Descent>");
-            printWriter.println("</gpxtrkx:TrackStatsExtension>");
+        TrackStatistics trackStatistics = track.getTrackStatistics();
+        printWriter.println("<gpxtrkx:TrackStatsExtension>");
+        printWriter.println("<gpxtrkx:Distance>" + trackStatistics.getTotalDistance().toM() + "</gpxtrkx:Distance>");
+        printWriter.println("<gpxtrkx:TimerTime>" + trackStatistics.getTotalTime().getSeconds() + "</gpxtrkx:TimerTime>");
+        printWriter.println("<gpxtrkx:MovingTime>" + trackStatistics.getMovingTime().getSeconds() + "</gpxtrkx:MovingTime>");
+        printWriter.println("<gpxtrkx:StoppedTime>" + trackStatistics.getStoppedTime().getSeconds() + "</gpxtrkx:StoppedTime>");
+        printWriter.println("<gpxtrkx:MaxSpeed>" + trackStatistics.getMaxSpeed().toMPS() + "</gpxtrkx:MaxSpeed>");
+        printWriter.println("<gpxtrkx:Ascent>" + trackStatistics.getTotalAltitudeGain() + "</gpxtrkx:Ascent>");
+        printWriter.println("<gpxtrkx:Descent>" + trackStatistics.getTotalAltitudeLoss() + "</gpxtrkx:Descent>");
+        printWriter.println("</gpxtrkx:TrackStatsExtension>");

-            printWriter.println("</extensions>");
-        }
+        printWriter.println("</extensions>");
    }

    public void writeEndTrack() {
-        if (printWriter != null) {
-            printWriter.println("</trk>");
-        }
+        printWriter.println("</trk>");
    }

    public void writeOpenSegment() {
@@ -310,67 +298,65 @@ public class GPXTrackExporter implements TrackExporter {
    public Distance writeTrackPoint(ZoneOffset zoneOffset, TrackPoint trackPoint, List<TrackPoint> sensorPoints, Distance trackDistance) {
        Distance cumulativeDistance = null;

-        if (printWriter != null) {
+        printWriter.println("<trkpt " + formatLocation(trackPoint.getLatitude(), trackPoint.getLongitude()) + ">");

-            printWriter.println("<trkpt " + formatLocation(trackPoint.getLatitude(), trackPoint.getLongitude()) + ">");
-
-            if (trackPoint.hasAltitude()) {
-                printWriter.println("<ele>" + ALTITUDE_FORMAT.format(trackPoint.getAltitude().toM()) + "</ele>");
-            }
-
-            printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(trackPoint.getTime(), zoneOffset) + "</time>");
-
-            {
-                String trackPointExtensionContent = "";
-
-                if (trackPoint.hasSpeed()) {
-                    trackPointExtensionContent += "<gpxtpx:speed>" + SPEED_FORMAT.format(trackPoint.getSpeed().toMPS()) + "</gpxtpx:speed>\n";
-                }
-
-                if (trackPoint.hasHeartRate()) {
-                    trackPointExtensionContent += "<gpxtpx:hr>" + HEARTRATE_FORMAT.format(trackPoint.getHeartRate().getBPM()) + "</gpxtpx:hr>\n";
-                }
-
-                if (trackPoint.hasCadence()) {
-                    trackPointExtensionContent += "<gpxtpx:cad>" + CADENCE_FORMAT.format(trackPoint.getCadence().getRPM()) + "</gpxtpx:cad>\n";
-                }
-
-                if (trackPoint.hasPower()) {
-                    trackPointExtensionContent += "<pwr:PowerInWatts>" + POWER_FORMAT.format(trackPoint.getPower().getW()) + "</pwr:PowerInWatts>\n";
-                }
-
-                Double cumulativeGain = cumulateSensorData(trackPoint, sensorPoints, (tp) -> tp.hasAltitudeGain() ? (double) tp.getAltitudeGain() : null);
-                if (cumulativeGain != null) {
-                    trackPointExtensionContent += ("<opentracks:gain>" + ALTITUDE_FORMAT.format(cumulativeGain) + "</opentracks:gain>\n");
-                }
-
-                Double cumulativeLoss = cumulateSensorData(trackPoint, sensorPoints, (tp) -> tp.hasAltitudeLoss() ? (double) tp.getAltitudeLoss() : null);
-                if (cumulativeLoss != null) {
-                    trackPointExtensionContent += ("<opentracks:loss>" + ALTITUDE_FORMAT.format(cumulativeLoss) + "</opentracks:loss>\n");
-                }
-
-                if (trackPoint.hasHorizontalAccuracy()) {
-                    trackPointExtensionContent += ("<opentracks:accuracy_horizontal>" + DISTANCE_FORMAT.format(trackPoint.getHorizontalAccuracy().toM()) + "</opentracks:accuracy_horizontal>");
-                }
-                if (trackPoint.hasVerticalAccuracy()) {
-                    trackPointExtensionContent += ("<opentracks:accuracy_vertical>" + DISTANCE_FORMAT.format(trackPoint.getVerticalAccuracy().toM()) + "</opentracks:accuracy_vertical>");
-                }
-
-                cumulativeDistance = Distance.ofOrNull(cumulateSensorData(trackPoint, sensorPoints, (tp) -> tp.hasSensorDistance() ? tp.getSensorDistance().toM() : null));
-                if (cumulativeDistance != null) {
-                    trackPointExtensionContent += ("<opentracks:distance>" + DISTANCE_FORMAT.format(cumulativeDistance.toM()) + "</opentracks:distance>\n");
-                    trackPointExtensionContent += ("<cluetrust:distance>" + DISTANCE_FORMAT.format(trackDistance.plus(cumulativeDistance).toM()) + "</cluetrust:distance>\n");
-                }
-
-                if (!trackPointExtensionContent.isEmpty()) {
-                    printWriter.println("<extensions><gpxtpx:TrackPointExtension>");
-                    printWriter.print(trackPointExtensionContent);
-                    printWriter.println("</gpxtpx:TrackPointExtension></extensions>");
-                }
-            }
-
-            printWriter.println("</trkpt>");
+        if (trackPoint.hasAltitude()) {
+            printWriter.println("<ele>" + ALTITUDE_FORMAT.format(trackPoint.getAltitude().toM()) + "</ele>");
        }
+
+        printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(trackPoint.getTime(), zoneOffset) + "</time>");
+
+        {
+            String trackPointExtensionContent = "";
+
+            if (trackPoint.hasSpeed()) {
+                trackPointExtensionContent += "<gpxtpx:speed>" + SPEED_FORMAT.format(trackPoint.getSpeed().toMPS()) + "</gpxtpx:speed>\n";
+            }
+
+            if (trackPoint.hasHeartRate()) {
+                trackPointExtensionContent += "<gpxtpx:hr>" + HEARTRATE_FORMAT.format(trackPoint.getHeartRate().getBPM()) + "</gpxtpx:hr>\n";
+            }
+
+            if (trackPoint.hasCadence()) {
+                trackPointExtensionContent += "<gpxtpx:cad>" + CADENCE_FORMAT.format(trackPoint.getCadence().getRPM()) + "</gpxtpx:cad>\n";
+            }
+
+            if (trackPoint.hasPower()) {
+                trackPointExtensionContent += "<pwr:PowerInWatts>" + POWER_FORMAT.format(trackPoint.getPower().getW()) + "</pwr:PowerInWatts>\n";
+            }
+
+            Double cumulativeGain = cumulateSensorData(trackPoint, sensorPoints, (tp) -> tp.hasAltitudeGain() ? (double) tp.getAltitudeGain() : null);
+            if (cumulativeGain != null) {
+                trackPointExtensionContent += ("<opentracks:gain>" + ALTITUDE_FORMAT.format(cumulativeGain) + "</opentracks:gain>\n");
+            }
+
+            Double cumulativeLoss = cumulateSensorData(trackPoint, sensorPoints, (tp) -> tp.hasAltitudeLoss() ? (double) tp.getAltitudeLoss() : null);
+            if (cumulativeLoss != null) {
+                trackPointExtensionContent += ("<opentracks:loss>" + ALTITUDE_FORMAT.format(cumulativeLoss) + "</opentracks:loss>\n");
+            }
+
+            if (trackPoint.hasHorizontalAccuracy()) {
+                trackPointExtensionContent += ("<opentracks:accuracy_horizontal>" + DISTANCE_FORMAT.format(trackPoint.getHorizontalAccuracy().toM()) + "</opentracks:accuracy_horizontal>");
+            }
+            if (trackPoint.hasVerticalAccuracy()) {
+                trackPointExtensionContent += ("<opentracks:accuracy_vertical>" + DISTANCE_FORMAT.format(trackPoint.getVerticalAccuracy().toM()) + "</opentracks:accuracy_vertical>");
+            }
+
+            cumulativeDistance = Distance.ofOrNull(cumulateSensorData(trackPoint, sensorPoints, (tp) -> tp.hasSensorDistance() ? tp.getSensorDistance().toM() : null));
+            if (cumulativeDistance != null) {
+                trackPointExtensionContent += ("<opentracks:distance>" + DISTANCE_FORMAT.format(cumulativeDistance.toM()) + "</opentracks:distance>\n");
+                trackPointExtensionContent += ("<cluetrust:distance>" + DISTANCE_FORMAT.format(trackDistance.plus(cumulativeDistance).toM()) + "</cluetrust:distance>\n");
+            }
+
+            if (!trackPointExtensionContent.isEmpty()) {
+                printWriter.println("<extensions><gpxtpx:TrackPointExtension>");
+                printWriter.print(trackPointExtensionContent);
+                printWriter.println("</gpxtpx:TrackPointExtension></extensions>");
+            }
+        }
+
+        printWriter.println("</trkpt>");
+
        if (cumulativeDistance != null) {
            return cumulativeDistance;
        }
@@ -212,196 +212,170 @@ public class KMLTrackExporter implements TrackExporter {

    @VisibleForTesting
    void close() {
-        if (printWriter != null) {
-            printWriter.flush();
-            printWriter = null;
-        }
+        printWriter.flush();
+        printWriter = null;
    }

    private void writeHeader(List<Track> tracks) {
-        if (printWriter != null) {
-            printWriter.println(
-                    """
-                            <?xml version="1.0" encoding="UTF-8"?>
-                            """);
-            printWriter.println(
-                    """
-                            <kml xmlns="http://www.opengis.net/kml/2.3"
-                                xmlns:atom="http://www.w3.org/2005/Atom"
-                                xmlns:opentracks="http://opentracksapp.com/xmlschemas/v1"
-                                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                                xsi:schemaLocation="http://www.opengis.net/kml/2.3 http://schemas.opengis.net/kml/2.3/ogckml23.xsd
-                                                    http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd">
-                            """); //TODO ADD xsi:schemaLocation for atom
-            printWriter.println("<Document>");
-            printWriter.println("<open>1</open>");
-            printWriter.println("<visibility>1</visibility>");
+        printWriter.println(
+                """
+                        <?xml version="1.0" encoding="UTF-8"?>
+                        """);
+        printWriter.println(
+                """
+                        <kml xmlns="http://www.opengis.net/kml/2.3"
+                            xmlns:atom="http://www.w3.org/2005/Atom"
+                            xmlns:opentracks="http://opentracksapp.com/xmlschemas/v1"
+                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                            xsi:schemaLocation="http://www.opengis.net/kml/2.3 http://schemas.opengis.net/kml/2.3/ogckml23.xsd
+                                                http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd">
+                        """); //TODO ADD xsi:schemaLocation for atom
+        printWriter.println("<Document>");
+        printWriter.println("<open>1</open>");
+        printWriter.println("<visibility>1</visibility>");

-            Track track = tracks.get(0);
-            printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
-            printWriter.println("<atom:generator>" + StringUtils.formatCData(context.getString(R.string.app_name)) + "</atom:generator>");
+        Track track = tracks.get(0);
+        printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
+        printWriter.println("<atom:generator>" + StringUtils.formatCData(context.getString(R.string.app_name)) + "</atom:generator>");

-            writeTrackStyle();
-            writePlacemarkerStyle();
-            printWriter.println("<Schema id=\"" + SCHEMA_ID + "\">");
+        writeTrackStyle();
+        writePlacemarkerStyle();
+        printWriter.println("<Schema id=\"" + SCHEMA_ID + "\">");

-            writeSimpleArrayStyle(EXTENDED_DATA_TYPE_SPEED, context.getString(R.string.description_speed_ms));
-            writeSimpleArrayStyle(EXTENDED_DATA_TYPE_POWER, context.getString(R.string.description_sensor_power));
-            writeSimpleArrayStyle(EXTENDED_DATA_TYPE_CADENCE, context.getString(R.string.description_sensor_cadence));
-            writeSimpleArrayStyle(EXTENDED_DATA_TYPE_HEART_RATE, context.getString(R.string.description_sensor_heart_rate));
+        writeSimpleArrayStyle(EXTENDED_DATA_TYPE_SPEED, context.getString(R.string.description_speed_ms));
+        writeSimpleArrayStyle(EXTENDED_DATA_TYPE_POWER, context.getString(R.string.description_sensor_power));
+        writeSimpleArrayStyle(EXTENDED_DATA_TYPE_CADENCE, context.getString(R.string.description_sensor_cadence));
+        writeSimpleArrayStyle(EXTENDED_DATA_TYPE_HEART_RATE, context.getString(R.string.description_sensor_heart_rate));

-            printWriter.println("</Schema>");
-        }
+        printWriter.println("</Schema>");
    }

    private void writeFooter() {
-        if (printWriter != null) {
-            printWriter.println("</Document>");
-            printWriter.println("</kml>");
-        }
+        printWriter.println("</Document>");
+        printWriter.println("</kml>");
    }

    private void writeBeginMarkers(Track track) {
-        if (printWriter != null) {
-            printWriter.println("<Folder>");
-            printWriter.println("<name>" + StringUtils.formatCData(context.getString(R.string.track_markers, track.getName())) + "</name>");
-            printWriter.println("<open>1</open>");
-        }
+        printWriter.println("<Folder>");
+        printWriter.println("<name>" + StringUtils.formatCData(context.getString(R.string.track_markers, track.getName())) + "</name>");
+        printWriter.println("<open>1</open>");
    }

    private void writeMarker(Marker marker, ZoneOffset zoneOffset) {
-        if (printWriter != null) {
-            boolean existsPhoto = MarkerUtils.buildInternalPhotoFile(context, marker.getTrackId(), marker.getPhotoURI()) != null;
-            if (marker.hasPhoto() && exportPhotos && existsPhoto) {
-                float heading = getHeading(marker.getTrackId(), marker.getLocation());
-                writePhotoOverlay(marker, heading, zoneOffset);
-            } else {
-                writePlacemark(marker.getName(), marker.getCategory(), marker.getDescription(), marker.getLocation(), zoneOffset);
-            }
+        boolean existsPhoto = MarkerUtils.buildInternalPhotoFile(context, marker.getTrackId(), marker.getPhotoURI()) != null;
+        if (marker.hasPhoto() && exportPhotos && existsPhoto) {
+            float heading = getHeading(marker.getTrackId(), marker.getLocation());
+            writePhotoOverlay(marker, heading, zoneOffset);
+        } else {
+            writePlacemark(marker.getName(), marker.getCategory(), marker.getDescription(), marker.getLocation(), zoneOffset);
        }
    }

    private void writeEndMarkers() {
-        if (printWriter != null) {
-            printWriter.println("</Folder>");
-        }
+        printWriter.println("</Folder>");
    }

    private void writeMultiTrackBegin() {
-        if (printWriter != null) {
-            printWriter.println("<Folder id=\"tracks\">");
-            printWriter.println("<name>" + context.getString(R.string.generic_tracks) + "</name>");
-            printWriter.println("<open>1</open>");
-        }
+        printWriter.println("<Folder id=\"tracks\">");
+        printWriter.println("<name>" + context.getString(R.string.generic_tracks) + "</name>");
+        printWriter.println("<open>1</open>");
    }

    private void writeMultiTrackEnd() {
-        if (printWriter != null) {
-            printWriter.println("</Folder>");
-        }
+        printWriter.println("</Folder>");
    }

    private void writeBeginTrack(Track track) {
-        if (printWriter != null) {
-            printWriter.println("<Placemark>");
+        printWriter.println("<Placemark>");

-            printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
-            printWriter.println("<description>" + StringUtils.formatCData(track.getDescription()) + "</description>");
-            printWriter.println("<icon>" + StringUtils.formatCData(track.getActivityType().getIconId()) + "</icon>");
-            printWriter.println("<opentracks:trackid>" + track.getUuid() + "</opentracks:trackid>");
+        printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
+        printWriter.println("<description>" + StringUtils.formatCData(track.getDescription()) + "</description>");
+        printWriter.println("<icon>" + StringUtils.formatCData(track.getActivityType().getIconId()) + "</icon>");
+        printWriter.println("<opentracks:trackid>" + track.getUuid() + "</opentracks:trackid>");

-            printWriter.println("<styleUrl>#" + TRACK_STYLE + "</styleUrl>");
-            writeActivityType(track.getActivityTypeLocalized());
-            printWriter.println("<MultiTrack>");
-            printWriter.println("<altitudeMode>absolute</altitudeMode>");
-            printWriter.println("<interpolate>1</interpolate>");
-        }
+        printWriter.println("<styleUrl>#" + TRACK_STYLE + "</styleUrl>");
+        writeActivityType(track.getActivityTypeLocalized());
+        printWriter.println("<MultiTrack>");
+        printWriter.println("<altitudeMode>absolute</altitudeMode>");
+        printWriter.println("<interpolate>1</interpolate>");
    }


    private void writeEndTrack() {
-        if (printWriter != null) {
-            printWriter.println("</MultiTrack>");
-            printWriter.println("</Placemark>");
-        }
+        printWriter.println("</MultiTrack>");
+        printWriter.println("</Placemark>");
    }

    @VisibleForTesting
    void writeOpenSegment() {
-        if (printWriter != null) {
-            printWriter.println("<Track>");
-            speedList.clear();
-            distanceList.clear();
-            powerList.clear();
-            cadenceList.clear();
-            heartRateList.clear();
-            altitudeGainList.clear();
-            altitudeLossList.clear();
-            accuracyHorizontal.clear();
-            accuracyVertical.clear();
-        }
+        printWriter.println("<Track>");
+        speedList.clear();
+        distanceList.clear();
+        powerList.clear();
+        cadenceList.clear();
+        heartRateList.clear();
+        altitudeGainList.clear();
+        altitudeLossList.clear();
+        accuracyHorizontal.clear();
+        accuracyVertical.clear();
    }

    @VisibleForTesting
    void writeCloseSegment() {
-        if (printWriter != null) {
-            printWriter.println("<ExtendedData>");
-            printWriter.println("<SchemaData schemaUrl=\"#" + SCHEMA_ID + "\">");
-            if (speedList.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(speedList, EXTENDED_DATA_TYPE_SPEED);
-            }
-            if (distanceList.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(distanceList, EXTENDED_DATA_TYPE_DISTANCE);
-            }
-            if (powerList.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(powerList, EXTENDED_DATA_TYPE_POWER);
-            }
-            if (cadenceList.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(cadenceList, EXTENDED_DATA_TYPE_CADENCE);
-            }
-            if (heartRateList.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(heartRateList, EXTENDED_DATA_TYPE_HEART_RATE);
-            }
-            if (altitudeGainList.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(altitudeGainList, EXTENDED_DATA_TYPE_ALTITUDE_GAIN);
-            }
-            if (altitudeLossList.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(altitudeLossList, EXTENDED_DATA_TYPE_ALTITUDE_LOSS);
-            }
-            if (accuracyHorizontal.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(accuracyHorizontal, EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL);
-            }
-            if (accuracyVertical.stream().anyMatch(Objects::nonNull)) {
-                writeSimpleArrayData(accuracyVertical, EXTENDED_DATA_TYPE_ACCURACY_VERTICAL);
-            }
-            printWriter.println("</SchemaData>");
-            printWriter.println("</ExtendedData>");
-            printWriter.println("</Track>");
+        printWriter.println("<ExtendedData>");
+        printWriter.println("<SchemaData schemaUrl=\"#" + SCHEMA_ID + "\">");
+        if (speedList.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(speedList, EXTENDED_DATA_TYPE_SPEED);
        }
+        if (distanceList.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(distanceList, EXTENDED_DATA_TYPE_DISTANCE);
+        }
+        if (powerList.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(powerList, EXTENDED_DATA_TYPE_POWER);
+        }
+        if (cadenceList.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(cadenceList, EXTENDED_DATA_TYPE_CADENCE);
+        }
+        if (heartRateList.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(heartRateList, EXTENDED_DATA_TYPE_HEART_RATE);
+        }
+        if (altitudeGainList.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(altitudeGainList, EXTENDED_DATA_TYPE_ALTITUDE_GAIN);
+        }
+        if (altitudeLossList.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(altitudeLossList, EXTENDED_DATA_TYPE_ALTITUDE_LOSS);
+        }
+        if (accuracyHorizontal.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(accuracyHorizontal, EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL);
+        }
+        if (accuracyVertical.stream().anyMatch(Objects::nonNull)) {
+            writeSimpleArrayData(accuracyVertical, EXTENDED_DATA_TYPE_ACCURACY_VERTICAL);
+        }
+        printWriter.println("</SchemaData>");
+        printWriter.println("</ExtendedData>");
+        printWriter.println("</Track>");
    }

    @VisibleForTesting
    void writeTrackPoint(ZoneOffset zoneOffset, TrackPoint trackPoint) {
-        if (printWriter != null) {
-            printWriter.println("<when>" + getTime(zoneOffset, trackPoint.getLocation()) + "</when>");
+        printWriter.println("<when>" + getTime(zoneOffset, trackPoint.getLocation()) + "</when>");

-            if (trackPoint.hasLocation()) {
-                printWriter.println("<coord>" + getCoordinates(trackPoint.getLocation(), " ") + "</coord>");
-            } else {
-                printWriter.println("<coord/>");
-            }
-            speedList.add(trackPoint.hasSpeed() ? (float) trackPoint.getSpeed().toMPS() : null);
-
-            distanceList.add(trackPoint.hasSensorDistance() ? (float) trackPoint.getSensorDistance().toM() : null);
-            heartRateList.add(trackPoint.hasHeartRate() ? trackPoint.getHeartRate().getBPM() : null);
-            cadenceList.add(trackPoint.hasCadence() ? trackPoint.getCadence().getRPM() : null);
-            powerList.add(trackPoint.hasPower() ? trackPoint.getPower().getW() : null);
-
-            altitudeGainList.add(trackPoint.hasAltitudeGain() ? trackPoint.getAltitudeGain() : null);
-            altitudeLossList.add(trackPoint.hasAltitudeLoss() ? trackPoint.getAltitudeLoss() : null);
-            accuracyHorizontal.add(trackPoint.hasHorizontalAccuracy() ? (float) trackPoint.getHorizontalAccuracy().toM() : null);
-            accuracyVertical.add(trackPoint.hasVerticalAccuracy() ? (float) trackPoint.getVerticalAccuracy().toM() : null);
+        if (trackPoint.hasLocation()) {
+            printWriter.println("<coord>" + getCoordinates(trackPoint.getLocation(), " ") + "</coord>");
+        } else {
+            printWriter.println("<coord/>");
        }
+        speedList.add(trackPoint.hasSpeed() ? (float) trackPoint.getSpeed().toMPS() : null);
+
+        distanceList.add(trackPoint.hasSensorDistance() ? (float) trackPoint.getSensorDistance().toM() : null);
+        heartRateList.add(trackPoint.hasHeartRate() ? trackPoint.getHeartRate().getBPM() : null);
+        cadenceList.add(trackPoint.hasCadence() ? trackPoint.getCadence().getRPM() : null);
+        powerList.add(trackPoint.hasPower() ? trackPoint.getPower().getW() : null);
+
+        altitudeGainList.add(trackPoint.hasAltitudeGain() ? trackPoint.getAltitudeGain() : null);
+        altitudeLossList.add(trackPoint.hasAltitudeLoss() ? trackPoint.getAltitudeLoss() : null);
+        accuracyHorizontal.add(trackPoint.hasHorizontalAccuracy() ? (float) trackPoint.getHorizontalAccuracy().toM() : null);
+        accuracyVertical.add(trackPoint.hasVerticalAccuracy() ? (float) trackPoint.getVerticalAccuracy().toM() : null);
    }

    /**
@@ -21,6 +21,7 @@ import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
+import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -31,9 +32,13 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang

    private static final String TAG = TrackRecordingManager.class.getSimpleName();

+    private static final AltitudeCorrectionManager ALTITUDE_CORRECTION_MANAGER = new AltitudeCorrectionManager();
+
    private final ContentProviderUtils contentProviderUtils;
    private final Context context;

+    private final TrackPointCreator trackPointCreator;
+
    private Distance recordingDistanceInterval;
    private Distance maxRecordingDistance;

@@ -47,8 +52,9 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
    private TrackPoint lastStoredTrackPoint;
    private TrackPoint lastStoredTrackPointWithLocation;

-    TrackRecordingManager(Context context) {
+    TrackRecordingManager(Context context, TrackPointCreator trackPointCreator) {
        this.context = context;
+        this.trackPointCreator = trackPointCreator;
        contentProviderUtils = new ContentProviderUtils(context);
    }

@@ -60,7 +66,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        PreferencesUtils.unregisterOnSharedPreferenceChangeListener(this);
    }

-    Track.Id startNewTrack(TrackPointCreator trackPointCreator) {
+    Track.Id startNewTrack() {
        TrackPoint segmentStartTrackPoint = trackPointCreator.createSegmentStartManual();
        // Create new track
        ZoneOffset zoneOffset = ZoneOffset.systemDefault().getRules().getOffset(segmentStartTrackPoint.getTime());
@@ -86,7 +92,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
    /**
     * @return if the recording could be started.
     */
-    boolean resumeExistingTrack(@NonNull Track.Id resumeTrackId, @NonNull TrackPointCreator trackPointCreator) {
+    boolean resumeExistingTrack(@NonNull Track.Id resumeTrackId) {
        trackId = resumeTrackId;
        Track track = contentProviderUtils.getTrack(trackId);
        if (track == null) {
@@ -102,7 +108,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        return true;
    }

-    void end(TrackPointCreator trackPointCreator) {
+    void end() {
        TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
        insertTrackPoint(segmentEnd, true);

@@ -112,15 +118,14 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        reset();
    }

-    Pair<Track, Pair<TrackPoint, SensorDataSet>> getDataForUI(TrackPointCreator trackPointCreator) {
-        if (trackPointCreator == null) {
-            return null;
-        }
+    Pair<Track, Pair<TrackPoint, SensorDataSet>> getDataForUI() {
        TrackStatisticsUpdater tmpTrackStatisticsUpdater = new TrackStatisticsUpdater(trackStatisticsUpdater);
        Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastTrackPointUIWithSpeed, lastTrackPointUIWithAltitude, lastStoredTrackPointWithLocation);

        tmpTrackStatisticsUpdater.addTrackPoint(current.first);

+        ALTITUDE_CORRECTION_MANAGER.correctAltitude(context, current.first);
+
        Track track = contentProviderUtils.getTrack(trackId); //Get copy
        if (track == null) {
            Log.w(TAG, "Requesting data if not recording is taking place, should not be done.");
@@ -38,7 +38,6 @@ import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.services.announcement.VoiceAnnouncementManager;
-import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.util.SystemUtils;
@@ -71,13 +70,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        public void run() {
            updateRecordingDataWhileRecording();

-            Handler localHandler = TrackRecordingService.this.handler;
-            if (localHandler == null) {
-                // when this happens, no recording is running and we should not send any notifications.
-                //TODO This implementation is not a good idea; rather solve the issue for this properly
-                return;
-            }
-            localHandler.postDelayed(this, RECORDING_DATA_UPDATE_INTERVAL.toMillis());
+            TrackRecordingService.this.handler.postDelayed(this, RECORDING_DATA_UPDATE_INTERVAL.toMillis());
        }
    };

@@ -97,8 +90,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
    private VoiceAnnouncementManager voiceAnnouncementManager;
    private TrackRecordingServiceNotificationManager notificationManager;

-    private AltitudeCorrectionManager egm2008CorrectionManager;
-
    @Override
    public void onCreate() {
        super.onCreate();
@@ -110,10 +101,9 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        gpsStatusObservable = new MutableLiveData<>(STATUS_GPS_DEFAULT);
        recordingDataObservable = new MutableLiveData<>(NOT_RECORDING);

-        egm2008CorrectionManager = new AltitudeCorrectionManager();
-        trackRecordingManager = new TrackRecordingManager(this);
-        trackRecordingManager.start();
        trackPointCreator = new TrackPointCreator(this, this, handler);
+        trackRecordingManager = new TrackRecordingManager(this, trackPointCreator);
+        trackRecordingManager.start();

        voiceAnnouncementManager = new VoiceAnnouncementManager(this);
        notificationManager = new TrackRecordingServiceNotificationManager(this);
@@ -136,12 +126,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        notificationManager.stop();
        notificationManager = null;

-        egm2008CorrectionManager = null;
-        try {
-            voiceAnnouncementManager.stop();
-        } finally {
-            voiceAnnouncementManager = null;
-        }
+        voiceAnnouncementManager.stop();
+        voiceAnnouncementManager = null;

        // This should be the next to last operation
        wakeLock = SystemUtils.releaseWakeLock(wakeLock);
@@ -171,7 +157,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        }

        // Set recording status
-        Track.Id trackId = trackRecordingManager.startNewTrack(trackPointCreator);
+        Track.Id trackId = trackRecordingManager.startNewTrack();
        updateRecordingStatus(RecordingStatus.record(trackId));

        startRecording();
@@ -179,7 +165,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
    }

    public void resumeTrack(Track.Id trackId) {
-        if (!trackRecordingManager.resumeExistingTrack(trackId, trackPointCreator)) {
+        if (!trackRecordingManager.resumeExistingTrack(trackId)) {
            Log.w(TAG, "Cannot resume a non-existing track.");
            return;
        }
@@ -223,7 +209,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        // Set recording status
        updateRecordingStatus(STATUS_DEFAULT);

-        trackRecordingManager.end(trackPointCreator);
+        trackRecordingManager.end();
        endRecording();

        stopSelf();
@@ -272,13 +258,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.

    @Override
    public void newGpsStatus(GpsStatusValue gpsStatusValue) {
-
-        //TODO This check should not be necessary, but prevents a crash; somehow the shutdown is not working correctly as we should not receive a notification then.
-        // It is likely a race condition as the LocationManager provides location updates without using the Handler.
-        if (gpsStatusObservable != null) {
-            notificationManager.updateContent(getString(gpsStatusValue.message));
-            gpsStatusObservable.postValue(gpsStatusValue);
-        }
+        notificationManager.updateContent(getString(gpsStatusValue.message));
+        gpsStatusObservable.postValue(gpsStatusValue);
    }

    public Marker.Id insertMarker(String name, String category, String description, String photoUrl) {
@@ -316,26 +297,11 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        }

        // Compute temporary track statistics using sensorData and update time.
+        Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.getDataForUI();

-        TrackPointCreator localTrackPointCreator = this.trackPointCreator;
-        VoiceAnnouncementManager localVoiceAnnouncementManager = this.voiceAnnouncementManager;
-        if (localTrackPointCreator == null || localVoiceAnnouncementManager == null) {
-            // when this happens, no recording is running and we should not send any notifications.
-            //TODO This implementation is not a good idea; rather solve the issue for this properly
-            return;
-        }
+        voiceAnnouncementManager.update(this, data.first);

-        Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.getDataForUI(trackPointCreator);
-        if (data == null) {
-            Log.w(TAG, "Requesting data if not recording is taking place, should not be done.");
-            return;
-        }
-        TrackPoint trackPoint = data.second.first;
-        egm2008CorrectionManager.correctAltitude(this, trackPoint);
-
-        localVoiceAnnouncementManager.update(this, data.first);
-
-        recordingDataObservable.postValue(new RecordingData(data.first, trackPoint, data.second.second));
+        recordingDataObservable.postValue(new RecordingData(data.first, data.second.first, data.second.second));
    }

    @VisibleForTesting