Always group in the sidebar when that is available

And remove all traces of `groupInSidebar`.

Author: erikjv

src/common/vfs.cpp

@@ -276,10 +276,9 @@ const VfsPluginManager &VfsPluginManager::instance()
     return *_instance;
 }
 
-VfsSetupParams::VfsSetupParams(Account *account, const QUrl &baseUrl, bool groupInSidebar, SyncEngine *syncEngine)
+VfsSetupParams::VfsSetupParams(Account *account, const QUrl &baseUrl, SyncEngine *syncEngine)
     : account(account)
     , _baseUrl(baseUrl)
-    , _groupInSidebar(groupInSidebar)
     , _syncEngine(syncEngine)
 {
 }

src/common/vfs.h

@@ -44,7 +44,7 @@ class SyncEngine;
 /** Collection of parameters for initializing a Vfs instance. */
 struct OCSYNC_EXPORT VfsSetupParams
 {
-    explicit VfsSetupParams(Account *account, const QUrl &baseUrl, bool groupInSidebar, SyncEngine *syncEngine);
+    explicit VfsSetupParams(Account *account, const QUrl &baseUrl, SyncEngine *syncEngine);
     /** The full path to the folder on the local filesystem
      *
      * Always ends with /.
@@ -81,16 +81,10 @@ struct OCSYNC_EXPORT VfsSetupParams
         return _baseUrl;
     }
 
-    bool groupInSidebar() const
-    {
-        return _groupInSidebar;
-    }
-
     SyncEngine *syncEngine() const;
 
 private:
     QUrl _baseUrl;
-    bool _groupInSidebar = false;
     SyncEngine *_syncEngine;
 };
 

src/gui/folder.cpp

@@ -503,7 +503,7 @@ void Folder::startVfs()
         return;
     }
 
-    VfsSetupParams vfsParams(_accountState->account(), webDavUrl(), groupInSidebar(), _engine.get());
+    VfsSetupParams vfsParams(_accountState->account(), webDavUrl(), _engine.get());
     vfsParams.filesystemPath = path();
     vfsParams.remotePath = remotePathTrailingSlash();
     vfsParams.journal = &_journal;
@@ -1227,15 +1227,4 @@ QString FolderDefinition::displayName() const
     return _displayName;
 }
 
-bool Folder::groupInSidebar() const
-{
-    if (_accountState && _accountState->account() && _accountState->account()->hasDefaultSyncRoot()) {
-        // QFileInfo is horrible and "/foo/" is treated different to "/foo"
-        const QString parentDir = QFileInfo(Utility::stripTrailingSlash(path())).dir().path();
-        // If parentDir == home, we would add the home dir to the sidebar.
-        return QFileInfo(parentDir) != QFileInfo(QDir::homePath()) && FileSystem::isChildPathOf(parentDir, _accountState->account()->defaultSyncRoot());
-    }
-    return false;
-}
-
 } // namespace OCC

src/gui/folder.h

@@ -323,14 +323,6 @@ class OWNCLOUDGUI_EXPORT Folder : public QObject
     /** Whether this folder should show selective sync ui */
     bool supportsSelectiveSync() const;
 
-    /**
-     * Whether to register the parent folder of our sync root in the explorer
-     * The default behaviour is to register alls spaces in a common dir in the home folder
-     * in that case we only display that common dir in the Windows sidebar.
-     * With the legacy behaviour we only have one dir which we will register with Windows
-     */
-    bool groupInSidebar() const;
-
     /**
      * The folder is deployed by an admin
      * We will hide the remove option and the disable/enable vfs option.

src/gui/folderman.cpp

@@ -960,8 +960,7 @@ Folder *FolderMan::addFolderFromScratch(AccountState *accountState, FolderDefini
     auto newFolder = addFolder(accountState, folderDefinition);
 
     if (newFolder) {
-        // With spaces we only handle the main folder
-        if (!newFolder->groupInSidebar()) {
+        if (newFolder->vfs().mode() != Vfs::WindowsCfApi) {
             Utility::setupFavLink(folderDefinition.localPath());
         }
         qCDebug(lcFolderMan) << "Local sync folder" << folderDefinition.localPath() << "successfully created!";

src/plugins/vfs/win/vfs_win.cpp

@@ -609,13 +609,7 @@ void VfsWinPrivate::registerFolder(const VfsSetupParams &params)
     // A Uri to a cloud storage recycle bin.
     //providerInfo.RecycleBinUri(L"recycle bin");
 
-    qCInfo(lcVfs)<<"winvfs: groupInsidebar:"<<params.groupInSidebar();
-    if (!params.groupInSidebar()) {
-        qCWarning(lcVfs) << "groupInsidebar info: parent dir:" << QFileInfo(Utility::stripTrailingSlash(syncRoot)).dir().path()
-                         << "home path:" << QDir::homePath()
-                         << "default sync root:" << params.account->defaultSyncRoot();
-    }
-    providerInfo.ShowSiblingsAsGroup(params.groupInSidebar());
+    providerInfo.ShowSiblingsAsGroup(true);
 
     // Prepage the key from the shell property store we'll use to determine
     // availability.

test/testutils/syncenginetestutils.cpp

@@ -927,7 +927,7 @@ void FakeFolder::switchToVfs(QSharedPointer<OCC::Vfs> vfs)
     opts._vfs = vfs;
     _syncEngine->setSyncOptions(opts);
 
-    OCC::VfsSetupParams vfsParams(account(), account()->davUrl(), false, &syncEngine());
+    OCC::VfsSetupParams vfsParams(account(), account()->davUrl(), &syncEngine());
     vfsParams.filesystemPath = localPath();
     vfsParams.remotePath = QLatin1Char('/');
     vfsParams.journal = _journalDb.get();