import org.asamk.signal.manager.groups.GroupUtils;
import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.Util;
+import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
import org.slf4j.helpers.MessageFormatter;
-import org.whispersystems.libsignal.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceContent;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
import org.whispersystems.signalservice.api.messages.shared.SharedContact;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;
-import java.io.IOException;
+import java.util.ArrayList;
import java.util.Base64;
import java.util.stream.Collectors;
@Override
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
- try {
- printMessage(envelope, content, exception);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- private void printMessage(
- SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception
- ) throws IOException {
PlainTextWriter writer = new PlainTextWriterImpl(System.out);
if (envelope.hasSource()) {
writer.println("Got receipt.");
} else if (envelope.isSignalMessage() || envelope.isPreKeySignalMessage() || envelope.isUnidentifiedSender()) {
if (exception != null) {
- if (exception instanceof UntrustedIdentityException) {
- var e = (UntrustedIdentityException) exception;
+ if (exception instanceof ProtocolUntrustedIdentityException) {
+ var e = (ProtocolUntrustedIdentityException) exception;
writer.println(
"The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message.");
+ final var recipientName = m.resolveSignalServiceAddress(e.getSender()).getLegacyIdentifier();
writer.println(
- "Use 'signal-cli -u {0} listIdentities -n {1}', verify the key and run 'signal-cli -u {0} trust -v \"FINGER_PRINT\" {1}' to mark it as trusted",
+ "Use 'signal-cli -u {} listIdentities -n {}', verify the key and run 'signal-cli -u {} trust -v \"FINGER_PRINT\" {}' to mark it as trusted",
m.getUsername(),
- e.getName());
+ recipientName,
+ m.getUsername(),
+ recipientName);
writer.println(
"If you don't care about security, use 'signal-cli -u {} trust -a {}' to trust it without verification",
m.getUsername(),
- e.getName());
+ recipientName);
} else {
writer.println("Exception: {} ({})", exception.getMessage(), exception.getClass().getSimpleName());
}
}
if (content == null) {
- writer.println("Failed to decrypt message.");
+ writer.println("No message content");
} else {
writer.println("Sender: {} (device: {})",
formatContact(content.getSender()),
private void printDataMessage(
PlainTextWriter writer, SignalServiceDataMessage message
- ) throws IOException {
+ ) {
writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.getTimestamp()));
if (message.isViewOnce()) {
writer.println("=VIEW ONCE=");
private void printTypingMessage(
final PlainTextWriter writer, final SignalServiceTypingMessage typingMessage
- ) throws IOException {
+ ) {
writer.println("Action: {}", typingMessage.getAction());
writer.println("Timestamp: {}", DateUtils.formatTimestamp(typingMessage.getTimestamp()));
if (typingMessage.getGroupId().isPresent()) {
private void printReceiptMessage(
final PlainTextWriter writer, final SignalServiceReceiptMessage receiptMessage
- ) throws IOException {
+ ) {
writer.println("When: {}", DateUtils.formatTimestamp(receiptMessage.getWhen()));
if (receiptMessage.isDeliveryReceipt()) {
writer.println("Is delivery receipt");
private void printCallMessage(
final PlainTextWriter writer, final SignalServiceCallMessage callMessage
- ) throws IOException {
+ ) {
if (callMessage.getDestinationDeviceId().isPresent()) {
final var deviceId = callMessage.getDestinationDeviceId().get();
writer.println("Destination device id: {}", deviceId);
private void printSyncMessage(
final PlainTextWriter writer, final SignalServiceSyncMessage syncMessage
- ) throws IOException {
+ ) {
if (syncMessage.getContacts().isPresent()) {
final var contactsMessage = syncMessage.getContacts().get();
var type = contactsMessage.isComplete() ? "complete" : "partial";
DateUtils.formatTimestamp(rm.getTimestamp()));
}
}
+ if (syncMessage.getViewed().isPresent()) {
+ writer.println("Received sync viewed messages list");
+ for (var vm : syncMessage.getViewed().get()) {
+ writer.println("- From: {} Message timestamp: {}",
+ formatContact(vm.getSender()),
+ DateUtils.formatTimestamp(vm.getTimestamp()));
+ }
+ }
if (syncMessage.getRequest().isPresent()) {
String type;
if (syncMessage.getRequest().get().isContactsRequest()) {
private void printPreview(
final PlainTextWriter writer, final SignalServiceDataMessage.Preview preview
- ) throws IOException {
+ ) {
writer.println("Title: {}", preview.getTitle());
writer.println("Description: {}", preview.getDescription());
writer.println("Date: {}", DateUtils.formatTimestamp(preview.getDate()));
private void printSticker(
final PlainTextWriter writer, final SignalServiceDataMessage.Sticker sticker
- ) throws IOException {
+ ) {
writer.println("Pack id: {}", Base64.getEncoder().encodeToString(sticker.getPackId()));
writer.println("Pack key: {}", Base64.getEncoder().encodeToString(sticker.getPackKey()));
writer.println("Sticker id: {}", sticker.getStickerId());
private void printReaction(
final PlainTextWriter writer, final SignalServiceDataMessage.Reaction reaction
- ) throws IOException {
+ ) {
writer.println("Emoji: {}", reaction.getEmoji());
writer.println("Target author: {}", formatContact(m.resolveSignalServiceAddress(reaction.getTargetAuthor())));
writer.println("Target timestamp: {}", DateUtils.formatTimestamp(reaction.getTargetSentTimestamp()));
private void printQuote(
final PlainTextWriter writer, final SignalServiceDataMessage.Quote quote
- ) throws IOException {
+ ) {
writer.println("Id: {}", quote.getId());
writer.println("Author: {}", m.resolveSignalServiceAddress(quote.getAuthor()).getLegacyIdentifier());
writer.println("Text: {}", quote.getText());
}
}
- private void printSharedContact(final PlainTextWriter writer, final SharedContact contact) throws IOException {
+ private void printSharedContact(final PlainTextWriter writer, final SharedContact contact) {
writer.println("Name:");
var name = contact.getName();
writer.indent(w -> {
private void printGroupContext(
final PlainTextWriter writer, final SignalServiceGroupContext groupContext
- ) throws IOException {
+ ) {
final var groupId = GroupUtils.getGroupId(groupContext);
if (groupContext.getGroupV1().isPresent()) {
var groupInfo = groupContext.getGroupV1().get();
}
}
- private void printGroupInfo(final PlainTextWriter writer, final GroupId groupId) throws IOException {
+ private void printGroupInfo(final PlainTextWriter writer, final GroupId groupId) {
writer.println("Id: {}", groupId.toBase64());
var group = m.getGroup(groupId);
private void printMention(
PlainTextWriter writer, SignalServiceDataMessage.Mention mention
- ) throws IOException {
+ ) {
final var address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null));
writer.println("- {}: {} (length: {})", formatContact(address), mention.getStart(), mention.getLength());
}
- private void printAttachment(PlainTextWriter writer, SignalServiceAttachment attachment) throws IOException {
+ private void printAttachment(PlainTextWriter writer, SignalServiceAttachment attachment) {
writer.println("Content-Type: {}", attachment.getContentType());
writer.println("Type: {}", attachment.isPointer() ? "Pointer" : attachment.isStream() ? "Stream" : "<unknown>");
if (attachment.isPointer()) {
pointer.getPreview().isPresent() ? " (Preview is available: "
+ pointer.getPreview().get().length
+ " bytes)" : "");
- writer.println("Voice note: {}", pointer.getVoiceNote() ? "yes" : "no");
- writer.println("Borderless: {}", pointer.isBorderless() ? "yes" : "no");
+ final var flags = new ArrayList<String>();
+ if (pointer.getVoiceNote()) {
+ flags.add("voice note");
+ }
+ if (pointer.isBorderless()) {
+ flags.add("borderless");
+ }
+ if (pointer.isGif()) {
+ flags.add("video gif");
+ }
+ if (flags.size() > 0) {
+ writer.println("Flags: {}", String.join(", ", flags));
+ }
if (pointer.getWidth() > 0 || pointer.getHeight() > 0) {
writer.println("Dimensions: {}x{}", pointer.getWidth(), pointer.getHeight());
}
private String formatContact(SignalServiceAddress address) {
final var number = address.getLegacyIdentifier();
- var name = m.getContactOrProfileName(number);
- if (name == null) {
+ String name = null;
+ try {
+ name = m.getContactOrProfileName(number);
+ } catch (InvalidNumberException ignored) {
+ }
+ if (name == null || name.isEmpty()) {
return number;
} else {
return MessageFormatter.arrayFormat("“{}” {}", new Object[]{name, number}).getMessage();
git.nmode.ca / signal-cli / blobdiff
