From a61678242b91944c07bf4b82b4eb25baad0db00b Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sat, 24 Jul 2021 14:59:14 +0200
Subject: [PATCH] Fix edge case that could lead to no new one time keys being
 uploaded

---
 src/ChatPage.cpp | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 6b8c1e10..615a15b3 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -929,31 +929,33 @@ ChatPage::currentPresence() const
 void
 ChatPage::ensureOneTimeKeyCount(const std::map<std::string, uint16_t> &counts)
 {
-        for (const auto &entry : counts) {
-                if (entry.second < MAX_ONETIME_KEYS) {
-                        const int nkeys = MAX_ONETIME_KEYS - entry.second;
+        uint16_t count = 0;
+        if (auto c = counts.find(mtx::crypto::SIGNED_CURVE25519); c != counts.end())
+                count = c->second;
 
-                        nhlog::crypto()->info("uploading {} {} keys", nkeys, entry.first);
-                        olm::client()->generate_one_time_keys(nkeys);
+        if (count < MAX_ONETIME_KEYS) {
+                const int nkeys = MAX_ONETIME_KEYS - count;
 
-                        http::client()->upload_keys(
-                          olm::client()->create_upload_keys_request(),
-                          [](const mtx::responses::UploadKeys &, mtx::http::RequestErr err) {
-                                  if (err) {
-                                          nhlog::crypto()->warn(
-                                            "failed to update one-time keys: {} {} {}",
-                                            err->matrix_error.error,
-                                            static_cast<int>(err->status_code),
-                                            static_cast<int>(err->error_code));
+                nhlog::crypto()->info(
+                  "uploading {} {} keys", nkeys, mtx::crypto::SIGNED_CURVE25519);
+                olm::client()->generate_one_time_keys(nkeys);
 
-                                          if (err->status_code < 400 || err->status_code >= 500)
-                                                  return;
-                                  }
+                http::client()->upload_keys(
+                  olm::client()->create_upload_keys_request(),
+                  [](const mtx::responses::UploadKeys &, mtx::http::RequestErr err) {
+                          if (err) {
+                                  nhlog::crypto()->warn("failed to update one-time keys: {} {} {}",
+                                                        err->matrix_error.error,
+                                                        static_cast<int>(err->status_code),
+                                                        static_cast<int>(err->error_code));
 
-                                  // mark as published anyway, otherwise we may end up in a loop.
-                                  olm::mark_keys_as_published();
-                          });
-                }
+                                  if (err->status_code < 400 || err->status_code >= 500)
+                                          return;
+                          }
+
+                          // mark as published anyway, otherwise we may end up in a loop.
+                          olm::mark_keys_as_published();
+                  });
         }
 }