Do not reconfigure file provider extension account if we are receivin…

…g the same details again Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
nextcloud · Feb 19, 2024 · fd20058 · fd20058
1 parent 8010ceb
commit fd20058
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...n/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientInterface.swift b/...n/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientInterface.swift
@@ -88,15 +88,17 @@ extension FileProviderExtension: NSFileProviderServicing {
     }
 
     @objc func setupDomainAccount(user: String, serverUrl: String, password: String) {
-        ncAccount = NextcloudAccount(user: user, serverUrl: serverUrl, password: password)
+        let newNcAccount = NextcloudAccount(user: user, serverUrl: serverUrl, password: password)
+        guard newNcAccount != ncAccount else { return }
+        ncAccount = newNcAccount
         ncKit.setup(
             user: ncAccount!.username,
             userId: ncAccount!.username,
             password: ncAccount!.password,
             urlBase: ncAccount!.serverUrl,
             userAgent: "Nextcloud-macOS/FileProviderExt",
             nextcloudVersion: 25,
-            delegate: nil)  // TODO: add delegate methods for self
+            delegate: nil) // TODO: add delegate methods for self
 
         Logger.fileProviderExtension.info(
             "Nextcloud account set up in File Provider extension for user: \(user, privacy: .public) at server: \(serverUrl, privacy: .public)"

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudAccount.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudAccount.swift
@@ -15,7 +15,7 @@
 import FileProvider
 import Foundation
 
-class NextcloudAccount: NSObject {
+struct NextcloudAccount: Equatable {
     static let webDavFilesUrlSuffix: String = "/remote.php/dav/files/"
     let username, password, ncKitAccount, serverUrl, davFilesUrl: String
 
@@ -25,7 +25,5 @@ class NextcloudAccount: NSObject {
         ncKitAccount = user + " " + serverUrl
         self.serverUrl = serverUrl
         davFilesUrl = serverUrl + NextcloudAccount.webDavFilesUrlSuffix + user
-
-        super.init()
     }
 }