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

Ensure blacklisted e2ee files get deleted

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2022-12-20 20:16:06 +01:00
parent b333310ffe
commit efcd23eb06
No known key found for this signature in database
GPG key ID: C839200C384636B0
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui/folder.cpp
View file

@ -1387,6 +1387,32 @@ void Folder::removeLocalE2eFiles()
slotTerminateSync();
}
for (const auto &e2eFilePath : qAsConst(e2eFoldersToBlacklist)) {
if (!_journal.deleteFileRecord(e2eFilePath, true)) {
qCWarning(lcFolder) << "Failed to delete file record from local DB" << e2eFilePath
<< "it might have already been deleted.";
continue;
}
qCDebug(lcFolder) << "Removing local copy of" << e2eFilePath;
const auto fullPath = QString(path() + e2eFilePath);
const QFileInfo pathInfo(fullPath);
if (pathInfo.isDir() && pathInfo.exists()) {
QDir dir(fullPath);
if (!dir.removeRecursively()) {
qCWarning(lcFolder) << "Unable to remove directory and contents at:" << fullPath;
}
} else if (pathInfo.exists()) {
if (!QFile::remove(fullPath)) {
qCWarning(lcFolder) << "Unable to delete:" << fullPath;
}
} else {
qCWarning(lcFolder) << "Unable to delete:" << fullPath << "as it does not exist!";
}
}
for (const auto &path : qAsConst(e2eFoldersToBlacklist)) {
_journal.schedulePathForRemoteDiscovery(path);
schedulePathForLocalDiscovery(path);