Revert sync folder name back to appName

This partly reverts 9719219 and the behavor introduced in 3.0
owncloud · Apr 2, 2024 · 336fd7f · 336fd7f
1 parent 32670a7
commit 336fd7f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/changelog/unreleased/enterprise-6390 b/changelog/unreleased/enterprise-6390
@@ -0,0 +1,18 @@
+Change: Revert local folder name back to pre 3.0 behavior
+
+Due to user requests, we reverted the folder name from 
+```
+ownCloud - Albert@owncloud.com
+ownCloud - Katherine@owncloud.org
+ownCloud - Marie@owncloud.com
+```
+
+back to
+
+ ```
+ownCloud
+ownCloud (1)
+ownCloud (2)
+```
+
+https://github.com/owncloud/enterprise/issues/6390
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -966,11 +966,7 @@ Folder *FolderMan::addFolderFromFolderWizardResult(const AccountStatePtr &accoun
 
 QString FolderMan::suggestSyncFolder(const QUrl &server, const QString &displayName, NewFolderType folderType)
 {
-    QString folderName = tr("%1 - %2@%3").arg(Theme::instance()->appName(), displayName, server.host());
-    if (!Theme::instance()->multiAccount()) {
-        folderName = Theme::instance()->appName();
-    }
-    return FolderMan::instance()->findGoodPathForNewSyncFolder(QDir::homePath(), folderName, folderType);
+    return FolderMan::instance()->findGoodPathForNewSyncFolder(QDir::homePath(), Theme::instance()->appName(), folderType);
 }
 
 bool FolderMan::prepareFolder(const QString &folder)