diff options
| author | marinofaggiana <marino@marinofaggiana.com> | 2020-08-14 15:56:04 +0300 |
|---|---|---|
| committer | marinofaggiana <marino@marinofaggiana.com> | 2020-08-14 15:56:04 +0300 |
| commit | e087266681c134d06c48cda91325f188f9affc43 (patch) | |
| tree | 4f8674d0adc1550cdaeed061962f44e3767617ee /File Provider Extension | |
| parent | 8d6df7e7d2b3359c0731b55f283249b4ee215e0a (diff) | |
normalized
Diffstat (limited to 'File Provider Extension')
| -rw-r--r-- | File Provider Extension/FileProviderData.swift | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/File Provider Extension/FileProviderData.swift b/File Provider Extension/FileProviderData.swift index a2d049a22..06679ff7b 100644 --- a/File Provider Extension/FileProviderData.swift +++ b/File Provider Extension/FileProviderData.swift @@ -75,7 +75,7 @@ class fileProviderData: NSObject { guard let tableAccount = NCManageDatabase.sharedInstance.getAccountActive() else { return false } let serverVersionMajor = NCManageDatabase.sharedInstance.getCapabilitiesServerInt(account: tableAccount.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor) - let webDavRoot = NCManageDatabase.sharedInstance.getCapabilitiesServerString(account: tableAccount.account, elements: NCElementsJSON.shared.capabilitiesWebDavRoot) + let webDav = NCUtility.shared.getWebDAV(account: tableAccount.account) account = tableAccount.account accountUser = tableAccount.user @@ -84,7 +84,7 @@ class fileProviderData: NSObject { accountUrlBase = tableAccount.urlBase homeServerUrl = NCUtility.shared.getHomeServer(urlBase: tableAccount.urlBase, account: tableAccount.account) - NCCommunicationCommon.shared.setup(account: account, user: accountUser, userId: accountUserID, password: accountPassword, urlBase: accountUrlBase, userAgent: CCUtility.getUserAgent(), capabilitiesGroup: NCBrandOptions.sharedInstance.capabilitiesGroups, webDavRoot: webDavRoot, davRoot: nil, nextcloudVersion: serverVersionMajor, delegate: NCNetworking.shared) + NCCommunicationCommon.shared.setup(account: account, user: accountUser, userId: accountUserID, password: accountPassword, urlBase: accountUrlBase, userAgent: CCUtility.getUserAgent(), capabilitiesGroup: NCBrandOptions.sharedInstance.capabilitiesGroups, webDav: webDav, dav: nil, nextcloudVersion: serverVersionMajor, delegate: NCNetworking.shared) NCNetworking.shared.delegate = providerExtension as? NCNetworkingDelegate return true @@ -100,7 +100,7 @@ class fileProviderData: NSObject { if accountDomain == domain { let serverVersionMajor = NCManageDatabase.sharedInstance.getCapabilitiesServerInt(account: tableAccount.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor) - let webDavRoot = NCManageDatabase.sharedInstance.getCapabilitiesServerString(account: tableAccount.account, elements: NCElementsJSON.shared.capabilitiesWebDavRoot) + let webDav = NCUtility.shared.getWebDAV(account: tableAccount.account) account = tableAccount.account accountUser = tableAccount.user @@ -110,7 +110,7 @@ class fileProviderData: NSObject { accountUrlBase = tableAccount.urlBase homeServerUrl = NCUtility.shared.getHomeServer(urlBase: tableAccount.urlBase, account: tableAccount.account) - NCCommunicationCommon.shared.setup(account: account, user: accountUser, userId: accountUserID, password: accountPassword, urlBase: accountUrlBase, userAgent: CCUtility.getUserAgent(), capabilitiesGroup: NCBrandOptions.sharedInstance.capabilitiesGroups, webDavRoot: webDavRoot, davRoot: nil, nextcloudVersion: serverVersionMajor, delegate: NCNetworking.shared) + NCCommunicationCommon.shared.setup(account: account, user: accountUser, userId: accountUserID, password: accountPassword, urlBase: accountUrlBase, userAgent: CCUtility.getUserAgent(), capabilitiesGroup: NCBrandOptions.sharedInstance.capabilitiesGroups, webDav: webDav, dav: nil, nextcloudVersion: serverVersionMajor, delegate: NCNetworking.shared) NCNetworking.shared.delegate = providerExtension as? NCNetworkingDelegate foundAccount = true @@ -133,7 +133,7 @@ class fileProviderData: NSObject { if accountFromItemIdentifier == tableAccount.account { let serverVersionMajor = NCManageDatabase.sharedInstance.getCapabilitiesServerInt(account: tableAccount.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor) - let webDavRoot = NCManageDatabase.sharedInstance.getCapabilitiesServerString(account: tableAccount.account, elements: NCElementsJSON.shared.capabilitiesWebDavRoot) + let webDav = NCUtility.shared.getWebDAV(account: tableAccount.account) account = tableAccount.account accountUser = tableAccount.user @@ -142,7 +142,7 @@ class fileProviderData: NSObject { accountUrlBase = tableAccount.urlBase homeServerUrl = NCUtility.shared.getHomeServer(urlBase: tableAccount.urlBase, account: tableAccount.account) - NCCommunicationCommon.shared.setup(account: account, user: accountUser, userId: accountUserID, password: accountPassword, urlBase: accountUrlBase, userAgent: CCUtility.getUserAgent(), capabilitiesGroup: NCBrandOptions.sharedInstance.capabilitiesGroups, webDavRoot: webDavRoot, davRoot: nil, nextcloudVersion: serverVersionMajor, delegate: NCNetworking.shared) + NCCommunicationCommon.shared.setup(account: account, user: accountUser, userId: accountUserID, password: accountPassword, urlBase: accountUrlBase, userAgent: CCUtility.getUserAgent(), capabilitiesGroup: NCBrandOptions.sharedInstance.capabilitiesGroups, webDav: webDav, dav: nil, nextcloudVersion: serverVersionMajor, delegate: NCNetworking.shared) NCNetworking.shared.delegate = providerExtension as? NCNetworkingDelegate foundAccount = true |