X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/85025d2e25a9993162d5c859858e7ecb6149fea6..916d0e3cf1713d91c0d8c511c0f31986caad22b7:/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..898f382c 100644 --- 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; @@ -42,11 +45,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 +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(), 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); @@ -95,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().get() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp())); } } if (syncMessage.getRequest().isPresent()) { @@ -115,6 +123,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { String dest = sentTranscriptMessage.getDestination().get().getNumber().get(); ContactInfo destContact = m.getContact(dest); to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest; + } else if (sentTranscriptMessage.getRecipients().size() > 0) { + StringBuilder toBuilder = new StringBuilder(); + for (SignalServiceAddress dest : sentTranscriptMessage.getRecipients()) { + ContactInfo destContact = m.getContact(dest.getNumber().get()); + toBuilder.append(destContact == null ? "" : "“" + destContact.name + "” ").append(dest.getNumber().get()).append(" "); + } + to = toBuilder.toString(); } else { to = "Unknown"; } @@ -130,14 +145,14 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println("Blocked numbers:"); final BlockedListMessage blockedList = syncMessage.getBlockedList().get(); for (SignalServiceAddress address : blockedList.getAddresses()) { - System.out.println(" - " + address.getNumber()); + System.out.println(" - " + address.getNumber().get()); } } if (syncMessage.getVerified().isPresent()) { System.out.println("Received sync message with verified identities:"); final VerifiedMessage verifiedMessage = syncMessage.getVerified().get(); System.out.println(" - " + verifiedMessage.getDestination() + ": " + verifiedMessage.getVerified()); - String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey())); + String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey())); System.out.println(" " + safetyNumber); } if (syncMessage.getConfiguration().isPresent()) { @@ -147,6 +162,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().get()); + System.out.println(" - Timestamp:" + viewOnceOpenMessage.getTimestamp()); + } + if (syncMessage.getStickerPackOperations().isPresent()) { + final List 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"); @@ -216,8 +254,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (message.getBody().isPresent()) { System.out.println("Body: " + message.getBody().get()); } - if (message.getGroupInfo().isPresent()) { - SignalServiceGroup groupInfo = message.getGroupInfo().get(); + if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) { + SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get(); System.out.println("Group info:"); System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId())); if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) { @@ -241,6 +279,33 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { printAttachment(groupInfo.getAvatar().get()); } } + if (message.getPreviews().isPresent()) { + final List 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 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"); } @@ -254,10 +319,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println("Profile key update, key length:" + message.getProfileKey().get().length); } + if (message.getReaction().isPresent()) { + final SignalServiceDataMessage.Reaction reaction = message.getReaction().get(); + System.out.println("Reaction:"); + System.out.println(" - Emoji: " + reaction.getEmoji()); + System.out.println(" - Target author: " + reaction.getTargetAuthor().getNumber().get()); + System.out.println(" - Target timestamp: " + reaction.getTargetSentTimestamp()); + System.out.println(" - Is remove: " + reaction.isRemove()); + } + if (message.getQuote().isPresent()) { SignalServiceDataMessage.Quote quote = message.getQuote().get(); System.out.println("Quote: (" + quote.getId() + ")"); - System.out.println(" Author: " + quote.getAuthor().getNumber()); + System.out.println(" Author: " + quote.getAuthor().getNumber().get()); System.out.println(" Text: " + quote.getText()); if (quote.getAttachments().size() > 0) { System.out.println(" Attachments: "); @@ -284,12 +358,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")"); if (attachment.isPointer()) { final SignalServiceAttachmentPointer pointer = attachment.asPointer(); - System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length); + System.out.println(" Id: " + pointer.getRemoteId() + " Key length: " + pointer.getKey().length); System.out.println(" Filename: " + (pointer.getFileName().isPresent() ? pointer.getFileName().get() : "-")); System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : "")); System.out.println(" Voice note: " + (pointer.getVoiceNote() ? "yes" : "no")); System.out.println(" Dimensions: " + pointer.getWidth() + "x" + pointer.getHeight()); - File file = m.getAttachmentFile(pointer.getId()); + File file = m.getAttachmentFile(pointer.getRemoteId()); if (file.exists()) { System.out.println(" Stored plaintext in: " + file); }