diff options
| author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-02-01 10:00:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 10:00:45 +0100 |
| commit | f642c61dfb4b9f3ca8cd6de5f645020169e07992 (patch) | |
| tree | 9a26d1715cc7be02f8732167b4f96092d369c568 /core | |
| parent | a0e3a04f678bd65258008ef9c120702dc022595f (diff) | |
| parent | 29bc5109a61c6bee9359a2986297917a2896405f (diff) | |
| download | AntennaPod-f642c61dfb4b9f3ca8cd6de5f645020169e07992.zip | |
Merge pull request #3810 from ByteHamster/do-not-reset-sleep-timer
Do not restart sleep timer when automatically playing next episode
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 7 |
1 files changed, 4 insertions, 3 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 d53f7d669..b9afb5c75 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 @@ -570,6 +570,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { } else if (mediaPlayer.getPlayable() == null) { startPlayingFromPreferences(); } + taskManager.restartSleepTimer(); return true; case KeyEvent.KEYCODE_MEDIA_PLAY: if (status == PlayerStatus.PAUSED || status == PlayerStatus.PREPARED) { @@ -580,6 +581,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { } else if (mediaPlayer.getPlayable() == null) { startPlayingFromPreferences(); } + taskManager.restartSleepTimer(); return true; case KeyEvent.KEYCODE_MEDIA_PAUSE: if (status == PlayerStatus.PLAYING) { @@ -827,9 +829,6 @@ public class PlaybackService extends MediaBrowserServiceCompat { @Override public void onPlaybackStart(@NonNull Playable playable, int position) { - if (taskManager.isSleepTimerActive()) { - taskManager.restartSleepTimer(); - } taskManager.startWidgetUpdater(); if (position != PlaybackServiceMediaPlayer.INVALID_TIME) { playable.setPosition(position); @@ -1446,10 +1445,12 @@ public class PlaybackService extends MediaBrowserServiceCompat { public void resume() { mediaPlayer.resume(); + taskManager.restartSleepTimer(); } public void prepare() { mediaPlayer.prepare(); + taskManager.restartSleepTimer(); } public void pause(boolean abandonAudioFocus, boolean reinit) { |