Merge branch '1.8' into 1.9

qxmpp-project · Jan 14, 2025 · a6d336b · a6d336b
2 parents 168e564 + cc202b9
commit a6d336b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
@@ -375,7 +375,6 @@ QXmppTask<bool> Manager::load()
             return;
         } else {
             d->signedPreKeyPairs = signedPreKeyPairs;
-            d->renewSignedPreKeyPairs();
         }
 
         const auto &preKeyPairs = omemoData.preKeyPairs;

diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
@@ -723,8 +723,8 @@ void ManagerPrivate::renewSignedPreKeyPairs()
         // Remove signed pre key pairs older than
         // SIGNED_PRE_KEY_RENEWAL_INTERVAL.
         if (currentDate - creationDate > SIGNED_PRE_KEY_RENEWAL_INTERVAL) {
-            itr = signedPreKeyPairs.erase(itr);
             omemoStorage->removeSignedPreKeyPair(itr.key());
+            itr = signedPreKeyPairs.erase(itr);
             isSignedPreKeyPairRemoved = true;
         } else {
             ++itr;