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

Fix an issue with auto display hidden media

Browse source
This commit is contained in:
Thomas 2023-02-16 17:20:50 +01:00
parent c403dc14f9
commit 740b42d5d3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1451,7 +1451,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
}); });
} else { } else {
int mediaPosition = 1; int mediaPosition = 1;
if (!fullAttachement) { if (!fullAttachement || statusToDeal.sensitive) {
int defaultHeight = (int) Helper.convertDpToPixel(300, context); int defaultHeight = (int) Helper.convertDpToPixel(300, context);
if (measuredWidth > 0) { if (measuredWidth > 0) {
defaultHeight = (int) (measuredWidth * 3) / 4; defaultHeight = (int) (measuredWidth * 3) / 4;
@ -1550,7 +1550,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
} }
mediaPosition++; mediaPosition++;
} }
if (!fullAttachement || statusToDeal.sensitive) { if (!fullAttachement || (statusToDeal.sensitive && !expand_media)) {
holder.binding.mediaContainer.setVisibility(View.GONE); holder.binding.mediaContainer.setVisibility(View.GONE);
holder.binding.media.mediaContainer.setVisibility(View.VISIBLE); holder.binding.media.mediaContainer.setVisibility(View.VISIBLE);
} else { } else {
@ -2359,7 +2359,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
} }
if (!isSensitive || expand_media) { if (!isSensitive || expand_media) {
requestBuilder = glideRequests.asDrawable(); requestBuilder = glideRequests.asDrawable();
if (!fullAttachement) { if (!fullAttachement || isSensitive) {
if (placeholder != null) { if (placeholder != null) {
requestBuilder = requestBuilder.placeholder(new BitmapDrawable(context.getResources(), placeholder)); requestBuilder = requestBuilder.placeholder(new BitmapDrawable(context.getResources(), placeholder));
} }