From 0dfd31a3087a952431426323fa4120b4e1b84d2d Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sun, 20 Sep 2020 18:46:05 +0200
Subject: [PATCH] Code cleanup via Android Studio analyze. Notably change:
 TrackPoint's copy constructor missed to copy the elevationGain.

---
 .../opentracks/adapters/IntervalStatisticsAdapter.java        | 2 +-
 .../java/de/dennisguse/opentracks/content/data/Marker.java    | 4 ----
 .../java/de/dennisguse/opentracks/content/data/Track.java     | 4 ----
 .../de/dennisguse/opentracks/content/data/TrackPoint.java     | 2 ++
 .../de/dennisguse/opentracks/services/handlers/GpsStatus.java | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java
index 6b5c1290b..f923d9006 100644
--- a/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java
@@ -72,7 +72,7 @@ public class IntervalStatisticsAdapter extends ArrayAdapter<IntervalStatistics.I
      */
     public enum StackMode {
         STACK_FROM_BOTTOM,
-        STACK_FROM_TOP;
+        STACK_FROM_TOP
     }
 
     private static class ViewHolder {
diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java b/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
index 55b39b952..d637ef05a 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
@@ -165,10 +165,6 @@ public final class Marker {
             this.id = id;
         }
 
-        public Id(@NonNull String id) {
-            this(Long.parseLong(id));
-        }
-
         //TOOD Limit visibility to TrackRecordingService / ContentProvider
         public long getId() {
             return id;
diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Track.java b/src/main/java/de/dennisguse/opentracks/content/data/Track.java
index 70edf69a1..df7f688bc 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/Track.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/Track.java
@@ -118,10 +118,6 @@ public class Track {
             this.id = id;
         }
 
-        public Id(@NonNull String id) {
-            this(Long.parseLong(id));
-        }
-
         //TOOD Limit visibility to TrackRecordingService / ContentProvider
         public long getId() {
             return id;
diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
index decb6a364..53306da79 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
@@ -48,6 +48,8 @@ public class TrackPoint {
         this.heartRate_bpm = trackPoint.getHeartRate_bpm();
         this.cyclingCadence_rpm = trackPoint.getCyclingCadence_rpm();
         this.power = trackPoint.getPower();
+
+        this.elevationGain = trackPoint.getElevationGain();
     }
 
     public TrackPoint(double latitude, double longitude, Double altitude, long time) {
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java
index 9d4e310e9..21fa0e8af 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java
@@ -102,7 +102,7 @@ class GpsStatus {
      * It look for GPS changes in lastLocation if it's not null. If it's null then look for in lastValidLocation if any.
      */
     public void onLocationChanged(final Location location) {
-        if (checking == true) {
+        if (checking) {
             return;
         }