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 6f6fac2f49ce11ce1aad67690c304ce318fe7900..6b49a81207bf3371bf9ea1022d874c49ffc4cce7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -3,41 +3,39 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.JsonWriter;
-import org.asamk.signal.OutputWriter;
-import org.asamk.signal.PlainTextWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
 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.push.SignalServiceAddress;
 
 import java.util.Base64;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.UUID;
 
 public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
 
     @Override
     public String getName() {
         return "listIdentities";
     }
 
-    private static void printIdentityFingerprint(PlainTextWriter writer, Manager m, Identity theirId) {
-        final SignalServiceAddress address = theirId.recipient().toSignalServiceAddress();
-        var digits = Util.formatSafetyNumber(theirId.safetyNumber());
+    private static void printIdentityFingerprint(PlainTextWriter writer, Identity theirId) {
         writer.println("{}: {} Added: {} Fingerprint: {} Safety Number: {}",
-                address.getNumber().orNull(),
+                theirId.recipient().getLegacyIdentifier(),
                 theirId.trustLevel(),
-                theirId.dateAdded(),
-                Hex.toString(theirId.getFingerprint()),
-                digits);
+                DateUtils.formatTimestamp(theirId.dateAddedTimestamp()),
+                Hex.toString(theirId.fingerprint()),
+                Util.formatSafetyNumber(theirId.safetyNumber()));
     }
 
     @Override
@@ -59,28 +57,29 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
             identities = m.getIdentities(CommandUtil.getSingleRecipientIdentifier(number, m.getSelfNumber()));
         }
 
-        if (outputWriter instanceof PlainTextWriter writer) {
-            for (var id : identities) {
-                printIdentityFingerprint(writer, m, id);
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var id : identities) {
+                    printIdentityFingerprint(writer, id);
+                }
+            }
+            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);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonIdentities = identities.stream().map(id -> {
-                final var address = id.recipient().toSignalServiceAddress();
-                var safetyNumber = Util.formatSafetyNumber(id.safetyNumber());
-                var scannableSafetyNumber = id.scannableSafetyNumber();
-                return new JsonIdentity(address.getNumber().orNull(),
-                        address.getUuid().toString(),
-                        Hex.toString(id.getFingerprint()),
-                        safetyNumber,
-                        scannableSafetyNumber == null
-                                ? null
-                                : Base64.getEncoder().encodeToString(scannableSafetyNumber),
-                        id.trustLevel().name(),
-                        id.dateAdded().getTime());
-            }).collect(Collectors.toList());
-
-            writer.write(jsonIdentities);
         }
     }