X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/7e7e4150e19a65c646bb3f4ec33b5ec87224f8cf..30e8e36635733b3e8c75a44e95785ba33cf55e61:/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java diff --git a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java index c6e9a4c6..aca52778 100644 --- a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java @@ -5,13 +5,10 @@ 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.IOErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.output.OutputWriter; import org.asamk.signal.util.CommandUtil; -import java.io.IOException; - public class RemoveContactCommand implements JsonRpcLocalCommand { @Override @@ -23,7 +20,11 @@ public class RemoveContactCommand implements JsonRpcLocalCommand { public void attachToSubparser(final Subparser subparser) { subparser.help("Remove the details of a given contact"); subparser.addArgument("recipient").help("Contact number"); - subparser.addArgument("--forget") + final var mut = subparser.addMutuallyExclusiveGroup(); + mut.addArgument("--hide") + .action(Arguments.storeTrue()) + .help("Hide the contact in the contact list, but keep the data."); + mut.addArgument("--forget") .action(Arguments.storeTrue()) .help("Delete all data associated with this contact, including identity keys and sessions."); } @@ -35,15 +36,14 @@ public class RemoveContactCommand implements JsonRpcLocalCommand { var recipientString = ns.getString("recipient"); var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber()); + var hide = Boolean.TRUE == ns.getBoolean("hide"); var forget = Boolean.TRUE == ns.getBoolean("forget"); - try { - if (forget) { - m.deleteRecipient(recipient); - } else { - m.deleteContact(recipient); - } - } catch (IOException e) { - throw new IOErrorException("Remove contact error: " + e.getMessage(), e); + if (hide) { + m.hideRecipient(recipient); + } else if (forget) { + m.deleteRecipient(recipient); + } else { + m.deleteContact(recipient); } } }