From: AsamK <asamk@gmx.de>
Date: Wed, 16 Oct 2019 17:26:52 +0000 (+0200)
Subject: Refactor UpdateContactCommand
X-Git-Tag: v0.6.4~2
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/faae998a7ee218b6134d0f773471e698d82bbf02

Refactor UpdateContactCommand
---

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 2d91826b..2f1b2ac2 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -223,16 +223,24 @@ with every outgoing messages (excluding group messages).
 *--remove-avatar*::
 	Remove the avatar visible by message recipients.
 
-setContactName
+updateContact
 --------------
-Update name associated to a number on our contact list. This change is only local but can be synchronized to other devices by using `sendContacts` (see below).
-number::
+Update the info associated to a number on our contact list. This change is only
+local but can be synchronized to other devices by using `sendContacts` (see
+below).
+If the contact doesn't exist yet, it will be added.
+
+NUMBER::
 	Specify the contact phone number.
-name::
+
+*-n*, *--name*::
 	Specify the new name for this contact.
+
 sendContacts
 ------------
-Update contact list on Signal servers.
+Send a synchronization message with the local contacts list to all linked devices.
+This command should only be used if this is the master device.
+
 daemon
 ~~~~~~
 signal-cli can run in daemon mode and provides an experimental dbus interface. For
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index ed2796b8..afd93e32 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -21,7 +21,7 @@ public class Commands {
         addCommand("removePin", new RemovePinCommand());
         addCommand("send", new SendCommand());
         addCommand("sendContacts", new SendContactsCommand());
-        addCommand("setContactName", new SetContactNameCommand());
+        addCommand("updateContact", new UpdateContactCommand());
         addCommand("setPin", new SetPinCommand());
         addCommand("trust", new TrustCommand());
         addCommand("unregister", new UnregisterCommand());
diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
index 15241a34..523292ab 100644
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -11,7 +11,7 @@ public class SendContactsCommand implements LocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.help("Send contacts to the signal server.");
+        subparser.help("Send a synchronization message with the local contacts list to all linked devices.");
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/commands/SetContactNameCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
similarity index 78%
rename from src/main/java/org/asamk/signal/commands/SetContactNameCommand.java
rename to src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index d7cbedc6..e1afca69 100644
--- a/src/main/java/org/asamk/signal/commands/SetContactNameCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -1,19 +1,20 @@
 package org.asamk.signal.commands;
 
-import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
+
 import org.asamk.signal.manager.Manager;
 
-public class SetContactNameCommand implements LocalCommand {
+public class UpdateContactCommand implements LocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("number")
                 .help("Contact number");
-        subparser.addArgument("name")
+        subparser.addArgument("-n", "--name")
+                .required(true)
                 .help("New contact name");
-        subparser.help("Set the name of a given contact");
+        subparser.help("Update the details of a given contact");
     }
 
     @Override
@@ -30,5 +31,4 @@ public class SetContactNameCommand implements LocalCommand {
 
         return 0;
     }
-
 }