Add parameter to configure phone number privacy

[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 516224f550cd6790eec90d9d0fd4c81c615d375e..1518c53a9c8447e1f623c866a8525f2d1a2c4fb2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -3,13 +3,14 @@ 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.OutputWriter;

 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.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.manager.NotMasterDeviceException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
+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.output.OutputWriter;

 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;


@@ -18,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() {


@@ -37,27 +38,27 @@ public class BlockCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");

-        for (var contact : CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber())) {
-            try {
-                m.setContactBlocked(contact, true);
-            } catch (NotMasterDeviceException 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);
-            }
+        final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber());
+        try {
+            m.setContactsBlocked(recipients, true);
+        } 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);
+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");

         }
 
         final var groupIdStrings = ns.<String>getList("group-id");
         }
 
         final var groupIdStrings = ns.<String>getList("group-id");

-        if (groupIdStrings != null) {
-            for (var groupId : CommandUtil.getGroupIds(groupIdStrings)) {
-                try {
-                    m.setGroupBlocked(groupId, true);
-                } catch (GroupNotFoundException e) {
-                    logger.warn("Group not found {}: {}", groupId.toBase64(), e.getMessage());
-                } catch (IOException e) {
-                    throw new UnexpectedErrorException("Failed to sync block to linked devices: " + e.getMessage(), e);
-                }
-            }
+        final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
+        try {
+            m.setGroupsBlocked(groupIds, true);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
+        } catch (GroupNotFoundException e) {
+            logger.warn("Unknown group id: {}", e.getMessage());
+        } catch (IOException e) {
+            throw new UnexpectedErrorException("Failed to sync block to linked devices: " + e.getMessage(), e);

         }
     }
 }
         }
     }
 }