diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 1 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/preferences/UserPreferences.java | 11 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/service/download/DownloadService.java | 3 |
4 files changed, 1 insertions, 16 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 367a91916..877004162 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -166,8 +166,6 @@ <string name="pref_flattr_this_app_sum">Support the development of AntennaPod by flattring it. Thanks!</string> <string name="pref_revokeAccess_title">Revoke access</string> <string name="pref_revokeAccess_sum">Revoke the access permission to your flattr account for this app.</string> - <string name="pref_autoQueue_title">Auto-enqueue</string> - <string name="pref_autoQueue_sum">Add an episode to the queue when you start to download it.</string> <string name="pref_display_only_episodes_title">Display only episodes</string> <string name="pref_display_only_episodes_sum">Display only items which also have an episode.</string> <string name="user_interface_label">User Interface</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 7f2a4d4bb..c8c947797 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -34,7 +34,6 @@ android:key="prefMobileUpdate" android:summary="@string/pref_mobileUpdate_sum" android:title="@string/pref_mobileUpdate_title" /> - <CheckBoxPreference android:summary="@string/pref_autoQueue_sum" android:defaultValue="true" android:key="prefAutoQueue" android:title="@string/pref_autoQueue_title"/> <ListPreference android:defaultValue="20" android:entries="@array/episode_cache_size" android:key="prefEpisodeCacheSize" android:title="@string/pref_episode_cache_title" android:entryValues="@array/episode_cache_size"/><PreferenceScreen android:summary="@string/pref_automatic_download_sum" android:key="prefAutoDownloadSettings" android:title="@string/pref_automatic_download_title"> <CheckBoxPreference android:key="prefEnableAutoDownloadWifiFilter" android:title="@string/pref_autodl_wifi_filter_title" android:summary="@string/pref_autodl_wifi_filter_sum"/> </PreferenceScreen> 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()); } |