package org.asamk.signal;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.storage.contacts.ContactInfo;
-import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupUtils;
+import org.asamk.signal.manager.storage.groups.GroupInfo;
import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.Util;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
+import org.whispersystems.signalservice.api.messages.calls.OpaqueMessage;
import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMessage;
import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage;
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;
import java.io.File;
+import java.util.Base64;
import java.util.List;
public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
SignalServiceAddress source = envelope.getSourceAddress();
- ContactInfo sourceContact = m.getContact(source.getLegacyIdentifier());
+ String name = m.getContactOrProfileName(source.getLegacyIdentifier());
System.out.println(String.format("Envelope from: %s (device: %d)",
- (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getLegacyIdentifier(),
+ (name == null ? "" : "“" + name + "” ") + source.getLegacyIdentifier(),
envelope.getSourceDevice()));
if (source.getRelay().isPresent()) {
System.out.println("Relayed by: " + source.getRelay().get());
if (content == null) {
System.out.println("Failed to decrypt message.");
} else {
- ContactInfo sourceContact = m.getContact(content.getSender().getLegacyIdentifier());
+ String senderName = m.getContactOrProfileName(content.getSender().getLegacyIdentifier());
System.out.println(String.format("Sender: %s (device: %d)",
- (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + content.getSender()
- .getLegacyIdentifier(),
+ (senderName == null ? "" : "“" + senderName + "” ") + content.getSender().getLegacyIdentifier(),
content.getSenderDevice()));
if (content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
} else {
System.out.println("Received sync contacts");
}
- printAttachment(contactsMessage.getContactsStream());
+ printAttachment(contactsMessage.getContactsStream(), 0);
}
if (syncMessage.getGroups().isPresent()) {
System.out.println("Received sync groups");
- printAttachment(syncMessage.getGroups().get());
+ printAttachment(syncMessage.getGroups().get(), 0);
}
if (syncMessage.getRead().isPresent()) {
System.out.println("Received sync read messages list");
for (ReadMessage rm : syncMessage.getRead().get()) {
- ContactInfo fromContact = m.getContact(rm.getSender().getLegacyIdentifier());
+ String name = m.getContactOrProfileName(rm.getSender().getLegacyIdentifier());
System.out.println("From: "
- + (fromContact == null ? "" : "“" + fromContact.name + "” ")
- + rm.getSender().getLegacyIdentifier()
+ + (name == null ? "" : "“" + name + "” ")
+ + rm.getSender()
+ .getLegacyIdentifier()
+ " Message timestamp: "
+ DateUtils.formatTimestamp(rm.getTimestamp()));
}
String to;
if (sentTranscriptMessage.getDestination().isPresent()) {
String dest = sentTranscriptMessage.getDestination().get().getLegacyIdentifier();
- ContactInfo destContact = m.getContact(dest);
- to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;
+ String name = m.getContactOrProfileName(dest);
+ to = (name == null ? "" : "“" + name + "” ") + dest;
} else if (sentTranscriptMessage.getRecipients().size() > 0) {
StringBuilder toBuilder = new StringBuilder();
for (SignalServiceAddress dest : sentTranscriptMessage.getRecipients()) {
- ContactInfo destContact = m.getContact(dest.getLegacyIdentifier());
- toBuilder.append(destContact == null ? "" : "“" + destContact.name + "” ")
+ String name = m.getContactOrProfileName(dest.getLegacyIdentifier());
+ toBuilder.append(name == null ? "" : "“" + name + "” ")
.append(dest.getLegacyIdentifier())
.append(" ");
}
for (StickerPackOperationMessage m : stickerPackOperationMessages) {
System.out.println(" - " + m.getType().toString());
if (m.getPackId().isPresent()) {
- System.out.println(" packId: " + Base64.encodeBytes(m.getPackId().get()));
+ System.out.println(" packId: " + Base64.getEncoder()
+ .encodeToString(m.getPackId().get()));
}
if (m.getPackKey().isPresent()) {
- System.out.println(" packKey: " + Base64.encodeBytes(m.getPackKey().get()));
+ System.out.println(" packKey: " + Base64.getEncoder()
+ .encodeToString(m.getPackKey().get()));
}
}
}
System.out.println("Received message request response:");
System.out.println(" Type: " + requestResponseMessage.getType());
if (requestResponseMessage.getGroupId().isPresent()) {
- System.out.println(" Group id: " + Base64.encodeBytes(requestResponseMessage.getGroupId()
- .get()));
+ System.out.println(" Group id: " + Base64.getEncoder()
+ .encodeToString(requestResponseMessage.getGroupId().get()));
}
if (requestResponseMessage.getPerson().isPresent()) {
System.out.println(" Person: " + requestResponseMessage.getPerson()
if (content.getCallMessage().isPresent()) {
System.out.println("Received a call message");
SignalServiceCallMessage callMessage = content.getCallMessage().get();
+ if (callMessage.getDestinationDeviceId().isPresent()) {
+ final Integer deviceId = callMessage.getDestinationDeviceId().get();
+ System.out.println("Destination device id: " + deviceId);
+ }
if (callMessage.getAnswerMessage().isPresent()) {
AnswerMessage answerMessage = callMessage.getAnswerMessage().get();
System.out.println("Answer message: " + answerMessage.getId() + ": " + answerMessage.getSdp());
OfferMessage offerMessage = callMessage.getOfferMessage().get();
System.out.println("Offer message: " + offerMessage.getId() + ": " + offerMessage.getSdp());
}
+ if (callMessage.getOpaqueMessage().isPresent()) {
+ final OpaqueMessage opaqueMessage = callMessage.getOpaqueMessage().get();
+ System.out.println("Opaque message: size " + opaqueMessage.getOpaque().length);
+ }
}
if (content.getReceiptMessage().isPresent()) {
System.out.println("Received a receipt message");
if (receiptMessage.isReadReceipt()) {
System.out.println(" - Is read receipt");
}
+ if (receiptMessage.isViewedReceipt()) {
+ System.out.println(" - Is viewed receipt");
+ }
System.out.println(" - Timestamps:");
for (long timestamp : receiptMessage.getTimestamps()) {
System.out.println(" " + DateUtils.formatTimestamp(timestamp));
System.out.println(" - Timestamp: " + DateUtils.formatTimestamp(typingMessage.getTimestamp()));
if (typingMessage.getGroupId().isPresent()) {
System.out.println(" - Group Info:");
- System.out.println(" Id: " + Base64.encodeBytes(typingMessage.getGroupId().get()));
- GroupInfo group = m.getGroup(typingMessage.getGroupId().get());
+ final GroupId groupId = GroupId.unknownVersion(typingMessage.getGroupId().get());
+ System.out.println(" Id: " + groupId.toBase64());
+ GroupInfo group = m.getGroup(groupId);
if (group != null) {
System.out.println(" Name: " + group.getTitle());
} else {
if (message.getGroupContext().isPresent()) {
System.out.println("Group info:");
final SignalServiceGroupContext groupContext = message.getGroupContext().get();
+ final GroupId groupId = GroupUtils.getGroupId(groupContext);
if (groupContext.getGroupV1().isPresent()) {
SignalServiceGroup groupInfo = groupContext.getGroupV1().get();
- System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
+ System.out.println(" Id: " + groupId.toBase64());
if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) {
System.out.println(" Name: " + groupInfo.getName().get());
} else {
- GroupInfo group = m.getGroup(groupInfo.getGroupId());
+ GroupInfo group = m.getGroup(groupId);
if (group != null) {
System.out.println(" Name: " + group.getTitle());
} else {
}
if (groupInfo.getAvatar().isPresent()) {
System.out.println(" Avatar:");
- printAttachment(groupInfo.getAvatar().get());
+ printAttachment(groupInfo.getAvatar().get(), 2);
}
} else if (groupContext.getGroupV2().isPresent()) {
final SignalServiceGroupV2 groupInfo = groupContext.getGroupV2().get();
- byte[] groupId = m.getGroupId(groupInfo.getMasterKey());
- System.out.println(" Id: " + Base64.encodeBytes(groupId));
+ System.out.println(" Id: " + groupId.toBase64());
GroupInfo group = m.getGroup(groupId);
if (group != null) {
System.out.println(" Name: " + group.getTitle());
System.out.println(" Has signed group change: " + groupInfo.hasSignedGroupChange());
}
}
+ if (message.getGroupCallUpdate().isPresent()) {
+ final SignalServiceDataMessage.GroupCallUpdate groupCallUpdate = message.getGroupCallUpdate().get();
+ System.out.println("Group call update:");
+ System.out.println(" - Era id: " + groupCallUpdate.getEraId());
+ }
if (message.getPreviews().isPresent()) {
final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
System.out.println("Previews:");
System.out.println(" - Title: " + preview.getTitle());
System.out.println(" - Url: " + preview.getUrl());
if (preview.getImage().isPresent()) {
- printAttachment(preview.getImage().get());
+ printAttachment(preview.getImage().get(), 1);
}
}
}
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
+ System.out.println(" - Name:");
+ SharedContact.Name name = contact.getName();
+ if (name.getDisplay().isPresent() && !name.getDisplay().get().isBlank()) {
+ System.out.println(" - Display name: " + name.getDisplay().get());
+ }
+ if (name.getGiven().isPresent() && !name.getGiven().get().isBlank()) {
+ System.out.println(" - First name: " + name.getGiven().get());
+ }
+ if (name.getMiddle().isPresent() && !name.getMiddle().get().isBlank()) {
+ System.out.println(" - Middle name: " + name.getMiddle().get());
+ }
+ if (name.getFamily().isPresent() && !name.getFamily().get().isBlank()) {
+ System.out.println(" - Family name: " + name.getFamily().get());
+ }
+ if (name.getPrefix().isPresent() && !name.getPrefix().get().isBlank()) {
+ System.out.println(" - Prefix name: " + name.getPrefix().get());
+ }
+ if (name.getSuffix().isPresent() && !name.getSuffix().get().isBlank()) {
+ System.out.println(" - Suffix name: " + name.getSuffix().get());
+ }
+
+ if (contact.getAvatar().isPresent()) {
+ SharedContact.Avatar avatar = contact.getAvatar().get();
+ System.out.println(" - Avatar:");
+ printAttachment(avatar.getAttachment(), 3);
+ if (avatar.isProfile()) {
+ System.out.println(" - Is profile");
+ } else {
+ System.out.println(" - Is not a profile");
+ }
+ }
+
+ if (contact.getPhone().isPresent()) {
+ System.out.println(" - Phone details:");
+ for (SharedContact.Phone phone : contact.getPhone().get()) {
+ System.out.println(" - Phone:");
+ if (phone.getValue() != null) {
+ System.out.println(" - Number: " + phone.getValue());
+ }
+ if (phone.getType() != null) {
+ System.out.println(" - Type: " + phone.getType());
+ }
+ if (phone.getLabel().isPresent() && !phone.getLabel().get().isBlank()) {
+ System.out.println(" - Label: " + phone.getLabel().get());
+ }
+ }
+ }
+
+ if (contact.getEmail().isPresent()) {
+ System.out.println(" - Email details:");
+ for (SharedContact.Email email : contact.getEmail().get()) {
+ System.out.println(" - Email:");
+ if (email.getValue() != null) {
+ System.out.println(" - Value: " + email.getValue());
+ }
+ if (email.getType() != null) {
+ System.out.println(" - Type: " + email.getType());
+ }
+ if (email.getLabel().isPresent() && !email.getLabel().get().isBlank()) {
+ System.out.println(" - Label: " + email.getLabel().get());
+ }
+ }
+ }
+
+ if (contact.getAddress().isPresent()) {
+ System.out.println(" - Address details:");
+ for (SharedContact.PostalAddress address : contact.getAddress().get()) {
+ System.out.println(" - Address:");
+ if (address.getType() != null) {
+ System.out.println(" - Type: " + address.getType());
+ }
+ if (address.getLabel().isPresent() && !address.getLabel().get().isBlank()) {
+ System.out.println(" - Label: " + address.getLabel().get());
+ }
+ if (address.getStreet().isPresent() && !address.getStreet().get().isBlank()) {
+ System.out.println(" - Street: " + address.getStreet().get());
+ }
+ if (address.getPobox().isPresent() && !address.getPobox().get().isBlank()) {
+ System.out.println(" - Pobox: " + address.getPobox().get());
+ }
+ if (address.getNeighborhood().isPresent() && !address.getNeighborhood().get().isBlank()) {
+ System.out.println(" - Neighbourhood: " + address.getNeighborhood().get());
+ }
+ if (address.getCity().isPresent() && !address.getCity().get().isBlank()) {
+ System.out.println(" - City: " + address.getCity().get());
+ }
+ if (address.getRegion().isPresent() && !address.getRegion().get().isBlank()) {
+ System.out.println(" - Region: " + address.getRegion().get());
+ }
+ if (address.getPostcode().isPresent() && !address.getPostcode().get().isBlank()) {
+ System.out.println(" - Postcode: " + address.getPostcode().get());
+ }
+ if (address.getCountry().isPresent() && !address.getCountry().get().isBlank()) {
+ System.out.println(" - Country: " + address.getCountry().get());
+ }
+ }
+ }
+
+ System.out.println(" - Organisation: " + (
+ contact.getOrganization().isPresent() ? contact.getOrganization().get() : "-"
+ ));
}
}
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(" - Pack id: " + Base64.getEncoder().encodeToString(sticker.getPackId()));
+ System.out.println(" - Pack key: " + Base64.getEncoder().encodeToString(sticker.getPackKey()));
System.out.println(" - Sticker id: " + sticker.getStickerId());
// TODO also download sticker image ??
}
if (message.getQuote().isPresent()) {
SignalServiceDataMessage.Quote quote = message.getQuote().get();
System.out.println("Quote: (" + quote.getId() + ")");
- System.out.println(" Author: " + quote.getAuthor().getLegacyIdentifier());
+ System.out.println(" Author: " + m.resolveSignalServiceAddress(quote.getAuthor()).getLegacyIdentifier());
System.out.println(" Text: " + quote.getText());
+ if (quote.getMentions() != null && quote.getMentions().size() > 0) {
+ System.out.println(" Mentions: ");
+ for (SignalServiceDataMessage.Mention mention : quote.getMentions()) {
+ printMention(mention, m, 1);
+ }
+ }
if (quote.getAttachments().size() > 0) {
System.out.println(" Attachments: ");
for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
- System.out.println(" Filename: " + attachment.getFileName());
- System.out.println(" Type: " + attachment.getContentType());
- System.out.println(" Thumbnail:");
+ System.out.println(" - Filename: " + attachment.getFileName());
+ System.out.println(" Type: " + attachment.getContentType());
+ System.out.println(" Thumbnail:");
if (attachment.getThumbnail() != null) {
- printAttachment(attachment.getThumbnail());
+ printAttachment(attachment.getThumbnail(), 3);
}
}
}
System.out.println("Remote delete message: timestamp = " + remoteDelete.getTargetSentTimestamp());
}
if (message.getMentions().isPresent()) {
- final List<SignalServiceDataMessage.Mention> mentions = message.getMentions().get();
System.out.println("Mentions: ");
- for (SignalServiceDataMessage.Mention mention : mentions) {
- System.out.println("- "
- + mention.getUuid()
- + ": "
- + mention.getStart()
- + " (length: "
- + mention.getLength()
- + ")");
+ for (SignalServiceDataMessage.Mention mention : message.getMentions().get()) {
+ printMention(mention, m, 0);
}
}
if (message.getAttachments().isPresent()) {
System.out.println("Attachments: ");
for (SignalServiceAttachment attachment : message.getAttachments().get()) {
- printAttachment(attachment);
+ printAttachment(attachment, 0);
}
}
}
- private void printAttachment(SignalServiceAttachment attachment) {
- System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (
+ /**
+ * Prints the Signal mention information
+ *
+ * @param mention is the Signal mention to print
+ * @param m is the Manager. used to resolve UUIDs into phone numbers if possible
+ * @param leadingSpaces is the number of spaces you want the message to be indented by
+ */
+ private void printMention(SignalServiceDataMessage.Mention mention, Manager m, int leadingSpaces) {
+ String spaces = " ".repeat(leadingSpaces);
+ System.out.println(spaces + "- " + m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(),
+ null)).getLegacyIdentifier() + ": " + mention.getStart() + " (length: " + mention.getLength() + ")");
+ }
+
+ /**
+ * Prints the Signal attachment information
+ *
+ * @param attachment is the Signal attachment to print
+ * @param leadingSpaces is the number of spaces you want the message to be indented by
+ */
+ private void printAttachment(SignalServiceAttachment attachment, int leadingSpaces) {
+ String spaces = " ".repeat(leadingSpaces);
+ System.out.println(spaces + "- " + attachment.getContentType() + " (" + (
+ attachment.isPointer() ? "Pointer" : ""
+ ) + (
attachment.isStream() ? "Stream" : ""
) + ")");
if (attachment.isPointer()) {
final SignalServiceAttachmentPointer pointer = attachment.asPointer();
- System.out.println(" Id: " + pointer.getRemoteId() + " Key length: " + pointer.getKey().length);
- System.out.println(" Filename: " + (
+ System.out.println(spaces + " Id: " + pointer.getRemoteId() + " Key length: " + pointer.getKey().length);
+ System.out.println(spaces + " Filename: " + (
pointer.getFileName().isPresent() ? pointer.getFileName().get() : "-"
));
- System.out.println(" Size: " + (
+ System.out.println(spaces + " Size: " + (
pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>"
) + (
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());
+ System.out.println(spaces + " Voice note: " + (pointer.getVoiceNote() ? "yes" : "no"));
+ System.out.println(spaces + " Dimensions: " + pointer.getWidth() + "x" + pointer.getHeight());
File file = m.getAttachmentFile(pointer.getRemoteId());
if (file.exists()) {
- System.out.println(" Stored plaintext in: " + file);
+ System.out.println(spaces + " Stored plaintext in: " + file);
}
}
}
git.nmode.ca / signal-cli / blobdiff
