feat(macOS): Add trash sync toggle for FileProvider virtual files

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderDomainDefaults.swift

@@ -14,7 +14,6 @@ struct FileProviderDomainDefaults {
     /// > Warning: Do not change the raw values of these keys, as they are used in UserDefaults. Any change would make the already stored value inaccessible and be like a reset.
     ///
     private enum ConfigKey: String {
-        case trashDeletionEnabled
         case user
         case userId
         case serverUrl
@@ -84,29 +83,6 @@ struct FileProviderDomainDefaults {
         }
     }
 
-    ///
-    /// Whether trash deletion is enabled or not.
-    ///
-    var trashDeletionEnabled: Bool {
-        get {
-            let identifier = self.identifier.rawValue
-
-            if let value = internalConfig[ConfigKey.trashDeletionEnabled.rawValue] as? Bool {
-                logger.debug("Returning existing value \"\(value)\" for \"trashDeletionEnabled\" for file provider domain \"\(identifier)\".")
-                return value
-            } else {
-                return false
-            }
-        }
-
-        set {
-            let identifier = self.identifier.rawValue
-
-            logger.error("Setting value \"\(newValue)\" for \"trashDeletionEnabled\" for file provider domain \"\(identifier)\".")
-            internalConfig[ConfigKey.trashDeletionEnabled.rawValue] = newValue
-        }
-    }
-
     ///
     /// The user name associated with the domain.
     ///
@@ -166,9 +142,4 @@ struct FileProviderDomainDefaults {
             }
         }
     }
-
-    ///
-    /// Whether a value for `trashDeletionEnabled` has been explicitly set.
-    ///
-    lazy var trashDeletionSet = internalConfig[ConfigKey.trashDeletionEnabled.rawValue] != nil
 }

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift

@@ -452,13 +452,6 @@ import OSLog
 
             logger.debug("Found item for identifier.", [.item: identifier, .name: item.filename])
 
-            guard config.trashDeletionEnabled || item.parentItemIdentifier != .trashContainer else {
-                logger.info("System requested deletion of item in trash, but deleting trash items is disabled. item: \(item.filename)")
-                removeSyncAction(actionId)
-                completionHandler(NSError.fileProviderErrorForRejectedDeletion(of: item))
-                return
-            }
-
             let error = await item.delete(domain: domain, ignoredFiles: ignoredFiles, dbManager: dbManager)
 
             if error != nil {

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h

@@ -21,8 +21,6 @@
                         password:(NSString *)password
                        userAgent:(NSString *)userAgent;
 - (void)removeAccountConfig;
-- (void)getTrashDeletionEnabledStateWithCompletionHandler:(void(^)(BOOL enabled, BOOL set))completionHandler;
-- (void)setTrashDeletionEnabled:(BOOL)enabled;
 - (void)setIgnoreList:(NSArray<NSString *> *)ignoreList;
 
 @end

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationService.swift

@@ -63,17 +63,6 @@ class ClientCommunicationService: NSObject, NSFileProviderServiceSource, NSXPCLi
         self.fpExtension.removeAccountConfig()
     }
 
-    func getTrashDeletionEnabledState(completionHandler: @escaping (Bool, Bool) -> Void) {
-        let enabled = fpExtension.config.trashDeletionEnabled
-        let set = fpExtension.config.trashDeletionSet
-        completionHandler(enabled, set)
-    }
-
-    func setTrashDeletionEnabled(_ enabled: Bool) {
-        fpExtension.config.trashDeletionEnabled = enabled
-        logger.info("Trash deletion setting changed to: \(enabled)")
-    }
-
     func setIgnoreList(_ ignoreList: [String]) {
         self.fpExtension.ignoredFiles = IgnoredFilesMatcher(ignoreList: ignoreList)
         logger.info("Ignore list updated.")

src/gui/macOS/fileprovider.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
 #include <QObject>
 
 #include "fileproviderdomainmanager.h"
 #include "fileprovidersocketserver.h"
@@ -36,6 +36,7 @@
 
 private slots:
     void configureXPC();
+    void onDomainReconfigurationFailed(const QString &accountId, const QString &errorMessage);
 
 private:
     std::unique_ptr<FileProviderDomainManager> _domainManager;

src/gui/macOS/fileprovider_mac.mm

@@ -6,6 +6,7 @@
 #include "fileprovider.h"
 
 #include <QLoggingCategory>
+#include <QMessageBox>
 
 #include "libsync/configfile.h"
 #include "gui/macOS/fileproviderxpc.h"
@@ -36,6 +37,8 @@
 
     if (_domainManager) {
         connect(_domainManager.get(), &FileProviderDomainManager::domainSetupComplete, this, &FileProvider::configureXPC);
+        connect(_domainManager.get(), &FileProviderDomainManager::domainReconfigurationFailed,
+                this, &FileProvider::onDomainReconfigurationFailed);
         _domainManager->start();
         qCDebug(lcMacFileProvider()) << "Initialized file provider domain manager";
     }
@@ -102,5 +105,16 @@
     return _socketServer.get();
 }
 
+void FileProvider::onDomainReconfigurationFailed(const QString &accountId, const QString &errorMessage)
+{
+    qCWarning(lcMacFileProvider) << "Domain reconfiguration failed for account:" << accountId << "Error:" << errorMessage;
+    QMessageBox::warning(nullptr,
+                         tr("Virtual files configuration error"),
+                         tr("Could not update the virtual files settings for account %1.\n\n"
+                            "Error: %2\n\n"
+                            "Please try again or restart the application.")
+                             .arg(accountId, errorMessage));
+}
+
 } // namespace Mac
 } // namespace OCC

src/gui/macOS/fileproviderdomainmanager.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
 #include <QObject>
 
 #include "accountstate.h"
 
@@ -31,6 +31,7 @@
 
 signals:
     void domainSetupComplete();
+    void domainReconfigurationFailed(const QString &accountId, const QString &errorMessage);
 
 public slots:
     void addFileProviderDomainForAccount(const OCC::AccountState * const accountState);
@@ -42,6 +43,7 @@
     void removeFileProviderDomainForAccount(const OCC::AccountState * const accountState);
     void disconnectFileProviderDomainForAccount(const OCC::AccountState * const accountState, const QString &reason);
     void reconnectFileProviderDomainForAccount(const OCC::AccountState * const accountState);
+    void reconfigureFileProviderDomainForAccount(const QString &accountId);
 
     void signalEnumeratorChanged(const OCC::Account * const account);
     void slotAccountStateChanged(const OCC::AccountState * const accountState);