Show the contact name when receiving messages

Works only if the contact is stored in the config file already

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index d276329f98cd7b79931f1afb2bfb4b0e407ff6c6..5f716e3cb52083b2a6b068437879b1919f084b25 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -667,7 +667,8 @@ public class Main {
         @Override
         public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
             SignalServiceAddress source = envelope.getSourceAddress();
-            System.out.println(String.format("Envelope from: %s (device: %d)", source.getNumber(), envelope.getSourceDevice()));
+            ContactInfo sourceContact = m.getContact(source.getNumber());
+            System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));
             if (source.getRelay().isPresent()) {
                 System.out.println("Relayed by: " + source.getRelay().get());
             }
@@ -698,7 +699,8 @@ public class Main {
                         if (syncMessage.getRead().isPresent()) {
                             System.out.println("Received sync read messages list");
                             for (ReadMessage rm : syncMessage.getRead().get()) {
-                                System.out.println("From: " + rm.getSender() + " Message timestamp: " + rm.getTimestamp());
+                                ContactInfo fromContact = m.getContact(rm.getSender());
+                                System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + rm.getTimestamp());
                             }
                         }
                         if (syncMessage.getRequest().isPresent()) {
@@ -713,7 +715,15 @@ public class Main {
                         if (syncMessage.getSent().isPresent()) {
                             System.out.println("Received sync sent message");
                             final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
-                            System.out.println("To: " + (sentTranscriptMessage.getDestination().isPresent() ? sentTranscriptMessage.getDestination().get() : "Unknown") + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
+                            String to;
+                            if (sentTranscriptMessage.getDestination().isPresent()) {
+                                String dest = sentTranscriptMessage.getDestination().get();
+                                ContactInfo destContact = m.getContact(dest);
+                                to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;
+                            } else {
+                                to = "Unknown";
+                            }
+                            System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
                             SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
                             handleSignalServiceDataMessage(message, null);
                         }

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 6295f730bd6aab4a83259a2228daaaf4d1a03ec9..bd8d8a5f8446f6364d5a8afe018993179bf2a72d 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -942,4 +942,8 @@ class Manager implements Signal {
             contactsFile.delete();
         }
     }
+
+    public ContactInfo getContact(String number) {
+        return contactStore.getContact(number);
+    }
 }