Refactor output writers

[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..6abf9c6f3bcf38e5f445f2446fb32823a1239315 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -2,6 +2,11 @@ package org.asamk.signal.commands;
 
 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.IOErrorException;
+import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 
@@ -9,23 +14,21 @@ import java.io.IOException;
 
 public class SendContactsCommand implements LocalCommand {
 
-    @Override
-    public void attachToSubparser(final Subparser subparser) {
+    public SendContactsCommand(final OutputWriter outputWriter) {
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {
         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) throws CommandException {
         try {
             m.sendContacts();
-            return 0;
-        } catch (IOException | UntrustedIdentityException e) {
-            System.err.println("SendContacts error: " + e.getMessage());
-            return 3;
+        } catch (UntrustedIdentityException e) {
+            throw new UntrustedKeyErrorException("SendContacts error: " + e.getMessage());
+        } catch (IOException e) {
+            throw new IOErrorException("SendContacts error: " + e.getMessage());
         }
     }
 }