From e1de1add6ccf141c1b3ca90c814d9293454d630c Mon Sep 17 00:00:00 2001 From: David Kocher Date: Fri, 1 Nov 2013 16:24:33 +0000 Subject: [PATCH] By default always set to change permissions after edit. Add hidden property editor.upload.permissions.change. Former-commit-id: 25eb36ea95dbc101a16ddc8a4264957a39a4fb68 --- source/ch/cyberduck/core/Preferences.java | 1 + source/ch/cyberduck/core/editor/AbstractEditor.java | 7 +++---- .../core/transfer/upload/AbstractUploadFilter.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/ch/cyberduck/core/Preferences.java b/source/ch/cyberduck/core/Preferences.java index 40fba45e5db..e97598b3781 100644 --- a/source/ch/cyberduck/core/Preferences.java +++ b/source/ch/cyberduck/core/Preferences.java @@ -341,6 +341,7 @@ protected void setDefaults() { defaults.put("editor.odb.enable", String.valueOf(false)); defaults.put("editor.upload.temporary", String.valueOf(true)); + defaults.put("editor.upload.permissions.change", String.valueOf(true)); defaults.put("filetype.text.regex", ".*\\.txt|.*\\.cgi|.*\\.htm|.*\\.html|.*\\.shtml|.*\\.xml|.*\\.xsl|.*\\.php|.*\\.php3|" + diff --git a/source/ch/cyberduck/core/editor/AbstractEditor.java b/source/ch/cyberduck/core/editor/AbstractEditor.java index 49b6760479e..1261b44c1c8 100644 --- a/source/ch/cyberduck/core/editor/AbstractEditor.java +++ b/source/ch/cyberduck/core/editor/AbstractEditor.java @@ -239,10 +239,9 @@ public TransferAction action(final Session session, final boolean resumeReque @Override public AbstractUploadFilter filter(final Session session, final TransferAction action) { - final AbstractUploadFilter filter = super.filter(session, action); - filter.setOptions(new UploadFilterOptions().withTemporary( - Preferences.instance().getBoolean("editor.upload.temporary"))); - return filter; + return super.filter(session, action).withOptions(new UploadFilterOptions() + .withTemporary(Preferences.instance().getBoolean("editor.upload.temporary")) + .withPermission(Preferences.instance().getBoolean("editor.upload.permissions.change"))); } }; final SingleTransferWorker worker diff --git a/source/ch/cyberduck/core/transfer/upload/AbstractUploadFilter.java b/source/ch/cyberduck/core/transfer/upload/AbstractUploadFilter.java index 03e0d15e2ea..ba2646f60a5 100644 --- a/source/ch/cyberduck/core/transfer/upload/AbstractUploadFilter.java +++ b/source/ch/cyberduck/core/transfer/upload/AbstractUploadFilter.java @@ -77,8 +77,9 @@ public AbstractUploadFilter(final SymlinkResolver symlinkResolver, final Session this.attribute = session.getFeature(Attributes.class).withCache(cache); } - public void setOptions(final UploadFilterOptions options) { + public AbstractUploadFilter withOptions(final UploadFilterOptions options) { this.options = options; + return this; } @Override