Skip to content

Commit

Permalink
Use concrete vault class when creating new.
Browse files Browse the repository at this point in the history
  • Loading branch information
dkocher committed Nov 28, 2017
1 parent 7553203 commit 36da235
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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<Path>(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));
Expand Down
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -114,4 +115,4 @@ public override void cleanup(object result)
}
}
}
}
}

0 comments on commit 36da235

Please sign in to comment.