Fix #10214.

iterate-ch · Feb 2, 2018 · 239c36b · 239c36b
1 parent 12c4320
commit 239c36b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/vault/DefaultVaultRegistry.java b/core/src/main/java/ch/cyberduck/core/vault/DefaultVaultRegistry.java
@@ -40,9 +40,6 @@ public class DefaultVaultRegistry extends CopyOnWriteArraySet<Vault> implements
     private final PasswordStore keychain;
     private final PasswordCallback prompt;
 
-    private boolean autodetect = preferences.getBoolean("cryptomator.vault.autodetect")
-        && preferences.getBoolean("cryptomator.enable");
-
     public DefaultVaultRegistry(final PasswordCallback prompt) {
         this(PasswordStoreFactory.get(), prompt);
     }
@@ -119,11 +116,15 @@ public <T> T getFeature(final Session<?> session, final Class<T> type, final T p
         }
         if(type == ListService.class) {
             return (T) new VaultRegistryListService(session, (ListService) proxy, this,
-                new LoadingVaultLookupListener(session, this, keychain, prompt)).withAutodetect(autodetect);
+                new LoadingVaultLookupListener(session, this, keychain, prompt))
+                .withAutodetect(preferences.getBoolean("cryptomator.vault.autodetect")
+                );
         }
         if(type == Find.class) {
             return (T) new VaultRegistryFindFeature(session, (Find) proxy, this,
-                new LoadingVaultLookupListener(session, this, keychain, prompt)).withAutodetect(autodetect);
+                new LoadingVaultLookupListener(session, this, keychain, prompt))
+                .withAutodetect(preferences.getBoolean("cryptomator.vault.autodetect")
+                );
         }
         if(type == Bulk.class) {
             return (T) new VaultRegistryBulkFeature(session, (Bulk) proxy, this);
@@ -214,10 +215,4 @@ public <T> T getFeature(final Session<?> session, final Class<T> type, final T p
         }
         return proxy;
     }
-
-    @Override
-    public DefaultVaultRegistry withAutodetect(final boolean autodetect) {
-        this.autodetect = autodetect && preferences.getBoolean("cryptomator.enable");
-        return this;
-    }
 }
diff --git a/core/src/main/java/ch/cyberduck/core/vault/DisabledVaultRegistry.java b/core/src/main/java/ch/cyberduck/core/vault/DisabledVaultRegistry.java
@@ -41,11 +41,6 @@ public boolean contains(final Path vault) {
         return false;
     }
 
-    @Override
-    public VaultRegistry withAutodetect(final boolean autodetect) {
-        return this;
-    }
-
     @Override
     public boolean add(final Vault vault) {
         return false;

diff --git a/core/src/main/java/ch/cyberduck/core/vault/VaultRegistry.java b/core/src/main/java/ch/cyberduck/core/vault/VaultRegistry.java
@@ -41,6 +41,4 @@ public interface VaultRegistry {
     <T> T getFeature(Session<?> session, Class<T> type, T proxy);
 
     boolean contains(Path vault);
-
-    VaultRegistry withAutodetect(boolean autodetect);
 }