Move accountStateFromFileProviderDomainIdentifier to FileProviderDomainManager where...

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/macOS/fileproviderdomainmanager.h b/src/gui/macOS/fileproviderdomainmanager.h
index a8787c7ccdc62c3050007165aa5eb77cee7c5f0b..f1fcb02a5bb28f1e695e9bf7f44896e4240f5cb8 100644 (file)
--- a/src/gui/macOS/fileproviderdomainmanager.h
+++ b/src/gui/macOS/fileproviderdomainmanager.h
@@ -32,6 +32,8 @@ public:
     explicit FileProviderDomainManager(QObject * const parent = nullptr);
     ~FileProviderDomainManager() override;
 
+    static AccountStatePtr accountStateFromFileProviderDomainIdentifier(const QString &domainIdentifier);
+
 private slots:
     void setupFileProviderDomains();
 

diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm
index 03c9f33b9b2cd643002d825637fc26316c5b4ca5..228b1550dd720fad36d8d427b0ea70f05e24d117 100644 (file)
--- a/src/gui/macOS/fileproviderdomainmanager_mac.mm
+++ b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -673,6 +673,23 @@ void FileProviderDomainManager::slotEnumeratorSignallingTimerTimeout()
     }
 }
 
+AccountStatePtr FileProviderDomainManager::accountStateFromFileProviderDomainIdentifier(const QString &domainIdentifier)
+{
+    if (domainIdentifier.isEmpty()) {
+        qCWarning(lcMacFileProviderDomainManager) << "Cannot return accountstateptr for empty domain identifier";
+        return AccountStatePtr();
+    }
+
+    const auto accountUserId = accountIdFromDomainId(domainIdentifier);
+    const auto accountForReceivedDomainIdentifier = AccountManager::instance()->accountFromUserId(accountUserId);
+    if (!accountForReceivedDomainIdentifier) {
+        qCWarning(lcMacFileProviderDomainManager) << "Could not find account matching user id matching file provider domain identifier:"
+                                                  << domainIdentifier;
+    }
+
+    return accountForReceivedDomainIdentifier;
+}
+
 } // namespace Mac
 
 } // namespace OCC

diff --git a/src/gui/macOS/fileprovidersocketcontroller.cpp b/src/gui/macOS/fileprovidersocketcontroller.cpp
index 8fd20fc9543537d6cfb58445b4606156161c952c..9fa7f2b68c0f8b990b6fa6b527b8381d463d4b44 100644 (file)
--- a/src/gui/macOS/fileprovidersocketcontroller.cpp
+++ b/src/gui/macOS/fileprovidersocketcontroller.cpp
@@ -18,6 +18,7 @@
 #include <QLoggingCategory>
 
 #include "accountmanager.h"
+#include "fileproviderdomainmanager.h"
 
 namespace OCC {
 
@@ -85,7 +86,7 @@ void FileProviderSocketController::parseReceivedLine(const QString &receivedLine
     const auto argument = receivedLine.mid(argPos + 1);
 
     if (command == QStringLiteral("FILE_PROVIDER_DOMAIN_IDENTIFIER_REQUEST_REPLY")) {
-        _accountState = accountStateFromFileProviderDomainIdentifier(argument);
+        _accountState = FileProviderDomainManager::accountStateFromFileProviderDomainIdentifier(argument);
         sendAccountDetails();
         return;
     }
@@ -93,21 +94,6 @@ void FileProviderSocketController::parseReceivedLine(const QString &receivedLine
     qCWarning(lcFileProviderSocketController) << "Unknown command or reply:" << receivedLine;
 }
 
-AccountStatePtr FileProviderSocketController::accountStateFromFileProviderDomainIdentifier(const QString &domainIdentifier)
-{
-    Q_ASSERT(!domainIdentifier.isEmpty());
-
-    // We use Account's userIdAtHostWithPort() as the file provider domain's identifier in FileProviderDomainManager.
-    // We can use this string to get a matching account here.
-    const auto accountForReceivedDomainIdentifier = AccountManager::instance()->accountFromUserId(domainIdentifier);
-    if (!accountForReceivedDomainIdentifier) {
-        qCWarning(lcFileProviderSocketController) << "Could not find account matching user id matching file provider domain identifier:"
-                                                  << domainIdentifier;
-    }
-
-    return accountForReceivedDomainIdentifier;
-}
-
 void FileProviderSocketController::sendMessage(const QString &message) const
 {
     if (!_socket) {

diff --git a/src/gui/macOS/fileprovidersocketcontroller.h b/src/gui/macOS/fileprovidersocketcontroller.h
index 67269b55e1613ed305455e54cab00052c4f2a3e1..ca7c35334323750fcffe9c1406f5b4c80ce2c2a4 100644 (file)
--- a/src/gui/macOS/fileprovidersocketcontroller.h
+++ b/src/gui/macOS/fileprovidersocketcontroller.h
@@ -51,8 +51,6 @@ private slots:
     void sendNotAuthenticated() const;
 
 private:
-    static AccountStatePtr accountStateFromFileProviderDomainIdentifier(const QString &domainIdentifier);
-
     QPointer<QLocalSocket> _socket;
     AccountStatePtr _accountState;
 };