X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b9b4d846d32b5a9b342ec795c56a8a1df26cdf23..03589f858ba2cf52df4d85a9d68df3f3cda5cb74:/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 91df4b06..b39fbf22 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -5,8 +5,8 @@ import org.asamk.signal.manager.groups.GroupId; 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; @@ -18,8 +18,9 @@ import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMess 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; @@ -33,16 +34,6 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { @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()) { @@ -63,11 +54,11 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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.getName()).getLegacyIdentifier(); + final var recipientName = m.resolveSignalServiceAddress(e.getSender()).getLegacyIdentifier(); writer.println( "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(), @@ -83,7 +74,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } if (content == null) { - writer.println("Failed to decrypt message."); + writer.println("No message content"); } else { writer.println("Sender: {} (device: {})", formatContact(content.getSender()), @@ -126,7 +117,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { private void printDataMessage( PlainTextWriter writer, SignalServiceDataMessage message - ) throws IOException { + ) { writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.getTimestamp())); if (message.isViewOnce()) { writer.println("=VIEW ONCE="); @@ -209,7 +200,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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()) { @@ -221,7 +212,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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"); @@ -240,7 +231,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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); @@ -276,7 +267,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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"; @@ -295,6 +286,14 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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()) { @@ -424,7 +423,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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())); @@ -437,7 +436,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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()); @@ -447,7 +446,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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())); @@ -456,7 +455,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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()); @@ -481,7 +480,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - 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 -> { @@ -590,7 +589,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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(); @@ -615,7 +614,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - 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); @@ -628,7 +627,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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()); } @@ -653,8 +652,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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(); + 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()); } @@ -667,7 +677,11 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { private String formatContact(SignalServiceAddress address) { final var number = address.getLegacyIdentifier(); - var name = m.getContactOrProfileName(number); + String name = null; + try { + name = m.getContactOrProfileName(number); + } catch (InvalidNumberException ignored) { + } if (name == null || name.isEmpty()) { return number; } else {