Commit aa45683a authored by Thomas's avatar Thomas
Browse files

Fix issue #1016 - Content Warning not applied to quoted messages

parent 9d1435c1

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

+2 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 


        String loadMediaType = sharedpreferences.getString(context.getString(R.string.SET_LOAD_MEDIA_TYPE), "ALWAYS");



        if (statusToDeal.quote != null) {

        if (statusToDeal.quote != null && (statusToDeal.spoiler_text == null || statusToDeal.spoiler_text.trim().isEmpty() || statusToDeal.isExpended)) {

            holder.binding.quotedMessage.cardviewContainer.setCardElevation((int) Helper.convertDpToPixel(5, context));

            holder.binding.quotedMessage.dividerCard.setVisibility(View.GONE);

            holder.binding.quotedMessage.cardviewContainer.setStrokeWidth((int) Helper.convertDpToPixel(1, context));
@@ -1466,6 +1466,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            }

        } else {

            holder.binding.statusContent.setVisibility(View.GONE);

            holder.binding.quotedMessage.cardviewContainer.setVisibility(View.GONE);

            holder.binding.mediaContainer.setVisibility(View.GONE);

            holder.binding.card.setVisibility(View.GONE);

        }