diff options
author | ByteHamster <info@bytehamster.com> | 2021-08-28 11:49:15 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2021-08-28 11:49:15 +0200 |
commit | bf58cdc430744e0923c898c75183650429bf1c05 (patch) | |
tree | 9f57491c75006fcd43f674e6770b6155cb4df6b1 /core/src/main/java/de/danoeh/antennapod | |
parent | 697c199275d3097d599789fd0c58d567621c282f (diff) | |
download | AntennaPod-bf58cdc430744e0923c898c75183650429bf1c05.zip |
Don't write noMediaPlaying when follow queue is disabled
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 5 |
1 files changed, 4 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 19c21a53a..f503c16f4 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 @@ -986,6 +986,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { private Playable getNextInQueue(final Playable currentMedia) { if (!(currentMedia instanceof FeedMedia)) { Log.d(TAG, "getNextInQueue(), but playable not an instance of FeedMedia, so not proceeding"); + PlaybackPreferences.writeNoMediaPlaying(); return null; } Log.d(TAG, "getNextInQueue()"); @@ -996,6 +997,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { FeedItem item = media.getItem(); if (item == null) { Log.w(TAG, "getNextInQueue() with FeedMedia object whose FeedItem is null"); + PlaybackPreferences.writeNoMediaPlaying(); return null; } FeedItem nextItem; @@ -1008,11 +1010,13 @@ public class PlaybackService extends MediaBrowserServiceCompat { } if (nextItem == null || nextItem.getMedia() == null) { + PlaybackPreferences.writeNoMediaPlaying(); return null; } if (!UserPreferences.isFollowQueue()) { Log.d(TAG, "getNextInQueue(), but follow queue is not enabled."); + PlaybackPreferences.writeMediaPlaying(nextItem.getMedia(), PlayerStatus.STOPPED, false); updateNotificationAndMediaSession(nextItem.getMedia()); return null; } @@ -1042,7 +1046,6 @@ public class PlaybackService extends MediaBrowserServiceCompat { if (stopPlaying) { taskManager.cancelPositionSaver(); cancelPositionObserver(); - PlaybackPreferences.writeNoMediaPlaying(); if (!isCasting) { stateManager.stopForeground(true); stateManager.stopService(); |