Skip to content
Snippets Groups Projects
Commit 4d50e0c4 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Prevent loading last playlist when history is disabled

Fixes #2254
parent 37d7cf51
No related branches found
No related tags found
1 merge request!1164Prevent loading last playlist when history is disabled
Pipeline #161936 passed with stage
in 19 minutes and 52 seconds
......@@ -18,6 +18,7 @@ import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.resources.*
import org.videolan.resources.util.getFromMl
import org.videolan.tools.PLAYBACK_HISTORY
import org.videolan.tools.Settings
import org.videolan.tools.removeQuery
import org.videolan.tools.retrieveParent
......@@ -42,14 +43,14 @@ internal class MediaSessionCallback(private val playbackService: PlaybackService
override fun onPlay() {
if (playbackService.hasMedia()) playbackService.play()
else if (!AndroidDevices.isAndroidTv) PlaybackService.loadLastAudio(playbackService)
else if (!AndroidDevices.isAndroidTv && Settings.getInstance(playbackService).getBoolean(PLAYBACK_HISTORY, true)) PlaybackService.loadLastAudio(playbackService)
}
override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
val keyEvent = mediaButtonEvent.getParcelableExtra(Intent.EXTRA_KEY_EVENT) as KeyEvent? ?: return false
if (!playbackService.hasMedia()
&& (keyEvent.keyCode == KeyEvent.KEYCODE_MEDIA_PLAY || keyEvent.keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)) {
return if (keyEvent.action == KeyEvent.ACTION_DOWN) {
return if (keyEvent.action == KeyEvent.ACTION_DOWN && Settings.getInstance(playbackService).getBoolean(PLAYBACK_HISTORY, true)) {
PlaybackService.loadLastAudio(playbackService)
true
} else false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment