Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SamWhited-delete-episode-update' into develop

This commit is contained in:
daniel oeh 2015-01-19 21:54:19 +01:00
parent d04aa82954 7f02e1b187
commit efcbbfe2b9
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/xml/preferences.xml
View File

@ -42,6 +42,12 @@
android:key="prefFollowQueue" android:key="prefFollowQueue"
android:summary="@string/pref_followQueue_sum" android:summary="@string/pref_followQueue_sum"
android:title="@string/pref_followQueue_title"/> android:title="@string/pref_followQueue_title"/>
<CheckBoxPreference
android:defaultValue="false"
android:enabled="true"
android:key="prefAutoDelete"
android:summary="@string/pref_auto_delete_sum"
android:title="@string/pref_auto_delete_title"/>
<Preference <Preference
android:key="prefPlaybackSpeedLauncher" android:key="prefPlaybackSpeedLauncher"
android:summary="@string/pref_playback_speed_sum" android:summary="@string/pref_playback_speed_sum"

9
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -553,6 +553,15 @@ public class PlaybackService extends Service {
if (isAutoFlattrable(media) && UserPreferences.getAutoFlattrPlayedDurationThreshold() == 1.0f) { if (isAutoFlattrable(media) && UserPreferences.getAutoFlattrPlayedDurationThreshold() == 1.0f) {
DBTasks.flattrItemIfLoggedIn(PlaybackService.this, item); DBTasks.flattrItemIfLoggedIn(PlaybackService.this, item);
} }
//Delete episode if enabled
if(UserPreferences.isAutoDelete()) {
DBWriter.deleteFeedMediaOfItem(PlaybackService.this, item.getMedia().getId());
if(BuildConfig.DEBUG)
Log.d(TAG, "Episode Deleted");
}
} }
// Load next episode if previous episode was in the queue and if there // Load next episode if previous episode was in the queue and if there

2
core/src/main/res/values/strings.xml
View File

@ -207,6 +207,8 @@
<string name="pref_pauseOnHeadsetDisconnect_sum">Pause playback when the headphones are disconnected</string> <string name="pref_pauseOnHeadsetDisconnect_sum">Pause playback when the headphones are disconnected</string>
<string name="pref_unpauseOnHeadsetReconnect_sum">Resume playback when the headphones are reconnected</string> <string name="pref_unpauseOnHeadsetReconnect_sum">Resume playback when the headphones are reconnected</string>
<string name="pref_followQueue_sum">Jump to next queue item when playback completes</string> <string name="pref_followQueue_sum">Jump to next queue item when playback completes</string>
<string name="pref_auto_delete_sum">Delete episode when playback completes</string>
<string name="pref_auto_delete_title">Auto Delete</string>
<string name="playback_pref">Playback</string> <string name="playback_pref">Playback</string>
<string name="network_pref">Network</string> <string name="network_pref">Network</string>
<string name="pref_autoUpdateIntervall_title">Update interval</string> <string name="pref_autoUpdateIntervall_title">Update interval</string>