Avoid overwriting local changes with remote modifications.

The case we ran into is the following:
* Fetching the full payload and marking all messages of a thread as read
happens simultaneously.
* The local modification to mark as read gets immediately overwritten
when the full payload arrives.
* Eventually the modification gets replayed to the server though (and
the reversal isn't because coming from the source), so on next sync the
situation fixes itself.

To be able to improve this we try to protect local modifications in that
properties that have been modified since baseRevision (which currently
isn't, but should be equal to the last to the server replayed revision)
are not overwritten. This conflict resolution strategy thus always
prefers local modifications. baseRevision is currently set to the
current maximum revision of the store at the time when the resource
creates the modification.

1 files changed, 3 insertions, 3 deletions

diff --git a/common/entitybuffer.h b/common/entitybuffer.h
index d73a138..31e6aed 100644
--- a/common/entitybuffer.h
+++ b/common/entitybuffer.h
@@ -25,9 +25,9 @@ public:
      * Note that @param data will need to remain valid and the data is not copied.
      */
     EntityBuffer(const QByteArray &data);
-    const uint8_t *resourceBuffer();
-    const uint8_t *metadataBuffer();
-    const uint8_t *localBuffer();
+    const uint8_t *resourceBuffer() const;
+    const uint8_t *metadataBuffer() const;
+    const uint8_t *localBuffer() const;
     const Entity &entity() const;
     bool isValid() const;