Merge pull request #5402 from Bnyro/master

fix: regressions by persistent notification lifecycle fix
libre-tube · Dec 30, 2023 · 98425bf · 98425bf
2 parents 65f113c + 2e551c8
commit 98425bf
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -448,7 +448,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
                     viewModel.isMiniPlayerVisible.value = false
                     // re-enable captions
                     updateCurrentSubtitle(currentSubtitle)
-                    enableController()
+                    binding.player.useController = true
                     commentsViewModel.setCommentSheetExpand(true)
                     mainMotionLayout.progress = 0F
                     changeOrientationMode()
@@ -468,7 +468,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
         binding.playerMotionLayout
             .addSwipeUpListener {
                 if (this::streams.isInitialized && PlayerHelper.fullscreenGesturesEnabled) {
-                    disableController()
+                    binding.player.hideController()
                     setFullscreen()
                 }
             }
@@ -536,7 +536,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
         // hide fullscreen button if autorotation enabled
         playerBinding.fullscreen.setOnClickListener {
             // hide player controller
-            disableController()
+            binding.player.hideController()
             if (viewModel.isFullscreen.value == false) {
                 // go to fullscreen mode
                 setFullscreen()
@@ -1541,7 +1541,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
 
             openOrCloseFullscreenDialog(true)
         } else {
-            enableController()
+            binding.player.useController = true
 
             // close button got clicked in PiP mode
             // pause the video and keep the app alive
@@ -1676,10 +1676,6 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
         }
     }
 
-    private fun enableController() {
-        binding.player.useController = true
-    }
-
     private fun disableController() {
         binding.player.useController = false
         binding.player.hideController()