Don't handle blocked or forbidden messages

This commit is contained in:
AsamK 2021-08-27 09:04:14 +02:00
parent 634437d22d
commit 85c5caeaca

View file

@ -107,8 +107,6 @@ public final class IncomingMessageHandler {
// address/uuid is validated by unidentified sender certificate // address/uuid is validated by unidentified sender certificate
account.getRecipientStore().resolveRecipientTrusted(content.getSender()); account.getRecipientStore().resolveRecipientTrusted(content.getSender());
} }
actions.addAll(handleMessage(envelope, content, ignoreAttachments));
} }
if (isMessageBlocked(envelope, content)) { if (isMessageBlocked(envelope, content)) {
@ -118,6 +116,7 @@ public final class IncomingMessageHandler {
(envelope.hasSource() ? envelope.getSourceAddress() : content.getSender()).getIdentifier(), (envelope.hasSource() ? envelope.getSourceAddress() : content.getSender()).getIdentifier(),
envelope.getTimestamp()); envelope.getTimestamp());
} else { } else {
actions.addAll(handleMessage(envelope, content, ignoreAttachments));
handler.handleMessage(envelope, content, exception); handler.handleMessage(envelope, content, exception);
} }
return new Pair<>(actions, exception); return new Pair<>(actions, exception);