X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/85025d2e25a9993162d5c859858e7ecb6149fea6..e03d04e14b827503cdca55030448bd3c287b181b:/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 fb4b3850..d6f62079 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -26,6 +26,7 @@ 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.VerifiedMessage;
+import org.whispersystems.signalservice.api.messages.shared.SharedContact;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.util.Base64;
 
@@ -42,11 +43,15 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
-        SignalServiceAddress source = envelope.getSourceAddress();
-        ContactInfo sourceContact = m.getContact(source.getNumber().get());
-        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());
+        if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
+            SignalServiceAddress source = envelope.getSourceAddress();
+            ContactInfo sourceContact = m.getContact(source.getNumber().get());
+            System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber().get(), envelope.getSourceDevice()));
+            if (source.getRelay().isPresent()) {
+                System.out.println("Relayed by: " + source.getRelay().get());
+            }
+        } else {
+            System.out.println("Envelope from: unknown source");
         }
         System.out.println("Timestamp: " + DateUtils.formatTimestamp(envelope.getTimestamp()));
         if (envelope.isUnidentifiedSender()) {
@@ -69,7 +74,7 @@ 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(), content.getSenderDevice()));
+                System.out.println(String.format("Sender: %s (device: %d)", content.getSender().getNumber().get(), content.getSenderDevice()));
                 if (content.getDataMessage().isPresent()) {
                     SignalServiceDataMessage message = content.getDataMessage().get();
                     handleSignalServiceDataMessage(message);
@@ -95,7 +100,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()) {
@@ -241,6 +246,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");
         }