diff options
author | Tobias Fella <fella@posteo.de> | 2021-06-12 18:58:54 +0200 |
---|---|---|
committer | Tobias Fella <fella@posteo.de> | 2021-12-01 21:56:11 +0100 |
commit | f89c05408bc9a4bf59366f92c50f055d527b9a28 (patch) | |
tree | 0ac634211e3efdefc5aa067f19ebd8235103d0e2 | |
parent | 2c5c990f4248a3112d26c3a92e011655064f3fcf (diff) | |
download | libquotient-f89c05408bc9a4bf59366f92c50f055d527b9a28.tar.gz libquotient-f89c05408bc9a4bf59366f92c50f055d527b9a28.zip |
Remove unrelated changes
-rw-r--r-- | lib/connection.cpp | 7 | ||||
-rw-r--r-- | lib/encryptionmanager.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index d7115885..ab5e030b 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -797,13 +797,12 @@ void Connection::Private::consumeToDeviceEvents(Events&& toDeviceEvents) return; } - visit(*sessionDecryptMessage(ee), - [this, senderKey = ee.senderKey()](const RoomKeyEvent& roomKeyEvent) { + visit(*sessionDecryptMessage(event), + [this, senderKey = event.senderKey()](const RoomKeyEvent& roomKeyEvent) { if (auto* detectedRoom = q->room(roomKeyEvent.roomId())) { detectedRoom->handleRoomKeyEvent(roomKeyEvent, senderKey); } else { - qCDebug(E2EE) - << "Encrypted event room id" << roomKeyEvent.roomId() + qCDebug(E2EE) << "Encrypted event room id" << roomKeyEvent.roomId() << "is not found at the connection" << q->objectName(); } }, diff --git a/lib/encryptionmanager.h b/lib/encryptionmanager.h index db9bff07..17f4f853 100644 --- a/lib/encryptionmanager.h +++ b/lib/encryptionmanager.h @@ -19,7 +19,6 @@ class EncryptionManager : public QObject { public: explicit EncryptionManager(QObject* parent = nullptr); ~EncryptionManager(); - QString sessionDecryptMessage(const QJsonObject& personalCipherObject, const QByteArray& senderKey, std::unique_ptr<QOlmAccount>& account); |