Browse Source

move to NextcloudKit

Signed-off-by: marinofaggiana <marino.faggiana@nextcloud.com>
marinofaggiana 2 years ago
parent
commit
e0004aa1a5

+ 1 - 1
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1118,7 +1118,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                     }
                 }
             } else {
-                completion(tableDirectory, nil, nil, nil, NKError(errorCode: 0, errorDescription: ""))
+                completion(tableDirectory, nil, nil, nil, NKError())
             }
         }
     }

+ 7 - 7
iOSClient/Networking/NCNetworking.swift

@@ -484,7 +484,7 @@ import Photos
 
                 NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, sessionError: "", sessionTaskIdentifier: task.taskIdentifier, status: NCGlobal.shared.metadataStatusUploading)
                 NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadStartFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "sessionSelector": metadata.sessionSelector])
-                completion(NKError(errorCode: 0, errorDescription:  ""))
+                completion(NKError())
 
             } else {
 
@@ -806,7 +806,7 @@ import Photos
         let dispatchGroup = DispatchGroup()
         dispatchGroup.enter()
         dispatchGroup.notify(queue: .main) {
-            completion(NKError(errorCode: 0, errorDescription: ""))
+            completion(NKError())
         }
 
         NextcloudKit.shared.unifiedSearch(term: literal, timeout: 30, timeoutProvider: 90) { provider in
@@ -972,14 +972,14 @@ import Photos
             fileNameFolder = NCUtilityFileSystem.shared.createFileName(fileNameFolder, serverUrl: serverUrl, account: account)
         }
         if fileNameFolder.count == 0 {
-            return completion(NKError(errorCode: 0, errorDescription: ""))
+            return completion(NKError())
         }
         let fileNameFolderUrl = serverUrl + "/" + fileNameFolder
 
         NextcloudKit.shared.createFolder(fileNameFolderUrl) { account, ocId, _, error in
             guard error == .success else {
                 if error.errorCode == 405 && overwrite {
-                    completion(NKError(errorCode: 0, errorDescription: ""))
+                    completion(NKError())
                 } else {
                     completion(error)
                 }
@@ -1061,7 +1061,7 @@ import Photos
 
                 NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["ocId": metadata.ocId, "fileNameView": metadata.fileNameView, "serverUrl": metadata.serverUrl, "account": metadata.account, "classFile": metadata.classFile, "onlyLocalCache": true])
             }
-            return completion(NKError(errorCode: 0, errorDescription: ""))
+            return completion(NKError())
         }
 
         let isDirectoryEncrypted = CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase)
@@ -1248,10 +1248,10 @@ import Photos
             return completion(NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_permission_modify_file_"))
         }
         guard let fileNameNew = CCUtility.removeForbiddenCharactersServer(fileNameNew) else {
-            return completion(NKError(errorCode: 0, errorDescription: ""))
+            return completion(NKError())
         }
         if fileNameNew.count == 0 || fileNameNew == metadata.fileNameView {
-            return completion(NKError(errorCode: 0, errorDescription: ""))
+            return completion(NKError())
         }
 
         let fileNamePath = metadata.serverUrl + "/" + metadata.fileName

+ 2 - 2
iOSClient/Networking/NCNetworkingChunkedUpload.swift

@@ -37,7 +37,7 @@ extension NCNetworking {
         let fileSizeInGB = Double(metadata.size) / 1e9
         let ocIdTemp = metadata.ocId
         let selector = metadata.sessionSelector
-        var uploadError = NKError(errorCode: 0, errorDescription: "")
+        var uploadError = NKError()
 
         var filesNames = NCManageDatabase.shared.getChunks(account: metadata.account, ocId: metadata.ocId)
         if filesNames.count == 0 {
@@ -210,7 +210,7 @@ extension NCNetworking {
         NextcloudKit.shared.readFileOrFolder(serverUrlFileName: chunkFolderPath, depth: "0", showHiddenFiles: CCUtility.getShowHiddenFiles(), queue: NKCommon.shared.backgroundQueue) { _, _, _, error in
 
             if error == .success {
-                completion(NKError(errorCode: 0, errorDescription: ""))
+                completion(NKError())
             } else if error.errorCode == NCGlobal.shared.errorResourceNotFound {
                 NextcloudKit.shared.createFolder(chunkFolderPath, queue: NKCommon.shared.backgroundQueue) { _, _, _, error in
                     completion(error)

+ 4 - 4
iOSClient/Networking/NCNetworkingE2EE.swift

@@ -43,7 +43,7 @@ import Alamofire
 
         fileNameFolder = NCUtilityFileSystem.shared.createFileName(fileNameFolder, serverUrl: serverUrl, account: account)
         if fileNameFolder.count == 0 {
-            return completion(NKError(errorCode: 0, errorDescription: ""))
+            return completion(NKError())
         }
         fileNameIdentifier = CCUtility.generateRandomIdentifier()
         fileNameFolderUrl = serverUrl + "/" + fileNameIdentifier
@@ -294,7 +294,7 @@ import Alamofire
                             CCUtility.removeFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId))
                             NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                             NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "errorCode": error.errorCode, "errorDescription": ""])
-                            completion(NKError(errorCode: 0, errorDescription: ""))
+                            completion(NKError())
 
                         } else if error == .success && ocId != nil {
 
@@ -356,7 +356,7 @@ import Alamofire
         var e2eToken: String?
 
         guard let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", account, serverUrl)) else {
-            return completion(nil, nil, NKError(errorCode: 0, errorDescription: ""))
+            return completion(nil, nil, NKError())
         }
 
         if let tableLock = NCManageDatabase.shared.getE2ETokenLock(account: account, serverUrl: serverUrl) {
@@ -376,7 +376,7 @@ import Alamofire
         var e2eToken: String?
 
         guard let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", account, serverUrl)) else {
-            return completion(nil, nil, NKError(errorCode: 0, errorDescription: ""))
+            return completion(nil, nil, NKError())
         }
 
         if let tableLock = NCManageDatabase.shared.getE2ETokenLock(account: account, serverUrl: serverUrl) {