From 2d68f025d7429103e702c3ba4e15b0529573aa02 Mon Sep 17 00:00:00 2001
From: Tim Butram <tbutram@worldsproject.org>
Date: Tue, 26 Aug 2014 21:18:00 -0400
Subject: [PATCH 1/2] Added option to delete epidode upon completion of
 playback.

Conflicts:
	app/dslv
---
 app/src/main/res/xml/preferences.xml                     | 6 ++++++
 .../core/service/playback/PlaybackService.java           | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5175acdcb..dedfb74c3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -35,6 +35,12 @@
             android:key="prefFollowQueue"
             android:summary="@string/pref_followQueue_sum"
             android:title="@string/pref_followQueue_title"/>
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="prefAutoDelete"
+            android:summary="Delete epidsode when playback completes"
+            android:title="Delete On Finish"/>
         <Preference
             android:key="prefPlaybackSpeedLauncher"
             android:summary="@string/pref_playback_speed_sum"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index a5560e3fb..94e490149 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -539,6 +539,15 @@ public class PlaybackService extends Service {
             if (isAutoFlattrable(media) && UserPreferences.getAutoFlattrPlayedDurationThreshold() == 1.0f) {
                 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

From 7f02e1b1875d2fa3391308a57def055b95d76c3d Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 18 Jan 2015 19:53:53 -0500
Subject: [PATCH 2/2] Option to delete episode after playback

Fixes #498
---
 app/src/main/res/xml/preferences.xml | 6 +++---
 core/src/main/res/values/strings.xml | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index dedfb74c3..a5887e205 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -39,13 +39,13 @@
             android:defaultValue="false"
             android:enabled="true"
             android:key="prefAutoDelete"
-            android:summary="Delete epidsode when playback completes"
-            android:title="Delete On Finish"/>
+            android:summary="@string/pref_auto_delete_sum"
+            android:title="@string/pref_auto_delete_title"/>
         <Preference
             android:key="prefPlaybackSpeedLauncher"
             android:summary="@string/pref_playback_speed_sum"
             android:title="@string/pref_playback_speed_title" />
-        
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:enabled="true"
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 86f46a330..7a44e6ebc 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -206,6 +206,8 @@
     <string name="flattr_label">Flattr</string>
     <string name="pref_pauseOnHeadsetDisconnect_sum">Pause playback when the headphones are disconnected</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="network_pref">Network</string>
     <string name="pref_autoUpdateIntervall_title">Update interval</string>