mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved check for dir/emptiness to "handleMountPointFolder"

Browse Source
This commit is contained in:
JaniruTEC
2023-07-24 19:15:22 +02:00
parent 9bb24320bf
commit ea8e850aa9
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
View File

@@ -40,9 +40,6 @@ public final class MountWithinParentUtil {
}
//... (now) without hideaway
checkIsDirectory(mountPoint);
checkIsEmpty(mountPoint);
Files.move(mountPoint, hideaway);
if (SystemUtils.IS_OS_WINDOWS) {
Files.setAttribute(hideaway, WIN_HIDDEN_ATTR, true, LinkOption.NOFOLLOW_LINKS);
@@ -68,6 +65,8 @@ public final class MountWithinParentUtil {
return false;
}
if (!Files.readAttributes(path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS).isOther()) {
checkIsDirectory(path);
checkIsEmpty(path);
return true;
}
if (Files.exists(path /* FOLLOW_LINKS */)) { //Both junction and target exist