From 3a073a3b0a041471516a36b251e0d8c6fc6cc96a Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 4 Apr 2021 23:31:36 +0200 Subject: [PATCH] Code cleanup. --- .../opentracks/services/TrackRecordingServiceTest.java | 3 --- .../opentracks/adapters/ExecutorListViewService.java | 2 +- .../opentracks/adapters/MarkerResourceCursorAdapter.java | 2 +- src/main/java/de/dennisguse/opentracks/chart/ChartView.java | 2 +- .../opentracks/io/file/importer/KmzTrackImporter.java | 5 ++--- .../services/sensors/BluetoothRemoteSensorManager.java | 5 ++--- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java index 643c23737..8608c3221 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java @@ -33,14 +33,11 @@ import androidx.test.rule.ServiceTestRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.time.Duration; import java.time.Instant; -import java.time.temporal.TemporalUnit; import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/de/dennisguse/opentracks/adapters/ExecutorListViewService.java b/src/main/java/de/dennisguse/opentracks/adapters/ExecutorListViewService.java index af78d9495..2e951921c 100644 --- a/src/main/java/de/dennisguse/opentracks/adapters/ExecutorListViewService.java +++ b/src/main/java/de/dennisguse/opentracks/adapters/ExecutorListViewService.java @@ -38,7 +38,7 @@ class ExecutorListViewService { } new Thread(() -> { - Future future = executorService.submit(runnable); + Future future = executorService.submit(runnable); try { future.get(); } catch (ExecutionException | InterruptedException e) { diff --git a/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java b/src/main/java/de/dennisguse/opentracks/adapters/MarkerResourceCursorAdapter.java index a8619f622..5703ce690 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/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index 83e2e9dbc..94061ef0c 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -899,7 +899,7 @@ public class ChartView extends View { Optional lastValid = chartPoints.stream().filter(chartValueSeries::isChartPointValid) .reduce((first, second) -> second); - if (firstValid.isPresent()) { + if (firstValid.isPresent() && lastValid.isPresent()) { Path path = chartValueSeries.getPath(); int yCorner = topBorder + effectiveHeight; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java index 0290d4300..badca4dcd 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java @@ -76,7 +76,7 @@ public class KmzTrackImporter implements TrackImporter { for (Track.Id trackId : trackIds) { if (copyKmzImages(trackId)) { trackIdsWithImages.add(trackId); - deleteOrphanImages(context, trackId); + deleteOrphanImages(trackId); } else { return new ArrayList<>(); } @@ -199,10 +199,9 @@ public class KmzTrackImporter implements TrackImporter { /** * Deletes all images that remained in external storage that doesn't have a marker associated. * - * @param context the Context object. * @param trackId the id of the Track. */ - private void deleteOrphanImages(Context context, Track.Id trackId) { + private void deleteOrphanImages(Track.Id trackId) { // 1.- Gets all photo names in the markers of the track identified by id. ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context); List markers = contentProviderUtils.getMarkers(trackId); diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java index 748162fe0..85b1a43b3 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java @@ -93,9 +93,8 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager. connect(cyclingPower, address); } - if (PreferencesUtils.isKey(context, R.string.settings_sensor_bluetooth_cycling_power_key, key)) { + if (PreferencesUtils.isKey(context, R.string.settings_sensor_bluetooth_cycling_speed_wheel_circumference_key, key)) { preferenceWheelCircumference = PreferencesUtils.getWheelCircumference(sharedPreferences, context); - } } }; @@ -185,7 +184,7 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager. Log.d(TAG, "onChanged: speed data repeated."); return; } - ((SensorDataCycling.DistanceSpeed) sensorData).compute(previous, PreferencesUtils.getWheelCircumference(sharedPreferences, context)); + ((SensorDataCycling.DistanceSpeed) sensorData).compute(previous, preferenceWheelCircumference); } sensorDataSet.set(sensorData);