From 5051a0f3d9930eab3287081ea84939f4472e2bbb Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Wed, 26 Apr 2017 19:34:56 +0200 Subject: Check successful file deletion --- .../main/java/de/danoeh/antennapod/core/storage/DBWriter.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/src/main/java/de/danoeh/antennapod') 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..bcfd19d4e 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,7 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.util.Log; +import android.widget.Toast; import org.shredzone.flattr4j.model.Flattr; import java.io.File; @@ -84,12 +85,15 @@ 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.delete()) { + Toast.makeText(context, "Unable to delete file. Rebooting the device could help.", + Toast.LENGTH_LONG).show(); + return; + } } media.setDownloaded(false); media.setFile_url(null); @@ -129,7 +133,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(); } -- cgit v1.2.3 From aae06389f9dce64d49c50c1b6caa9b7d896943e0 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 4 Jun 2017 14:42:42 +0200 Subject: Using MessageEvent to deliver error message --- .../java/de/danoeh/antennapod/core/storage/DBWriter.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'core/src/main/java/de/danoeh/antennapod') 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 bcfd19d4e..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,7 +7,8 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.util.Log; -import android.widget.Toast; +import de.danoeh.antennapod.core.R; +import de.danoeh.antennapod.core.event.MessageEvent; import org.shredzone.flattr4j.model.Flattr; import java.io.File; @@ -88,12 +89,10 @@ public class DBWriter { if (media.isDownloaded()) { // delete downloaded media file File mediaFile = new File(media.getFile_url()); - if (mediaFile.exists()) { - if (!mediaFile.delete()) { - Toast.makeText(context, "Unable to delete file. Rebooting the device could help.", - Toast.LENGTH_LONG).show(); - return; - } + 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); -- cgit v1.2.3