Merge pull request libre-tube#7455 from Bnyro/master

fix: crash when opening other video while in background player

Author: Bnyro

app/src/main/java/com/github/libretube/helpers/NavigationHelper.kt

@@ -65,8 +65,8 @@ object NavigationHelper {
         val activity = ContextHelper.unwrapActivity<MainActivity>(context)
         val attachedToRunningPlayer = activity.runOnPlayerFragment {
             try {
-                this.playNextVideo(videoUrlOrId.toID())
                 PlayingQueue.clear()
+                this.playNextVideo(videoUrlOrId.toID())
 
                 if (audioOnlyPlayerRequested) {
                     // switch to audio only player
@@ -85,12 +85,12 @@ object NavigationHelper {
         if (attachedToRunningPlayer) return
 
         val attachedToRunningAudioPlayer = activity.runOnAudioPlayerFragment {
-            this.playNextVideo(videoUrlOrId.toID())
             PlayingQueue.clear()
+            this.playNextVideo(videoUrlOrId.toID())
 
             if (!audioOnlyPlayerRequested) {
                 // switch to video only player
-                this.switchToVideoMode()
+                this.switchToVideoMode(videoUrlOrId.toID())
             } else {
                 // maximize player
                 this.binding.playerMotionLayout.transitionToStart()

app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt

@@ -175,7 +175,7 @@ class AudioPlayerFragment : Fragment(R.layout.fragment_audio_player), AudioPlaye
         }
 
         binding.openVideo.setOnClickListener {
-            switchToVideoMode()
+            switchToVideoMode(PlayingQueue.getCurrent()?.url!!.toID())
         }
 
         childFragmentManager.setFragmentResultListener(
@@ -260,7 +260,7 @@ class AudioPlayerFragment : Fragment(R.layout.fragment_audio_player), AudioPlaye
         }
     }
 
-    fun switchToVideoMode() {
+    fun switchToVideoMode(videoId: String) {
         playerController?.sendCustomCommand(
             AbstractPlayerService.runPlayerActionCommand,
             bundleOf(PlayerCommand.TOGGLE_AUDIO_ONLY_MODE.name to false)
@@ -270,7 +270,7 @@ class AudioPlayerFragment : Fragment(R.layout.fragment_audio_player), AudioPlaye
 
         NavigationHelper.openVideoPlayerFragment(
             context = requireContext(),
-            videoId = PlayingQueue.getCurrent()?.url!!.toID(),
+            videoId = videoId,
             alreadyStarted = true,
         )
     }
@@ -492,7 +492,7 @@ class AudioPlayerFragment : Fragment(R.layout.fragment_audio_player), AudioPlaye
     private fun updateVolume(distance: Float) {
         val bar = binding.volumeProgressBar
         binding.volumeControls.apply {
-            if (visibility == View.GONE) {
+            if (isGone) {
                 isVisible = true
                 // Volume could be changed using other mediums, sync progress
                 // bar with new value.