Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct FileProviderConfig {
}

var trashDeletionEnabled: Bool {
get { internalConfig[ConfigKey.trashDeletionEnabled.rawValue] as? Bool ?? true }
get { internalConfig[ConfigKey.trashDeletionEnabled.rawValue] as? Bool ?? false }
set { internalConfig[ConfigKey.trashDeletionEnabled.rawValue] = newValue }
}

Expand Down
4 changes: 2 additions & 2 deletions src/gui/macOS/fileprovidersettingscontroller_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -378,12 +378,12 @@ void initialCheck()
{
const auto xpc = FileProvider::instance()->xpc();
if (!xpc) {
return true;
return false;
}
if (const auto trashDeletionState = xpc->trashDeletionEnabledStateForExtension(userIdAtHost)) {
return trashDeletionState->first;
}
return true;
return false;
}

bool FileProviderSettingsController::trashDeletionSetForAccount(const QString &userIdAtHost) const
Expand Down
2 changes: 1 addition & 1 deletion src/gui/macOS/fileproviderxpc_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
return std::nullopt;
}

__block BOOL receivedTrashDeletionEnabled = YES; // What is the value of the setting being used by the extension?
__block BOOL receivedTrashDeletionEnabled = NO; // What is the value of the setting being used by the extension?
__block BOOL receivedTrashDeletionEnabledSet = NO; // Has the setting been set by the user?
__block BOOL receivedResponse = NO;
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
Expand Down
Loading