Show contact name for message Sender

[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 6f382b7af42a52c90dd3bf1c0bbfab0b6bd055bf..570631e7119a43a88557c897333cec2fe1e7bc34 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -25,7 +25,10 @@ import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage
 import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMessage;
+import org.whispersystems.signalservice.api.messages.shared.SharedContact;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.util.Base64;
 
@@ -73,7 +76,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             if (content == null) {
                 System.out.println("Failed to decrypt message.");
             } else {
-                System.out.println(String.format("Sender: %s (device: %d)", content.getSender().getNumber().get(), content.getSenderDevice()));
+                ContactInfo sourceContact = m.getContact(content.getSender().getNumber().get());
+                System.out.println(String.format("Sender: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + content.getSender().getNumber().get(), content.getSenderDevice()));
                 if (content.getDataMessage().isPresent()) {
                     SignalServiceDataMessage message = content.getDataMessage().get();
                     handleSignalServiceDataMessage(message);
@@ -99,7 +103,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         System.out.println("Received sync read messages list");
                         for (ReadMessage rm : syncMessage.getRead().get()) {
                             ContactInfo fromContact = m.getContact(rm.getSender().getNumber().get());
-                            System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp()));
+                            System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender().getNumber() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp()));
                         }
                     }
                     if (syncMessage.getRequest().isPresent()) {
@@ -151,6 +155,29 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                             System.out.println(" - Read receipts: " + (configurationMessage.getReadReceipts().get() ? "enabled" : "disabled"));
                         }
                     }
+                    if (syncMessage.getFetchType().isPresent()) {
+                        final SignalServiceSyncMessage.FetchType fetchType = syncMessage.getFetchType().get();
+                        System.out.println("Received sync message with fetch type: " + fetchType.toString());
+                    }
+                    if (syncMessage.getViewOnceOpen().isPresent()) {
+                        final ViewOnceOpenMessage viewOnceOpenMessage = syncMessage.getViewOnceOpen().get();
+                        System.out.println("Received sync message with view once open message:");
+                        System.out.println(" - Sender:" + viewOnceOpenMessage.getSender().getNumber());
+                        System.out.println(" - Timestamp:" + viewOnceOpenMessage.getTimestamp());
+                    }
+                    if (syncMessage.getStickerPackOperations().isPresent()) {
+                        final List<StickerPackOperationMessage> stickerPackOperationMessages = syncMessage.getStickerPackOperations().get();
+                        System.out.println("Received sync message with sticker pack operations:");
+                        for (StickerPackOperationMessage m : stickerPackOperationMessages) {
+                            System.out.println(" - " + m.getType().toString());
+                            if (m.getPackId().isPresent()) {
+                                System.out.println("   packId: " + Base64.encodeBytes(m.getPackId().get()));
+                            }
+                            if (m.getPackKey().isPresent()) {
+                                System.out.println("   packKey: " + Base64.encodeBytes(m.getPackKey().get()));
+                            }
+                        }
+                    }
                 }
                 if (content.getCallMessage().isPresent()) {
                     System.out.println("Received a call message");
@@ -245,6 +272,33 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                 printAttachment(groupInfo.getAvatar().get());
             }
         }
+        if (message.getPreviews().isPresent()) {
+            final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
+            System.out.println("Previes:");
+            for (SignalServiceDataMessage.Preview preview : previews) {
+                System.out.println(" - Title: " + preview.getTitle());
+                System.out.println(" - Url: " + preview.getUrl());
+                if (preview.getImage().isPresent()) {
+                    printAttachment(preview.getImage().get());
+                }
+            }
+        }
+        if (message.getSharedContacts().isPresent()) {
+            final List<SharedContact> sharedContacts = message.getSharedContacts().get();
+            System.out.println("Contacts:");
+            for (SharedContact contact : sharedContacts) {
+                System.out.println(" - Name: " + contact.getName());
+                // TODO show or store rest of the contact info
+            }
+        }
+        if (message.getSticker().isPresent()) {
+            final SignalServiceDataMessage.Sticker sticker = message.getSticker().get();
+            System.out.println("Sticker:");
+            System.out.println(" - Pack id: " + Base64.encodeBytes(sticker.getPackId()));
+            System.out.println(" - Pack key: " + Base64.encodeBytes(sticker.getPackKey()));
+            System.out.println(" - Sticker id: " + sticker.getStickerId());
+            // TODO also download sticker image ??
+        }
         if (message.isEndSession()) {
             System.out.println("Is end session");
         }