From 56ffe4f6b14b4cd54e0c9bb9b867e5bda8830751 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Tue, 21 Feb 2023 09:16:35 -0500 Subject: [PATCH] Show block avatar option even when cannot see real jid --- .../ui/util/MucDetailsContextMenuHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java b/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java index 692f75b5c3c41518770c799a023ec203e97c2150..5bd90cdd77971ab7e58bd102532d4627b44406a2 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java @@ -55,9 +55,14 @@ public final class MucDetailsContextMenuHelper { final boolean advancedMode = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("advanced_muc_mode", false); final boolean isGroupChat = mucOptions.isPrivateAndNonAnonymous(); MenuItem sendPrivateMessage = menu.findItem(R.id.send_private_message); + + MenuItem blockAvatar = menu.findItem(R.id.action_block_avatar); + if (user != null && user.getAvatar() != null) { + blockAvatar.setVisible(true); + } + if (user != null && user.getRealJid() != null) { MenuItem showContactDetails = menu.findItem(R.id.action_contact_details); - MenuItem blockAvatar = menu.findItem(R.id.action_block_avatar); MenuItem startConversation = menu.findItem(R.id.start_conversation); MenuItem giveMembership = menu.findItem(R.id.give_membership); MenuItem removeMembership = menu.findItem(R.id.remove_membership); @@ -77,9 +82,6 @@ public final class MucDetailsContextMenuHelper { if ((contact != null && contact.showInRoster()) || mucOptions.isPrivateAndNonAnonymous()) { showContactDetails.setVisible(contact == null || !contact.isSelf()); } - if (user.getAvatar() != null) { - blockAvatar.setVisible(true); - } if ((activity instanceof ConferenceDetailsActivity || activity instanceof MucUsersActivity) && user.getRole() == MucOptions.Role.NONE) { invite.setVisible(true); }