Fixes

quotient-im · Aug 27, 2024 · 682f857 · 682f857
1 parent 23c3f4f
commit 682f857
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/Quotient/connection.cpp b/Quotient/connection.cpp
@@ -323,7 +323,6 @@ void Connection::Private::completeSetup(const QString& mxId, const QString& devi
         ConnectionEncryptionData::setup(q, mock, encryptionData).then([this](bool successful) {
             if (!successful || !encryptionData)
                 useEncryption = false;
-            //TODO connect needssave -> saveOlmAccount?
 
             emit q->encryptionChanged(useEncryption);
             emit q->stateChanged();

diff --git a/Quotient/connectionencryptiondata_p.cpp b/Quotient/connectionencryptiondata_p.cpp
@@ -98,28 +98,35 @@ QFuture<bool> ConnectionEncryptionData::setup(Connection* connection, bool mock,
                                               std::unique_ptr<ConnectionEncryptionData>& result)
 {
     return setupPicklingKey(connection, mock, result)
-        .then([connection, mock, &result] {
+        .then([connection, &result] {
             // if (mock) {
             //     result->database.clear();
             //     result->olmAccount.setupNewAccount();
             //     return true;
             // }
-            if (const auto olmAccount = result->database.setupOlmAccount(connection->userId(), connection->deviceId())) {
+            if (const auto accountResult = result->database.setupOlmAccount(connection->userId(), connection->deviceId()); accountResult.first) {
                 //TODO: check unpickling errors here
-                result->olmAccount = olmAccount;
-                return true;
+                result->olmAccount = accountResult.first;
+                result->olmAccount->connect(result->olmAccount, &QOlmAccount::needsSave, result->olmAccount, [&result]{
+                    result->saveOlmAccount();
+                });
+
+                if (accountResult.second) {
+                    qCDebug(E2EE) << "A new Olm account has been created, uploading device keys";
+                    result->saveOlmAccount();
+                    connection->callApi<UploadKeysJob>(result->olmAccount->deviceKeys())
+                        .then(connection, [connection, &result] {
+                                result->trackedUsers += connection->userId();
+                                result->outdatedUsers += connection->userId();
+                                result->encryptionUpdateRequired = true;
+                        },
+                        [](auto* job) {
+                            qCWarning(E2EE) << "Failed to upload device keys:" << job->errorString();
+                        }
+                    );
+                }
+
             }
-            qCDebug(E2EE) << "A new Olm account has been created, uploading device keys";
-            connection->callApi<UploadKeysJob>(result->olmAccount->deviceKeys())
-                .then(connection,
-                    [connection, &result] {
-                        result->trackedUsers += connection->userId();
-                        result->outdatedUsers += connection->userId();
-                        result->encryptionUpdateRequired = true;
-                    },
-                    [](auto* job) {
-                        qCWarning(E2EE) << "Failed to upload device keys:" << job->errorString();
-                    });
             return true;
         })
         .onCanceled([connection] {

diff --git a/Quotient/database.cpp b/Quotient/database.cpp
@@ -350,13 +350,13 @@ void Database::storeOlmAccount(const QOlmAccount& olmAccount)
     commit();
 }
 
-QOlmAccount *Database::setupOlmAccount(const QString& userId, const QString& deviceId)
+std::pair<QOlmAccount*, bool> Database::setupOlmAccount(const QString& userId, const QString& deviceId)
 {
     auto query = prepareQuery(QStringLiteral("SELECT pickle FROM accounts;"));
     execute(query);
     if (query.next())
-        return QOlmAccount::unpickle(query.value(QStringLiteral("pickle")).toByteArray(), m_picklingKey, nullptr);
-    return QOlmAccount::newAccount(nullptr/*TODO*/, userId, deviceId);
+        return {QOlmAccount::unpickle(query.value(QStringLiteral("pickle")).toByteArray(), m_picklingKey, nullptr), false};
+    return {QOlmAccount::newAccount(nullptr/*TODO*/, userId, deviceId), true};
     return {};
 }
 

diff --git a/Quotient/database.h b/Quotient/database.h
@@ -33,7 +33,7 @@ class QUOTIENT_API Database
     QSqlQuery prepareQuery(const QString& queryString) const;
 
     void storeOlmAccount(const QOlmAccount& olmAccount);
-    QOlmAccount *setupOlmAccount(const QString& userId, const QString& deviceId);
+    std::pair<QOlmAccount*, bool> setupOlmAccount(const QString& userId, const QString& deviceId);
     void clear();
     void saveOlmSession(const QByteArray& senderKey, const QOlmSession& session,
                         const QDateTime& timestamp);

diff --git a/Quotient/e2ee/qolminboundsession.cpp b/Quotient/e2ee/qolminboundsession.cpp
@@ -43,7 +43,7 @@ QOlmExpected<QOlmInboundGroupSession> QOlmInboundGroupSession::unpickle(
     //TODO: This is terrible :(
     std::array<std::uint8_t, 32> _key;
     std::copy(key.data(), key.data() + 32, _key.begin());
-    auto session = megolm::inbound_group_session_from_pickle(rust::String(keyBytes.data(), keyBytes.size()), _key);
+    auto session = megolm::inbound_group_session_from_pickle(rust::String(pickled.data(), pickled.size()), _key);
     return QOlmInboundGroupSession(std::move(session));
 }