improved code

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/AppDelegate.swift

@@ -905,7 +905,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                     return false
                 }
 
-                let davFiles = NCGlobal.shared.davfiles + self.userId
+                let davFiles = NKCommon.shared.dav + "/files/" + self.userId
                 if pathScheme.contains("/") {
                     fileName = (pathScheme as NSString).lastPathComponent
                     serverUrl = matchedAccount.urlBase + "/" + davFiles + "/" + (pathScheme as NSString).deletingLastPathComponent

iOSClient/Login/NCLogin.swift

@@ -359,7 +359,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                 let user = valueArray[0].replacingOccurrences(of: "user:", with: "")
                 let password = valueArray[1].replacingOccurrences(of: "password:", with: "")
                 let urlBase = valueArray[2].replacingOccurrences(of: "server:", with: "")
-                let serverUrl = urlBase + "/" + NCGlobal.shared.dav
+                let serverUrl = urlBase + "/" + NKCommon.shared.dav
 
                 loginButton.isEnabled = false
 

iOSClient/NCGlobal.swift

@@ -95,11 +95,6 @@ class NCGlobal: NSObject {
     @objc let appName                               = "files"
     @objc let talkName                              = "talk-message"
 
-    // DAV -
-    //
-    @objc let dav                                   = "remote.php/dav"
-    @objc let davfiles                              = "remote.php/dav/files/"
-
     // Nextcloud version
     //
     let nextcloudVersion12: Int                     =  12

iOSClient/Networking/NCNetworkingChunkedUpload.swift

@@ -33,7 +33,7 @@ extension NCNetworking {
 
         let directoryProviderStorageOcId = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId)!
         let chunkFolder = NCManageDatabase.shared.getChunkFolder(account: metadata.account, ocId: metadata.ocId)
-        let chunkFolderPath = metadata.urlBase + "/" + NCGlobal.shared.dav + "/uploads/" + metadata.userId + "/" + chunkFolder
+        let chunkFolderPath = metadata.urlBase + "/" + NKCommon.shared.dav + "/uploads/" + metadata.userId + "/" + chunkFolder
         let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
         let chunkSize = CCUtility.getChunkSize()
         let fileSizeInGB = Double(metadata.size) / 1e9
@@ -141,7 +141,7 @@ extension NCNetworking {
             // Assembling the chunks
             let serverUrlFileNameSource = chunkFolderPath + "/.file"
             let pathServerUrl = CCUtility.returnPathfromServerUrl(metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId, account: metadata.account)!
-            let serverUrlFileNameDestination = metadata.urlBase + "/" + NCGlobal.shared.davfiles + metadata.userId + pathServerUrl + "/" + metadata.fileName
+            let serverUrlFileNameDestination = metadata.urlBase + "/" + NKCommon.shared.dav + "/files/" + metadata.userId + pathServerUrl + "/" + metadata.fileName
 
             var customHeader: [String: String] = [:]
             let creationDate = "\(metadata.creationDate.timeIntervalSince1970)"

iOSClient/Trash/NCTrash.swift

@@ -262,7 +262,7 @@ class NCTrash: UIViewController, NCSelectableNavigationView, NCTrashListCellDele
 
         if self.trashPath.isEmpty {
             guard let userId = (appDelegate.userId as NSString).addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlFragmentAllowed) else { return nil }
-            let trashPath = appDelegate.urlBase + "/" + NCGlobal.shared.dav + "/trashbin/" + userId + "/trash/"
+            let trashPath = appDelegate.urlBase + "/" + NKCommon.shared.dav + "/trashbin/" + userId + "/trash/"
             return trashPath
         } else {
             return self.trashPath
@@ -296,7 +296,7 @@ extension NCTrash {
 
         guard let tableTrash = NCManageDatabase.shared.getTrashItem(fileId: fileId, account: appDelegate.account) else { return }
         let fileNameFrom = tableTrash.filePath + tableTrash.fileName
-        let fileNameTo = appDelegate.urlBase + "/" + NCGlobal.shared.dav + "/trashbin/" + appDelegate.userId + "/restore/" + tableTrash.fileName
+        let fileNameTo = appDelegate.urlBase + "/" + NKCommon.shared.dav + "/trashbin/" + appDelegate.userId + "/restore/" + tableTrash.fileName
 
         NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: fileNameFrom, serverUrlFileNameDestination: fileNameTo, overwrite: true) { account, error in
 
@@ -312,7 +312,7 @@ extension NCTrash {
 
     func emptyTrash() {
 
-        let serverUrlFileName = appDelegate.urlBase + "/" + NCGlobal.shared.dav + "/trashbin/" + appDelegate.userId + "/trash"
+        let serverUrlFileName = appDelegate.urlBase + "/" + NKCommon.shared.dav + "/trashbin/" + appDelegate.userId + "/trash"
 
         NextcloudKit.shared.deleteFileOrFolder(serverUrlFileName: serverUrlFileName) { account, error in