From b4a4d359d04112e460167b42e620978595265e46 Mon Sep 17 00:00:00 2001
From: Maxr1998 <max.rumpf1998@gmail.com>
Date: Fri, 23 Sep 2022 01:14:57 +0200
Subject: [PATCH] Simplify PlayerFragment transaction

---
 .../jellyfin/mobile/events/ActivityEventHandler.kt   | 12 ++++--------
 .../mobile/utils/extensions/FragmentManager.kt       |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/jellyfin/mobile/events/ActivityEventHandler.kt b/app/src/main/java/org/jellyfin/mobile/events/ActivityEventHandler.kt
index 720af445..c054642c 100644
--- a/app/src/main/java/org/jellyfin/mobile/events/ActivityEventHandler.kt
+++ b/app/src/main/java/org/jellyfin/mobile/events/ActivityEventHandler.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.net.Uri
 import android.os.Bundle
-import androidx.fragment.app.add
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -59,13 +58,10 @@ class ActivityEventHandler(
                 }
             }
             is ActivityEvent.LaunchNativePlayer -> {
-                supportFragmentManager.beginTransaction().apply {
-                    val args = Bundle().apply {
-                        putParcelable(Constants.EXTRA_MEDIA_PLAY_OPTIONS, event.playOptions)
-                    }
-                    add<PlayerFragment>(R.id.fragment_container, args = args)
-                    addToBackStack(null)
-                }.commit()
+                val args = Bundle().apply {
+                    putParcelable(Constants.EXTRA_MEDIA_PLAY_OPTIONS, event.playOptions)
+                }
+                supportFragmentManager.addFragment<PlayerFragment>(args)
             }
             is ActivityEvent.OpenUrl -> {
                 try {
diff --git a/app/src/main/java/org/jellyfin/mobile/utils/extensions/FragmentManager.kt b/app/src/main/java/org/jellyfin/mobile/utils/extensions/FragmentManager.kt
index 22be9e8b..926ff12c 100644
--- a/app/src/main/java/org/jellyfin/mobile/utils/extensions/FragmentManager.kt
+++ b/app/src/main/java/org/jellyfin/mobile/utils/extensions/FragmentManager.kt
@@ -9,9 +9,9 @@ import androidx.fragment.app.add
 import androidx.fragment.app.replace
 import org.jellyfin.mobile.R
 
-inline fun <reified T : Fragment> FragmentManager.addFragment() {
+inline fun <reified T : Fragment> FragmentManager.addFragment(args: Bundle? = null) {
     beginTransaction().apply {
-        add<T>(R.id.fragment_container)
+        add<T>(R.id.fragment_container, args = args)
         addToBackStack(null)
     }.commit()
 }