Merge branch 'develop' into files_downloadlimit

nextcloud · Dec 4, 2024 · e175406 · e175406
2 parents f2dabb2 + 4e0a7fa
commit e175406
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Sources/NextcloudKit/Models/NKTrash.swift b/Sources/NextcloudKit/Models/NKTrash.swift
@@ -6,6 +6,7 @@
 import Foundation
 
 public class NKTrash: NSObject {
+    public var ocId = ""
     public var contentType = ""
     public var date = Date()
     public var directory: Bool = false

diff --git a/Sources/NextcloudKit/NKDataFileXML.swift b/Sources/NextcloudKit/NKDataFileXML.swift
@@ -658,6 +658,10 @@ class NKDataFileXML: NSObject {
                 file.contentType = "httpd/unix-directory"
             }
 
+            if let ocId = propstat["d:prop", "oc:id"].text {
+                file.ocId = ocId
+            }
+
             if let fileId = propstat["d:prop", "oc:fileid"].text {
                 file.fileId = fileId
             }