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

Restrict blocking of group to master device

Browse source
This commit is contained in:
AsamK 2021-10-12 20:49:41 +02:00
parent e977f38bdd
commit 997b3c6a2a
5 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -184,7 +184,7 @@ public interface Manager extends Closeable {
void setGroupBlocked(
GroupId groupId, boolean blocked
) throws GroupNotFoundException, IOException;
) throws GroupNotFoundException, IOException, NotMasterDeviceException;
void setExpirationTimer(
RecipientIdentifier.Single recipient, int messageExpirationTimer

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

@ -714,7 +714,10 @@ public class ManagerImpl implements Manager {
@Override
public void setGroupBlocked(
final GroupId groupId, final boolean blocked
) throws GroupNotFoundException, IOException {
) throws GroupNotFoundException, IOException, NotMasterDeviceException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
groupHelper.setGroupBlocked(groupId, blocked);
// TODO cycle our profile key
syncHelper.sendBlockedList();

2
src/main/java/org/asamk/signal/commands/BlockCommand.java
View file

@ -52,6 +52,8 @@ public class BlockCommand implements JsonRpcLocalCommand {
for (var groupId : CommandUtil.getGroupIds(groupIdStrings)) {
try {
m.setGroupBlocked(groupId, true);
} catch (NotMasterDeviceException e) {
throw new UserErrorException("This command doesn't work on linked devices.");
} catch (GroupNotFoundException e) {
logger.warn("Group not found {}: {}", groupId.toBase64(), e.getMessage());
} catch (IOException e) {

2
src/main/java/org/asamk/signal/commands/UnblockCommand.java
View file

@ -51,6 +51,8 @@ public class UnblockCommand implements JsonRpcLocalCommand {
for (var groupId : CommandUtil.getGroupIds(groupIdStrings)) {
try {
m.setGroupBlocked(groupId, false);
} catch (NotMasterDeviceException e) {
throw new UserErrorException("This command doesn't work on linked devices.");
} catch (GroupNotFoundException e) {
logger.warn("Unknown group id: {}", groupId);
} catch (IOException e) {

4
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View file

@ -405,6 +405,8 @@ public class DbusSignalImpl implements Signal {
public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
try {
m.setGroupBlocked(getGroupId(groupId), blocked);
} catch (NotMasterDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (GroupNotFoundException e) {
throw new Error.GroupNotFound(e.getMessage());
} catch (IOException e) {
@ -1060,6 +1062,8 @@ public class DbusSignalImpl implements Signal {
private void setIsBlocked(final boolean isBlocked) {
try {
m.setGroupBlocked(groupId, isBlocked);
} catch (NotMasterDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (GroupNotFoundException e) {
throw new Error.GroupNotFound(e.getMessage());
} catch (IOException e) {