From: alex-z <blackslayer4@gmail.com>
Date: Thu, 7 Sep 2023 15:43:43 +0000 (+0200)
Subject: Store the new etag into local database when opening with auto-locking/manual locking... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~9^2~10^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b45da619a47ee81c2e3b9f86f9b607bc5440223d;p=nextcloud-desktop.git

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

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

diff --git a/src/libsync/lockfilejobs.cpp b/src/libsync/lockfilejobs.cpp
index 77f01c3ba..477045139 100644
--- 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 be3c436b5..50e02016b 100644
--- 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;