From b26adc84b0317f4767b9eaddfe530b14c5fe3d50 Mon Sep 17 00:00:00 2001 From: kosyak Date: Tue, 15 Aug 2023 01:22:10 +0200 Subject: [PATCH] don't hide indicator on merged messages --- .../conversations/ui/adapter/MessageAdapter.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 3b9f8df9f..a47a5c1d8 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -998,16 +998,16 @@ public class MessageAdapter extends ArrayAdapter { if (viewHolder.contact_picture != null) viewHolder.contact_picture.setVisibility(mergeableWithNext ? View.INVISIBLE : View.VISIBLE); - if (viewHolder.edit_indicator != null) - viewHolder.edit_indicator.setVisibility(mergeableWithNext ? View.GONE : viewHolder.edit_indicator.getVisibility()); - if (viewHolder.encryption != null) - viewHolder.encryption.setVisibility(mergeableWithNext ? View.GONE : viewHolder.encryption.getVisibility()); - if (viewHolder.indicator != null) - viewHolder.indicator.setVisibility(mergeableWithNext ? View.GONE : viewHolder.indicator.getVisibility()); + // if (viewHolder.edit_indicator != null) + // viewHolder.edit_indicator.setVisibility(mergeableWithNext ? View.GONE : viewHolder.edit_indicator.getVisibility()); + // if (viewHolder.encryption != null) + // viewHolder.encryption.setVisibility(mergeableWithNext ? View.GONE : viewHolder.encryption.getVisibility()); + // if (viewHolder.indicator != null) + // viewHolder.indicator.setVisibility(mergeableWithNext ? View.GONE : viewHolder.indicator.getVisibility()); // if (viewHolder.time != null) // viewHolder.time.setVisibility(mergeableWithNext ? View.GONE : View.VISIBLE); - if (viewHolder.indicatorReceived != null) - viewHolder.indicatorReceived.setVisibility(mergeableWithNext ? View.GONE : viewHolder.indicatorReceived.getVisibility()); + // if (viewHolder.indicatorReceived != null) + // viewHolder.indicatorReceived.setVisibility(mergeableWithNext ? View.GONE : viewHolder.indicatorReceived.getVisibility()); if (mergeableWithPrev && mergeableWithNext) { view.setPadding(view.getPaddingLeft(), 0, view.getPaddingRight(), 0);