From 593c241661148dfd80854d3e156d9a4ee60d5ab4 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 19 Jun 2020 17:56:56 +0200
Subject: Fix FTBFS and warnings with E2EE switched on

---
 lib/encryptionmanager.cpp | 3 ++-
 lib/room.cpp              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index c50459f3..4a1025b2 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -89,7 +89,8 @@ public:
     // A map from senderKey to InboundSession
     QMap<QString, InboundSession*> sessions; // TODO: cache
     void updateDeviceKeys(
-        const QHash<QString, QHash<QString, QueryKeysJob::DeviceKeys>>& deviceKeys)
+        const QHash<QString,
+                    QHash<QString, QueryKeysJob::DeviceInformation>>& deviceKeys)
     {
         for (auto userId : deviceKeys.keys()) {
             for (auto deviceId : deviceKeys.value(userId).keys()) {
diff --git a/lib/room.cpp b/lib/room.cpp
index 22ec1c82..b83d805c 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -1263,7 +1263,7 @@ RoomEventPtr Room::decryptMessage(const EncryptedEvent& encryptedEvent)
         QString decrypted = d->groupSessionDecryptMessage(
             encryptedEvent.ciphertext(), encryptedEvent.senderKey(),
             encryptedEvent.sessionId(), encryptedEvent.id(),
-            encryptedEvent.timestamp());
+            encryptedEvent.originTimestamp());
         if (decrypted.isEmpty()) {
             return {};
         }
-- 
cgit v1.2.3