From 69aeee67a561235f93111f7dd9cc4963b134f3ad Mon Sep 17 00:00:00 2001
From: bxdxnn <267911624+bxdxnn@users.noreply.github.com>
Date: Mon, 30 Mar 2026 12:26:16 +0300
Subject: [PATCH] Fix media cover placeholder floating (#6484)

---
 .../impl/local/audio/MediaAudioView.kt        | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt
index 01115b7c91..cb9d6ae9c8 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt
@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -51,6 +52,7 @@ import androidx.media3.common.Timeline
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
+import com.bumble.appyx.core.node.LocalNodeTargetVisibility
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.audio.api.AudioFocus
@@ -130,6 +132,8 @@ private fun ExoPlayerMediaAudioView(
         mutableStateOf(null)
     }
 
+    val isTargetVisible = LocalNodeTargetVisibility.current
+
     val playableState: PlayableState.Playable by remember {
         derivedStateOf {
             PlayableState.Playable(
@@ -196,13 +200,21 @@ private fun ExoPlayerMediaAudioView(
             exoPlayer.pause()
         }
     }
+    LaunchedEffect(isTargetVisible) {
+        if (!isTargetVisible) {
+            exoPlayer.pause()
+        }
+    }
     if (localMedia?.uri != null) {
         LaunchedEffect(localMedia.uri) {
             val mediaItem = MediaItem.fromUri(localMedia.uri)
             exoPlayer.setMediaItem(mediaItem)
+            exoPlayer.prepare()
         }
     } else {
-        exoPlayer.setMediaItems(emptyList())
+        LaunchedEffect(Unit) {
+            exoPlayer.setMediaItems(emptyList())
+        }
     }
     val context = LocalContext.current
     val waveform = info?.waveform
@@ -247,7 +259,7 @@ private fun ExoPlayerMediaAudioView(
                             }
                         },
                         update = { playerView ->
-                            playerView.isVisible = metadata.hasArtwork()
+                            playerView.isVisible = metadata.hasArtwork() && isTargetVisible
                         },
                         onRelease = { playerView ->
                             playerView.player = null
@@ -317,16 +329,19 @@ private fun ExoPlayerMediaAudioView(
         )
     }
 
-    OnLifecycleEvent { _, event ->
-        when (event) {
-            Lifecycle.Event.ON_CREATE -> exoPlayer.addListener(playerListener)
-            Lifecycle.Event.ON_RESUME -> exoPlayer.prepare()
-            Lifecycle.Event.ON_PAUSE -> exoPlayer.pause()
-            Lifecycle.Event.ON_DESTROY -> {
-                exoPlayer.release()
+    DisposableEffect(exoPlayer) {
+        exoPlayer.addListener(playerListener)
+        onDispose {
+            if (!exoPlayer.isReleased) {
                 exoPlayer.removeListener(playerListener)
+                exoPlayer.release()
             }
-            else -> Unit
+        }
+    }
+
+    OnLifecycleEvent { _, event ->
+        if (event == Lifecycle.Event.ON_PAUSE) {
+            exoPlayer.pause()
         }
     }
 }