upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-03 01:53:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix naming for the pace of reading of GPS location in settings

Browse Source 
Fixes #1840
This commit is contained in:
Peter Hercek
2024-01-25 00:12:26 +01:00
committed by Dennis Guse
parent c48f9b0818
commit 91b5c148cc
8 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/services/handlers/GPSManager.java
+3 -3
View File
@@ -79,13 +79,13 @@ public class GPSManager implements SensorConnector, LocationListenerCompat, GpsS
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
boolean registerListener = false;
if (PreferencesUtils.isKey(R.string.min_recording_interval_key, key)) {
if (PreferencesUtils.isKey(R.string.min_sampling_interval_key, key)) {
registerListener = true;
gpsInterval = PreferencesUtils.getMinRecordingInterval();
gpsInterval = PreferencesUtils.getMinSamplingInterval();
if (gpsStatusManager != null) {
gpsStatusManager.onMinRecordingIntervalChanged(gpsInterval);
gpsStatusManager.onMinSamplingIntervalChanged(gpsInterval);
}
}
if (PreferencesUtils.isKey(R.string.recording_gps_accuracy_key, key)) {
src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java
+2 -2
View File
@@ -50,7 +50,7 @@ class GpsStatusManager {
this.handler = handler;
onRecordingDistanceChanged(PreferencesUtils.getRecordingDistanceInterval());
onMinRecordingIntervalChanged(PreferencesUtils.getMinRecordingInterval());
onMinSamplingIntervalChanged(PreferencesUtils.getMinSamplingInterval());
}
public void start() {
@@ -76,7 +76,7 @@ class GpsStatusManager {
horizontalAccuracyThreshold = value;
}
public void onMinRecordingIntervalChanged(Duration value) {
public void onMinSamplingIntervalChanged(Duration value) {
signalLostThreshold = SIGNAL_LOST_THRESHOLD.plus(value); //TODO Reschedule gpsStatusTimer?
}
src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java
+5 -5
View File
@@ -28,7 +28,7 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat {
.setSummaryProvider(
preference -> {
Distance distance = PreferencesUtils.getRecordingDistanceInterval();
return getString(R.string.settings_recording_location_frequency_summary, formatter.formatDistance(distance));
return getString(R.string.settings_recording_location_distance_summary, formatter.formatDistance(distance));
}
);
@@ -48,10 +48,10 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat {
}
);
findPreference(getString(R.string.min_recording_interval_key))
findPreference(getString(R.string.min_sampling_interval_key))
.setSummaryProvider(
preference -> {
Duration interval = PreferencesUtils.getMinRecordingInterval();
Duration interval = PreferencesUtils.getMinSamplingInterval();
return getString(R.string.settings_recording_location_frequency_summary, getString(R.string.value_integer_second, interval.getSeconds()));
}
);
@@ -67,8 +67,8 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat {
public void onResume() {
super.onResume();
ListPreference minRecordingInterval = findPreference(getString(R.string.min_recording_interval_key));
minRecordingInterval.setEntries(PreferencesUtils.getMinRecordingIntervalEntries());
ListPreference minSamplingInterval = findPreference(getString(R.string.min_sampling_interval_key));
minSamplingInterval.setEntries(PreferencesUtils.getMinSamplingIntervalEntries());
ListPreference recordingDistanceInterval = findPreference(getString(R.string.recording_distance_interval_key));
recordingDistanceInterval.setEntries(PreferencesUtils.getRecordingDistanceIntervalEntries());
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+8 -8
View File
@@ -535,18 +535,18 @@ public class PreferencesUtils {
return entries;
}
public static Duration getMinRecordingInterval() {
final Duration MIN_RECORDING_INTERVAL = getMinRecordingIntervalDefault();
return Duration.ofSeconds(getInt(R.string.min_recording_interval_key, (int) MIN_RECORDING_INTERVAL.getSeconds()));
public static Duration getMinSamplingInterval() {
final Duration MIN_SAMPLING_INTERVAL = getMinSamplingIntervalDefault();
return Duration.ofSeconds(getInt(R.string.min_sampling_interval_key, (int) MIN_SAMPLING_INTERVAL.getSeconds()));
}
public static Duration getMinRecordingIntervalDefault() {
return Duration.ofSeconds(Integer.parseInt(resources.getString(R.string.min_recording_interval_default)));
public static Duration getMinSamplingIntervalDefault() {
return Duration.ofSeconds(Integer.parseInt(resources.getString(R.string.min_sampling_interval_default)));
}
static String[] getMinRecordingIntervalEntries() {
String[] entryValues = resources.getStringArray(R.array.min_recording_interval_values);
long recommended = PreferencesUtils.getMinRecordingIntervalDefault().getSeconds();
static String[] getMinSamplingIntervalEntries() {
String[] entryValues = resources.getStringArray(R.array.min_sampling_interval_values);
long recommended = PreferencesUtils.getMinSamplingIntervalDefault().getSeconds();
String[] entries = new String[entryValues.length];
for (int i = 0; i < entryValues.length; i++) {
int value = Integer.parseInt(entryValues[i]);