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

Don't write noMediaPlaying when follow queue is disabled

This commit is contained in:
ByteHamster 2021-08-28 11:49:15 +02:00
parent 697c199275
commit bf58cdc430
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();