From 367bca0319da555166cfc3f136d45e29930ce5bc Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 20 Feb 2023 22:22:52 -0500 Subject: [PATCH] Confirm before blocking avatar --- .../ui/util/MucDetailsContextMenuHelper.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 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 9b2cc39b60bd08b444a68a724b84652c820d70e2..692f75b5c3c41518770c799a023ec203e97c2150 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java @@ -149,12 +149,20 @@ public final class MucDetailsContextMenuHelper { } return true; case R.id.action_block_avatar: - activity.xmppConnectionService.getFileBackend().getAvatarFile(user.getAvatar()).delete(); - activity.xmppConnectionService.blockMedia(user.getAvatarCid()); - activity.avatarService().clear(user); - if (user.getContact() != null) activity.avatarService().clear(user.getContact()); - user.setAvatar(null); - activity.xmppConnectionService.updateConversationUi(); + new AlertDialog.Builder(activity) + .setTitle(R.string.block_media) + .setMessage("Do you really want to block this avatar?") + .setPositiveButton(R.string.yes, (dialog, whichButton) -> { + activity.xmppConnectionService.blockMedia( + activity.xmppConnectionService.getFileBackend().getAvatarFile(user.getAvatar()) + ); + activity.xmppConnectionService.getFileBackend().getAvatarFile(user.getAvatar()).delete(); + activity.avatarService().clear(user); + if (user.getContact() != null) activity.avatarService().clear(user.getContact()); + user.setAvatar(null); + activity.xmppConnectionService.updateConversationUi(); + }) + .setNegativeButton(R.string.no, null).show(); return true; case R.id.start_conversation: startConversation(user, activity);