aboutsummaryrefslogtreecommitdiff
path: root/lib/room.h
diff options
context:
space:
mode:
authorTobias Fella <fella@posteo.de>2022-04-16 23:18:14 +0200
committerTobias Fella <fella@posteo.de>2022-04-16 23:18:14 +0200
commitbcde0a74e82e7dbb9eed6b108ebbb63941da34ea (patch)
tree1c21f5f4bba2ce5275be692e5bfea628779c0044 /lib/room.h
parent7cd71c978f39a0bd8f82ebdf01cbaaf317ebe020 (diff)
parent87e8d6d6ef325f176a7d3b5da441569f9b24c847 (diff)
downloadlibquotient-bcde0a74e82e7dbb9eed6b108ebbb63941da34ea.tar.gz
libquotient-bcde0a74e82e7dbb9eed6b108ebbb63941da34ea.zip
Merge branch 'dev' into sendmessages
Diffstat (limited to 'lib/room.h')
-rw-r--r--lib/room.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/room.h b/lib/room.h
index 1a1d839f..f5199eff 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -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;