Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3881 from ByteHamster/fix-resume-streaming 

Fixed resuming when episode was streamed
This commit is contained in:
H. Lehmann 2020-02-23 19:05:39 +01:00 committed by GitHub
parent 03f3fa1c80 1433446738
commit a7efede66c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -643,7 +643,18 @@ public class PlaybackService extends MediaBrowserServiceCompat {
private void startPlayingFromPreferences() { private void startPlayingFromPreferences() {
Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext()); Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext());
if (playable != null) { 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(); stateManager.validStartCommandWasReceived();
PlaybackService.this.updateMediaSessionMetadata(playable); PlaybackService.this.updateMediaSessionMetadata(playable);
} else { } else {