From 29b522b8a2c9c17a52e98462d5607a4e3eed86fb Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 11 Mar 2021 21:16:24 +0100 Subject: [PATCH] Cleanup. --- .../content/data/TestSensorDataUtil.java | 20 +++++++++---------- .../adapters/MarkerResourceCursorAdapter.java | 2 +- .../provider/CustomContentProvider.java | 3 +-- .../viewmodels/SensorDataModel.java | 4 ++-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java index 9665237c8..bbb89c074 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java @@ -7,8 +7,8 @@ import java.util.List; public class TestSensorDataUtil { - private List trackPointList = new ArrayList<>(); - private List sensorDataList = new ArrayList<>(); + private final List trackPointList = new ArrayList<>(); + private final List sensorDataList = new ArrayList<>(); public void add(Instant time, Float hr, Float cadence, Float power, TrackPoint.Type type) { sensorDataList.add(new TestSensorDataUtil.SensorData(time, hr, cadence, power, type)); @@ -33,7 +33,7 @@ public class TestSensorDataUtil { } public SensorDataStats computeStats() { - if (sensorDataList == null || sensorDataList.size() <= 1) { + if (sensorDataList.size() <= 1) { return null; } @@ -49,9 +49,9 @@ public class TestSensorDataUtil { if (dataPrev.type != TrackPoint.Type.SEGMENT_START_MANUAL) { timeElapsed = dataCurrent.type != TrackPoint.Type.SEGMENT_START_MANUAL ? dataCurrent.time.getEpochSecond() - dataPrev.time.getEpochSecond() : 0; stats.avgHr += (dataPrev.hr * timeElapsed); - stats.maxHr = dataPrev.hr > stats.maxHr ? dataPrev.hr : stats.maxHr; + stats.maxHr = Math.max(dataPrev.hr, stats.maxHr); stats.avgCadence += (dataPrev.cadence * timeElapsed); - stats.maxCadence = dataPrev.cadence > stats.maxCadence ? dataPrev.cadence : stats.maxCadence; + stats.maxCadence = Math.max(dataPrev.cadence, stats.maxCadence); stats.avgPower += (dataPrev.power * timeElapsed); movingTime += timeElapsed; @@ -67,11 +67,11 @@ public class TestSensorDataUtil { } private static class SensorData { - Instant time; - float hr; - float cadence; - float power; - TrackPoint.Type type; + final Instant time; + final float hr; + final float cadence; + final float power; + final TrackPoint.Type type; public SensorData(Instant time, Float hr, Float cadence, Float power, TrackPoint.Type type) { this.time = time; diff --git a/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java b/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java index c6dbf3b45..a8619f622 100644 --- a/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java @@ -34,7 +34,7 @@ public class MarkerResourceCursorAdapter extends ResourceCursorAdapter implement private final Activity activity; //TODO Should be Marker.Id - private final ExecutorListViewService executorService = new ExecutorListViewService(LIST_PREFERRED_ITEM_HEIGHT_DEFAULT); + private final ExecutorListViewService executorService = new ExecutorListViewService(LIST_PREFERRED_ITEM_HEIGHT_DEFAULT); private boolean scroll = false; diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java index 13218a4c0..7e9542fd4 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java @@ -259,8 +259,7 @@ public class CustomContentProvider extends ContentProvider { break; case TRACKS_SENSOR_STATS: long trackId = ContentUris.parseId(url); - Cursor cursor = db.rawQuery(SENSOR_STATS_QUERY, new String[]{String.valueOf(trackId), String.valueOf(trackId)}); - return cursor; + return db.rawQuery(SENSOR_STATS_QUERY, new String[]{String.valueOf(trackId), String.valueOf(trackId)}); case MARKERS: queryBuilder.setTables(MarkerColumns.TABLE_NAME); sortOrder = sort != null ? sort : MarkerColumns.DEFAULT_SORT_ORDER; diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/SensorDataModel.java b/src/main/java/de/dennisguse/opentracks/viewmodels/SensorDataModel.java index dca6d5958..aa5a350e3 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/SensorDataModel.java +++ b/src/main/java/de/dennisguse/opentracks/viewmodels/SensorDataModel.java @@ -19,9 +19,9 @@ public class SensorDataModel { this.sensorValue = StringUtils.formatDecimal(sensorValue, 0); } - public SensorDataModel(SensorData sensorData) { + public SensorDataModel(SensorData sensorData) { this.sensorName = sensorData.getSensorNameOrAddress(); - this.sensorValue = sensorData.hasValue() && sensorData.isRecent() ? StringUtils.formatDecimal((float) sensorData.getValue(), 0) : null; + this.sensorValue = sensorData.hasValue() && sensorData.isRecent() ? StringUtils.formatDecimal(sensorData.getValue(), 0) : null; if (sensorData instanceof SensorDataHeartRate) { this.labelId = R.string.sensor_state_heart_rate; this.unitId = R.string.sensor_unit_beats_per_minute;