feat: add capability support for multiple personal spaces (#11956)

owncloud · Oct 24, 2024 · 726fa08 · 726fa08
1 parent 493080b
commit 726fa08
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
@@ -304,6 +304,7 @@ SpaceSupport::SpaceSupport(const QVariantMap &spaces_support)
         return;
     }
     enabled = spaces_support.value(QStringLiteral("enabled")).toBool();
+    hasMultiplePersonalSpaces = spaces_support.value(QStringLiteral("has_multiple_personal_spaces")).toBool();
     version = QVersionNumber::fromString(spaces_support.value(QStringLiteral("version")).toString());
 }
 

diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h
@@ -20,8 +20,8 @@
 
 #include "common/checksumalgorithms.h"
 
-#include <QVariantMap>
 #include <QStringList>
+#include <QVariantMap>
 #include <QVersionNumber>
 
 namespace OCC {
@@ -81,11 +81,13 @@ struct OWNCLOUDSYNC_EXPORT SpaceSupport
     /**
         "spaces": {
           "version": "0.0.1",
-          "enabled": true
+          "enabled": true,
+          "has_multiple_personal_spaces": true
         }
     */
     SpaceSupport(const QVariantMap &spaces_support);
     bool enabled = false;
+    bool hasMultiplePersonalSpaces = false;
     QVersionNumber version;
 
     bool isValid() const;
@@ -305,4 +307,4 @@ class OWNCLOUDSYNC_EXPORT Capabilities
 };
 }
 
-#endif //CAPABILITIES_H
+#endif // CAPABILITIES_H
diff --git a/src/libsync/graphapi/space.cpp b/src/libsync/graphapi/space.cpp
@@ -97,6 +97,11 @@ void SpaceImage::update()
 
 QString Space::displayName() const
 {
+    auto hasManyPersonalSpaces = _spaceManager->account()->capabilities().spacesSupport().enabled;
+    if (hasManyPersonalSpaces) {
+        return _drive.getName();
+    }
+
     if (_drive.getDriveType() == personalC) {
         return tr("Personal");
     } else if (_drive.getId() == sharesIdC) {
-Original file line number
+Diff line change
@@ Expand Up @@
             return;
         }
         enabled = spaces_support.value(QStringLiteral("enabled")).toBool();
+        hasMultiplePersonalSpaces = spaces_support.value(QStringLiteral("has_multiple_personal_spaces")).toBool();
         version = QVersionNumber::fromString(spaces_support.value(QStringLiteral("version")).toString());
     }
@@ Expand Down @@