Merge pull request #2314 from ByteHamster/delete-only-success

Check successful file deletion

1 files changed, 6 insertions, 4 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index 563d80da0..49ec07004 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -7,6 +7,8 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import de.danoeh.antennapod.core.R;
+import de.danoeh.antennapod.core.event.MessageEvent;
 import org.shredzone.flattr4j.model.Flattr;
 
 import java.io.File;
@@ -84,12 +86,13 @@ public class DBWriter {
             if (media != null) {
                 Log.i(TAG, String.format("Requested to delete FeedMedia [id=%d, title=%s, downloaded=%s",
                         media.getId(), media.getEpisodeTitle(), String.valueOf(media.isDownloaded())));
-                boolean result = false;
                 if (media.isDownloaded()) {
                     // delete downloaded media file
                     File mediaFile = new File(media.getFile_url());
-                    if (mediaFile.exists()) {
-                        result = mediaFile.delete();
+                    if (mediaFile.exists() && !mediaFile.delete()) {
+                        MessageEvent evt = new MessageEvent(context.getString(R.string.delete_failed));
+                        EventBus.getDefault().post(evt);
+                        return;
                     }
                     media.setDownloaded(false);
                     media.setFile_url(null);
@@ -129,7 +132,6 @@ public class DBWriter {
                         GpodnetPreferences.enqueueEpisodeAction(action);
                     }
                 }
-                Log.d(TAG, "Deleting File. Result: " + result);
                 EventBus.getDefault().post(FeedItemEvent.deletedMedia(Collections.singletonList(media.getItem())));
                 EventDistributor.getInstance().sendUnreadItemsUpdateBroadcast();
             }