Prevent updateContact and block commands on linked devices

The changes would be overwritten with the next sync anyway

Fixes #600
This commit is contained in:
AsamK 2021-05-03 19:46:35 +02:00
parent 312c6c8bb2
commit 36475bb632
6 changed files with 38 additions and 5 deletions

View file

@ -3,7 +3,10 @@ package org.asamk.signal.commands;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.NotMasterDeviceException;
import org.asamk.signal.manager.groups.GroupIdFormatException;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.util.Util;
@ -23,12 +26,14 @@ public class BlockCommand implements LocalCommand {
}
@Override
public void handleCommand(final Namespace ns, final Manager m) {
public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
for (var contact_number : ns.<String>getList("contact")) {
try {
m.setContactBlocked(contact_number, true);
} catch (InvalidNumberException e) {
logger.warn("Invalid number {}: {}", contact_number, e.getMessage());
} catch (NotMasterDeviceException e) {
throw new UserErrorException("This command doesn't work on linked devices.");
}
}