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/room.h | |
parent | 7cd71c978f39a0bd8f82ebdf01cbaaf317ebe020 (diff) | |
parent | 87e8d6d6ef325f176a7d3b5da441569f9b24c847 (diff) | |
download | libquotient-bcde0a74e82e7dbb9eed6b108ebbb63941da34ea.tar.gz libquotient-bcde0a74e82e7dbb9eed6b108ebbb63941da34ea.zip |
Merge branch 'dev' into sendmessages
Diffstat (limited to 'lib/room.h')
-rw-r--r-- | lib/room.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -277,7 +277,7 @@ public: int timelineSize() const; bool usesEncryption() const; RoomEventPtr decryptMessage(const EncryptedEvent& encryptedEvent); - void handleRoomKeyEvent(const RoomKeyEvent& roomKeyEvent, const QString& senderKey); + void handleRoomKeyEvent(const RoomKeyEvent& roomKeyEvent, const QString& senderId, const QString& olmSessionId); int joinedCount() const; int invitedCount() const; int totalMemberCount() const; |