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

Refactor set blocked methods to accept multiple recipientIds/groupIds

Browse source
This commit is contained in:
AsamK 2022-05-18 11:09:05 +02:00
parent 2d60f98e93
commit 53f47d42fc
6 changed files with 74 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -151,12 +152,12 @@ public interface Manager extends Closeable {
RecipientIdentifier.Single recipient, String name
) throws NotMasterDeviceException, IOException, UnregisteredRecipientException;
void setContactBlocked(
RecipientIdentifier.Single recipient, boolean blocked
void setContactsBlocked(
Collection<RecipientIdentifier.Single> recipient, boolean blocked
) throws NotMasterDeviceException, IOException, UnregisteredRecipientException;
void setGroupBlocked(
GroupId groupId, boolean blocked
void setGroupsBlocked(
Collection<GroupId> groupId, boolean blocked
) throws GroupNotFoundException, IOException, NotMasterDeviceException;
/**

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

@ -79,6 +79,7 @@ import java.io.IOException;
import java.net.URI;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@ -683,25 +684,36 @@ class ManagerImpl implements Manager {
}
@Override
public void setContactBlocked(
RecipientIdentifier.Single recipient, boolean blocked
public void setContactsBlocked(
Collection<RecipientIdentifier.Single> recipients, boolean blocked
) throws NotMasterDeviceException, IOException, UnregisteredRecipientException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
context.getContactHelper().setContactBlocked(context.getRecipientHelper().resolveRecipient(recipient), blocked);
if (recipients.size() == 0) {
return;
}
final var recipientIds = context.getRecipientHelper().resolveRecipients(recipients);
for (final var recipientId : recipientIds) {
context.getContactHelper().setContactBlocked(recipientId, blocked);
}
// TODO cycle our profile key, if we're not together in a group with recipient
context.getSyncHelper().sendBlockedList();
}
@Override
public void setGroupBlocked(
final GroupId groupId, final boolean blocked
public void setGroupsBlocked(
final Collection<GroupId> groupIds, final boolean blocked
) throws GroupNotFoundException, NotMasterDeviceException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
context.getGroupHelper().setGroupBlocked(groupId, blocked);
if (groupIds.size() == 0) {
return;
}
for (final var groupId : groupIds) {
context.getGroupHelper().setGroupBlocked(groupId, blocked);
}
// TODO cycle our profile key
context.getSyncHelper().sendBlockedList();
}