Use a new serviceID for the re-deployed KBS setup in staging.

[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 60009cfbbdd8a04b20ba1b088da2c276b06c521e..98fce6676d018e504928ce817e572a390d6f98d5 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -4,14 +4,17 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;

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

 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.util.Util;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 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) {
         subparser.addArgument("contact").help("Contact number").nargs("*");
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("contact").help("Contact number").nargs("*");


@@ -20,26 +23,24 @@ public class BlockCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        for (String contact_number : ns.<String>getList("contact")) {
+    public void handleCommand(final Namespace ns, final Manager m) {
+        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());

             }
         }
 
         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 {

-                    GroupId 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;

     }
 }
     }
 }