Skip to content

Commit 0597b8a

Browse files
authored
Merge pull request #17245 from iterate-ch/bugfix/MD-17732-addendum
Review implementations.
2 parents faeb99c + 60d50af commit 0597b8a

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,11 @@ public boolean close(final Path directory) {
7474
@Override
7575
public boolean contains(final Path directory, final boolean recursive) {
7676
for(Vault vault : this) {
77-
if(directory.equals(vault.getHome())) {
77+
if(new SimplePathPredicate(directory).test(vault.getHome())) {
7878
return true;
7979
}
8080
if(recursive) {
81-
if(directory.isChild(vault.getHome())) {
82-
return true;
83-
}
81+
return vault.contains(directory);
8482
}
8583
}
8684
return false;

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVault.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,7 @@ public State getState() {
392392

393393
@Override
394394
public boolean contains(final Path file) {
395-
if(this.isUnlocked()) {
396-
return new SimplePathPredicate(file).test(home) || file.isChild(home);
397-
}
398-
return false;
395+
return new SimplePathPredicate(file).test(home) || file.isChild(home);
399396
}
400397

401398
@Override

0 commit comments

Comments
 (0)