Refactor signed pre key store

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

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 6df283f367679077c32e0618a178213d1ad64840..91df4b0697a17c132b63194242ec30a622223b82 100644 (file)
--- 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.");
                     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(
                     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(),
                             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(),
                     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());
                 }
                 } else {
                     writer.println("Exception: {} ({})", exception.getMessage(), exception.getClass().getSimpleName());
                 }


@@ -665,7 +668,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     private String formatContact(SignalServiceAddress address) {
         final var number = address.getLegacyIdentifier();
         var name = m.getContactOrProfileName(number);
     private String formatContact(SignalServiceAddress address) {
         final var number = address.getLegacyIdentifier();
         var name = m.getContactOrProfileName(number);

-        if (name == null) {
+        if (name == null || name.isEmpty()) {

             return number;
         } else {
             return MessageFormatter.arrayFormat("“{}” {}", new Object[]{name, number}).getMessage();
             return number;
         } else {
             return MessageFormatter.arrayFormat("“{}” {}", new Object[]{name, number}).getMessage();