From a9d93c90749f463a2f2cba7481084e2ef1d814d5 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 15 Mar 2020 17:28:34 +0100
Subject: Fixed error message when file was deleted

---
 .../antennapod/adapter/actionbutton/PlayActionButton.java      |  6 +++++-
 .../antennapod/adapter/actionbutton/StreamActionButton.java    | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/adapter/actionbutton')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java
index 0c6924469..3a80ec998 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java
@@ -6,6 +6,7 @@ import androidx.annotation.StringRes;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 
 public class PlayActionButton extends ItemActionButton {
@@ -32,7 +33,10 @@ public class PlayActionButton extends ItemActionButton {
         if (media == null) {
             return;
         }
-
+        if (!media.fileExists()) {
+            DBTasks.notifyMissingFeedMediaFile(context, media);
+            return;
+        }
         new PlaybackServiceStarter(context, media)
                 .callEvenIfRunning(true)
                 .startWhenPrepared(true)
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java
index 38b84c453..2f943e5fb 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java
@@ -8,14 +8,10 @@ import androidx.annotation.StringRes;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
-import de.danoeh.antennapod.core.storage.DBTasks;
-import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.NetworkUtils;
 import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import de.danoeh.antennapod.dialog.StreamingConfirmationDialog;
 
-import static de.danoeh.antennapod.core.service.playback.PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE;
-
 public class StreamActionButton extends ItemActionButton {
 
     public StreamActionButton(FeedItem item) {
@@ -44,6 +40,10 @@ public class StreamActionButton extends ItemActionButton {
             new StreamingConfirmationDialog(context, media).show();
             return;
         }
-        DBTasks.playMedia(context, media, false, true, true);
+        new PlaybackServiceStarter(context, media)
+                .callEvenIfRunning(true)
+                .startWhenPrepared(true)
+                .shouldStream(true)
+                .start();
     }
 }
-- 
cgit v1.2.3