* Auto release when LegacyYouTubePlayerView is detached from window

* Change listeners in NetworkObservers from List to Set to avoid duplicated listeners
hoangthan · Sep 19, 2023 · 1816c49 · 1816c49
1 parent a7d20f7
commit 1816c49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...java/com/pierfrancescosoffritti/androidyoutubeplayer/core/player/utils/NetworkObserver.kt b/...java/com/pierfrancescosoffritti/androidyoutubeplayer/core/player/utils/NetworkObserver.kt
@@ -20,7 +20,7 @@ internal class NetworkObserver(private val context: Context) {
     fun onNetworkUnavailable()
   }
 
-  val listeners = mutableListOf<Listener>()
+  val listeners = mutableSetOf<Listener>()
 
   private var networkBroadcastReceiver: NetworkBroadcastReceiver? = null
   private var networkCallback: ConnectivityManager.NetworkCallback? = null

diff --git a/.../pierfrancescosoffritti/androidyoutubeplayer/core/player/views/LegacyYouTubePlayerView.kt b/.../pierfrancescosoffritti/androidyoutubeplayer/core/player/views/LegacyYouTubePlayerView.kt
@@ -67,7 +67,9 @@ internal class LegacyYouTubePlayerView(
         youTubePlayer.removeListener(this)
       }
     })
+  }
 
+  private fun initInternalNetworkListener() {
     networkObserver.listeners.add(object : NetworkObserver.Listener {
       override fun onNetworkAvailable() {
         if (!isYouTubePlayerReady) {
@@ -82,6 +84,16 @@ internal class LegacyYouTubePlayerView(
     })
   }
 
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    initInternalNetworkListener()
+  }
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+    release()
+  }
+
   /**
    * Initialize the player. You must call this method before using the player.
    * @param youTubePlayerListener listener for player events