diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-04-16 22:23:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 22:23:53 +0200 |
| commit | 87e8d6d6ef325f176a7d3b5da441569f9b24c847 (patch) | |
| tree | 671133c8974569b182a27d82d627929addeb5ad6 /lib/connection.h | |
| parent | fc3ad90a054e3c674127a0cdd385ddbb98cf2010 (diff) | |
| parent | c0c4cd014718fdb54ee691ccbdab46981e15d25f (diff) | |
| download | libquotient-87e8d6d6ef325f176a7d3b5da441569f9b24c847.tar.gz libquotient-87e8d6d6ef325f176a7d3b5da441569f9b24c847.zip | |
Merge pull request #544 from TobiasFella/checkedkey
Check edKey when receiving an olm message and prepare for MSC 3700
Diffstat (limited to 'lib/connection.h')
| -rw-r--r-- | lib/connection.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/connection.h b/lib/connection.h index a4986b06..29731593 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -317,8 +317,8 @@ public: #ifdef Quotient_E2EE_ENABLED QOlmAccount* olmAccount() const; Database* database(); - UnorderedMap<std::pair<QString, QString>, QOlmInboundGroupSessionPtr> loadRoomMegolmSessions(Room* room); - void saveMegolmSession(Room* room, const QString& senderKey, QOlmInboundGroupSession* session, const QString& ed25519Key); + UnorderedMap<QString, QOlmInboundGroupSessionPtr> loadRoomMegolmSessions(Room* room); + void saveMegolmSession(Room* room, QOlmInboundGroupSession* session); #endif // Quotient_E2EE_ENABLED Q_INVOKABLE Quotient::SyncJob* syncJob() const; Q_INVOKABLE int millisToReconnect() const; @@ -684,6 +684,7 @@ public Q_SLOTS: QStringList devicesForUser(User* user) const; QString curveKeyForUserDevice(const QString &user, const QString& device) const; QString edKeyForUserDevice(const QString& user, const QString& device) const; + bool isKnownCurveKey(const QString& user, const QString& curveKey); #endif Q_SIGNALS: /// \brief Initial server resolution has failed @@ -841,6 +842,7 @@ Q_SIGNALS: void cacheStateChanged(); void lazyLoadingChanged(); void turnServersChanged(const QJsonObject& servers); + void devicesListLoaded(); protected: /** |