Release: v3.17.2

build.gradle

@@ -51,8 +51,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 3986
+        versionCode 3990
-        versionName "v3.17.1"
+        versionName "v3.17.2"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 

fastlane/metadata/android/en-US/changelogs/3990.txt

@@ -0,0 +1,8 @@
+v3.17.2: OpenTracks
+
+WARNING: The v3.17.0+ releases contain a memory leak.
+This issues is NOT FIXED by this release.
+It is recommended to not upgrade if you still use a release before v3.17.0
+
+Bugfix:
+- Crash while using voice announcements

src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java

@@ -44,7 +44,7 @@ public class ChartValueSeriesTest {
                 ApplicationProvider.getApplicationContext(),
                 Integer.MIN_VALUE,
                 Integer.MAX_VALUE,
-                new int[]{100, 1000},
+                new int[]{1, 100, 1000},
                 R.string.description_altitude_metric,
                 R.string.description_altitude_imperial,
                 R.color.chart_altitude_fill,
@@ -52,7 +52,7 @@ public class ChartValueSeriesTest {
                 15,
                 18) {
             @Override
-            double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+            Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getAltitude();
             }
 
@@ -77,6 +77,17 @@ public class ChartValueSeriesTest {
         assertFalse(series.isEnabled());
     }
 
+    @Test
+    public void testVerySmallUpdates() {
+        series.update(new ChartPoint(1f));
+        series.update(new ChartPoint(2f));
+        series.update(new ChartPoint(3f));
+        series.updateDimension();
+        assertEquals(1, series.getInterval());
+        assertEquals(1, series.getMinMarkerValue());
+        assertEquals(6, series.getMaxMarkerValue());
+    }
+
     @Test
     public void testSmallUpdates() {
         series.update(new ChartPoint(0));

src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java

@@ -39,6 +39,7 @@ import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * Tests {@link ChartFragment}.
@@ -83,9 +84,9 @@ public class ChartFragmentTest {
         ChartPoint point = chartFragment.createPendingPoint(trackPoint);
 
         // then
-        assertEquals(Float.NaN, point.getHeartRate(), 0.01);
+        assertNull(point.getHeartRate());
-        assertEquals(Float.NaN, point.getCadence(), 0.01);
+        assertNull(point.getCadence());
-        assertEquals(Float.NaN, point.getPower(), 0.01);
+        assertNull(point.getPower());
     }
 
     /**

src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java

@@ -14,11 +14,11 @@ public class ChartPoint {
 
     //Y-axis
     private double altitude;
-    private double speed;
+    private Double speed;
-    private double pace;
+    private Double pace;
-    private double heartRate = Double.NaN;
+    private Double heartRate;
-    private double cadence = Double.NaN;
+    private Double cadence;
-    private double power = Double.NaN;
+    private Double power;
 
     @VisibleForTesting
     ChartPoint(double altitude) {
@@ -43,13 +43,13 @@ public class ChartPoint {
         pace = trackStatisticsUpdater.getSmoothedSpeed().toPace(metricUnits).toMillis() * UnitConversions.MS_TO_S * UnitConversions.S_TO_MIN;
         if (trackPoint != null) {
             if (trackPoint.hasHeartRate()) {
-                heartRate = trackPoint.getHeartRate_bpm();
+                heartRate = (double) trackPoint.getHeartRate_bpm();
             }
             if (trackPoint.hasCyclingCadence()) {
-                cadence = trackPoint.getCyclingCadence_rpm();
+                cadence = (double) trackPoint.getCyclingCadence_rpm();
             }
             if (trackPoint.hasPower()) {
-                power = trackPoint.getPower();
+                power = (double) trackPoint.getPower();
             }
         }
     }
@@ -58,39 +58,27 @@ public class ChartPoint {
         return timeOrDistance;
     }
 
-    public double getAltitude() {
+    public Double getAltitude() {
         return altitude;
     }
 
-    public double getSpeed() {
+    public Double getSpeed() {
         return speed;
     }
 
-    public double getPace() {
+    public Double getPace() {
         return pace;
     }
 
-    public boolean hasHeartRate() {
+    public Double getHeartRate() {
-        return Double.isNaN(heartRate);
-    }
-
-    public double getHeartRate() {
         return heartRate;
     }
 
-    public boolean hasCadence() {
+    public Double getCadence() {
-        return Double.isNaN(cadence);
-    }
-
-    public double getCadence() {
         return cadence;
     }
 
-    public boolean hasPower() {
+    public Double getPower() {
-        return Double.isNaN(power);
-    }
-
-    public double getPower() {
         return power;
     }
 }

src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java

@@ -132,10 +132,10 @@ abstract class ChartValueSeries {
         }
     }
 
-    abstract double extractDataFromChartPoint(@NonNull ChartPoint chartPoint);
+    abstract Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint);
 
     boolean isChartPointValid(@NonNull ChartPoint chartPoint) {
-        return !Double.isNaN(extractDataFromChartPoint(chartPoint));
+        return extractDataFromChartPoint(chartPoint) != null;
     }
 
     protected abstract boolean drawIfChartPointHasNoData();

src/main/java/de/dennisguse/opentracks/chart/ChartView.java

@@ -206,7 +206,7 @@ public class ChartView extends View {
                 fontSizeSmall,
                 fontSizeMedium) {
             @Override
-            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getAltitude();
             }
 
@@ -227,7 +227,7 @@ public class ChartView extends View {
                 fontSizeSmall,
                 fontSizeMedium) {
             @Override
-            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getSpeed();
             }
 
@@ -249,7 +249,7 @@ public class ChartView extends View {
                 fontSizeSmall,
                 fontSizeMedium) {
             @Override
-            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getPace();
             }
 
@@ -271,7 +271,7 @@ public class ChartView extends View {
                 fontSizeSmall,
                 fontSizeMedium) {
             @Override
-            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getHeartRate();
             }
 
@@ -292,7 +292,7 @@ public class ChartView extends View {
                 fontSizeSmall,
                 fontSizeMedium) {
             @Override
-            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getCadence();
             }
 
@@ -312,7 +312,7 @@ public class ChartView extends View {
                 fontSizeSmall,
                 fontSizeMedium) {
             @Override
-            protected double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
                 return chartPoint.getPower();
             }
 

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -192,6 +192,10 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
         return serviceStatus.getRecordingTrackPaused();
     }
 
+    public Track.Id getRecordingTrackId() {
+        return serviceStatus.getRecordingTrackId();
+    }
+
     public TrackStatistics getTrackStatistics() {
         if (trackStatisticsUpdater == null) {
             return null;
@@ -569,6 +573,12 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
         serviceStatus.addListener(listener);
     }
 
+    //TODO Check that this is used everywhere, where addListener is called!
+    //Otherwise, we keep objects in referenced and waste memory until this service instance is terminated.
+    public void removeListener(@NonNull TrackRecordingServiceStatus.Listener listener) {
+        serviceStatus.removeListener(listener);
+    }
+
     /**
      * Inserts a trackPoint if this trackPoint is different than lastValidTrackPoint.
      *

src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceStatus.java

@@ -19,7 +19,7 @@ public class TrackRecordingServiceStatus {
 
     private final List<Listener> listeners = new ArrayList<>();
 
-    public void addListener(@NonNull Listener listener) {
+    void addListener(@NonNull Listener listener) {
         if (this.listeners.contains(listener)) {
             return;
         }
@@ -28,6 +28,10 @@ public class TrackRecordingServiceStatus {
         listener.onTrackRecordingPaused(recordingTrackPaused);
     }
 
+    void removeListener(@NonNull Listener listener) {
+        this.listeners.remove(listener);
+    }
+
     public boolean getRecordingTrackPaused() {
         return this.recordingTrackPaused;
     }

src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java

@@ -24,6 +24,7 @@ import android.speech.tts.UtteranceProgressListener;
 import android.util.Log;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Locale;
 
 import de.dennisguse.opentracks.content.data.Distance;
@@ -32,7 +33,6 @@ import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.TrackPointIterator;
 import de.dennisguse.opentracks.services.TrackRecordingService;
-import de.dennisguse.opentracks.services.TrackRecordingServiceStatus;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.AnnouncementUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -58,8 +58,6 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
 
     private final ContentProviderUtils contentProviderUtils;
 
-    private Track.Id recordingTrackId;
-
     private final AudioManager.OnAudioFocusChangeListener audioFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {
         @Override
         public void onAudioFocusChange(int focusChange) {
@@ -142,13 +140,8 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
             Log.e(TAG, "TrackRecordingService is null.");
             return;
         }
-        trackRecordingService.addListener(new TrackRecordingServiceStatus.Listener() {
+
-            @Override
+        announce(trackRecordingService.getRecordingTrackId(), trackRecordingService.getTrackStatistics());
-            public void onTrackRecordingId(Track.Id trackId) {
-                recordingTrackId = trackId;
-                announce(trackRecordingService.getTrackStatistics());
-            }
-        });
     }
 
     /**
@@ -156,7 +149,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
      *
      * @param trackStatistics the track statistics
      */
-    private void announce(TrackStatistics trackStatistics) {
+    private void announce(Track.Id trackId, TrackStatistics trackStatistics) {
         if (trackStatistics == null) {
             Log.e(TAG, "TrackStatistics is null.");
             return;
@@ -175,14 +168,15 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
             }
         }
 
-        if (audioManager.getMode() == AudioManager.MODE_IN_CALL || audioManager.getMode() == AudioManager.MODE_IN_COMMUNICATION) {
+        if (Arrays.asList(AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION)
+                .contains(audioManager.getMode())) {
             Log.i(TAG, "Speech is not allowed at this time.");
             return;
         }
 
-        Track track = contentProviderUtils.getTrack(recordingTrackId);
+        Track track = contentProviderUtils.getTrack(trackId);
         if (track == null) {
-            Log.i(TAG, "It doesn't exists a track with trackid = " + recordingTrackId);
+            Log.i(TAG, "It doesn't exists a track with trackid = " + track);
             return;
         }
         String category = track.getCategory();

src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java

@@ -106,7 +106,7 @@ public class TrackStatisticsUpdater {
      */
     public void addTrackPoint(TrackPoint trackPoint, Distance minGPSDistance) {
         internalAddTrackPoint(trackPoint, minGPSDistance);
-        Log.d(TAG, this.toString());
+        Log.v(TAG, this.toString());
     }
 
     private void internalAddTrackPoint(TrackPoint trackPoint, Distance minGPSDistance) {