diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2013-03-09 11:19:31 +0100 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2013-03-09 11:19:31 +0100 |
commit | 459fba9b54bc03073c1947a1cd331f82e6380297 (patch) | |
tree | 6eef6fcdd4926120fe8a38477b3072cad7daa41a /src | |
parent | 6a784b7b31cd6de1935cc7ed242c613d6eff0b0c (diff) | |
download | AntennaPod-459fba9b54bc03073c1947a1cd331f82e6380297.zip |
Removed auto-queue preference, auto-queue is now always enabled
Diffstat (limited to 'src')
-rw-r--r-- | src/de/danoeh/antennapod/preferences/UserPreferences.java | 11 | ||||
-rw-r--r-- | src/de/danoeh/antennapod/service/download/DownloadService.java | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/de/danoeh/antennapod/preferences/UserPreferences.java b/src/de/danoeh/antennapod/preferences/UserPreferences.java index 5684c5f37..09fb49623 100644 --- a/src/de/danoeh/antennapod/preferences/UserPreferences.java +++ b/src/de/danoeh/antennapod/preferences/UserPreferences.java @@ -34,7 +34,6 @@ public class UserPreferences implements public static final String PREF_DOWNLOAD_MEDIA_ON_WIFI_ONLY = "prefDownloadMediaOnWifiOnly"; public static final String PREF_UPDATE_INTERVAL = "prefAutoUpdateIntervall"; public static final String PREF_MOBILE_UPDATE = "prefMobileUpdate"; - public static final String PREF_AUTO_QUEUE = "prefAutoQueue"; public static final String PREF_DISPLAY_ONLY_EPISODES = "prefDisplayOnlyEpisodes"; public static final String PREF_AUTO_DELETE = "prefAutoDelete"; public static final String PREF_THEME = "prefTheme"; @@ -52,7 +51,6 @@ public class UserPreferences implements private boolean downloadMediaOnWifiOnly; private long updateInterval; private boolean allowMobileUpdate; - private boolean autoQueue; private boolean displayOnlyEpisodes; private boolean autoDelete; private int theme; @@ -95,7 +93,6 @@ public class UserPreferences implements updateInterval = readUpdateInterval(sp.getString(PREF_UPDATE_INTERVAL, "0")); allowMobileUpdate = sp.getBoolean(PREF_MOBILE_UPDATE, false); - autoQueue = sp.getBoolean(PREF_AUTO_QUEUE, true); displayOnlyEpisodes = sp.getBoolean(PREF_DISPLAY_ONLY_EPISODES, false); autoDelete = sp.getBoolean(PREF_AUTO_DELETE, false); theme = readThemeValue(sp.getString(PREF_THEME, "0")); @@ -155,11 +152,6 @@ public class UserPreferences implements return instance.allowMobileUpdate; } - public static boolean isAutoQueue() { - instanceAvailable(); - return instance.autoQueue; - } - public static boolean isDisplayOnlyEpisodes() { instanceAvailable(); return instance.displayOnlyEpisodes; @@ -226,9 +218,6 @@ public class UserPreferences implements } else if (key.equals(PREF_AUTO_DELETE)) { autoDelete = sp.getBoolean(PREF_AUTO_DELETE, false); - } else if (key.equals(PREF_AUTO_QUEUE)) { - autoQueue = sp.getBoolean(PREF_AUTO_QUEUE, true); - } else if (key.equals(PREF_DISPLAY_ONLY_EPISODES)) { displayOnlyEpisodes = sp.getBoolean(PREF_DISPLAY_ONLY_EPISODES, false); diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/src/de/danoeh/antennapod/service/download/DownloadService.java index 0aa06985d..d72e3704b 100644 --- a/src/de/danoeh/antennapod/service/download/DownloadService.java +++ b/src/de/danoeh/antennapod/service/download/DownloadService.java @@ -848,8 +848,7 @@ public class DownloadService extends Service { manager.setFeedMedia(DownloadService.this, media); } - if (UserPreferences.isAutoQueue() - && !FeedManager.getInstance().isInQueue(media.getItem())) { + if (!FeedManager.getInstance().isInQueue(media.getItem())) { FeedManager.getInstance().addQueueItem(DownloadService.this, media.getItem()); } |