webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement blocking for v2 groups

Browse source
This commit is contained in:
AsamK 2020-12-21 15:24:52 +01:00
parent 17608ce522
commit 6be0b2da77
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1928,10 +1928,23 @@ public class Manager implements Closeable {
if (content != null && content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
GroupInfo group = getGroup(groupInfo.getGroupId());
return groupInfo.getType() == SignalServiceGroup.Type.DELIVER && group != null && group.isBlocked();
if (message.getGroupContext().isPresent()) {
GroupInfo group = null;
if (message.getGroupContext().get().getGroupV1().isPresent()) {
SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
if (groupInfo.getType() == SignalServiceGroup.Type.DELIVER) {
group = getGroup(groupInfo.getGroupId());
}
}
if (message.getGroupContext().get().getGroupV2().isPresent()) {
SignalServiceGroupV2 groupContext = message.getGroupContext().get().getGroupV2().get();
final GroupMasterKey groupMasterKey = groupContext.getMasterKey();
byte[] groupId = GroupUtils.getGroupId(groupMasterKey);
group = account.getGroupStore().getGroupByV2Id(groupId);
}
if (group != null && group.isBlocked()) {
return true;
}
}
}
return false;