From 627657e1de8b96e80909f31c12a6d72dbbf6b3a2 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 19 Jul 2023 12:18:04 -0400 Subject: [PATCH] Update to the final ExoPlayer release. --- .../voice/VoiceNotePlaybackPreparer.java | 4 +- .../giph/mp4/GiphyMp4VideoPlayer.java | 11 +-- .../securesms/video/VideoPlayer.java | 4 +- app/src/main/res/layout/gif_player.xml | 2 +- .../main/res/layout/story_video_player.xml | 2 +- app/src/main/res/layout/video_player.xml | 2 +- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 96 +++++++++++-------- 8 files changed, 68 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java index e5e38f29f3..4fe7dc6316 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java @@ -144,7 +144,7 @@ final class VoiceNotePlaybackPreparer implements MediaSessionConnector.Playbac @MainThread private void applyDescriptionsToQueue(@NonNull List mediaItems) { for (MediaItem mediaItem : mediaItems) { - MediaItem.PlaybackProperties playbackProperties = mediaItem.playbackProperties; + final MediaItem.LocalConfiguration playbackProperties = mediaItem.playbackProperties; if (playbackProperties == null) { continue; } @@ -194,7 +194,7 @@ final class VoiceNotePlaybackPreparer implements MediaSessionConnector.Playbac private int indexOfPlayerMediaItemByUri(@NonNull Uri uri) { for (int i = 0; i < player.getMediaItemCount(); i++) { - MediaItem.PlaybackProperties playbackProperties = player.getMediaItemAt(i).playbackProperties; + final MediaItem.LocalConfiguration playbackProperties = player.getMediaItemAt(i).playbackProperties; if (playbackProperties != null && playbackProperties.uri.equals(uri)) { return i; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer.java index 7d98324d92..f66d3dcbcf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer.java @@ -16,7 +16,7 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; -import com.google.android.exoplayer2.ui.PlayerView; +import com.google.android.exoplayer2.ui.StyledPlayerView; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; @@ -31,10 +31,9 @@ public final class GiphyMp4VideoPlayer extends FrameLayout implements DefaultLif @SuppressWarnings("unused") private static final String TAG = Log.tag(GiphyMp4VideoPlayer.class); - private final PlayerView exoView; - private ExoPlayer exoPlayer; - private CornerMask cornerMask; - private MediaItem mediaItem; + private final StyledPlayerView exoView; + private ExoPlayer exoPlayer; + private CornerMask cornerMask; public GiphyMp4VideoPlayer(Context context) { this(context, null); @@ -79,7 +78,6 @@ public final class GiphyMp4VideoPlayer extends FrameLayout implements DefaultLif } void setVideoItem(@NonNull MediaItem mediaItem) { - this.mediaItem = mediaItem; exoPlayer.setMediaItem(mediaItem); exoPlayer.prepare(); } @@ -110,7 +108,6 @@ public final class GiphyMp4VideoPlayer extends FrameLayout implements DefaultLif if (exoPlayer != null) { exoPlayer.stop(); exoPlayer.clearMediaItems(); - mediaItem = null; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java index 2bcbdd97b9..161f88b9cb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java @@ -37,7 +37,7 @@ import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import com.google.android.exoplayer2.ui.PlayerControlView; -import com.google.android.exoplayer2.ui.PlayerView; +import com.google.android.exoplayer2.ui.StyledPlayerView; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; @@ -53,7 +53,7 @@ public class VideoPlayer extends FrameLayout { @SuppressWarnings("unused") private static final String TAG = Log.tag(VideoPlayer.class); - private final PlayerView exoView; + private final StyledPlayerView exoView; private final DefaultMediaSourceFactory mediaSourceFactory; private ExoPlayer exoPlayer; diff --git a/app/src/main/res/layout/gif_player.xml b/app/src/main/res/layout/gif_player.xml index f722a29b38..5998320549 100644 --- a/app/src/main/res/layout/gif_player.xml +++ b/app/src/main/res/layout/gif_player.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + + + + + + + + @@ -2252,68 +2260,76 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + +