From 4b48f0c429271de96b2e99442c60d65f70bb3fb6 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 10 Jan 2023 21:21:28 +0100
Subject: [PATCH] Use server dav files URL in enumerator

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 .../FileProviderExt/FileProviderEnumerator.swift          | 6 ++----
 .../FileProviderExt/NextcloudAccount.swift                | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
index 1b0fa2cb8..5c49c88de 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
@@ -18,15 +18,13 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     
     private let enumeratedItemIdentifier: NSFileProviderItemIdentifier
     private let anchor = NSFileProviderSyncAnchor("an anchor".data(using: .utf8)!)
-    let ncAccount: NextcloudAccount
     var serverUrl: URL?
     
-    init(enumeratedItemIdentifier: NSFileProviderItemIdentifier, ncAccount: NextcloudAccount) {
+    init(enumeratedItemIdentifier: NSFileProviderItemIdentifier, ncAccount: NextcloudAccount?) {
         self.enumeratedItemIdentifier = enumeratedItemIdentifier
-        self.ncAccount = ncAccount
 
         if enumeratedItemIdentifier == .rootContainer {
-            self.serverUrl = ncAccount.serverUrl
+            self.serverUrl = ncAccount?.davFilesUrl
         } else {
             let dbManager = NextcloudFilesDatabaseManager.shared
             if let itemMetadata = dbManager.fileMetadataFromFileProviderItemIdentifier(enumeratedItemIdentifier),
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudAccount.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudAccount.swift
index 365bcfe62..fe2614348 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudAccount.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudAccount.swift
@@ -16,9 +16,9 @@ import Foundation
 import FileProvider
 
 class NextcloudAccount: NSObject {
-    let webDavUrlSuffix: String = "/remote.php/dav"
+    let webDavFilesUrlSuffix: String = "/remote.php/dav/files/"
     let username, password: String?
-    let serverUrl, davUrl: URL?
+    let serverUrl, davFilesUrl: URL?
 
     var isNull: Bool {
         return username?.isEmpty ?? false || serverUrl?.absoluteString.isEmpty ?? false
@@ -46,12 +46,12 @@ class NextcloudAccount: NSObject {
             return nil
         }
 
-        let davUrlUrl = serverUrlUrl.appendingPathComponent(webDavUrlSuffix)
+        let davFilesUrlUrl = serverUrlUrl.appendingPathComponent(webDavFilesUrlSuffix + usernameString)
 
         username = usernameString
         password = passwordString
         serverUrl = serverUrlUrl
-        davUrl = davUrlUrl
+        davFilesUrl = davFilesUrlUrl
 
         super.init()
     }
-- 
2.30.2