Make deviceId an int

[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 523292abdf76a121576fd36b2122e61c5ef6581c..a5128937481e1554c99f9d24f7a6fa47c1a2585d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -2,12 +2,20 @@ 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) {
@@ -15,17 +23,13 @@ public class SendContactsCommand implements LocalCommand {
     }
 
     @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);
         }
     }
 }