Prepare next release

[signal-cli] / src / main / java / org / asamk / signal / commands / BlockCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 8d7f1a8b869a810ed437a01175e726e35bff07cb..e7d0af49ca9f266e85d70d5b8656dadcb6059960 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -7,9 +7,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.api.NotMasterDeviceException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;

 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;

-import org.asamk.signal.manager.groups.GroupNotFoundException;

 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;


@@ -19,7 +19,7 @@ import java.io.IOException;
 
 public class BlockCommand implements JsonRpcLocalCommand {
 
 
 public class BlockCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(BlockCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {


@@ -35,13 +35,15 @@ public class BlockCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
 
     @Override
     public void handleCommand(

-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter

     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");
         final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber());
         try {
             m.setContactsBlocked(recipients, true);
     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");
         final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber());
         try {
             m.setContactsBlocked(recipients, true);

-        } catch (NotMasterDeviceException e) {
+        } catch (NotPrimaryDeviceException e) {

             throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new UnexpectedErrorException("Failed to sync block to linked devices: " + e.getMessage(), e);
             throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new UnexpectedErrorException("Failed to sync block to linked devices: " + e.getMessage(), e);


@@ -53,7 +55,7 @@ public class BlockCommand implements JsonRpcLocalCommand {
         final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
         try {
             m.setGroupsBlocked(groupIds, true);
         final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
         try {
             m.setGroupsBlocked(groupIds, true);

-        } catch (NotMasterDeviceException e) {
+        } catch (NotPrimaryDeviceException e) {

             throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (GroupNotFoundException e) {
             logger.warn("Unknown group id: {}", e.getMessage());
             throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (GroupNotFoundException e) {
             logger.warn("Unknown group id: {}", e.getMessage());