diff options
6 files changed, 11 insertions, 10 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java index a2c5ca3ff..d2796b5e2 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java @@ -109,5 +109,13 @@ public class PreferenceUpgrader { if (oldVersion < 2050000) { prefs.edit().putBoolean(UserPreferences.PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, true).apply(); } + if (oldVersion < 2080000) { + // Migrate drawer feed counter setting to reflect removal of + // "unplayed and in inbox" (0), by changing it to "unplayed" (2) + String feedCounterSetting = prefs.getString(UserPreferences.PREF_DRAWER_FEED_COUNTER, "1"); + if (feedCounterSetting.equals("0")) { + prefs.edit().putString(UserPreferences.PREF_DRAWER_FEED_COUNTER, "2").apply(); + } + } } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index b1bc38ebc..47a447021 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -52,7 +52,7 @@ public class UserPreferences { public static final String PREF_THEME = "prefTheme"; public static final String PREF_HIDDEN_DRAWER_ITEMS = "prefHiddenDrawerItems"; public static final String PREF_DRAWER_FEED_ORDER = "prefDrawerFeedOrder"; - private static final String PREF_DRAWER_FEED_COUNTER = "prefDrawerFeedIndicator"; + public static final String PREF_DRAWER_FEED_COUNTER = "prefDrawerFeedIndicator"; public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify"; public static final String PREF_USE_EPISODE_COVER = "prefEpisodeCover"; public static final String PREF_SHOW_TIME_LEFT = "showTimeLeft"; diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 4a32eb760..0ff5df376 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -175,14 +175,12 @@ </string-array> <string-array name="nav_drawer_feed_counter_options"> - <item>@string/drawer_feed_counter_inbox_unplayed</item> <item>@string/drawer_feed_counter_inbox</item> <item>@string/drawer_feed_counter_unplayed</item> <item>@string/drawer_feed_counter_downloaded</item> <item>@string/drawer_feed_counter_none</item> </string-array> <string-array name="nav_drawer_feed_counter_values"> - <item>0</item> <item>1</item> <item>2</item> <item>4</item> diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedCounter.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedCounter.java index eef1cc1ef..0cf6e0858 100644 --- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedCounter.java +++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedCounter.java @@ -1,7 +1,6 @@ package de.danoeh.antennapod.model.feed; public enum FeedCounter { - SHOW_NEW_UNPLAYED_SUM(0), SHOW_NEW(1), SHOW_UNPLAYED(2), SHOW_NONE(3), diff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java index bd0024042..3cf7e37dc 100644 --- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java +++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java @@ -1271,15 +1271,12 @@ public class PodDBAdapter { public final Map<Long, Integer> getFeedCounters(FeedCounter setting, long... feedIds) { String whereRead; switch (setting) { - case SHOW_NEW_UNPLAYED_SUM: - whereRead = "(" + KEY_READ + "=" + FeedItem.NEW + - " OR " + KEY_READ + "=" + FeedItem.UNPLAYED + ")"; - break; case SHOW_NEW: whereRead = KEY_READ + "=" + FeedItem.NEW; break; case SHOW_UNPLAYED: - whereRead = KEY_READ + "=" + FeedItem.UNPLAYED; + whereRead = "(" + KEY_READ + "=" + FeedItem.NEW + + " OR " + KEY_READ + "=" + FeedItem.UNPLAYED + ")"; break; case SHOW_DOWNLOADED: whereRead = KEY_DOWNLOADED + "=1"; diff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml index 1a748778f..600364161 100644 --- a/ui/i18n/src/main/res/values/strings.xml +++ b/ui/i18n/src/main/res/values/strings.xml @@ -73,7 +73,6 @@ <string name="drawer_feed_order_alphabetical">Sort alphabetically</string> <string name="drawer_feed_order_last_update">Sort by publication date</string> <string name="drawer_feed_order_most_played">Sort by number of played episodes</string> - <string name="drawer_feed_counter_inbox_unplayed">Number of unplayed episodes and episodes in the inbox</string> <string name="drawer_feed_counter_inbox">Number of episodes in the inbox</string> <string name="drawer_feed_counter_unplayed">Number of unplayed episodes</string> <string name="drawer_feed_counter_downloaded">Number of downloaded episodes</string> |