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 5, 2024 · 83e327b · 83e327b
1 parent e4475a6
commit 83e327b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...n/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientInterface.swift b/...n/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientInterface.swift
@@ -79,7 +79,9 @@ 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,

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