Cyberduck Mountain Duck CLI

Changeset 43834


Ignore:
Timestamp:
Feb 5, 2018 8:10:47 AM (5 months ago)
Author:
dkocher
Message:

Fix #10214.

Location:
shelves/02.02.2018
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • shelves/02.02.2018/core/src/main/java/ch/cyberduck/core/vault/DefaultVaultRegistry.java

    r43508 r43834  
    4141    private final PasswordCallback prompt;
    4242
    43     private boolean autodetect = preferences.getBoolean("cryptomator.vault.autodetect")
    44         && preferences.getBoolean("cryptomator.enable");
    45 
    4643    public DefaultVaultRegistry(final PasswordCallback prompt) {
    4744        this(PasswordStoreFactory.get(), prompt);
     
    120117        if(type == ListService.class) {
    121118            return (T) new VaultRegistryListService(session, (ListService) proxy, this,
    122                 new LoadingVaultLookupListener(session, this, keychain, prompt)).withAutodetect(autodetect);
     119                new LoadingVaultLookupListener(session, this, keychain, prompt))
     120                .withAutodetect(preferences.getBoolean("cryptomator.vault.autodetect")
     121                );
    123122        }
    124123        if(type == Find.class) {
    125124            return (T) new VaultRegistryFindFeature(session, (Find) proxy, this,
    126                 new LoadingVaultLookupListener(session, this, keychain, prompt)).withAutodetect(autodetect);
     125                new LoadingVaultLookupListener(session, this, keychain, prompt))
     126                .withAutodetect(preferences.getBoolean("cryptomator.vault.autodetect")
     127                );
    127128        }
    128129        if(type == Bulk.class) {
     
    215216        return proxy;
    216217    }
    217 
    218     @Override
    219     public DefaultVaultRegistry withAutodetect(final boolean autodetect) {
    220         this.autodetect = autodetect && preferences.getBoolean("cryptomator.enable");
    221         return this;
    222     }
    223218}
  • shelves/02.02.2018/core/src/main/java/ch/cyberduck/core/vault/DisabledVaultRegistry.java

    r43508 r43834  
    4343
    4444    @Override
    45     public VaultRegistry withAutodetect(final boolean autodetect) {
    46         return this;
    47     }
    48 
    49     @Override
    5045    public boolean add(final Vault vault) {
    5146        return false;
  • shelves/02.02.2018/core/src/main/java/ch/cyberduck/core/vault/VaultRegistry.java

    r43508 r43834  
    4242
    4343    boolean contains(Path vault);
    44 
    45     VaultRegistry withAutodetect(boolean autodetect);
    4644}
Note: See TracChangeset for help on using the changeset viewer.
swiss made software