Implement dbus support for listIdentities

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

diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 1f1b6258413401ececc34b28371df5d70019b9ac..6b49a81207bf3371bf9ea1022d874c49ffc4cce7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -3,60 +3,93 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.PlainTextWriter;
-import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.storage.protocol.IdentityInfo;
+import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.CommandUtil;
+import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.Hex;
 import org.asamk.signal.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
-import java.io.IOException;
+import java.util.Base64;
+import java.util.List;
+import java.util.UUID;
 
-public class ListIdentitiesCommand implements LocalCommand {
+public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
 
-    private static void printIdentityFingerprint(PlainTextWriter writer, Manager m, IdentityInfo theirId) {
-        var digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirId.getAddress(), theirId.getIdentityKey()));
-        try {
-            writer.println("{}: {} Added: {} Fingerprint: {} Safety Number: {}",
-                    theirId.getAddress().getNumber().orNull(),
-                    theirId.getTrustLevel(),
-                    theirId.getDateAdded(),
-                    Hex.toString(theirId.getFingerprint()),
-                    digits);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    @Override
+    public String getName() {
+        return "listIdentities";
+    }
+
+    private static void printIdentityFingerprint(PlainTextWriter writer, Identity theirId) {
+        writer.println("{}: {} Added: {} Fingerprint: {} Safety Number: {}",
+                theirId.recipient().getLegacyIdentifier(),
+                theirId.trustLevel(),
+                DateUtils.formatTimestamp(theirId.dateAddedTimestamp()),
+                Hex.toString(theirId.fingerprint()),
+                Util.formatSafetyNumber(theirId.safetyNumber()));
     }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
+        subparser.help("List all known identity keys and their trust status, fingerprint and safety number.");
         subparser.addArgument("-n", "--number").help("Only show identity keys for the given phone number.");
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
-        final var writer = new PlainTextWriterImpl(System.out);
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        var number = ns.getString("number");
 
-        if (ns.get("number") == null) {
-            for (var identity : m.getIdentities()) {
-                printIdentityFingerprint(writer, m, identity);
-            }
+        List<Identity> identities;
+        if (number == null) {
+            identities = m.getIdentities();
         } else {
-            var number = ns.getString("number");
-            try {
-                var identities = m.getIdentities(number);
+            identities = m.getIdentities(CommandUtil.getSingleRecipientIdentifier(number, m.getSelfNumber()));
+        }
+
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
                 for (var id : identities) {
-                    printIdentityFingerprint(writer, m, id);
+                    printIdentityFingerprint(writer, id);
                 }
-            } catch (InvalidNumberException e) {
-                System.err.println("Invalid number: " + e.getMessage());
+            }
+            case JsonWriter writer -> {
+                final var jsonIdentities = identities.stream().map(id -> {
+                    final var address = id.recipient();
+                    var safetyNumber = Util.formatSafetyNumber(id.safetyNumber());
+                    var scannableSafetyNumber = id.scannableSafetyNumber();
+                    return new JsonIdentity(address.number().orElse(null),
+                            address.uuid().map(UUID::toString).orElse(null),
+                            Hex.toString(id.fingerprint()),
+                            safetyNumber,
+                            scannableSafetyNumber == null
+                                    ? null
+                                    : Base64.getEncoder().encodeToString(scannableSafetyNumber),
+                            id.trustLevel().name(),
+                            id.dateAddedTimestamp());
+                }).toList();
+                writer.write(jsonIdentities);
             }
         }
-        return 0;
     }
+
+    private record JsonIdentity(
+            String number,
+            String uuid,
+            String fingerprint,
+            String safetyNumber,
+            String scannableSafetyNumber,
+            String trustLevel,
+            long addedTimestamp
+    ) {}
 }