Cleanup.

2021-02-27 22:14:21 +01:00
parent 844c6e9609
commit fdf4336a9b
13 changed files with 33 additions and 55 deletions
@@ -84,11 +84,9 @@ public class MarkerEditActivity extends AbstractActivity {
        // Setup UI elements
        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.marker_types, android.R.layout.simple_dropdown_item_1line);
        viewBinding.markerEditMarkerType.setAdapter(adapter);
-        viewBinding.markerEditPhotoDelete.setOnClickListener(v -> {
-            viewModel.onPhotoDelete(viewBinding.markerEditName.getText().toString(),
-                    viewBinding.markerEditMarkerType.getText().toString(),
-                    viewBinding.markerEditDescription.getText().toString());
-        });
+        viewBinding.markerEditPhotoDelete.setOnClickListener(v -> viewModel.onPhotoDelete(viewBinding.markerEditName.getText().toString(),
+                viewBinding.markerEditMarkerType.getText().toString(),
+                viewBinding.markerEditDescription.getText().toString()));

        viewBinding.markerEditCancel.setOnClickListener(v -> {
            viewModel.onCancel();
@@ -14,8 +14,8 @@ import java.util.concurrent.Future;
 */
 class ExecutorListViewService<T> {

-    private List<T> enqueueObjects = new ArrayList<>();
-    private ExecutorService executorService;
+    private final List<T> enqueueObjects = new ArrayList<>();
+    private final ExecutorService executorService;

    public ExecutorListViewService(int numThreads) {
        executorService = Executors.newFixedThreadPool(numThreads);
@@ -23,7 +23,6 @@ class ExecutorListViewService<T> {

    public void shutdown() {
        enqueueObjects.clear();
-        enqueueObjects = null;
        executorService.shutdown();
    }

@@ -12,7 +12,7 @@ public class ScrollVisibleViews implements AbsListView.OnScrollListener {
    private int from = -1;
    private int to = -1;

-    private VisibleViewsListener visibleViewsListener;
+    private final VisibleViewsListener visibleViewsListener;

    public ScrollVisibleViews(@NonNull VisibleViewsListener visibleViewsListener) {
        this.visibleViewsListener = visibleViewsListener;
@@ -45,6 +45,9 @@ public class TrackPoint {

    private static final Duration MAX_LOCATION_AGE = Duration.ofMinutes(1);

+    // Anything faster than that (in meters per second) will be considered moving.
+    private static final double MAX_NO_MOVEMENT_SPEED = 0.224;
+
    private TrackPoint.Id id;

    private Instant time;
@@ -279,6 +282,10 @@ public class TrackPoint {
        this.speed_mps = speed;
    }

+    public boolean isMoving() {
+        return hasSpeed() && getSpeed() >= MAX_NO_MOVEMENT_SPEED;
+    }
+
    public boolean hasBearing() {
        return bearing != null;
    }
@@ -307,6 +314,10 @@ public class TrackPoint {
        return getLocation().distanceTo(dest.getLocation());
    }

+    public boolean fulfillsAccuracy(int poorAccuracy) {
+        return hasAccuracy() && accuracy < poorAccuracy;
+    }
+
    public float bearingTo(@NonNull TrackPoint dest) {
        return getLocation().bearingTo(dest.getLocation());
    }
@@ -8,7 +8,7 @@ import java.time.Instant;

 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;

-public class SensorData<T> {
+public abstract class SensorData<T> {

    protected T value;

@@ -33,11 +33,11 @@ public final class SensorDataSet {
        return cyclingPower;
    }

-    public void set(SensorData data) {
+    public void set(SensorData<?> data) {
        set(data, data);
    }

-    public void remove(SensorData type) {
+    public void remove(SensorData<?> type) {
        set(type, null);
    }

@@ -75,7 +75,7 @@ public final class SensorDataSet {
                + (getCyclingPower() != null ? " " + getCyclingPower() : "");
    }

-    private void set(@NonNull SensorData type, SensorData data) {
+    private void set(@NonNull SensorData<?> type, SensorData<?> data) {
        if (type instanceof SensorDataHeartRate) {
            this.heartRate = (SensorDataHeartRate) data;
            return;
@@ -95,7 +95,7 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe
        private int successCount;
        private int existsCount;
        private int errorCount;
-        private ArrayList<Track.Id> importedTrackIds = new ArrayList<>();
+        private final ArrayList<Track.Id> importedTrackIds = new ArrayList<>();
        private final ArrayList<String> fileErrors = new ArrayList<>();

        public int getTotalCount() {
@@ -66,7 +66,6 @@ import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.SystemUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackNameUtils;
-import de.dennisguse.opentracks.util.TrackPointUtils;

 /**
 * A background service that registers a location listener and records track points.
@@ -594,7 +593,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
            return;
        }

-        if (!isIdle && !TrackPointUtils.isMoving(trackPoint)) {
+        if (!isIdle && !trackPoint.isMoving()) {
            insertTrackPointIfNewer(track, lastTrackPoint);

            insertTrackPoint(track, trackPoint);
@@ -605,7 +604,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
            return;
        }

-        if (isIdle && TrackPointUtils.isMoving(trackPoint)) {
+        if (isIdle && trackPoint.isMoving()) {
            insertTrackPointIfNewer(track, lastTrackPoint);

            insertTrackPoint(track, trackPoint);
@@ -16,7 +16,6 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.TrackPointUtils;

 class LocationHandler implements HandlerServer.Handler, LocationListener, GpsStatus.GpsStatusListener {

@@ -92,7 +91,7 @@ class LocationHandler implements HandlerServer.Handler, LocationListener, GpsSta
    @Override
    public void onLocationChanged(@NonNull Location location) {
        TrackPoint trackPoint = new TrackPoint(location);
-        boolean isAccurate = TrackPointUtils.fulfillsAccuracy(trackPoint, recordingGpsAccuracy);
+        boolean isAccurate = trackPoint.fulfillsAccuracy(recordingGpsAccuracy);
        boolean isValid = LocationUtils.isValidLocation(location);

        if (gpsStatus != null) {
@@ -1,11 +1,11 @@
 package de.dennisguse.opentracks.stats;

 public class SensorStatistics {
-    private Float maxHr;
-    private Float avgHr;
-    private Float maxCadence;
-    private Float avgCadence;
-    private Float avgPower;
+    private final Float maxHr;
+    private final Float avgHr;
+    private final Float maxCadence;
+    private final Float avgCadence;
+    private final Float avgPower;

    public SensorStatistics(Float maxHr, Float avgHr, Float maxCadence, Float avgCadence, Float avgPower) {
        this.maxHr = maxHr;
@@ -25,7 +25,6 @@ import java.time.Duration;

 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.provider.TrackPointIterator;
-import de.dennisguse.opentracks.util.TrackPointUtils;

 /**
 * Updater for {@link TrackStatistics}.
@@ -161,7 +160,7 @@ public class TrackStatisticsUpdater {
        }

        double movingDistance = lastMovingTrackPoint.distanceTo(trackPoint);
-        if (movingDistance < minRecordingDistance && !TrackPointUtils.isMoving(trackPoint)) {
+        if (movingDistance < minRecordingDistance && !trackPoint.isMoving()) {
            speedBuffer_ms.reset();
            lastTrackPoint = trackPoint;
            return;
@@ -211,7 +210,7 @@ public class TrackStatisticsUpdater {
     */
    @VisibleForTesting
    private void updateSpeed(@NonNull TrackPoint trackPoint, @NonNull TrackPoint lastTrackPoint) {
-        if (!TrackPointUtils.isMoving(trackPoint)) {
+        if (!trackPoint.isMoving()) {
            speedBuffer_ms.reset();
        } else if (isValidSpeed(trackPoint, lastTrackPoint)) {
            speedBuffer_ms.setNext(trackPoint.getSpeed());
@@ -1,27 +0,0 @@
-package de.dennisguse.opentracks.util;
-
-import androidx.annotation.NonNull;
-
-import de.dennisguse.opentracks.content.data.TrackPoint;
-
-public class TrackPointUtils {
-
-    // Anything faster than that (in meters per second) will be considered moving.
-    private static final double MAX_NO_MOVEMENT_SPEED = 0.224;
-
-    private final static String TAG = TrackPointUtils.class.getSimpleName();
-
-    private TrackPointUtils() {
-    }
-
-    public static boolean isMoving(@NonNull TrackPoint trackPoint) {
-        return trackPoint.hasSpeed() && trackPoint.getSpeed() >= MAX_NO_MOVEMENT_SPEED;
-    }
-
-    /**
-     * Is accuracy better than threshold?
-     */
-    public static boolean fulfillsAccuracy(@NonNull TrackPoint trackPoint, int poorAccuracy) {
-        return trackPoint.hasAccuracy() && trackPoint.getAccuracy() < poorAccuracy;
-    }
-}
@@ -9,7 +9,7 @@ import de.dennisguse.opentracks.util.StringUtils;

 public class SensorDataModel {
    private int labelId;
-    private String sensorValue;
+    private final String sensorValue;
    private String sensorName;
    private int unitId;