Register vault provider as feature.

Author: dkocher

core/src/main/java/ch/cyberduck/core/Session.java

@@ -36,6 +36,8 @@
 import ch.cyberduck.core.proxy.ProxyFinder;
 import ch.cyberduck.core.shared.*;
 import ch.cyberduck.core.threading.CancelCallback;
+import ch.cyberduck.core.vault.VaultProvider;
+import ch.cyberduck.core.vault.VaultProviderFactory;
 import ch.cyberduck.core.vault.VaultRegistry;
 
 import org.apache.logging.log4j.LogManager;
@@ -331,6 +333,9 @@ public <T> T _getFeature(final Class<T> type) {
         if(type == Bulk.class) {
             return (T) new DisabledBulkFeature();
         }
+        if(type == VaultProvider.class) {
+            return (T) VaultProviderFactory.get(this);
+        }
         return host.getProtocol().getFeature(type);
     }
 

core/src/main/java/ch/cyberduck/core/vault/LoadingVaultLookupListener.java

@@ -47,7 +47,7 @@ public Vault load(final Session<?> session, final Path directory, final VaultMet
             log.info("Loading vault for session {}", session);
             final Vault vault;
             try {
-                vault = VaultProviderFactory.get(session).provide(session, directory, metadata);
+                vault = session.getFeature(VaultProvider.class).provide(session, directory, metadata);
             }
             catch(UnsupportedException e) {
                 throw new VaultUnlockCancelException(Vault.DISABLED, e);

core/src/main/java/ch/cyberduck/core/vault/VaultFinderListProgressListener.java

@@ -46,7 +46,7 @@ public VaultFinderListProgressListener(final Session<?> session, final VaultLook
         this.lookup = lookup;
         this.proxy = proxy;
         this.filecount = filecount;
-        this.provider = VaultProviderFactory.get(session);
+        this.provider = session.getFeature(VaultProvider.class);
     }
 
     @Override

core/src/main/java/ch/cyberduck/core/vault/registry/VaultRegistryFindFeature.java

@@ -25,7 +25,6 @@
 import ch.cyberduck.core.vault.VaultLookupListener;
 import ch.cyberduck.core.vault.VaultMetadata;
 import ch.cyberduck.core.vault.VaultProvider;
-import ch.cyberduck.core.vault.VaultProviderFactory;
 import ch.cyberduck.core.vault.VaultRegistry;
 import ch.cyberduck.core.vault.VaultUnlockCancelException;
 
@@ -51,7 +50,7 @@ public VaultRegistryFindFeature(final Session<?> session, final Find proxy, fina
         this.lookup = lookup;
         this.autodetect = HostPreferencesFactory.get(session.getHost()).getBoolean("cryptomator.vault.autodetect")
                 && HostPreferencesFactory.get(session.getHost()).getBoolean("cryptomator.enable");
-        this.provider = VaultProviderFactory.get(session);
+        this.provider = session.getFeature(VaultProvider.class);
     }
 
     @Override

core/src/main/java/ch/cyberduck/core/worker/CreateVaultWorker.java

@@ -23,7 +23,7 @@
 import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider;
 import ch.cyberduck.core.vault.VaultCredentials;
 import ch.cyberduck.core.vault.VaultMetadata;
-import ch.cyberduck.core.vault.VaultProviderFactory;
+import ch.cyberduck.core.vault.VaultProvider;
 
 import java.text.MessageFormat;
 import java.util.Objects;
@@ -44,7 +44,7 @@ public CreateVaultWorker(final String region, final Path directory, final VaultC
 
     @Override
     public Vault run(final Session<?> session) throws BackgroundException {
-        final Vault vault = VaultProviderFactory.get(session).provide(session, directory, metadata);
+        final Vault vault = session.getFeature(VaultProvider.class).provide(session, directory, metadata);
         vault.create(session, region, new DefaultVaultMetadataCredentialsProvider(passphrase));
         vault.close();
         return vault;