Fix placeholder detection for cfapi

Fixes: #8326

2 files changed, 11 insertions, 6 deletions

diff --git a/changelog/unreleased/8326 b/changelog/unreleased/8326
new file mode 100644
index 000000000..61280310b
--- /dev/null
+++ b/changelog/unreleased/8326
@@ -0,0 +1,6 @@
+Bugfix: Remove stray placeholders
+
+We fixed a bug where Windows Virtual Files where not handled as such and thus
+not removed.
+
+https://github.com/owncloud/client/issues/8326
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 2a2f279e4..b4f5f13dd 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -840,16 +840,15 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
     item->_type = localEntry.isDirectory ? ItemTypeDirectory : localEntry.isVirtualFile ? ItemTypeVirtualFile : ItemTypeFile;
     _childModified = true;
 
-    auto postProcessLocalNew = [item, localEntry, this]() {
+    auto postProcessLocalNew = [item, localEntry, path, this]() {
         if (localEntry.isVirtualFile) {
-            // Remove the spurious file if it looks like a placeholder file
-            // (we know placeholder files contain " ")
-            if (localEntry.size <= 1) {
-                qCWarning(lcDisco) << "Wiping virtual file without db entry for" << _currentFolder._local + QLatin1Char('/') + localEntry.name;
+            const bool isPlaceHolder = _discoveryData->_syncOptions._vfs->isDehydratedPlaceholder(_discoveryData->_localDir + path._local);
+            if (isPlaceHolder) {
+                qCWarning(lcDisco) << "Wiping virtual file without db entry for" << path._local;
                 item->_instruction = CSYNC_INSTRUCTION_REMOVE;
                 item->_direction = SyncFileItem::Down;
             } else {
-                qCWarning(lcDisco) << "Virtual file without db entry for" << _currentFolder._local << localEntry.name
+                qCWarning(lcDisco) << "Virtual file without db entry for" << path._local
                                    << "but looks odd, keeping";
                 item->_instruction = CSYNC_INSTRUCTION_IGNORE;
             }