diff options
| author | orionlee <orionlee@yahoo.com> | 2018-11-14 14:14:15 -0800 |
|---|---|---|
| committer | orionlee <orionlee@yahoo.com> | 2019-01-04 10:33:26 -0800 |
| commit | d1c73dda5b5e7d9346c24d323461810bac18499e (patch) | |
| tree | 2e6dd62af5126cf65f6fb0031bdddb66b9c1331d /app/src/main | |
| parent | 566a682122a8438a656b72ec603e6ddaae90727c (diff) | |
| download | AntennaPod-d1c73dda5b5e7d9346c24d323461810bac18499e.zip | |
episode cleanup 12 hour option - use hours internally part 2 (persisted shared preference)
requires data migartion: app versionCode increased to 1070196
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cff85e905..55b54775b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.danoeh.antennapod" android:installLocation="auto" - android:versionCode="1070195" + android:versionCode="1070196" android:versionName="1.7.1"> <!-- Version code schema: diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index 7f497c7aa..906dcfebb 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -67,7 +67,6 @@ import de.danoeh.antennapod.core.export.opml.OpmlWriter; import de.danoeh.antennapod.core.preferences.GpodnetPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.GpodnetSyncService; -import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.util.flattr.FlattrUtils; import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil; import de.danoeh.antennapod.dialog.AuthenticationDialog; @@ -840,19 +839,18 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc R.array.episode_cleanup_values); String[] entries = new String[values.length]; for (int x = 0; x < values.length; x++) { - float v = Float.parseFloat(values[x]); + int v = Integer.parseInt(values[x]); if (v == UserPreferences.EPISODE_CLEANUP_QUEUE) { entries[x] = res.getString(R.string.episode_cleanup_queue_removal); } else if (v == UserPreferences.EPISODE_CLEANUP_NULL){ entries[x] = res.getString(R.string.episode_cleanup_never); } else if (v == 0) { entries[x] = res.getString(R.string.episode_cleanup_after_listening); - } else if (v > 0 && v < 1) { - int numHours = Converter.numberOfDaysFloatToNumberOfHours(v); - entries[x] = res.getQuantityString(R.plurals.episode_cleanup_hours_after_listening, numHours, numHours); + } else if (v > 0 && v < 24) { + entries[x] = res.getQuantityString(R.plurals.episode_cleanup_hours_after_listening, v, v); } else { - int vInt = (int)v; - entries[x] = res.getQuantityString(R.plurals.episode_cleanup_days_after_listening, vInt, vInt); + int numDays = (int)(v / 24); // assume underlying value will be fractions, e.g., 36 (hours) + entries[x] = res.getQuantityString(R.plurals.episode_cleanup_days_after_listening, numDays, numDays); } } pref.setEntries(entries); |