From be7eb41cf3d0462780658d677912734b3cbce051 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sun, 28 Jun 2020 08:27:23 +0200
Subject: [PATCH] Bugfix: previous total elevation gain was added twice.

---
 .../StatisticsRecordingFragment.java          | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
index c5cbe4828..d68c13826 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
@@ -430,7 +430,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
         setCadenceSensorData(sensorDataSet);
         setSpeedSensorData(sensorDataSet, isSelectedTrackRecording());
 
-        setElevationGainFromSensor(elevationGain_m);
+        setTotalElevationGain(elevationGain_m);
     }
 
     private void setHeartRateSensorData(SensorDataSet sensorDataSet) {
@@ -480,22 +480,9 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
     }
 
     // Set elevation gain
-    public void setTotalElevationGain(Float elevationGain_m) {
+    private void setTotalElevationGain(Float elevationGain_m) {
         boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
 
-        if (elevationGain_m == null) {
-            elevationGain_m = 0f;
-        }
-        if (lastTrackStatistics != null) {
-            elevationGain_m += (float) lastTrackStatistics.getTotalElevationGain();
-        }
-
-        Pair<String, String> parts = StringUtils.formatElevation(getContext(), elevationGain_m, metricUnits);
-        elevationTotalGainValue.setText(parts.first);
-        elevationTotalGainUnit.setText(parts.second);
-    }
-
-    public void setElevationGainFromSensor(Float elevationGain_m) {
         float totalElevationGain = 0;
         if (elevationGain_m != null) {
             totalElevationGain = elevationGain_m;
@@ -503,7 +490,10 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
         if (lastTrackStatistics != null) {
             totalElevationGain += (float) lastTrackStatistics.getTotalElevationGain();
         }
-        setTotalElevationGain(totalElevationGain);
+
+        Pair<String, String> parts = StringUtils.formatElevation(getContext(), totalElevationGain, metricUnits);
+        elevationTotalGainValue.setText(parts.first);
+        elevationTotalGainUnit.setText(parts.second);
     }
 
     /**