MamManager: Fix task is not finished when no message is encrypted

1 files changed, 9 insertions, 0 deletions

diff --git a/src/client/QXmppMamManager.cpp b/src/client/QXmppMamManager.cpp
index f173aa01..c39a3411 100644
--- a/src/client/QXmppMamManager.cpp
+++ b/src/client/QXmppMamManager.cpp
@@ -264,11 +264,14 @@ QXmppTask<QXmppMamManager::RetrieveResult> QXmppMamManager::retrieveMessages(con
             if (auto *e2eeExt = client()->encryptionExtension()) {
                 auto &messages = itr->second.messages;
                 auto running = std::make_shared<uint>(0);
+                // handle case when no message is encrypted
+                auto hasEncryptedMessages = false;
 
                 for (auto i = 0; i < messages.size(); i++) {
                     if (!e2eeExt->isEncrypted(messages.at(i))) {
                         continue;
                     }
+                    hasEncryptedMessages = true;
 
                     auto message = messages.at(i);
                     (*running)++;
@@ -290,6 +293,12 @@ QXmppTask<QXmppMamManager::RetrieveResult> QXmppMamManager::retrieveMessages(con
                         }
                     });
                 }
+
+                if (!hasEncryptedMessages) {
+                    // finish here, no decryptMessage callback will do it
+                    itr->second.finish();
+                    d->ongoingRequests.erase(itr);
+                }
             } else {
                 itr->second.finish();
                 d->ongoingRequests.erase(itr);