webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-02 12:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent blocked messages from being printed

Browse source
This commit is contained in:
Daniel Schäufele 2020-01-07 00:43:24 +01:00
parent ff478a5b0a
commit 67e94bc856
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -1182,7 +1182,9 @@ public class Manager implements Signal {
handleMessage(envelope, content, ignoreAttachments); handleMessage(envelope, content, ignoreAttachments);
} }
account.save(); account.save();
handler.handleMessage(envelope, content, exception); if (!isMessageBlocked(envelope, content)) {
handler.handleMessage(envelope, content, exception);
}
if (!(exception instanceof ProtocolUntrustedIdentityException)) { if (!(exception instanceof ProtocolUntrustedIdentityException)) {
File cacheFile = null; File cacheFile = null;
try { try {
@ -1203,6 +1205,26 @@ public class Manager implements Signal {
} }
} }
private boolean isMessageBlocked(SignalServiceEnvelope envelope, SignalServiceContent content) {
SignalServiceAddress source = envelope.getSourceAddress();
ContactInfo sourceContact = getContact(source.getNumber().get());
if (sourceContact != null && sourceContact.blocked) {
return true;
}
if (content != null && content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
if (message.getGroupInfo().isPresent()) {
SignalServiceGroup groupInfo = message.getGroupInfo().get();
GroupInfo group = getGroup(groupInfo.getGroupId());
if (groupInfo.getType() == SignalServiceGroup.Type.DELIVER && group != null && group.blocked) {
return true;
}
}
}
return false;
}
private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments) { private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments) {
if (content != null) { if (content != null) {
SignalServiceAddress sender; SignalServiceAddress sender;