mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup syncengine after the new option not to ask confirmation when everything is removed

Browse source 
Cleanup after pull reuqest  #4389

Do not make the SyncEngine depends on the ConfigFile
This commit is contained in:
Olivier Goffart 2016-02-22 16:14:22 +01:00
parent a76ba06817
commit b3d57f3c7c
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/folder.cpp
View file

@ -1175,6 +1175,10 @@ void Folder::slotNewBigFolderDiscovered(const QString &newF)
void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
{
ConfigFile cfgFile;
if (!cfgFile.promptDeleteFiles())
return;
QString msg =
tr("This sync would remove all the files in the sync folder '%1'.\n"
"This might be because the folder was silently reconfigured, or that all "

5
src/libsync/syncengine.cpp
View file

@ -23,7 +23,6 @@
#include "syncfilestatus.h"
#include "csync_private.h"
#include "filesystem.h"
#include "configfile.h"
#ifdef Q_OS_WIN
#include <windows.h>
@ -842,9 +841,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
}
}
// Check the config file before displaying prompt in case it is disabled.
ConfigFile cfgFile;
if (!_hasNoneFiles && _hasRemoveFile && cfgFile.promptDeleteFiles()) {
if (!_hasNoneFiles && _hasRemoveFile) {
qDebug() << Q_FUNC_INFO << "All the files are going to be changed, asking the user";
bool cancel = false;
emit aboutToRemoveAllFiles(_syncedItems.first()->_direction, &cancel);