Add CommandException to abstract cli return codes for errors

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

diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index f2037239c4d00c6d6e2dc0880721ac3b88a18303..7165d07c4666a3ce933813bbc2ed5d0d9320bc74 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -4,34 +4,44 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
 
 import java.io.IOException;
+import java.util.List;
 
 public class ListDevicesCommand implements LocalCommand {
 
+    private final static Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
+
     @Override
     public void attachToSubparser(final Subparser subparser) {
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         final var writer = new PlainTextWriterImpl(System.out);
+
+        List<DeviceInfo> devices;
         try {
-            var devices = m.getLinkedDevices();
-            for (var d : devices) {
-                writer.println("- Device {}{}:", d.getId(), (d.getId() == m.getDeviceId() ? " (this device)" : ""));
-                writer.indent(w -> {
-                    w.println("Name: {}", d.getName());
-                    w.println("Created: {}", DateUtils.formatTimestamp(d.getCreated()));
-                    w.println("Last seen: {}", DateUtils.formatTimestamp(d.getLastSeen()));
-                });
-            }
-            return 0;
+            devices = m.getLinkedDevices();
         } catch (IOException e) {
-            e.printStackTrace();
-            return 3;
+            logger.debug("Failed to get linked devices", e);
+            throw new IOErrorException("Failed to get linked devices: " + e.getMessage());
+        }
+
+        for (var d : devices) {
+            writer.println("- Device {}{}:", d.getId(), (d.getId() == m.getDeviceId() ? " (this device)" : ""));
+            writer.indent(w -> {
+                w.println("Name: {}", d.getName());
+                w.println("Created: {}", DateUtils.formatTimestamp(d.getCreated()));
+                w.println("Last seen: {}", DateUtils.formatTimestamp(d.getLastSeen()));
+            });
         }
     }
 }