Add json output listIdentities command

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / Manager.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index c4b696657d3679cbfc3d4df9a72a69fe980daddd..e2306dece3cc73ad69ab0832bc60810339f0533a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -2664,14 +2664,22 @@ public class Manager implements Closeable {
         }
     }
 
-    public String computeSafetyNumber(
-            SignalServiceAddress theirAddress, IdentityKey theirIdentityKey
-    ) {
-        return Utils.computeSafetyNumber(ServiceConfig.capabilities.isUuid(),
+    public String computeSafetyNumber(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+        final var fingerprint = Utils.computeSafetyNumber(capabilities.isUuid(),
+                account.getSelfAddress(),
+                getIdentityKeyPair().getPublicKey(),
+                theirAddress,
+                theirIdentityKey);
+        return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
+    }
+
+    public byte[] computeSafetyNumberForScanning(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+        final var fingerprint = Utils.computeSafetyNumber(capabilities.isUuid(),
                 account.getSelfAddress(),
                 getIdentityKeyPair().getPublicKey(),
                 theirAddress,
                 theirIdentityKey);
+        return fingerprint == null ? null : fingerprint.getScannableFingerprint().getSerialized();
     }
 
     @Deprecated