Improve decryption error logging

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 ac06baabf6584df77c0fd48cfd3358cd53701a2c..0b9cc80d73290ac465f5a5e523ee6e77ce996f13 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
@@ -2,8 +2,6 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.SignalDependencies;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.SignalDependencies;

-import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.api.UntrustedIdentityException;

 import org.asamk.signal.manager.actions.HandleAction;
 import org.asamk.signal.manager.actions.RefreshPreKeysAction;
 import org.asamk.signal.manager.actions.RenewSessionAction;
 import org.asamk.signal.manager.actions.HandleAction;
 import org.asamk.signal.manager.actions.RefreshPreKeysAction;
 import org.asamk.signal.manager.actions.RenewSessionAction;


@@ -22,6 +20,8 @@ import org.asamk.signal.manager.actions.SendSyncKeysAction;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.StickerPackId;

+import org.asamk.signal.manager.api.TrustLevel;
+import org.asamk.signal.manager.api.UntrustedIdentityException;

 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupUtils;


@@ -228,7 +228,10 @@ public final class IncomingMessageHandler {
 
         if (content.getDecryptionErrorMessage().isPresent()) {
             var message = content.getDecryptionErrorMessage().get();
 
         if (content.getDecryptionErrorMessage().isPresent()) {
             var message = content.getDecryptionErrorMessage().get();

-            logger.debug("Received a decryption error message (resend request for {})", message.getTimestamp());
+            logger.debug("Received a decryption error message from {}.{} (resend request for {})",
+                    sender,
+                    senderDeviceId,
+                    message.getTimestamp());

             if (message.getDeviceId() == account.getDeviceId()) {
                 handleDecryptionErrorMessage(actions, sender, senderDeviceId, message);
             } else {
             if (message.getDeviceId() == account.getDeviceId()) {
                 handleDecryptionErrorMessage(actions, sender, senderDeviceId, message);
             } else {

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index aedd29a2c9290b3382bc51e2cd7efa1d505a3b69..712d5a31669b65f6c660f25656969e7bf8af1405 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -213,6 +213,7 @@ public class SendHelper {
     public SendMessageResult resendMessage(
             final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry
     ) {
     public SendMessageResult resendMessage(
             final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry
     ) {

+        logger.trace("Resending message {} to {}", timestamp, recipientId);

         if (messageSendLogEntry.groupId().isEmpty()) {
             return handleSendMessage(recipientId,
                     (messageSender, address, unidentifiedAccess) -> messageSender.resendContent(address,
         if (messageSendLogEntry.groupId().isEmpty()) {
             return handleSendMessage(recipientId,
                     (messageSender, address, unidentifiedAccess) -> messageSender.resendContent(address,