[network/ruqola] src/core/localdatabase: Add missing account name

Git commit 85bb7da1af80ab6e3e96f49b00d572171759e680 by Laurent Montel.
Committed on 04/08/2026 at 11:25.
Pushed by mlaurent into branch 'master'.

Add missing account name

M  +9    -9    src/core/localdatabase/e2edatabase.cpp
M  +5    -5    src/core/localdatabase/e2edatabase.h

https://invent.kde.org/network/ruqola/-/commit/85bb7da1af80ab6e3e96f49b00d572171759e680

diff --git a/src/core/localdatabase/e2edatabase.cpp b/src/core/localdatabase/e2edatabase.cpp
index e7bc7e4839..71f1effd53 100644
--- a/src/core/localdatabase/e2edatabase.cpp
+++ b/src/core/localdatabase/e2edatabase.cpp
@@ -30,10 +30,10 @@ QString E2EDataBase::schemaDataBase() const
     return QString::fromLatin1(s_schemaE2EKeyStore);
 }
 
-bool E2EDataBase::saveKey(const QString &userId, const QByteArray &encryptedPrivateKey, const QByteArray &publicKey)
+bool E2EDataBase::saveKey(const QString &accountName, const QString &userId, const QByteArray &encryptedPrivateKey, const QByteArray &publicKey)
 {
     QSqlDatabase db;
-    if (!initializeDataBase(userId, db)) {
+    if (!initializeDataBase(accountName, db)) {
         return false;
     }
     QSqlQuery query(db);
@@ -48,10 +48,10 @@ bool E2EDataBase::saveKey(const QString &userId, const QByteArray &encryptedPriv
     return true;
 }
 
-bool E2EDataBase::loadKey(const QString &userId, QByteArray &encryptedPrivateKey, QByteArray &publicKey)
+bool E2EDataBase::loadKey(const QString &accountName, const QString &userId, QByteArray &encryptedPrivateKey, QByteArray &publicKey)
 {
     QSqlDatabase db;
-    if (!initializeDataBase(userId, db)) {
+    if (!initializeDataBase(accountName, db)) {
         return false;
     }
     QSqlQuery query(db);
@@ -65,10 +65,10 @@ bool E2EDataBase::loadKey(const QString &userId, QByteArray &encryptedPrivateKey
     return false;
 }
 
-bool E2EDataBase::deleteKey(const QString &userId)
+bool E2EDataBase::deleteKey(const QString &accountName, const QString &userId)
 {
     QSqlDatabase db;
-    if (!initializeDataBase(userId, db)) {
+    if (!initializeDataBase(accountName, db)) {
         return false;
     }
     QSqlQuery query(db);
@@ -81,10 +81,10 @@ bool E2EDataBase::deleteKey(const QString &userId)
     return true;
 }
 
-bool E2EDataBase::hasKey(const QString &userId)
+bool E2EDataBase::hasKey(const QString &accountName, const QString &userId)
 {
     QSqlDatabase db;
-    if (!initializeDataBase(userId, db)) {
+    if (!initializeDataBase(accountName, db)) {
         return false;
     }
     QSqlQuery query(db);
@@ -93,7 +93,7 @@ bool E2EDataBase::hasKey(const QString &userId)
     return query.exec() && query.first();
 }
 
-std::unique_ptr<QSqlTableModel> E2EDataBase::createAccountsModel(const QString &accountName) const
+std::unique_ptr<QSqlTableModel> E2EDataBase::createE2eModel(const QString &accountName) const
 {
     const QString dbName = databaseName(accountName);
     QSqlDatabase db = QSqlDatabase::database(dbName);
diff --git a/src/core/localdatabase/e2edatabase.h b/src/core/localdatabase/e2edatabase.h
index 1734a8b44c..4144c935b4 100644
--- a/src/core/localdatabase/e2edatabase.h
+++ b/src/core/localdatabase/e2edatabase.h
@@ -14,12 +14,12 @@ public:
     E2EDataBase();
     ~E2EDataBase() override;
 
-    [[nodiscard]] bool saveKey(const QString &userId, const QByteArray &encryptedPrivateKey, const QByteArray &publicKey);
-    [[nodiscard]] bool loadKey(const QString &userId, QByteArray &encryptedPrivateKey, QByteArray &publicKey);
-    [[nodiscard]] bool deleteKey(const QString &userId);
-    [[nodiscard]] bool hasKey(const QString &userId);
+    [[nodiscard]] bool saveKey(const QString &accountName, const QString &userId, const QByteArray &encryptedPrivateKey, const QByteArray &publicKey);
+    [[nodiscard]] bool loadKey(const QString &accountName, const QString &userId, QByteArray &encryptedPrivateKey, QByteArray &publicKey);
+    [[nodiscard]] bool deleteKey(const QString &accountName, const QString &userId);
+    [[nodiscard]] bool hasKey(const QString &accountName, const QString &userId);
 
-    [[nodiscard]] std::unique_ptr<QSqlTableModel> createAccountsModel(const QString &accountName) const;
+    [[nodiscard]] std::unique_ptr<QSqlTableModel> createE2eModel(const QString &accountName) const;
 
 protected:
     [[nodiscard]] QString schemaDataBase() const override;