From 20f1524701a3ae26b74ec84e3eb822b2b6ca701b Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 15 Dec 2019 16:25:37 +0100 Subject: [PATCH] Cleanup. --- .../java/de/dennisguse/opentracks/chart/ChartView.java | 2 +- .../de/dennisguse/opentracks/content/TrackDataHub.java | 3 +++ .../dennisguse/opentracks/fragments/ChartFragment.java | 3 ++- .../opentracks/services/TrackRecordingService.java | 10 +--------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index ee41cbd0a..f098dcda4 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -327,7 +327,7 @@ public class ChartView extends View { * * @param dataPoints an array of data points to be added */ - public void addDataPoints(ArrayList dataPoints) { + public void addDataPoints(List dataPoints) { synchronized (chartData) { chartData.addAll(dataPoints); for (double[] dataPoint : dataPoints) { diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java index 98bed99d8..1ae3ae45c 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java @@ -44,13 +44,16 @@ public class TrackDataHub implements DataSourceListener { * Target number of track points displayed by the map overlay. * We may display more than this number of points. */ + @Deprecated private static final int TARGET_DISPLAYED_TRACK_POINTS = 5000; /** * Maximum number of waypoints to displayed. */ @VisibleForTesting + @Deprecated private static final int MAX_DISPLAYED_WAYPOINTS = 128; + private static final String TAG = TrackDataHub.class.getSimpleName(); private final Context context; diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java index ed5b6a19e..e71659ef1 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java @@ -31,6 +31,7 @@ import androidx.fragment.app.FragmentActivity; import java.util.ArrayList; import java.util.EnumSet; +import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackDetailActivity; @@ -58,7 +59,7 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene private static final String STATE_CHART_VIEW_BY_DISTANCE_KEY = "chartViewByDistance"; - private final ArrayList pendingPoints = new ArrayList<>(); + private final List pendingPoints = new ArrayList<>(); private TrackDataHub trackDataHub; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index 21a1c299b..47e274c68 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -904,15 +904,7 @@ public class TrackRecordingService extends Service { @Override public SensorDataSet getSensorData() { - if (trackRecordingService.remoteSensorManager == null) { - Log.d(TAG, "remoteSensorManager is null."); - return null; - } - if (trackRecordingService.getSensorDataSet() == null) { - Log.d(TAG, "Sensor data set is null."); - return null; - } - return trackRecordingService.remoteSensorManager.getSensorDataSet(); + return trackRecordingService.getSensorDataSet(); } /**