Add some additional converters for domain and account identifiers in FileProviderDoma...

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

diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm
index 3677128bb0eed49cbb90a58eb8efa783f63600a0..1e40fb4191af66d9cc10c64957cc60d7c903f5ac 100644 (file)
--- a/src/gui/macOS/fileproviderdomainmanager_mac.mm
+++ b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -23,6 +23,8 @@
 #include "gui/accountmanager.h"
 #include "libsync/account.h"
 
+// Ensure that conversion to/from domain identifiers and display names
+// are consistent throughout these classes
 namespace {
 
 QString domainIdentifierForAccount(const OCC::Account * const account)
@@ -47,9 +49,19 @@ QString domainDisplayNameForAccount(const OCC::AccountPtr account)
     return domainDisplayNameForAccount(account.get());
 }
 
+QString accountIdFromDomainId(const QString &domainId)
+{
+    return domainId;
+}
+
+QString accountIdFromDomainId(NSString * const domainId)
+{
+    return accountIdFromDomainId(QString::fromNSString(domainId));
+}
+
 QString accountIdFromDomain(NSFileProviderDomain * const domain)
 {
-    return QString::fromNSString(domain.identifier);
+    return accountIdFromDomainId(domain.identifier);
 }
 
 }