summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorByteHamster <info@bytehamster.com>2019-07-25 13:53:54 +0200
committerByteHamster <info@bytehamster.com>2019-07-25 13:53:54 +0200
commit1651b95f774a61333a5d020cc8925c139d38e48e (patch)
tree0b7b4fded3c95feb7f532304b1446e5639718ecd /core
parentbe8e7c32f138bab841d3b040dad0c85ee54875ac (diff)
downloadAntennaPod-1651b95f774a61333a5d020cc8925c139d38e48e.zip
Displaying notification when playback switches to streamed episode
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java18
1 files changed, 17 insertions, 1 deletions
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 6707d10f4..bc8725432 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
@@ -73,6 +73,7 @@ import de.danoeh.antennapod.core.util.QueueAccess;
import de.danoeh.antennapod.core.util.gui.NotificationUtils;
import de.danoeh.antennapod.core.util.playback.ExternalMedia;
import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
import org.greenrobot.eventbus.EventBus;
/**
@@ -853,7 +854,22 @@ public class PlaybackService extends MediaBrowserServiceCompat {
Log.e(TAG, "Error handling the queue in order to retrieve the next item", e);
return null;
}
- return (nextItem != null) ? nextItem.getMedia() : null;
+
+ if (nextItem == null || nextItem.getMedia() == null) {
+ return null;
+ }
+
+ if (!nextItem.getMedia().localFileAvailable() && !NetworkUtils.isStreamingAllowed()) {
+ displayStreamingNotAllowedNotification(
+ new PlaybackServiceStarter(this, nextItem.getMedia())
+ .prepareImmediately(true)
+ .startWhenPrepared(true)
+ .shouldStream(true)
+ .getIntent());
+ stopService();
+ return null;
+ }
+ return nextItem.getMedia();
}