diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index f6960225c..8c9fdb891 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -471,12 +471,12 @@ public class TrackRecordingService extends Service { } PreferencesUtils.incrementAutoResumeTrackCurrentRetryDefault(this); - if (autoResumeTrackTimeout == context.getResources().getInteger(R.integer.auto_resume_track_timeout_never)) { + if (autoResumeTrackTimeout == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_never))) { Log.d(TAG, "Not resuming. Auto-resume track timeout set to never."); return false; } - if (autoResumeTrackTimeout == context.getResources().getInteger(R.integer.auto_resume_track_timeout_always)) { + if (autoResumeTrackTimeout == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_always))) { Log.d(TAG, "Resuming. Auto-resume track timeout set to always."); return true; } diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java b/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java index ce7f2fccb..82d769aa3 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java @@ -168,9 +168,9 @@ final class PreferenceHelper { static void setAutoResumeTrackTimeoutOptions(Context context, String[] options, String[] values) { for (int i = 0; i < values.length; i++) { int value = Integer.parseInt(values[i]); - if (value == context.getResources().getInteger(R.integer.auto_resume_track_timeout_never)) { + if (value == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_never))) { options[i] = context.getString(R.string.value_never); - } else if (value == context.getResources().getInteger(R.integer.auto_resume_track_timeout_always)) { + } else if (value == Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_always))) { options[i] = context.getString(R.string.value_always); } else { options[i] = context.getString(R.string.value_integer_minute, value); diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java index 3dfb0f357..43cc7dda0 100644 --- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java @@ -269,7 +269,7 @@ public class PreferencesUtils { } public static int getAutoResumeTrackTimeout(Context context) { - final int AUTO_RESUME_TRACK_TIMEOUT = context.getResources().getInteger(R.integer.auto_resume_track_timeout_default); + final int AUTO_RESUME_TRACK_TIMEOUT = Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default)); return PreferencesUtils.getInt(context, R.string.auto_resume_track_timeout_key, AUTO_RESUME_TRACK_TIMEOUT); } @@ -329,32 +329,32 @@ public class PreferencesUtils { } public static int getVoiceFrequency(Context context) { - final int VOICE_FREQUENCY_DEFAULT = context.getResources().getInteger(R.integer.voice_frequency_default); + final int VOICE_FREQUENCY_DEFAULT = Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default)); return PreferencesUtils.getInt(context, R.string.voice_frequency_key, VOICE_FREQUENCY_DEFAULT); } public static int getSplitFrequency(Context context) { - final int SPLIT_FREQUENCY_DEFAULT = context.getResources().getInteger(R.integer.split_frequency_default); + final int SPLIT_FREQUENCY_DEFAULT = Integer.parseInt(context.getResources().getString(R.string.split_frequency_default)); return PreferencesUtils.getInt(context, R.string.split_frequency_key, SPLIT_FREQUENCY_DEFAULT); } public static int getRecordingDistanceInterval(Context context) { - final int RECORDING_DISTANCE_INTERVAL = context.getResources().getInteger(R.integer.recording_distance_interval_default); + final int RECORDING_DISTANCE_INTERVAL = Integer.parseInt(context.getResources().getString(R.string.recording_distance_interval_default)); return PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, RECORDING_DISTANCE_INTERVAL); } public static int getMaxRecordingDistance(Context context) { - final int MAX_RECORDING_DISTANCE = context.getResources().getInteger(R.integer.max_recording_distance_default); + final int MAX_RECORDING_DISTANCE = Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default)); return PreferencesUtils.getInt(context, R.string.max_recording_distance_key, MAX_RECORDING_DISTANCE); } public static int getMinRecordingInterval(Context context) { - final int MIN_RECORDING_INTERVAL = context.getResources().getInteger(R.integer.min_recording_interval_default); + final int MIN_RECORDING_INTERVAL = Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)); return PreferencesUtils.getInt(context, R.string.min_recording_interval_key, MIN_RECORDING_INTERVAL); } public static int getRecordingGPSAccuracy(Context context) { - final int RECORDING_GPS_ACCURACY = context.getResources().getInteger(R.integer.recording_gps_accuracy_default); + final int RECORDING_GPS_ACCURACY = Integer.parseInt(context.getResources().getString(R.string.recording_gps_accuracy_default)); return PreferencesUtils.getInt(context, R.string.recording_gps_accuracy_key, RECORDING_GPS_ACCURACY); } diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index 244fcd0d5..10b4025a4 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -102,15 +102,15 @@ autoResumeTrackTimeout - 10 - -1 - 0 + 10 + -1 + 0 - @integer/auto_resume_track_timeout_never + @string/auto_resume_track_timeout_never 5 - @integer/auto_resume_track_timeout_default + @string/auto_resume_track_timeout_default 15 - @integer/auto_resume_track_timeout_always + @string/auto_resume_track_timeout_always chartXAxis @@ -127,14 +127,12 @@ splitFrequency - @integer/frequency_default - + @string/frequency_default voiceFrequency - @integer/frequency_default - - 0 + @string/frequency_default + 0 - @integer/frequency_default + @string/frequency_default 1 2 5 @@ -151,36 +149,36 @@ recordingDistanceInterval - 10 + 10 1 2 5 - @integer/recording_distance_interval_default + @string/recording_distance_interval_default 20 50 100 maxRecordingDistance - 200 + 200 50 100 - @integer/max_recording_distance_default + @string/max_recording_distance_default 500 1000 5000 minRecordingInterval - 0 - -1 - -2 + 0 + -1 + -2 - @integer/min_recording_interval_adapt_battery_life - @integer/min_recording_interval_adapt_accuracy - @integer/min_recording_interval_default + @string/min_recording_interval_adapt_battery_life + @string/min_recording_interval_adapt_accuracy + @string/min_recording_interval_default 2 3 4 @@ -197,19 +195,19 @@ recordingGpsAccuracy - 50 - 10 - 2000 + 50 + 10 + 2000 - @integer/recording_gps_accuracy_excellent + @string/recording_gps_accuracy_excellent 20 30 - @integer/recording_gps_accuracy_default + @string/recording_gps_accuracy_default 100 200 500 1000 - @integer/recording_gps_accuracy_poor + @string/recording_gps_accuracy_poor statsRate diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml index 6dcc0ea14..3675a87da 100644 --- a/src/main/res/xml/settings.xml +++ b/src/main/res/xml/settings.xml @@ -73,13 +73,13 @@ limitations under the License. android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary" android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />