Merge pull request #4741 from owncloud/fix-alias

Accountsettings: Generate an alias for new folders

diff --cc src/gui/accountsettings.cpp
Simple merge

diff --cc src/gui/folderman.cpp
index ac623c118820a71f3021f4f399d56db38c013a3a,ec3c63ccf8ad24a87cc5657f1514dbafea20d900..0fad3f07c2f4350afcee4874792dbb60c4b2df89
--- 1/src/gui/folderman.cpp
--- 2/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@@ -777,11 -777,18 +777,18 @@@ Folder* FolderMan::addFolder(AccountSta
      return folder;
  }
  
- Folder* FolderMan::addFolderInternal(const FolderDefinition& folderDefinition, AccountState* accountState)
+ Folder* FolderMan::addFolderInternal(FolderDefinition folderDefinition, AccountState* accountState)
  {
+     auto alias = folderDefinition.alias;
+     int count = 0;
+     while (folderDefinition.alias.isEmpty() || _folderMap.contains(folderDefinition.alias)) {
+         // There is already a folder configured with this name and folder names need to be unique
+         folderDefinition.alias = alias + QString::number(++count);
+     }
+ 
      auto folder = new Folder(folderDefinition, accountState, this );
  
 -    qDebug() << "Adding folder to Folder Map " << folder;
 +    qDebug() << "Adding folder to Folder Map " << folder << folder->alias();
      _folderMap[folder->alias()] = folder;
      if (folder->syncPaused()) {
          _disabledFolders.insert(folder);