diff options
| author | Tobias Fella <fella@posteo.de> | 2021-05-24 18:01:27 +0200 |
|---|---|---|
| committer | Tobias Fella <fella@posteo.de> | 2021-12-01 21:34:52 +0100 |
| commit | 1186c9fc980f9659191df4b3f5b540befe946dfa (patch) | |
| tree | 2ef44aed9dcd6e1396711c3a9e54797f9f964a7a | |
| parent | 65877dc9fb6e024d456343d42ef55e0c5c8b67b3 (diff) | |
| download | libquotient-1186c9fc980f9659191df4b3f5b540befe946dfa.tar.gz libquotient-1186c9fc980f9659191df4b3f5b540befe946dfa.zip | |
Make sure that only one upload is running
| -rw-r--r-- | lib/connection.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index 9883b8f3..b91a1a90 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -110,6 +110,7 @@ public: #ifdef Quotient_E2EE_ENABLED std::unique_ptr<QOlmAccount> olmAccount; //QScopedPointer<EncryptionManager> encryptionManager; + bool isUploadingKeys = false; #endif // Quotient_E2EE_ENABLED QPointer<GetWellknownJob> resolverJob = nullptr; @@ -620,7 +621,8 @@ void Connection::onSyncSuccess(SyncData&& data, bool fromCache) d->consumePresenceData(data.takePresenceData()); d->consumeToDeviceEvents(data.takeToDeviceEvents()); #ifdef Quotient_E2EE_ENABLED - if(data.deviceOneTimeKeysCount()["signed_curve25519"] < 0.4 * d->olmAccount->maxNumberOfOneTimeKeys()) { + if(data.deviceOneTimeKeysCount()["signed_curve25519"] < 0.4 * d->olmAccount->maxNumberOfOneTimeKeys() && !d->isUploadingKeys) { + d->isUploadingKeys = true; d->olmAccount->generateOneTimeKeys(d->olmAccount->maxNumberOfOneTimeKeys() - data.deviceOneTimeKeysCount()["signed_curve25519"]); auto keys = d->olmAccount->oneTimeKeys(); auto job = d->olmAccount->createUploadKeyRequest(keys); @@ -628,6 +630,9 @@ void Connection::onSyncSuccess(SyncData&& data, bool fromCache) connect(job, &BaseJob::success, this, [=](){ d->olmAccount->markKeysAsPublished(); }); + connect(job, &BaseJob::result, this, [=](){ + d->isUploadingKeys = false; + }); } #endif // Quotient_E2EE_ENABLED } |