Merge branch 'master' into bugfix/file-provider-share-fields

nextcloud · Apr 23, 2024 · bf012c2 · bf012c2
2 parents b40397d + 1c84b83
commit bf012c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -16,6 +16,7 @@
 #import <FileProvider/FileProvider.h>
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 #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)

diff --git 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

diff --git 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;