diff options
Diffstat (limited to 'File Provider Extension/FileProviderExtension.swift')
| -rw-r--r-- | File Provider Extension/FileProviderExtension.swift | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/File Provider Extension/FileProviderExtension.swift b/File Provider Extension/FileProviderExtension.swift index 9643b4fdd..f646b4b0b 100644 --- a/File Provider Extension/FileProviderExtension.swift +++ b/File Provider Extension/FileProviderExtension.swift @@ -23,7 +23,7 @@ import UIKit import FileProvider -import NCCommunication +import NextcloudKit import Alamofire /* ----------------------------------------------------------------------------------------------------------------------------------------------- @@ -119,7 +119,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { metadata.fileName = "root" metadata.fileNameView = "root" metadata.serverUrl = fileProviderData.shared.homeServerUrl - metadata.classFile = NCCommunicationCommon.typeClassFile.directory.rawValue + metadata.classFile = NKCommon.typeClassFile.directory.rawValue return FileProviderItem(metadata: metadata, parentItemIdentifier: NSFileProviderItemIdentifier(NSFileProviderItemIdentifier.rootContainer.rawValue)) @@ -209,7 +209,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusDownloading) fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, update: true) - NCCommunication.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, requestHandler: { _ in + NextcloudKit.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, requestHandler: { _ in }, taskHandler: { task in @@ -218,7 +218,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { }, progressHandler: { _ in - }) { _, etag, date, _, _, _, errorCode, errorDescription in + }) { _, etag, date, _, _, _, error in self.outstandingSessionTasks.removeValue(forKey: url) guard var metadata = fileProviderUtility.shared.getTableMetadataFromItemIdentifier(identifier) else { @@ -227,7 +227,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { } metadata = tableMetadata.init(value: metadata) - if errorCode == 0 { + if error == .success { metadata.status = NCGlobal.shared.metadataStatusNormal metadata.date = date ?? NSDate() @@ -238,7 +238,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { completionHandler(nil) - } else if errorCode == 200 { + } else if error.errorCode == 200 { NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusNormal) @@ -247,7 +247,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { } else { metadata.status = NCGlobal.shared.metadataStatusDownloadError - metadata.sessionError = errorDescription + metadata.sessionError = error.errorDescription NCManageDatabase.shared.addMetadata(metadata) completionHandler(NSFileProviderError(.noSuchItem)) @@ -277,7 +277,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { let serverUrlFileName = metadata.serverUrl + "/" + fileName let fileNameLocalPath = url.path - if let task = NCCommunicationBackground.shared.upload(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, dateCreationFile: nil, dateModificationFile: nil, description: metadata.ocId, session: NCNetworking.shared.sessionManagerBackgroundExtension) { + if let task = NKBackground.shared.upload(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, dateCreationFile: nil, dateModificationFile: nil, description: metadata.ocId, session: NCNetworking.shared.sessionManagerBackgroundExtension) { fileProviderData.shared.fileProviderManager.register(task, forItemWithIdentifier: NSFileProviderItemIdentifier(metadata.fileId)) { _ in } } @@ -357,7 +357,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { let serverUrlFileName = tableDirectory.serverUrl + "/" + fileName let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(ocIdTemp, fileNameView: fileName)! - if let task = NCCommunicationBackground.shared.upload(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, dateCreationFile: nil, dateModificationFile: nil, description: ocIdTemp, session: NCNetworking.shared.sessionManagerBackgroundExtension) { + if let task = NKBackground.shared.upload(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, dateCreationFile: nil, dateModificationFile: nil, description: ocIdTemp, session: NCNetworking.shared.sessionManagerBackgroundExtension) { self.outstandingSessionTasks[URL(fileURLWithPath: fileNameLocalPath)] = task as URLSessionTask @@ -371,7 +371,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { } } - func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: NSDate?, size: Int64, description: String?, task: URLSessionTask, errorCode: Int, errorDescription: String) { + func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: NSDate?, size: Int64, description: String?, task: URLSessionTask, error: NKError) { guard let ocIdTemp = description else { return } guard let metadataTemp = NCManageDatabase.shared.getMetadataFromOcId(ocIdTemp) else { return } @@ -383,7 +383,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate { } outstandingOcIdTemp[ocIdTemp] = ocId - if errorCode == 0 { + if error == .success { // New file if ocId != ocIdTemp { |