From 0beeeb435153f1fdb11ffe7f89899b76c10f3f3b Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 2 Oct 2015 07:56:34 -0400 Subject: resolved bug in how we were choosing the default cleanup parameter --- app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java | 1 + .../java/de/danoeh/antennapod/preferences/PreferenceController.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java index 024b506d9..698d23406 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java @@ -65,6 +65,7 @@ public class DBTasksTest extends InstrumentationTestCase { SharedPreferences.Editor prefEdit = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext()).edit(); prefEdit.putString(UserPreferences.PREF_EPISODE_CACHE_SIZE, Integer.toString(EPISODE_CACHE_SIZE)); + prefEdit.putInt(UserPreferences.PREF_EPISODE_CLEANUP, UserPreferences.EPISODE_CLEANUP_DEFAULT); prefEdit.commit(); UserPreferences.init(context); 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 0b3fda9b2..a8838dafa 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -442,9 +442,9 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc String[] entries = new String[values.length]; for (int x = 0; x < values.length; x++) { int v = Integer.parseInt(values[x]); - if (v == -1) { + if (v == UserPreferences.EPISODE_CLEANUP_QUEUE) { entries[x] = res.getString(R.string.episode_cleanup_queue_removal); - } else if (v == -2){ + } 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); -- cgit v1.2.3