From: AsamK <asamk@gmx.de>
Date: Fri, 23 Apr 2021 20:00:09 +0000 (+0200)
Subject: Resolve recipient address when displaying untrusted identity message
X-Git-Tag: v0.8.2~54
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/b9b4d846d32b5a9b342ec795c56a8a1df26cdf23

Resolve recipient address when displaying untrusted identity message
---

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index b59eeee2..91df4b06 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -67,14 +67,17 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                     var e = (UntrustedIdentityException) exception;
                     writer.println(
                             "The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message.");
+                    final var recipientName = m.resolveSignalServiceAddress(e.getName()).getLegacyIdentifier();
                     writer.println(
-                            "Use 'signal-cli -u {0} listIdentities -n {1}', verify the key and run 'signal-cli -u {0} trust -v \"FINGER_PRINT\" {1}' to mark it as trusted",
+                            "Use 'signal-cli -u {} listIdentities -n {}', verify the key and run 'signal-cli -u {} trust -v \"FINGER_PRINT\" {}' to mark it as trusted",
                             m.getUsername(),
-                            e.getName());
+                            recipientName,
+                            m.getUsername(),
+                            recipientName);
                     writer.println(
                             "If you don't care about security, use 'signal-cli -u {} trust -a {}' to trust it without verification",
                             m.getUsername(),
-                            e.getName());
+                            recipientName);
                 } else {
                     writer.println("Exception: {} ({})", exception.getMessage(), exception.getClass().getSimpleName());
                 }