Use PlainTextWriter for all cli stdout output

[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 4946cd4aa89ddaf2a127b0431c7792d5d2d3024f..f2037239c4d00c6d6e2dc0880721ac3b88a18303 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -3,6 +3,7 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
+import org.asamk.signal.PlainTextWriterImpl;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 
@@ -16,16 +17,16 @@ public class ListDevicesCommand implements LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
+        final var writer = new PlainTextWriterImpl(System.out);
         try {
             var devices = m.getLinkedDevices();
             for (var d : devices) {
-                System.out.println("Device "
-                        + d.getId()
-                        + (d.getId() == m.getDeviceId() ? " (this device)" : "")
-                        + ":");
-                System.out.println(" Name: " + d.getName());
-                System.out.println(" Created: " + DateUtils.formatTimestamp(d.getCreated()));
-                System.out.println(" Last seen: " + DateUtils.formatTimestamp(d.getLastSeen()));
+                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;
         } catch (IOException e) {