Update libsignal-service-java

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / helper / IncomingMessageHandler.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 3da0c729d4a4a7289be2e875f23d40b168ac2e92..c4b1524cf7042c95bb773920e52fafdf1811f4ae 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -122,7 +122,8 @@ public final class IncomingMessageHandler {
                 actions.add(new RetrieveProfileAction(recipientId));
                 exception = new UntrustedIdentityException(account.getRecipientStore()
                         .resolveRecipientAddress(recipientId), e.getSenderDevice());
-            } catch (ProtocolInvalidKeyIdException | ProtocolInvalidKeyException | ProtocolNoSessionException | ProtocolInvalidMessageException e) {
+            } catch (ProtocolInvalidKeyIdException | ProtocolInvalidKeyException | ProtocolNoSessionException |
+                     ProtocolInvalidMessageException e) {
                 logger.debug("Failed to decrypt incoming message", e);
                 final var sender = account.getRecipientStore().resolveRecipient(e.getSender());
                 if (context.getContactHelper().isContactBlocked(sender)) {
@@ -319,11 +320,13 @@ public final class IncomingMessageHandler {
         if (syncMessage.getSent().isPresent()) {
             var message = syncMessage.getSent().get();
             final var destination = message.getDestination().orElse(null);
-            actions.addAll(handleSignalServiceDataMessage(message.getMessage(),
-                    true,
-                    sender,
-                    destination == null ? null : context.getRecipientHelper().resolveRecipient(destination),
-                    ignoreAttachments));
+            if (message.getDataMessage().isPresent()) {
+                actions.addAll(handleSignalServiceDataMessage(message.getDataMessage().get(),
+                        true,
+                        sender,
+                        destination == null ? null : context.getRecipientHelper().resolveRecipient(destination),
+                        ignoreAttachments));
+            }
         }
         if (syncMessage.getRequest().isPresent() && account.isMasterDevice()) {
             var rm = syncMessage.getRequest().get();