From befb720edad8566b891370898f6fe779eb10d942 Mon Sep 17 00:00:00 2001 From: Sgn-32 <49990901+Sgn-32@users.noreply.github.com> Date: Sat, 29 Jan 2022 17:03:06 +0100 Subject: [PATCH] Do not show Buttons for Message, Video, Audio/Call in RecipientBottomSheetDialog when recipient is blocked. --- .../RecipientBottomSheetDialogFragment.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java index 8a332a37b3..3ae10d8844 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java @@ -211,13 +211,13 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF } ButtonStripPreference.State buttonStripState = new ButtonStripPreference.State( - /* isMessageAvailable = */ !recipient.isSelf(), - /* isVideoAvailable = */ recipient.isRegistered() && !recipient.isSelf(), - /* isAudioAvailable = */ !recipient.isSelf(), - /* isMuteAvailable = */ false, - /* isSearchAvailable = */ false, - /* isAudioSecure = */ recipient.isRegistered(), - /* isMuted = */ false + /* isMessageAvailable = */ !recipient.isBlocked() && !recipient.isSelf(), + /* isVideoAvailable = */ !recipient.isBlocked() && !recipient.isSelf() && recipient.isRegistered(), + /* isAudioAvailable = */ !recipient.isBlocked() && !recipient.isSelf(), + /* isMuteAvailable = */ false, + /* isSearchAvailable = */ false, + /* isAudioSecure = */ recipient.isRegistered(), + /* isMuted = */ false ); ButtonStripPreference.Model buttonStripModel = new ButtonStripPreference.Model( @@ -246,7 +246,7 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF new ButtonStripPreference.ViewHolder(buttonStrip).bind(buttonStripModel); - if (recipient.isSystemContact() || recipient.isGroup() || recipient.isSelf()) { + if (recipient.isSystemContact() || recipient.isGroup() || recipient.isSelf() || recipient.isBlocked()) { addContactButton.setVisibility(View.GONE); } else { addContactButton.setVisibility(View.VISIBLE);