Room: Make sure an event with the same id isn't added twice to the timeline; forbid empty event id's

Added assertions and enhanced debug messages along the way

2 files changed, 5 insertions, 5 deletions

diff --git a/jobs/roommessagesjob.cpp b/jobs/roommessagesjob.cpp
index 1e53f601..7a0bc756 100644
--- a/jobs/roommessagesjob.cpp
+++ b/jobs/roommessagesjob.cpp
@@ -28,7 +28,7 @@ class RoomMessagesJob::Private
     public:
         Private() {}
 
-        Events events;
+        Owning<Events> events;
         QString end;
 };
 
@@ -49,9 +49,9 @@ RoomMessagesJob::~RoomMessagesJob()
     delete d;
 }
 
-Events RoomMessagesJob::events()
+Events RoomMessagesJob::releaseEvents()
 {
-    return d->events;
+    return d->events.release();
 }
 
 QString RoomMessagesJob::end()
@@ -62,7 +62,7 @@ QString RoomMessagesJob::end()
 BaseJob::Status RoomMessagesJob::parseJson(const QJsonDocument& data)
 {
     QJsonObject obj = data.object();
-    d->events = eventsFromJson(obj.value("chunk").toArray());
+    d->events.assign(eventsFromJson(obj.value("chunk").toArray()));
     d->end = obj.value("end").toString();
     return Success;
 }
diff --git a/jobs/roommessagesjob.h b/jobs/roommessagesjob.h
index 348217cc..fd6a131d 100644
--- a/jobs/roommessagesjob.h
+++ b/jobs/roommessagesjob.h
@@ -35,7 +35,7 @@ namespace QMatrixClient
                             FetchDirectory dir = FetchDirectory::Backwards, int limit=10);
             virtual ~RoomMessagesJob();
 
-            Events events();
+            Events releaseEvents();
             QString end();
 
         protected: