From 9dfa3d76a74a53951b64df9c40babee2d38e18b5 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 13 Mar 2023 17:48:30 +0100 Subject: [PATCH] Add some additional converters for domain and account identifiers in FileProviderDomainManager Signed-off-by: Claudio Cambra --- src/gui/macOS/fileproviderdomainmanager_mac.mm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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); } } -- 2.30.2