Merge pull request #27 from nextcloud/develop

Fix
nextcloud · Mar 26, 2020 · d254d19 · d254d19
2 parents ea79050 + 14c3311
commit d254d19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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 }

diff --git 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 {