Merge pull request #9813 from nextcloud/bugfix/unloadfolder

fix(folderman): disconnect slotFolderCanSyncChanged when unloading folder.

Author: camilasan

src/gui/folderman.cpp

@@ -131,6 +131,8 @@ void FolderMan::unloadFolder(Folder *f)
         this, &FolderMan::slotForwardFolderSyncStateChange);
     disconnect(f, &Folder::syncPausedChanged,
         this, &FolderMan::slotFolderSyncPaused);
+    disconnect(f, &Folder::canSyncChanged,
+        this, &FolderMan::slotFolderCanSyncChanged);
     disconnect(&f->syncEngine().syncFileStatusTracker(), &SyncFileStatusTracker::fileStatusChanged,
         _socketApi.data(), &SocketApi::broadcastStatusPushMessage);
     disconnect(f, &Folder::watchedFileChangedExternally,
@@ -748,12 +750,12 @@ void FolderMan::slotFolderSyncPaused(Folder *f, bool paused)
 
 void FolderMan::slotFolderCanSyncChanged()
 {
-    auto *f = qobject_cast<Folder *>(sender());
-     ASSERT(f);
-    if (f->canSync()) {
-        _socketApi->slotRegisterPath(f->alias());
+    auto folder = qobject_cast<Folder *>(sender());
+    ASSERT(folder);
+    if (folder->canSync()) {
+        _socketApi->slotRegisterPath(folder->alias());
     } else {
-        _socketApi->slotUnregisterPath(f->alias());
+        _socketApi->slotUnregisterPath(folder->alias());
     }
 }
 

src/gui/socketapi/socketapi.cpp

@@ -470,12 +470,16 @@ void SocketApi::slotRegisterPath(const QString &alias)
 
 void SocketApi::slotUnregisterPath(const QString &alias)
 {
-    if (!_registeredAliases.contains(alias))
+    if (!_registeredAliases.contains(alias)) {
         return;
+    }
 
-    Folder *f = FolderMan::instance()->folder(alias);
-    if (f)
-        broadcastMessage(buildMessage(QLatin1String("UNREGISTER_PATH"), removeTrailingSlash(f->path()), QString()), true);
+    auto folder = FolderMan::instance()->folder(alias);
+    if (folder) {
+        broadcastMessage(buildMessage(QLatin1String("UNREGISTER_PATH"),
+                                      removeTrailingSlash(folder->path()),
+                                      QString()));
+    }
 
     _registeredAliases.remove(alias);
 }

test/testfolderman.cpp

@@ -19,6 +19,7 @@
 #include "accountstate.h"
 #include <accountmanager.h>
 #include "configfile.h"
+#include "socketapi/socketapi.h"
 #include "syncenginetestutils.h"
 #include "testhelper.h"
 
@@ -554,6 +555,39 @@ private slots:
         verifyFolderSyncChangesOnReceivedFileIdNotification(user2, {50},                  {"2"});
         verifyFolderSyncChangesOnReceivedFileIdNotification(user2, {10, 11, 17, 18, 404}, {});
     }
+
+    void testUnloadAndDeleteAllFolders()
+    {
+        _fm.reset({});
+        _fm.reset(new FolderMan{});
+
+        QTemporaryDir dir;
+        ConfigFile::setConfDir(dir.path());
+        QVERIFY(dir.isValid());
+        QVERIFY(QDir(dir.path()).mkpath(QStringLiteral("folder1")));
+        QVERIFY(QDir(dir.path()).mkpath(QStringLiteral("folder2")));
+
+        auto account = Account::create();
+        account->setCredentials(new FakeCredentials{new FakeQNAM({})});
+        account->setUrl(QUrl(QStringLiteral("http://example.de")));
+        auto accountState = new FakeAccountState(account);
+
+        const auto folder1 = FolderMan::instance()->addFolder(accountState, folderDefinition(dir.path() + QStringLiteral("/folder1")));
+        const auto folder2 = FolderMan::instance()->addFolder(accountState, folderDefinition(dir.path() + QStringLiteral("/folder2")));
+        QVERIFY(folder1);
+        QVERIFY(folder2);
+        QCOMPARE(FolderMan::instance()->map().count(), 2);
+
+        auto socketApi = FolderMan::instance()->socketApi();
+
+        // verifies that calling slotUnregisterPath twice on the same alias doesn't crash
+        socketApi->slotUnregisterPath(folder1->alias());
+        socketApi->slotUnregisterPath(folder1->alias());
+
+        FolderMan::instance()->unloadAndDeleteAllFolders();
+
+        QCOMPARE(FolderMan::instance()->map().count(), 0);
+    }
 };
 
 QTEST_GUILESS_MAIN(TestFolderMan)