Skip to content

Accept #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 1 commit into from
Jul 26, 2025
Merged

Accept #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Sources/NextcloudKit/NextcloudKit+WebDAV.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ ocId: String?, _ date: Date?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let url = serverUrlFileName.encodedToUrl,
let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, nil, nil, .urlError) }
}
let method = HTTPMethod(rawValue: "MKCOL")
Expand Down Expand Up @@ -105,7 +105,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let url = serverUrlFileName.encodedToUrl,
let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, .urlError) }
}
var urlRequest: URLRequest
Expand Down Expand Up @@ -185,7 +185,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let url = serverUrlFileNameSource.encodedToUrl,
let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, .urlError) }
}
let method = HTTPMethod(rawValue: "MOVE")
Expand Down Expand Up @@ -278,7 +278,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let url = serverUrlFileNameSource.encodedToUrl,
let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, .urlError) }
}
let method = HTTPMethod(rawValue: "COPY")
Expand Down Expand Up @@ -378,7 +378,7 @@ public extension NextcloudKit {
var serverUrlFileName = serverUrlFileName
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = serverUrlFileName.encodedToUrl,
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
if depth == "0", serverUrlFileName.last == "/" {
Expand Down Expand Up @@ -855,7 +855,7 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ files: [NKFile]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
guard let url = (serverUrl + "/" + nkSession.dav).encodedToUrl else {
Expand Down Expand Up @@ -958,7 +958,7 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, .urlError) }
}
let serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/files/" + nkSession.userId + "/" + fileName
Expand Down Expand Up @@ -1042,7 +1042,7 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ files: [NKFile]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
let serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/files/" + nkSession.userId
Expand Down Expand Up @@ -1137,7 +1137,7 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ items: [NKTrash]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml", accept: "application/xml") else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
var serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/trashbin/" + nkSession.userId + "/trash/"
Expand Down
Loading