mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-07-14 07:30:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix a memory leak for not cropped media

Browse source
This commit is contained in:
Thomas 2025-06-05 10:32:39 +02:00
parent b1b3c5230c
commit 723771e464
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View file

@ -1612,6 +1612,15 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
}); });
} }
LayoutInflater inflater = ((Activity) context).getLayoutInflater(); LayoutInflater inflater = ((Activity) context).getLayoutInflater();
//Release players if they already exist
if(holder.binding.mediaContainer.getChildCount() > 0 ) {
for(int i = 0 ; i < holder.binding.mediaContainer.getChildCount() ; i++ ) {
PlayerView video = holder.binding.mediaContainer.getChildAt(i).findViewById(R.id.media_video);
if (video != null && video.getPlayer() != null) {
video.getPlayer().release();
}
}
}
holder.binding.mediaContainer.removeAllViews(); holder.binding.mediaContainer.removeAllViews();
PlayerView video = holder.binding.media.media1Container.findViewById(R.id.media_video); PlayerView video = holder.binding.media.media1Container.findViewById(R.id.media_video);
if (video != null && video.getPlayer() != null) { if (video != null && video.getPlayer() != null) {
@ -3620,10 +3629,22 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
public void onViewRecycled(@NonNull RecyclerView.ViewHolder viewHolder) { public void onViewRecycled(@NonNull RecyclerView.ViewHolder viewHolder) {
super.onViewRecycled(viewHolder); super.onViewRecycled(viewHolder);
if (viewHolder instanceof StatusViewHolder holder) { if (viewHolder instanceof StatusViewHolder holder) {
if (holder.binding != null) { //Release players
PlayerView doubleTapPlayerView = holder.binding.media.getRoot().findViewById(R.id.media_video); if (holder.binding != null) { //Cropped views
if (doubleTapPlayerView != null && doubleTapPlayerView.getPlayer() != null) { if(holder.binding.media.getRoot().getChildCount() > 0) {
doubleTapPlayerView.getPlayer().release(); for(int i = 0 ; i < holder.binding.media.getRoot().getChildCount() ; i++ ) {
PlayerView doubleTapPlayerView = holder.binding.media.getRoot().getChildAt(i).findViewById(R.id.media_video);
if (doubleTapPlayerView != null && doubleTapPlayerView.getPlayer() != null) {
doubleTapPlayerView.getPlayer().release();
}
}
} else if (holder.binding.mediaContainer.getChildCount() > 0) { //Not cropped views
for(int i = 0 ; i < holder.binding.mediaContainer.getChildCount() ; i++ ) {
PlayerView doubleTapPlayerView = holder.binding.mediaContainer.getChildAt(i).findViewById(R.id.media_video);
if (doubleTapPlayerView != null && doubleTapPlayerView.getPlayer() != null) {
doubleTapPlayerView.getPlayer().release();
}
}
} }
} }
} }