From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 20 Mar 2023 13:56:41 +0000 (+0100)
Subject: Properly handle metadata delete after item deletion in FileProviderExtension
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~55^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7550ed7a1ba57b1efdf776e3bb8cde7853324369;p=nextcloud-desktop.git

Properly handle metadata delete after item deletion in FileProviderExtension

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
index 1a8bb0ba1..67f27c551 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
@@ -580,11 +580,12 @@ class FileProviderExtension: NSObject, NSFileProviderReplicatedExtension, NKComm
             Logger.fileTransfer.info("Successfully deleted item with identifier: \(identifier.rawValue, privacy: .public) at: \(serverFileNameUrl, privacy: OSLogPrivacy.auto(mask: .hash))")
 
             if itemMetadata.directory {
-                dbManager.deleteDirectoryAndSubdirectoriesMetadata(ocId: ocId)
-            }
-
-            if dbManager.localFileMetadataFromOcId(ocId) != nil {
-                dbManager.deleteLocalFileMetadata(ocId: ocId)
+                _ = dbManager.deleteDirectoryAndSubdirectoriesMetadata(ocId: ocId)
+            } else {
+                dbManager.deleteItemMetadata(ocId: ocId)
+                if dbManager.localFileMetadataFromOcId(ocId) != nil {
+                    dbManager.deleteLocalFileMetadata(ocId: ocId)
+                }
             }
 
             completionHandler(nil)