summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorByteHamster <info@bytehamster.com>2017-06-04 14:42:42 +0200
committerByteHamster <info@bytehamster.com>2017-06-04 14:42:42 +0200
commitaae06389f9dce64d49c50c1b6caa9b7d896943e0 (patch)
tree3257aa2bf4edc637d6653e8b5628ac5c8268a20f
parent5051a0f3d9930eab3287081ea84939f4472e2bbb (diff)
downloadAntennaPod-aae06389f9dce64d49c50c1b6caa9b7d896943e0.zip
Using MessageEvent to deliver error message
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java13
-rw-r--r--core/src/main/res/values/strings.xml1
2 files changed, 7 insertions, 7 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 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);
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index b82a03801..eab2c1064 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -155,6 +155,7 @@
<string name="stream_label">Stream</string>
<string name="remove_label">Remove</string>
<string name="delete_label">Delete</string>
+ <string name="delete_failed">Unable to delete file. Rebooting the device could help.</string>
<string name="remove_episode_lable">Remove Episode</string>
<string name="marked_as_seen_label">Marked as seen</string>
<string name="mark_read_label">Mark as played</string>