Fix null pointer regression

[signal-cli] / src / main / java / org / asamk / signal / commands / SendContactsCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
index 15241a34c0033c07e3e51c427b2f51b838b783ee..a67950c1d80fc4e4bc9592fb4cc145c30a080e40 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -2,30 +2,36 @@ package org.asamk.signal.commands;
 
 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.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
 
-public class SendContactsCommand implements LocalCommand {
+public class SendContactsCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "sendContacts";
+    }
 
     @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
-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
         try {
             m.sendContacts();
-            return 0;
-        } catch (IOException | UntrustedIdentityException e) {
-            System.err.println("SendContacts error: " + e.getMessage());
-            return 3;
+        } catch (IOException e) {
+            throw new IOErrorException("SendContacts error: " + e.getMessage(), e);
         }
     }
 }