Store the new etag into local database when opening with auto-locking/manual locking...

Signed-off-by: alex-z <blackslayer4@gmail.com>

diff --git a/src/libsync/lockfilejobs.cpp b/src/libsync/lockfilejobs.cpp
index 77f01c3ba034bfcd32cd29609461f0c40bdf122b..47704513938fe1e36510414ba9e0cc257d080220 100644 (file)
--- a/src/libsync/lockfilejobs.cpp
+++ b/src/libsync/lockfilejobs.cpp
@@ -104,6 +104,9 @@ void LockFileJob::setFileRecordLocked(SyncJournalFileRecord &record) const
     record._lockstate._lockEditorApp = _editorName;
     record._lockstate._lockTime = _lockTime;
     record._lockstate._lockTimeout = _lockTimeout;
+    if (!_etag.isEmpty()) {
+        record._etag = _etag;
+    }
 }
 
 void LockFileJob::resetState()
@@ -223,6 +226,8 @@ void LockFileJob::decodeStartElement(const QString &name,
         }
     } else if (name == QStringLiteral("lock-owner-editor")) {
         _editorName = reader.readElementText();
+    } else if (name == QStringLiteral("getetag")) {
+        _etag = reader.readElementText().toUtf8();
     }
 }
 

diff --git a/src/libsync/lockfilejobs.h b/src/libsync/lockfilejobs.h
index be3c436b5ec1305cfb4d578f687448f4fbd31f63..50e02016b7d205541f0fa7bf01d6f3012417501b 100644 (file)
--- a/src/libsync/lockfilejobs.h
+++ b/src/libsync/lockfilejobs.h
@@ -54,6 +54,7 @@ private:
     QString _userDisplayName;
     QString _editorName;
     QString _userId;
+    QByteArray _etag;
     qint64 _lockTime = 0;
     qint64 _lockTimeout = 0;
     QString _remoteSyncPathWithTrailingSlash;