]> nmode's Git Repositories - signal-cli/commitdiff
Clear queued message actions after handling
authorAsamK <asamk@gmx.de>
Fri, 15 Oct 2021 17:40:45 +0000 (19:40 +0200)
committerAsamK <asamk@gmx.de>
Fri, 15 Oct 2021 18:01:54 +0000 (20:01 +0200)
Fixes #777

lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java

index d2ffaaabe577d8c6d2a7bf749a24fe70712ce457..668c0b13204bd3f536dfb6afcc6fbecb12bc806a 100644 (file)
@@ -939,9 +939,11 @@ public class ManagerImpl implements Manager {
 
             if (hasCaughtUpWithOldMessages) {
                 handleQueuedActions(queuedActions);
+                queuedActions.clear();
             }
             if (cachedMessage[0] != null) {
                 if (exception instanceof UntrustedIdentityException) {
+                    logger.debug("Keeping message with untrusted identity in message cache");
                     final var address = ((UntrustedIdentityException) exception).getSender();
                     final var recipientId = resolveRecipient(address);
                     if (!envelope.hasSourceUuid()) {
@@ -958,6 +960,7 @@ public class ManagerImpl implements Manager {
             }
         }
         handleQueuedActions(queuedActions);
+        queuedActions.clear();
     }
 
     @Override
@@ -966,6 +969,7 @@ public class ManagerImpl implements Manager {
     }
 
     private void handleQueuedActions(final Collection<HandleAction> queuedActions) {
+        logger.debug("Handling message actions");
         var interrupted = false;
         for (var action : queuedActions) {
             try {