react-native-tpstreams 0.1.0 → 0.1.2

package/android/src/main/java/com/tpstreams/FragmentModule.kt

@@ -65,24 +65,29 @@ class FragmentModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
 
   @ReactMethod
   fun closeCustomFragment() {
-    Log.e("FragmentModule", "closeCustomFragment() called")
-    // Ensure the currentActivity is a FragmentActivity
-    val activity = currentActivity as? FragmentActivity
-    activity?.let {
-      // Access the fragment manager
-      val fragmentManager = it.supportFragmentManager
-
-      // Check if there are any fragments in the back stack
-      if (fragmentManager.backStackEntryCount > 0) {
-        // Pop the last fragment off the back stack
-        fragmentManager.popBackStack()
+      Log.e("FragmentModule", "closeCustomFragment() called")
+  
+      // Ensure currentActivity is a FragmentActivity
+      val activity = currentActivity as? FragmentActivity
+      if (activity == null || activity.isFinishing || activity.isDestroyed) {
+          Log.e("FragmentModule", "Activity is null, finishing, or destroyed")
+          return
+      }
+  
+      val fragmentManager = activity.supportFragmentManager
+      val playerFragment = fragmentManager.findFragmentByTag("PLAYER_FRAGMENT") as? PlayerFragment
+  
+      if (playerFragment != null) {
+          Log.d("FragmentModule", "Removing PlayerFragment")
+          fragmentManager.beginTransaction()
+              .remove(playerFragment)
+              .commitAllowingStateLoss() // Avoid IllegalStateException
+      } else if (fragmentManager.backStackEntryCount > 0) {
+          Log.d("FragmentModule", "Popping back stack")
+          fragmentManager.popBackStack()
       } else {
-        Log.e("FragmentModule", "No fragments in the back stack to remove")
+          Log.e("FragmentModule", "No fragments to remove")
       }
-    } ?: run {
-      // Handle the error if the activity is not a FragmentActivity
-      Log.e("ReactNativeJS", "Current activity is not a FragmentActivity")
-    }
   }
 
   @ReactMethod

package/android/src/main/java/com/tpstreams/TpStreamsPlayerView.kt

@@ -39,7 +39,14 @@ class TpStreamsPlayerView @JvmOverloads constructor(
 
     private fun updateFragment() {
         if (!videoId.isNullOrEmpty() && !accessToken.isNullOrEmpty()) {
+            fragmentModule?.closeCustomFragment()
             fragmentModule?.showCustomFragment(videoId!!, accessToken!!)
         }
     }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        fragmentModule?.closeCustomFragment()
+    }
+    
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tpstreams",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Video Component for TPStreams",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",