From 9225eaec426ecd44a1c203e11e1aafe7772c46d7 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 9 Dec 2018 19:55:14 +0900
Subject: Room: track more changes; fix cache smashing upon restart

Commit fd52459 introduced a regression rendering the cache unusable
after a client restart (an empty state overwrites whatever state was in
the cache). This commit contains the fix, along with more room change
tracking.
---
 lib/room.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/room.h')

diff --git a/lib/room.h b/lib/room.h
index 97d8454a..7b5be331 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -120,8 +120,9 @@ namespace QMatrixClient
                 EncryptionOn = 0x100,
                 AccountDataChange = 0x200,
                 SummaryChange = 0x400,
-                OtherChange = 0x1000,
-                AnyChange = 0x1FFF
+                ReadMarkerChange = 0x800,
+                OtherChange = 0x8000,
+                AnyChange = 0xFFFF
             };
             Q_DECLARE_FLAGS(Changes, Change)
             Q_FLAG(Changes)
@@ -467,7 +468,7 @@ namespace QMatrixClient
         protected:
             /// Returns true if any of room names/aliases has changed
             virtual Changes processStateEvent(const RoomEvent& e);
-            virtual void processEphemeralEvent(EventPtr&& event);
+            virtual Changes processEphemeralEvent(EventPtr&& event);
             virtual Changes processAccountDataEvent(EventPtr&& event);
             virtual void onAddNewTimelineEvents(timeline_iter_t /*from*/) { }
             virtual void onAddHistoricalTimelineEvents(rev_iter_t /*from*/) { }
-- 
cgit v1.2.3