From 5e1293fc82f9543a2b91950dc911a973b1165424 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 11 Apr 2021 19:01:20 +0200 Subject: [PATCH] For delays/timers: use Duration. --- .../java/de/dennisguse/opentracks/TrackController.java | 7 ++++--- .../opentracks/fragments/MarkerDetailFragment.java | 9 +++++---- .../fragments/StatisticsRecordingFragment.java | 5 ++--- .../opentracks/services/sensors/AltitudeSumManager.java | 7 ++++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/TrackController.java b/src/main/java/de/dennisguse/opentracks/TrackController.java index 626174d39..fe34a3f2b 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackController.java +++ b/src/main/java/de/dennisguse/opentracks/TrackController.java @@ -31,7 +31,6 @@ import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.util.ActivityUtils; import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.util.UnitConversions; /** * Track controller for record, pause, resume, and stop. @@ -42,6 +41,8 @@ public class TrackController implements View.OnTouchListener { private static final String TAG = TrackController.class.getSimpleName(); + private static final Duration UI_UPDATE_INTERVAL = Duration.ofSeconds(1); + private final Activity activity; private final TrackRecordingServiceConnection trackRecordingServiceConnection; private final Handler handlerUpdateTotalTime = new Handler(); @@ -66,7 +67,7 @@ public class TrackController implements View.OnTouchListener { if (isResumed && isRecording && !isRecordingPaused) { updateTotalTime(); setTotalTime(); - handlerUpdateTotalTime.postDelayed(this, UnitConversions.ONE_SECOND_MS); + handlerUpdateTotalTime.postDelayed(this, UI_UPDATE_INTERVAL.toMillis()); } } }; @@ -180,7 +181,7 @@ public class TrackController implements View.OnTouchListener { } if (isRecording && !isRecordingPaused) { - handlerUpdateTotalTime.postDelayed(updateTotalTimeRunnable, UnitConversions.ONE_SECOND_MS); + handlerUpdateTotalTime.postDelayed(updateTotalTimeRunnable, UI_UPDATE_INTERVAL.toMillis()); } viewBinding.trackControllerRecord.setImageResource(isRecording && !isRecordingPaused ? R.drawable.ic_button_pause : R.drawable.button_record); diff --git a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java index 071631a30..fae1fca34 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java @@ -34,6 +34,8 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import java.time.Duration; + import de.dennisguse.opentracks.MarkerEditActivity; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Marker; @@ -43,7 +45,6 @@ import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.ListItemUtils; import de.dennisguse.opentracks.util.MarkerUtils; import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.util.UnitConversions; /** * A fragment to show marker details. @@ -55,7 +56,7 @@ public class MarkerDetailFragment extends Fragment { private static final String TAG = MarkerDetailFragment.class.getSimpleName(); private static final String KEY_MARKER_ID = "markerId"; - private static final long HIDE_TEXT_DELAY = 4 * UnitConversions.ONE_SECOND_MS; + private static final Duration HIDE_TEXT_DELAY = Duration.ofSeconds(4); private MenuItem shareMarkerImageMenuItem; @@ -126,7 +127,7 @@ public class MarkerDetailFragment extends Fragment { viewBinding.markerDetailMarkerTextGradient.setVisibility(visibility); viewBinding.markerDetailMarkerInfo.setVisibility(visibility); if (visibility == View.VISIBLE) { - handler.postDelayed(hideText, HIDE_TEXT_DELAY); + handler.postDelayed(hideText, HIDE_TEXT_DELAY.toMillis()); } }); return viewBinding.getRoot(); @@ -236,7 +237,7 @@ public class MarkerDetailFragment extends Fragment { if (hasPhoto) { handler.removeCallbacks(hideText); viewBinding.markerDetailMarkerPhoto.setImageURI(marker.getPhotoURI()); - handler.postDelayed(hideText, HIDE_TEXT_DELAY); + handler.postDelayed(hideText, HIDE_TEXT_DELAY.toMillis()); } else { viewBinding.markerDetailMarkerPhoto.setImageResource(MarkerUtils.ICON_ID); } diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java index ae2872c32..22c318805 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java @@ -37,7 +37,6 @@ import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.util.TrackIconUtils; -import de.dennisguse.opentracks.util.UnitConversions; import de.dennisguse.opentracks.viewmodels.SensorDataModel; /** @@ -50,7 +49,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi private static final String TAG = StatisticsRecordingFragment.class.getSimpleName(); - private static final long UI_UPDATE_INTERVAL = UnitConversions.ONE_SECOND_MS; + private static final Duration UI_UPDATE_INTERVAL = Duration.ofSeconds(1); public static Fragment newInstance() { return new StatisticsRecordingFragment(); @@ -121,7 +120,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi updateSensorDataUI(); } - handlerUpdateUI.postDelayed(this, UI_UPDATE_INTERVAL); + handlerUpdateUI.postDelayed(this, UI_UPDATE_INTERVAL.toMillis()); } } }; diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java index dc646cfcf..ca9b5a26c 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java @@ -10,8 +10,9 @@ import android.util.Log; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import java.time.Duration; + import de.dennisguse.opentracks.util.PressureSensorUtils; -import de.dennisguse.opentracks.util.UnitConversions; /** * Estimates the altitude gain and altitude loss using the device's pressure sensor (i.e., barometer). @@ -20,7 +21,7 @@ public class AltitudeSumManager implements SensorEventListener { private static final String TAG = AltitudeSumManager.class.getSimpleName(); - private static final int SAMPLING_RATE = 3 * (int) UnitConversions.ONE_SECOND_US; + private static final Duration SAMPLING_RATE = Duration.ofSeconds(3); private boolean isConnected = false; @@ -39,7 +40,7 @@ public class AltitudeSumManager implements SensorEventListener { Log.w(TAG, "No pressure sensor available."); isConnected = false; } else { - isConnected = sensorManager.registerListener(this, pressureSensor, SAMPLING_RATE); + isConnected = sensorManager.registerListener(this, pressureSensor, (int) SAMPLING_RATE.toNanos()); } lastAcceptedPressureValue_hPa = Float.NaN;