Browse Source

Add files lock owner-type & time-out

Signed-off-by: Henrik Storch <henrik.storch@nextcloud.com>
Henrik Storch 2 years ago
parent
commit
2eafc0bb05
2 changed files with 5 additions and 1 deletions
  1. 3 1
      iOSClient/Data/NCDatabase.swift
  2. 2 0
      iOSClient/Data/NCManageDatabase+Metadata.swift

+ 3 - 1
iOSClient/Data/NCDatabase.swift

@@ -386,8 +386,10 @@ class tableMetadata: Object, NCUserBaseUrl {
     @objc dynamic var ownerDisplayName = ""
     @objc public var lock = false
     @objc public var lockOwner = ""
+    @objc public var lockOwnerType = 0
     @objc public var lockOwnerDisplayName = ""
     @objc public var lockTime: Date?
+    @objc public var lockTimeOut: Date?
     @objc dynamic var path = ""
     @objc dynamic var permissions = ""
     @objc dynamic var quotaUsedBytes: Int64 = 0
@@ -427,7 +429,7 @@ extension tableMetadata {
 
     /// Returns false if the user is lokced out of the file. I.e. The file is locked but by somone else
     func canUnlock(as user: String) -> Bool {
-        return !lock || lockOwner == user
+        return !lock || (lockOwner == user && lockOwnerType == 0)
     }
 }
 

+ 2 - 0
iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -66,8 +66,10 @@ extension NCManageDatabase {
         metadata.ownerDisplayName = file.ownerDisplayName
         metadata.lock = file.lock
         metadata.lockOwner = file.lockOwner
+        metadata.lockOwnerType = file.lockOwnerType
         metadata.lockOwnerDisplayName = file.lockOwnerDisplayName
         metadata.lockTime = file.lockTime
+        metadata.lockTimeOut = file.lockTimeOut
         metadata.path = file.path
         metadata.permissions = file.permissions
         metadata.quotaUsedBytes = file.quotaUsedBytes