Fix #3144: check for promptDeleteAllFiles config setting before emitt…

…ing signal to display warning. The signal is not connected to any slot when running nextcloudcmd. The callback to finish the sync was never being called because the check for the config was done in the slot, which was never called. Signed-off-by: Camila Ayres <[email protected]>
nextcloud · Jun 4, 2024 · 11b11c0 · 11b11c0
1 parent e60f6b0
commit 11b11c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -1628,12 +1628,6 @@ bool Folder::virtualFilesEnabled() const
 
 void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, std::function<void(bool)> callback)
 {
-    ConfigFile cfgFile;
-    if (!cfgFile.promptDeleteFiles()) {
-        callback(false);
-        return;
-    }
-
     const QString msg = dir == SyncFileItem::Down ? tr("All files in the sync folder \"%1\" folder were deleted on the server.\n"
                                                  "These deletes will be synchronized to your local sync folder, making such files "
                                                  "unavailable unless you have a right to restore. \n"
@@ -1644,7 +1638,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, std::functio
                                                  "Are you sure you want to sync those actions with the server?\n"
                                                  "If this was an accident and you decide to keep your files, they will be re-synced from the server.");
     auto msgBox = new QMessageBox(QMessageBox::Warning, tr("Remove All Files?"),
-        msg.arg(shortGuiLocalPath()), QMessageBox::NoButton);
+    msg.arg(shortGuiLocalPath()), QMessageBox::NoButton);
     msgBox->setAttribute(Qt::WA_DeleteOnClose);
     msgBox->setWindowFlags(msgBox->windowFlags() | Qt::WindowStaysOnTopHint);
     msgBox->addButton(tr("Remove all files"), QMessageBox::DestructiveRole);

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
@@ -898,7 +898,7 @@ void SyncEngine::slotDiscoveryFinished()
         qCInfo(lcEngine) << "#### Post-Reconcile end #################################################### " << _stopWatch.addLapTime(QStringLiteral("Post-Reconcile Finished")) << "ms";
     };
 
-    if (!_hasNoneFiles && _hasRemoveFile) {
+    if (!_hasNoneFiles && _hasRemoveFile && ConfigFile().promptDeleteFiles()) {
         qCInfo(lcEngine) << "All the files are going to be changed, asking the user";
         int side = 0; // > 0 means more deleted on the server.  < 0 means more deleted on the client
         foreach (const auto &it, _syncItems) {
@@ -907,15 +907,14 @@ void SyncEngine::slotDiscoveryFinished()
             }
         }
 
-        QPointer<QObject> guard = new QObject();
-        QPointer<QObject> self = this;
+        const auto guard = new QObject();
+        const auto self = this;
         auto callback = [this, self, finish, guard](bool cancel) -> void {
             // use a guard to ensure its only called once...
             // qpointer to self to ensure we still exist
             if (!guard || !self) {
                 return;
             }
-            guard->deleteLater();
             if (cancel) {
                 qCInfo(lcEngine) << "User aborted sync";
                 finalize(false);