Merge branch 'dev' into device-verification

# Conflicts:
#	autotests/testfilecrypto.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/database.cpp
#	lib/database.h
#	lib/e2ee/qolmoutboundsession.cpp
#	lib/e2ee/qolmoutboundsession.h
#	lib/eventitem.h
#	lib/events/encryptedevent.cpp
#	lib/events/encryptedevent.h
#	lib/events/encryptedfile.cpp
#	lib/events/encryptedfile.h
#	lib/events/keyverificationevent.cpp
#	lib/events/keyverificationevent.h
#	lib/events/roomkeyevent.h
#	lib/room.cpp
#	lib/room.h

1 files changed, 34 insertions, 18 deletions

diff --git a/lib/database.h b/lib/database.h
index afc41e42..8a133f8e 100644
--- a/lib/database.h
+++ b/lib/database.h
@@ -11,11 +11,7 @@
 
 #include "e2ee/e2ee.h"
 
-#include "e2ee/qolmoutboundsession.h"
-
 namespace Quotient {
-class User;
-class Room;
 
 class QUOTIENT_API Database : public QObject
 {
@@ -34,21 +30,41 @@ public:
     QByteArray accountPickle();
     void setAccountPickle(const QByteArray &pickle);
     void clear();
-    void saveOlmSession(const QString& senderKey, const QString& sessionId, const QByteArray& pickle, const QDateTime& timestamp);
-    UnorderedMap<QString, std::vector<QOlmSessionPtr>> loadOlmSessions(const PicklingMode& picklingMode);
-    UnorderedMap<QString, QOlmInboundGroupSessionPtr> loadMegolmSessions(const QString& roomId, const PicklingMode& picklingMode);
-    void saveMegolmSession(const QString& roomId, const QString& sessionId, const QByteArray& pickle, const QString& senderId, const QString& olmSessionId);
-    void addGroupSessionIndexRecord(const QString& roomId, const QString& sessionId, uint32_t index, const QString& eventId, qint64 ts);
-    std::pair<QString, qint64> groupSessionIndexRecord(const QString& roomId, const QString& sessionId, qint64 index);
+    void saveOlmSession(const QString& senderKey, const QString& sessionId,
+                        const QByteArray& pickle, const QDateTime& timestamp);
+    UnorderedMap<QString, std::vector<QOlmSessionPtr>> loadOlmSessions(
+        const PicklingMode& picklingMode);
+    UnorderedMap<QString, QOlmInboundGroupSessionPtr> loadMegolmSessions(
+        const QString& roomId, const PicklingMode& picklingMode);
+    void saveMegolmSession(const QString& roomId, const QString& sessionId,
+                           const QByteArray& pickle, const QString& senderId,
+                           const QString& olmSessionId);
+    void addGroupSessionIndexRecord(const QString& roomId,
+                                    const QString& sessionId, uint32_t index,
+                                    const QString& eventId, qint64 ts);
+    std::pair<QString, qint64> groupSessionIndexRecord(const QString& roomId,
+                                                       const QString& sessionId,
+                                                       qint64 index);
     void clearRoomData(const QString& roomId);
-    void setOlmSessionLastReceived(const QString& sessionId, const QDateTime& timestamp);
-    QOlmOutboundGroupSessionPtr loadCurrentOutboundMegolmSession(const QString& roomId, const PicklingMode& picklingMode);
-    void saveCurrentOutboundMegolmSession(const QString& roomId, const PicklingMode& picklingMode, const QOlmOutboundGroupSessionPtr& data);
-    void updateOlmSession(const QString& senderKey, const QString& sessionId, const QByteArray& pickle);
+    void setOlmSessionLastReceived(const QString& sessionId,
+                                   const QDateTime& timestamp);
+    QOlmOutboundGroupSessionPtr loadCurrentOutboundMegolmSession(
+        const QString& roomId, const PicklingMode& picklingMode);
+    void saveCurrentOutboundMegolmSession(
+        const QString& roomId, const PicklingMode& picklingMode,
+        const QOlmOutboundGroupSession& session);
+    void updateOlmSession(const QString& senderKey, const QString& sessionId,
+                          const QByteArray& pickle);
 
-    // Returns a map User -> [Device] that have not received key yet
-    QHash<QString, QStringList> devicesWithoutKey(Room* room, const QString &sessionId);
-    void setDevicesReceivedKey(const QString& roomId, QHash<User *, QStringList> devices, const QString& sessionId, int index);
+    // Returns a map UserId -> [DeviceId] that have not received key yet
+    QMultiHash<QString, QString> devicesWithoutKey(
+        const QString& roomId, QMultiHash<QString, QString> devices,
+        const QString& sessionId);
+    // 'devices' contains tuples {userId, deviceId, curveKey}
+    void setDevicesReceivedKey(
+        const QString& roomId,
+        const QVector<std::tuple<QString, QString, QString>>& devices,
+        const QString& sessionId, int index);
 
     bool isSessionVerified(const QString& edKey);
     void setSessionVerified(const QString& edKeyId);
@@ -62,4 +78,4 @@ private:
 
     QString m_matrixId;
 };
-}
+} // namespace Quotient