diff options
| author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-02-23 19:05:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 19:05:39 +0100 |
| commit | a7efede66c90de785aeaf00ed3924818010676cc (patch) | |
| tree | 998618906a6cb2d378e4ec3ab7832c98cb0e481b /core/src/main/java | |
| parent | 03f3fa1c80c8687e3fe245d46effb71a989379c5 (diff) | |
| parent | 1433446738889ce01233447fc86fe732ac9c5a02 (diff) | |
| download | AntennaPod-a7efede66c90de785aeaf00ed3924818010676cc.zip | |
Merge pull request #3881 from ByteHamster/fix-resume-streaming
Fixed resuming when episode was streamed
Diffstat (limited to 'core/src/main/java')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 13 |
1 files changed, 12 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 bf59b0ffd..0ec325e85 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 @@ -643,7 +643,18 @@ public class PlaybackService extends MediaBrowserServiceCompat { private void startPlayingFromPreferences() { Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext()); if (playable != null) { - mediaPlayer.playMediaObject(playable, false, true, true); + if (PlaybackPreferences.getCurrentEpisodeIsStream() && !NetworkUtils.isStreamingAllowed()) { + displayStreamingNotAllowedNotification( + new PlaybackServiceStarter(this, playable) + .prepareImmediately(true) + .startWhenPrepared(true) + .shouldStream(true) + .getIntent()); + PlaybackPreferences.writeNoMediaPlaying(); + stateManager.stopService(); + return; + } + mediaPlayer.playMediaObject(playable, PlaybackPreferences.getCurrentEpisodeIsStream(), true, true); stateManager.validStartCommandWasReceived(); PlaybackService.this.updateMediaSessionMetadata(playable); } else { |