From 8f6c19e02923a166f0f543cdd5230696a1d0f189 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 27 Mar 2024 19:47:04 +0800 Subject: [PATCH 1/3] Fix "false" error about bad applying of nodiscard to value type Signed-off-by: Claudio Cambra --- src/gui/userstatusselectormodel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/userstatusselectormodel.h b/src/gui/userstatusselectormodel.h index 6f85a28a8900..65be9a9cad94 100644 --- a/src/gui/userstatusselectormodel.h +++ b/src/gui/userstatusselectormodel.h @@ -93,7 +93,7 @@ class UserStatusSelectorModel : public QObject Q_REQUIRED_RESULT QVariantList clearStageTypes() const; Q_REQUIRED_RESULT QString clearAtDisplayString() const; - Q_INVOKABLE [[nodiscard]] QString clearAtReadable(const OCC::UserStatus &status) const; + [[nodiscard]] Q_INVOKABLE QString clearAtReadable(const OCC::UserStatus &status) const; Q_REQUIRED_RESULT QString errorMessage() const; From 591d5eebd2c1309b29b940d48e7fae0a843ae8d6 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 23 Apr 2024 21:59:45 +0800 Subject: [PATCH 2/3] Prevent use of invalid characters for file provider domain names Signed-off-by: Claudio Cambra --- src/gui/macOS/fileproviderdomainmanager_mac.mm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm index 6e59f621ac8f..33e97355b45d 100644 --- a/src/gui/macOS/fileproviderdomainmanager_mac.mm +++ b/src/gui/macOS/fileproviderdomainmanager_mac.mm @@ -16,6 +16,7 @@ #import #include +#include #include "config.h" #include "fileproviderdomainmanager.h" @@ -31,7 +32,8 @@ QString domainIdentifierForAccount(const OCC::Account * const account) { Q_ASSERT(account); - return account->userIdAtHostWithPort(); + static const QRegularExpression illegalChars("[:/]"); + return account->userIdAtHostWithPort().replace(illegalChars, "-"); } QString domainIdentifierForAccount(const OCC::AccountPtr account) From 1c84b832fe934e0cfa91aa5177ad49c2afada2db Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 23 Apr 2024 22:58:55 +0800 Subject: [PATCH 3/3] Fetch macOS VFS package in autoupdater if the client is using the file provider module Signed-off-by: Claudio Cambra --- src/gui/updater/updater.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp index 46393fcfb9ca..4365ae5837ab 100644 --- a/src/gui/updater/updater.cpp +++ b/src/gui/updater/updater.cpp @@ -60,8 +60,10 @@ QUrl Updater::updateUrl() if (SparkleUpdater::autoUpdaterAllowed()) { urlQuery.addQueryItem(QLatin1String("sparkle"), QLatin1String("true")); } +#ifdef BUILD_FILE_PROVIDER_MODULE + urlQuery.addQueryItem(QLatin1String("fileprovider"), QLatin1String("true")); +#endif #endif - #if defined(Q_OS_WIN) urlQuery.addQueryItem(QLatin1String("msi"), QLatin1String("true")); #endif