diff options
| author | Tobias Fella <fella@posteo.de> | 2022-04-16 23:18:14 +0200 |
|---|---|---|
| committer | Tobias Fella <fella@posteo.de> | 2022-04-16 23:18:14 +0200 |
| commit | bcde0a74e82e7dbb9eed6b108ebbb63941da34ea (patch) | |
| tree | 1c21f5f4bba2ce5275be692e5bfea628779c0044 /lib/connection.h | |
| parent | 7cd71c978f39a0bd8f82ebdf01cbaaf317ebe020 (diff) | |
| parent | 87e8d6d6ef325f176a7d3b5da441569f9b24c847 (diff) | |
| download | libquotient-bcde0a74e82e7dbb9eed6b108ebbb63941da34ea.tar.gz libquotient-bcde0a74e82e7dbb9eed6b108ebbb63941da34ea.zip | |
Merge branch 'dev' into sendmessages
Diffstat (limited to 'lib/connection.h')
| -rw-r--r-- | lib/connection.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/connection.h b/lib/connection.h index 52e1700c..12db2e30 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -319,8 +319,6 @@ 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); bool hasOlmSession(User* user, const QString& deviceId) const; QOlmOutboundGroupSessionPtr loadCurrentOutboundMegolmSession(Room* room); @@ -330,6 +328,9 @@ public: //This assumes that an olm session with (user, device) exists QPair<QOlmMessage::Type, QByteArray> olmEncryptMessage(User* user, const QString& device, const QByteArray& message); void createOlmSession(const QString& theirIdentityKey, const QString& theirOneTimeKey); + + 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; @@ -695,6 +696,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 @@ -852,6 +854,7 @@ Q_SIGNALS: void cacheStateChanged(); void lazyLoadingChanged(); void turnServersChanged(const QJsonObject& servers); + void devicesListLoaded(); protected: /** |