Merge pull request #15138 from iterate-ch/feature/GH-15137

Fix #15137

Changelog.txt

@@ -2,6 +2,7 @@ Cyberduck
 https://cyberduck.io/
 
 8.9.0
+- [Feature] Versioning of files edited in external application (#15137)
 - [Feature] Resumable file uploads (ownCloud) (#15619)
 - [Feature] Support authentication using SSH certificates (SFTP) (#15183)
 - [Bugfix] Failure sharing file (ownCloud) (#15855, #15839)

core/src/main/java/ch/cyberduck/core/editor/EditSaveWorker.java

@@ -77,8 +77,8 @@ public TransferAction action(final Session<?> source,
             @Override
             public AbstractUploadFilter filter(final Session<?> session, final Session<?> destination, final TransferAction action, final ProgressListener listener) {
                 return super.filter(session, destination, action, listener).withOptions(new UploadFilterOptions(host)
-                    .withTemporary(PreferencesFactory.get().getBoolean("queue.upload.file.temporary"))
-                    .withPermission(PreferencesFactory.get().getBoolean("editor.upload.permissions.change")));
+                        .withVersioning(PreferencesFactory.get().getBoolean("editor.upload.file.versioning"))
+                        .withPermission(PreferencesFactory.get().getBoolean("editor.upload.permissions.change")));
             }
         };
         this.listener = listener;
@@ -90,9 +90,9 @@ public Transfer run(final Session<?> session) throws BackgroundException {
             log.debug(String.format("Run upload action for editor %s", editor));
         }
         final SingleTransferWorker worker
-            = new SingleTransferWorker(session, session, upload, new TransferOptions(),
+                = new SingleTransferWorker(session, session, upload, new TransferOptions(),
                 new TransferSpeedometer(upload), new DisabledTransferPrompt(), callback,
-            listener, new DisabledStreamListener(), new DisabledLoginCallback(), notification);
+                listener, new DisabledStreamListener(), new DisabledLoginCallback(), notification);
         worker.run(session);
         if(!upload.isComplete()) {
             log.warn(String.format("File size changed for %s", file));

core/src/main/java/ch/cyberduck/core/transfer/upload/UploadFilterOptions.java

@@ -110,6 +110,11 @@ public UploadFilterOptions withChecksum(boolean enabled) {
         return this;
     }
 
+    public UploadFilterOptions withVersioning(final boolean versioning) {
+        this.versioning = versioning;
+        return this;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("UploadFilterOptions{");

defaults/src/main/resources/default.properties

@@ -136,6 +136,7 @@ editor.bundleIdentifier=
 editor.alwaysUseDefault=false
 editor.upload.permissions.change=true
 editor.upload.symboliclink.resolve=true
+editor.upload.file.versioning=false
 
 # Save bookmarks in ~/Library
 favorites.save=true

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/PreferencesController.java

@@ -448,6 +448,21 @@ public void defaultEditorCheckboxClicked(final NSButton sender) {
         preferences.setProperty("editor.alwaysUseDefault", enabled);
     }
 
+    @Outlet
+    private NSButton editorVersioningCheckbox;
+
+    public void setEditorVersioningCheckbox(final NSButton b) {
+        this.editorVersioningCheckbox = b;
+        this.editorVersioningCheckbox.setTarget(this.id());
+        this.editorVersioningCheckbox.setAction(Foundation.selector("editorVersioningCheckboxClicked:"));
+        this.editorVersioningCheckbox.setState(preferences.getBoolean("editor.upload.file.versioning") ? NSCell.NSOnState : NSCell.NSOffState);
+    }
+
+    public void editorVersioningCheckboxClicked(final NSButton sender) {
+        boolean enabled = sender.state() == NSCell.NSOnState;
+        preferences.setProperty("editor.upload.file.versioning", enabled);
+    }
+
     @Outlet
     private NSPopUpButton bookmarkSizePopup;
 

windows/src/main/csharp/ch/cyberduck/ui/controller/IPreferencesView.cs

@@ -35,6 +35,7 @@ internal interface IPreferencesView : IView
         bool AlwaysUseDefaultEditor { set; get; }
         bool ShowHiddenFiles { set; get; }
         bool DoubleClickEditor { set; get; }
+        bool EnableVersioning { get; set; }
         bool ReturnKeyRenames { set; get; }
         bool InfoWindowShowsCurrentSelection { set; get; }
         int BookmarkSize { set; get; }
@@ -155,6 +156,7 @@ internal interface IPreferencesView : IView
         event VoidHandler DefaultEditorChangedEvent;
         event VoidHandler RepopulateEditorsEvent;
         event VoidHandler AlwaysUseDefaultEditorChangedEvent;
+        event VoidHandler EnableVersioningChangedEvent;
         event VoidHandler ChmodDownloadChangedEvent;
         event VoidHandler ChmodDownloadUseDefaultChangedEvent;
         event VoidHandler ChmodDownloadTypeChangedEvent;

windows/src/main/csharp/ch/cyberduck/ui/controller/PreferencesController.cs

@@ -76,6 +76,7 @@ private PreferencesController(IPreferencesView view)
             View.AlwaysUseDefaultEditorChangedEvent += View_AlwaysUseDefaultEditorChangedEvent;
             View.ShowHiddenFilesChangedEvent += View_ShowHiddenFilesChangedEvent;
             View.DoubleClickEditorChangedEvent += View_DoubleClickEditorChangedEvent;
+            View.EnableVersioningChangedEvent += View_EnableVersioningChangedEvent;
             View.ReturnKeyRenamesChangedEvent += View_ReturnKeyRenamesChangedEvent;
             View.InfoWindowShowsCurrentSelectionChangedEvent += View_InfoWindowShowsCurrentSelectionChangedEvent;
             View.AlternatingRowBackgroundChangedEvent += View_AlternatingRowBackgroundChangedEvent;
@@ -823,6 +824,11 @@ private void View_DoubleClickEditorChangedEvent()
             PreferencesFactory.get().setProperty("browser.doubleclick.edit", View.DoubleClickEditor);
         }
 
+        private void View_EnableVersioningChangedEvent()
+        {
+            PreferencesFactory.get().setProperty("editor.upload.file.versioning", View.EnableVersioning);
+        }
+
         private void View_ReturnKeyRenamesChangedEvent()
         {
             PreferencesFactory.get().setProperty("browser.enterkey.rename", View.ReturnKeyRenames);
@@ -978,6 +984,7 @@ private void Init()
 
             PopulateAndSelectEditor();
             View.AlwaysUseDefaultEditor = PreferencesFactory.get().getBoolean("editor.alwaysUseDefault");
+            View.EnableVersioning = PreferencesFactory.get().getBoolean("editor.upload.file.versioning");
 
             #endregion