From 8dea8085bcbdaadd869ca29e797e767f14666540 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Tue, 29 Oct 2024 12:09:20 -0500 Subject: [PATCH] Include message id with spam report If they didn't pick a specific message but report the whole chat as spam, most recent message is spam. --- .../eu/siacs/conversations/ui/BlockContactDialog.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java index 04678c3c7260a448f93ec435277580fb3bfedc2f..73f6420a09bc45f9273297f7eda2aa947dd29687 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java @@ -71,7 +71,13 @@ public final class BlockContactDialog { xmppActivity.xmppConnectionService.sendUnblockRequest(blockable); } else { boolean toastShown = false; - if (xmppActivity.xmppConnectionService.sendBlockRequest(blockable, binding.reportSpam.isChecked(), serverMsgId)) { + var finalServerId = serverMsgId; + if (serverMsgId == null && binding.reportSpam.isChecked() && blockable instanceof Conversation) { + final var lastM = ((Conversation) blockable).getLatestMessage(); + if (lastM != null) finalServerId = lastM.getServerMsgId(); + } + + if (xmppActivity.xmppConnectionService.sendBlockRequest(blockable, binding.reportSpam.isChecked(), finalServerId)) { Toast.makeText(xmppActivity, R.string.corresponding_chats_closed, Toast.LENGTH_SHORT).show(); toastShown = true; }