From b809d24ab1e5d73f2caa507102751b2155cfbcdb Mon Sep 17 00:00:00 2001
From: wch423 <chwl1001@tuta.io>
Date: Fri, 13 Feb 2026 17:57:57 +0100
Subject: [PATCH] Change PlayerView to StyledPlayerView to avoid conflict
 between ExoPlayer2 and Media3

---
 CHANGELOG.md                                                  | 1 +
 .../java/org/thoughtcrime/securesms/video/VideoPlayer.java    | 4 ++--
 src/main/res/layout/video_player.xml                          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe28ec243..d3cf9f220 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 * Add context menu in long-pressing relays items instead of showing buttons
+* Enhanced video player UI
 
 ## v2.42.0
 2026-02
diff --git a/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
index 818a478fb..9847a9e24 100644
--- a/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
+++ b/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
@@ -36,7 +36,7 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
-import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
@@ -48,7 +48,7 @@ import org.thoughtcrime.securesms.video.exo.AttachmentDataSourceFactory;
 
 public class VideoPlayer extends FrameLayout {
 
-  @Nullable private final PlayerView exoView;
+  @Nullable private final StyledPlayerView exoView;
 
   @Nullable private       SimpleExoPlayer     exoPlayer;
   @Nullable private       Window              window;
diff --git a/src/main/res/layout/video_player.xml b/src/main/res/layout/video_player.xml
index 25f852928..f17b5024c 100644
--- a/src/main/res/layout/video_player.xml
+++ b/src/main/res/layout/video_player.xml
@@ -4,7 +4,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-  <com.google.android.exoplayer2.ui.PlayerView
+  <com.google.android.exoplayer2.ui.StyledPlayerView
       android:id="@+id/video_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"