mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-29 19:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

OK, found reliable repro for the lock screen bug... and I think I found

Browse Source 
a hack to fix it.
This commit is contained in:
casey langen 2019-02-17 13:55:19 -08:00
parent d28a85dc4f
commit 43d898a7ad
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/streaming/StreamingPlaybackService.kt
View File

@ -225,8 +225,8 @@ class StreamingPlaybackService(context: Context) : IPlaybackService {
killAudioFocus()
if (playContext.currentPlayer != null) {
playContext.currentPlayer?.pause()
state = PlaybackState.Paused
playContext.currentPlayer?.pause()
}
}
}
@ -754,6 +754,7 @@ class StreamingPlaybackService(context: Context) : IPlaybackService {
}
private fun schedulePausedSleep() {
handler.removeCallbacks(pauseServiceSleepRunnable)
handler.postDelayed(pauseServiceSleepRunnable, PAUSED_SERVICE_SLEEP_DELAY_MS.toLong())
}

37
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/SystemService.kt
View File

@ -135,6 +135,7 @@ class SystemService : Service() {
}
checkInitMediaSession()
updateMediaSessionPlaybackState()
}
private fun shutdownNow() {
@ -174,8 +175,6 @@ class SystemService : Service() {
this.setCallback(mediaSessionCallback)
this.isActive = true
}
updateMediaSessionPlaybackState()
}
}
@ -198,28 +197,30 @@ class SystemService : Service() {
}
private fun updateMediaSessionPlaybackState() {
var mediaSessionState = PlaybackStateCompat.STATE_STOPPED
mediaSession?.let { session ->
var mediaSessionState = PlaybackStateCompat.STATE_STOPPED
var duration = 0
var playing: ITrack? = null
var duration = 0
var playing: ITrack? = null
playback?.let {
when (it.state) {
PlaybackState.Playing -> mediaSessionState = PlaybackStateCompat.STATE_PLAYING
PlaybackState.Buffering -> mediaSessionState = PlaybackStateCompat.STATE_BUFFERING
PlaybackState.Paused -> mediaSessionState = PlaybackStateCompat.STATE_PAUSED
else -> { }
playback?.let { pb ->
mediaSessionState = when (pb.state) {
PlaybackState.Playing -> PlaybackStateCompat.STATE_PLAYING
PlaybackState.Buffering -> PlaybackStateCompat.STATE_BUFFERING
/* HACK: if we return STATE_PAUSED, the playback controls will disappear
from the lock screen! wtf? we don't want that, so we return
STATE_BUFFERING instead, which seems to keep the play controls visible,
and also display the "PLAY" button like the user expects. sigh */
PlaybackState.Paused -> PlaybackStateCompat.STATE_BUFFERING
PlaybackState.Stopped -> PlaybackStateCompat.STATE_STOPPED
}
playing = pb.playingTrack
duration = (pb.duration * 1000).toInt()
}
playing = it.playingTrack
duration = (it.duration * 1000).toInt()
}
mediaSession?.let {
updateMediaSession(playing, duration)
updateNotification(playing, mediaSessionState)
it.setPlaybackState(PlaybackStateCompat.Builder()
session.setPlaybackState(PlaybackStateCompat.Builder()
.setState(mediaSessionState, 0, 0f)
.setActions(MEDIA_SESSION_ACTIONS)
.build())