Use different lock types.

Signed-off-by: alex-z <[email protected]>
nextcloud · Jan 18, 2024 · 16926c0 · 16926c0
1 parent 9131ef2
commit 16926c0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/src/gui/editlocallyjob.cpp b/src/gui/editlocallyjob.cpp
@@ -651,7 +651,7 @@ void EditLocallyJob::lockFile()
                                                                 _folderForFile->path(),
                                                                 _folderForFile->journalDb(),
                                                                 SyncFileItem::LockStatus::LockedItem,
-                                                                SyncFileItem::LockOwnerType::AppLock);
+                                                                SyncFileItem::LockOwnerType::TokenLock);
 }
 
 void EditLocallyJob::disconnectFolderSignals()

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -649,7 +649,7 @@ void Folder::slotFilesLockReleased(const QSet<QString> &files)
         }
         const auto canUnlockFile = isFileRecordValid
             && rec._lockstate._locked
-            && rec._lockstate._lockOwnerType == static_cast<qint64>(SyncFileItem::LockOwnerType::AppLock)
+            && rec._lockstate._lockOwnerType == static_cast<qint64>(SyncFileItem::LockOwnerType::TokenLock)
             && rec._lockstate._lockOwnerId == _accountState->account()->davUser();
 
         if (!canUnlockFile) {
@@ -721,7 +721,7 @@ void Folder::slotLockedFilesFound(const QSet<QString> &files)
                                                    path(),
                                                    journalDb(),
                                                    SyncFileItem::LockStatus::LockedItem,
-                                                   SyncFileItem::LockOwnerType::AppLock);
+                                                   SyncFileItem::LockOwnerType::TokenLock);
     }
 }
 

diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
@@ -1092,9 +1092,7 @@ void SocketApi::setFileLock(const QString &localFile, const SyncFileItem::LockSt
     }
 
     const auto record = fileData.journalRecord();
-    const auto canAffectLockState = static_cast<SyncFileItem::LockOwnerType>(record._lockstate._lockOwnerType) == SyncFileItem::LockOwnerType::NoLock
-        || static_cast<SyncFileItem::LockOwnerType>(record._lockstate._lockOwnerType) == SyncFileItem::LockOwnerType::UserLock; 
-    if (!canAffectLockState) {
+    if (static_cast<SyncFileItem::LockOwnerType>(record._lockstate._lockOwnerType) != SyncFileItem::LockOwnerType::UserLock) {
         qCDebug(lcSocketApi) << "Only user lock state or non-locked files can be affected manually!";
         return;
     }

diff --git a/src/libsync/lockfilejobs.cpp b/src/libsync/lockfilejobs.cpp
@@ -52,9 +52,9 @@ void LockFileJob::start()
     QNetworkRequest request;
     request.setRawHeader(QByteArrayLiteral("X-User-Lock"), QByteArrayLiteral("1"));
     if (_account->capabilities().filesLockTypeAvailable()) {
-        if (_requestedLockOwnerType == SyncFileItem::LockOwnerType::AppLock) {
-            request.setRawHeader(QByteArrayLiteral("X-User-Lock-Type"), ("1"));
-        } else if (_requestedLockOwnerType == SyncFileItem::LockOwnerType::UserLock) {
+        if (_requestedLockOwnerType == SyncFileItem::LockOwnerType::UserLock) {
+            request.setRawHeader(QByteArrayLiteral("X-User-Lock-Type"), ("0"));
+        } else if (_requestedLockOwnerType == SyncFileItem::LockOwnerType::TokenLock) {
             request.setRawHeader(QByteArrayLiteral("X-User-Lock-Type"), ("2"));
         }
     }
@@ -215,7 +215,7 @@ void LockFileJob::decodeStartElement(const QString &name,
         if (isValid) {
             _lockOwnerType = static_cast<SyncFileItem::LockOwnerType>(convertedValue);
         } else {
-            _lockOwnerType = SyncFileItem::LockOwnerType::NoLock;
+            _lockOwnerType = SyncFileItem::LockOwnerType::UserLock;
         }
     } else if (name == QStringLiteral("lock-owner-displayname")) {
         _userDisplayName = reader.readElementText();

diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
@@ -115,9 +115,8 @@ class OWNCLOUDSYNC_EXPORT SyncFileItem
     Q_ENUM(LockStatus)
 
     enum class LockOwnerType : int{
-        NoLock = 0,
+        UserLock = 0,
         AppLock = 1,
-        UserLock = 2,
         TokenLock = 3,
     };