From 8557794bccd1be53cd8d41602f9ffa720e3801a4 Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Sun, 22 Mar 2020 12:11:31 +0100 Subject: [PATCH 1/2] fix Signed-off-by: marinofaggiana --- NCCommunication/NCCommunication.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NCCommunication/NCCommunication.swift b/NCCommunication/NCCommunication.swift index 633a3b4..3e00baa 100644 --- a/NCCommunication/NCCommunication.swift +++ b/NCCommunication/NCCommunication.swift @@ -337,7 +337,7 @@ import SwiftyJSON if let directory = subJson["directory"].bool { file.directory = directory } if let etag = subJson["etag"].string { file.etag = etag } if let favorite = subJson["favorite"].bool { file.favorite = favorite } - if let fileId = subJson["fileId"].string { file.fileId = fileId } + if let fileId = subJson["fileId"].int { file.fileId = String(fileId) } if let hasPreview = subJson["hasPreview"].bool { file.hasPreview = hasPreview } if let mimetype = subJson["mimetype"].string { file.contentType = mimetype } if let name = subJson["name"].string { file.fileName = name } From 14c3311db642a3f9d0ea763c2f940b4d27ea5043 Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Wed, 25 Mar 2020 16:45:00 +0100 Subject: [PATCH 2/2] fix Signed-off-by: marinofaggiana --- NCCommunication/NCCommunicationCommon.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NCCommunication/NCCommunicationCommon.swift b/NCCommunication/NCCommunicationCommon.swift index 02ff80f..8812b70 100644 --- a/NCCommunication/NCCommunicationCommon.swift +++ b/NCCommunication/NCCommunicationCommon.swift @@ -121,7 +121,7 @@ import Alamofire func encodeUrlString(_ string: String) -> URLConvertible? { - let allowedCharacterSet = (CharacterSet(charactersIn: " ").inverted) + let allowedCharacterSet = (CharacterSet(charactersIn: " #").inverted) if let escapedString = string.addingPercentEncoding(withAllowedCharacters: allowedCharacterSet) { var url: URLConvertible do {