Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 91 insertions, 88 deletions

diff --git a/lib/syncdata.h b/lib/syncdata.h
index 8694626e..67d04557 100644
--- a/lib/syncdata.h
+++ b/lib/syncdata.h
@@ -13,104 +13,107 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "joinstate.h"
+
 #include "events/stateevent.h"
 
-namespace QMatrixClient {
-    /// Room summary, as defined in MSC688
-    /**
-     * Every member of this structure is an Omittable; as per the MSC, only
-     * changed values are sent from the server so if nothing is in the payload
-     * the respective member will be omitted. In particular, `heroes.omitted()`
-     * means that nothing has come from the server; heroes.value().isEmpty()
-     * means a peculiar case of a room with the only member - the current user.
+namespace Quotient {
+/// Room summary, as defined in MSC688
+/**
+ * Every member of this structure is an Omittable; as per the MSC, only
+ * changed values are sent from the server so if nothing is in the payload
+ * the respective member will be omitted. In particular, `heroes.omitted()`
+ * means that nothing has come from the server; heroes.value().isEmpty()
+ * means a peculiar case of a room with the only member - the current user.
+ */
+struct RoomSummary {
+    Omittable<int> joinedMemberCount;
+    Omittable<int> invitedMemberCount;
+    Omittable<QStringList> heroes; //< mxids of users to take part in the room
+                                   // name
+
+    bool isEmpty() const;
+    /// Merge the contents of another RoomSummary object into this one
+    /// \return true, if the current object has changed; false otherwise
+    bool merge(const RoomSummary& other);
+};
+QDebug operator<<(QDebug dbg, const RoomSummary& rs);
+
+
+template <>
+struct JsonObjectConverter<RoomSummary> {
+    static void dumpTo(QJsonObject& jo, const RoomSummary& rs);
+    static void fillFrom(const QJsonObject& jo, RoomSummary& rs);
+};
+
+class SyncRoomData {
+public:
+    QString roomId;
+    JoinState joinState;
+    RoomSummary summary;
+    StateEvents state;
+    RoomEvents timeline;
+    Events ephemeral;
+    Events accountData;
+
+    bool timelineLimited;
+    QString timelinePrevBatch;
+    int unreadCount;
+    int highlightCount;
+    int notificationCount;
+
+    SyncRoomData(const QString& roomId, JoinState joinState_,
+                 const QJsonObject& room_);
+    SyncRoomData(SyncRoomData&&) = default;
+    SyncRoomData& operator=(SyncRoomData&&) = default;
+
+    static const QString UnreadCountKey;
+};
+
+// QVector cannot work with non-copyable objects, std::vector can.
+using SyncDataList = std::vector<SyncRoomData>;
+
+class SyncData {
+public:
+    SyncData() = default;
+    explicit SyncData(const QString& cacheFileName);
+    /** Parse sync response into room events
+     * \param json response from /sync or a room state cache
+     * \return the list of rooms with missing cache files; always
+     *         empty when parsing response from /sync
      */
-    struct RoomSummary
+    void parseJson(const QJsonObject& json, const QString& baseDir = {});
+
+    Events&& takePresenceData();
+    Events&& takeAccountData();
+    Events&& takeToDeviceEvents();
+    const QHash<QString, int>& deviceOneTimeKeysCount() const
     {
-        Omittable<int> joinedMemberCount;
-        Omittable<int> invitedMemberCount;
-        Omittable<QStringList> heroes; //< mxids of users to take part in the room name
+        return deviceOneTimeKeysCount_;
+    }
+    SyncDataList&& takeRoomData();
 
-        bool isEmpty() const;
-        /// Merge the contents of another RoomSummary object into this one
-        /// \return true, if the current object has changed; false otherwise
-        bool merge(const RoomSummary& other);
+    QString nextBatch() const { return nextBatch_; }
 
-        friend QDebug operator<<(QDebug dbg, const RoomSummary& rs);
-    };
+    QStringList unresolvedRooms() const { return unresolvedRoomIds; }
 
-    template <>
-    struct JsonObjectConverter<RoomSummary>
-    {
-        static void dumpTo(QJsonObject& jo, const RoomSummary& rs);
-        static void fillFrom(const QJsonObject& jo, RoomSummary& rs);
-    };
+    static std::pair<int, int> cacheVersion() { return { 11, 0 }; }
+    static QString fileNameForRoom(QString roomId);
 
-    class SyncRoomData
-    {
-        public:
-            QString roomId;
-            JoinState joinState;
-            RoomSummary summary;
-            StateEvents state;
-            RoomEvents timeline;
-            Events ephemeral;
-            Events accountData;
-
-            bool timelineLimited;
-            QString timelinePrevBatch;
-            int unreadCount;
-            int highlightCount;
-            int notificationCount;
-
-            SyncRoomData(const QString& roomId, JoinState joinState_,
-                         const QJsonObject& room_);
-            SyncRoomData(SyncRoomData&&) = default;
-            SyncRoomData& operator=(SyncRoomData&&) = default;
-
-            static const QString UnreadCountKey;
-    };
-
-    // QVector cannot work with non-copiable objects, std::vector can.
-    using SyncDataList = std::vector<SyncRoomData>;
-
-    class SyncData
-    {
-        public:
-            SyncData() = default;
-            explicit SyncData(const QString& cacheFileName);
-            /** Parse sync response into room events
-             * \param json response from /sync or a room state cache
-             * \return the list of rooms with missing cache files; always
-             *         empty when parsing response from /sync
-             */
-            void parseJson(const QJsonObject& json, const QString& baseDir = {});
-
-            Events&& takePresenceData();
-            Events&& takeAccountData();
-            Events&& takeToDeviceEvents();
-            SyncDataList&& takeRoomData();
-
-            QString nextBatch() const { return nextBatch_; }
-
-            QStringList unresolvedRooms() const { return unresolvedRoomIds; }
-
-            static std::pair<int, int> cacheVersion() { return { 10, 0 }; }
-            static QString fileNameForRoom(QString roomId);
-
-        private:
-            QString nextBatch_;
-            Events presenceData;
-            Events accountData;
-            Events toDeviceEvents;
-            SyncDataList roomData;
-            QStringList unresolvedRoomIds;
-
-            static QJsonObject loadJson(const QString& fileName);
-    };
-}  // namespace QMatrixClient
+private:
+    QString nextBatch_;
+    Events presenceData;
+    Events accountData;
+    Events toDeviceEvents;
+    SyncDataList roomData;
+    QStringList unresolvedRoomIds;
+    QHash<QString, int> deviceOneTimeKeysCount_;
+
+    static QJsonObject loadJson(const QString& fileName);
+};
+} // namespace Quotient