mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary checks

Browse Source
This commit is contained in:
JaniruTEC
2023-07-10 16:01:39 +02:00
parent 92b77baf40
commit 328f2f89a8
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,12 +73,9 @@ public final class MountWithinParentUtil {
private static void removeResidualHideaway(Path hideaway) throws IOException {
if (!Files.isDirectory(hideaway, LinkOption.NOFOLLOW_LINKS)) {
if (SystemUtils.IS_OS_WINDOWS) {
Files.setAttribute(hideaway, WIN_HIDDEN_ATTR, false);
}
throw new MountPointPreparationException(new NotDirectoryException(hideaway.toString()));
}
Files.delete(hideaway);
Files.delete(hideaway); //Fails if not empty
}
static void cleanup(Path mountPoint) {
@@ -89,13 +86,6 @@ public final class MountWithinParentUtil {
LOG.error("Unable to restore hidden directory to mountpoint \"{}\": Directory does not exist. (Deleted by user?)", mountPoint);
return;
}
if (!Files.isDirectory(hideaway, LinkOption.NOFOLLOW_LINKS)) {
LOG.error("Unable to restore hidden directory to mountpoint \"{}\": Not a directory.", mountPoint);
if (SystemUtils.IS_OS_WINDOWS) {
Files.setAttribute(hideaway, WIN_HIDDEN_ATTR, false);
}
return;
}
Files.move(hideaway, mountPoint);
if (SystemUtils.IS_OS_WINDOWS) {