Merge pull request #6067 from Bnyro/master

fix: use correct fragment manager for result callbacks
libre-tube · May 20, 2024 · 55e3069 · 55e3069
2 parents dc65638 + 07d925b
commit 55e3069
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
@@ -170,7 +170,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
             )
         }
 
-        requireActivity().supportFragmentManager.setFragmentResultListener(
+        childFragmentManager.setFragmentResultListener(
             ChaptersBottomSheet.SEEK_TO_POSITION_REQUEST_KEY,
             viewLifecycleOwner
         ) { _, bundle ->
@@ -187,7 +187,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
                         IntentData.duration to playerService.player?.duration?.div(1000)
                     )
                 }
-                .show(requireActivity().supportFragmentManager)
+                .show(childFragmentManager)
         }
 
         binding.miniPlayerClose.setOnClickListener {

diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
@@ -231,19 +231,14 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment() {
 
     private fun setupSortAndFilter() {
         binding.filterSort.setOnClickListener {
-            val activityCompat = context as AppCompatActivity
-            val fragManager = activityCompat
-                .supportFragmentManager
-                .apply {
-                    setFragmentResultListener(
-                        FILTER_SORT_REQUEST_KEY,
-                        activityCompat
-                    ) { _, resultBundle ->
-                        selectedSortOrder = resultBundle.getInt(IntentData.sortOptions)
-                        hideWatched = resultBundle.getBoolean(IntentData.hideWatched)
-                        showFeed()
-                    }
-                }
+            childFragmentManager.setFragmentResultListener(
+                FILTER_SORT_REQUEST_KEY,
+                viewLifecycleOwner
+            ) { _, resultBundle ->
+                selectedSortOrder = resultBundle.getInt(IntentData.sortOptions)
+                hideWatched = resultBundle.getBoolean(IntentData.hideWatched)
+                showFeed()
+            }
 
             FilterSortBottomSheet()
                 .apply {
@@ -252,7 +247,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment() {
                         IntentData.hideWatched to hideWatched
                     )
                 }
-                .show(fragManager)
+                .show(childFragmentManager)
         }
     }