diff --git a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt index bddcb5fde..1c8e569cc 100644 --- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt +++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt @@ -293,22 +293,23 @@ class BackgroundMode : Service() { * Sets the [MediaItem] with the [streams] into the [player] */ private fun setMediaItem() { - streams?.let { - val uri = if (streams!!.hls != null) { - streams!!.hls - } else if (streams!!.audioStreams!!.isNotEmpty()) { - PlayerHelper.getAudioSource( - this, - streams!!.audioStreams!! - ) - } else { - return - } - val mediaItem = MediaItem.Builder() - .setUri(uri) - .build() - player?.setMediaItem(mediaItem) + streams ?: return + + val uri = if (streams!!.audioStreams.orEmpty().isNotEmpty()) { + PlayerHelper.getAudioSource( + this, + streams!!.audioStreams!! + ) + } else if (streams!!.hls != null) { + streams!!.hls + } else { + return } + + val mediaItem = MediaItem.Builder() + .setUri(uri) + .build() + player?.setMediaItem(mediaItem) } /** diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt index 04fd05430..90f35d2f2 100644 --- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt +++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt @@ -323,10 +323,14 @@ internal class CustomExoPlayerView( // hide the dimming background overlay if locked binding.exoControlsBackground.setBackgroundColor( - if (isLocked) ContextCompat.getColor( - context, - com.google.android.exoplayer2.R.color.exo_black_opacity_60 - ) else Color.TRANSPARENT + if (isLocked) { + ContextCompat.getColor( + context, + com.google.android.exoplayer2.R.color.exo_black_opacity_60 + ) + } else { + Color.TRANSPARENT + } ) // disable tap and swipe gesture if the player is locked