From 36da235037ae87b71ab2b9cda40dd83dd170993c Mon Sep 17 00:00:00 2001 From: David Kocher Date: Tue, 28 Nov 2017 13:07:56 +0100 Subject: [PATCH] Use concrete vault class when creating new. --- .../ch/cyberduck/ui/cocoa/controller/BrowserController.java | 4 ++-- .../csharp/ch/cyberduck/ui/controller/VaultController.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java index 9491e690f75..8fd0a60344e 100644 --- a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java +++ b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.*; import ch.cyberduck.core.aquaticprime.LicenseFactory; import ch.cyberduck.core.bonjour.RendezvousCollection; +import ch.cyberduck.core.cryptomator.CryptoVault; import ch.cyberduck.core.editor.DefaultEditorListener; import ch.cyberduck.core.editor.Editor; import ch.cyberduck.core.editor.EditorFactory; @@ -82,7 +83,6 @@ import ch.cyberduck.core.transfer.TransferPrompt; import ch.cyberduck.core.transfer.UploadTransfer; import ch.cyberduck.core.vault.VaultCredentials; -import ch.cyberduck.core.vault.VaultFactory; import ch.cyberduck.core.worker.CopyWorker; import ch.cyberduck.core.worker.CreateDirectoryWorker; import ch.cyberduck.core.worker.CreateSymlinkWorker; @@ -2328,7 +2328,7 @@ public void createEncryptedVaultButtonClicked(final ID sender) { @Override public void callback(final Path folder, final String region, final VaultCredentials passphrase) { background(new WorkerBackgroundAction(BrowserController.this, pool, - new CreateVaultWorker(region, passphrase, VaultFactory.get(folder, PasswordStoreFactory.get())) { + new CreateVaultWorker(region, passphrase, new CryptoVault(folder, PasswordStoreFactory.get())) { @Override public void cleanup(final Path vault) { reload(workdir(), Collections.singletonList(folder), Collections.singletonList(folder)); diff --git a/windows/src/main/csharp/ch/cyberduck/ui/controller/VaultController.cs b/windows/src/main/csharp/ch/cyberduck/ui/controller/VaultController.cs index c2359405aaf..712ab9ead53 100644 --- a/windows/src/main/csharp/ch/cyberduck/ui/controller/VaultController.cs +++ b/windows/src/main/csharp/ch/cyberduck/ui/controller/VaultController.cs @@ -25,6 +25,7 @@ using ch.cyberduck.core.threading; using ch.cyberduck.core.worker; using ch.cyberduck.core.vault; +using ch.cyberduck.core.cryptomator; using ch.cyberduck.ui.browser; using Ch.Cyberduck.Core; using Ch.Cyberduck.Core.Resources; @@ -95,7 +96,7 @@ private class InnerCreateVaultWorker : CreateVaultWorker public InnerCreateVaultWorker(BrowserController controller, Path folder, String filename, String region, String passphrase) - : base(region, new VaultCredentials(passphrase), VaultFactory.get(folder, PasswordStoreFactory.get())) + : base(region, new VaultCredentials(passphrase), new CryptoVault(folder, PasswordStoreFactory.get())) { _controller = controller; _folder = folder; @@ -114,4 +115,4 @@ public override void cleanup(object result) } } } -} \ No newline at end of file +}