Make name optional for updateContact

[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 95c3738c1168c7671c1f7774ce7268a58e9fe747..f94dfde44bd065e49dbb28b4bb4660e14783e46d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -3,47 +3,49 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.GroupNotFoundException;
+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.Manager;

-import org.asamk.signal.util.GroupIdFormatException;
+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;
 import org.asamk.signal.util.Util;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 public class BlockCommand implements LocalCommand {
 
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 public class BlockCommand implements LocalCommand {
 

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

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @Override
     public void attachToSubparser(final Subparser subparser) {

+        subparser.help("Block the given contacts or groups (no messages will be received)");

         subparser.addArgument("contact").help("Contact number").nargs("*");
         subparser.addArgument("-g", "--group").help("Group ID").nargs("*");
         subparser.addArgument("contact").help("Contact number").nargs("*");
         subparser.addArgument("-g", "--group").help("Group ID").nargs("*");

-        subparser.help("Block the given contacts or groups (no messages will be received)");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
-        for (String contact_number : ns.<String>getList("contact")) {
+    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) {
             try {
                 m.setContactBlocked(contact_number, true);
             } catch (InvalidNumberException e) {

-                System.err.println(e.getMessage());
+                logger.warn("Invalid number {}: {}", contact_number, e.getMessage());
+            } catch (NotMasterDeviceException e) {
+                throw new UserErrorException("This command doesn't work on linked devices.");

             }
         }
 
         if (ns.<String>getList("group") != null) {
             }
         }
 
         if (ns.<String>getList("group") != null) {

-            for (String groupIdString : ns.<String>getList("group")) {
+            for (var groupIdString : ns.<String>getList("group")) {

                 try {
                 try {

-                    byte[] groupId = Util.decodeGroupId(groupIdString);
+                    var groupId = Util.decodeGroupId(groupIdString);

                     m.setGroupBlocked(groupId, true);
                 } catch (GroupIdFormatException | GroupNotFoundException e) {
                     m.setGroupBlocked(groupId, true);
                 } catch (GroupIdFormatException | GroupNotFoundException e) {

-                    System.err.println(e.getMessage());
+                    logger.warn("Invalid group id {}: {}", groupIdString, e.getMessage());

                 }
             }
         }
                 }
             }
         }

-
-        return 0;

     }
 }
     }
 }