From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 13 Mar 2023 16:48:30 +0000 (+0100)
Subject: Add some additional converters for domain and account identifiers in FileProviderDoma... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~55^2~114
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9dfa3d76a74a53951b64df9c40babee2d38e18b5;p=nextcloud-desktop.git

Add some additional converters for domain and account identifiers in FileProviderDomainManager

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 3677128bb..1e40fb419 100644
--- 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);
 }
 
 }