From a66e08ee9bf44c3e0111f00f7e238b3164dfb616 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 27 Nov 2017 16:20:35 +0100 Subject: [PATCH] No longer using Files.isRegularFile(), fixing "add existing vault located on OneDrive's FoD" --- .../org/cryptomator/launcher/FileOpenRequestHandlerTest.java | 1 - .../java/org/cryptomator/ui/controllers/MainController.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/main/launcher/src/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java b/main/launcher/src/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java index f1ea4e521..54acb065c 100644 --- a/main/launcher/src/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java +++ b/main/launcher/src/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java @@ -32,7 +32,6 @@ public class FileOpenRequestHandlerTest { Mockito.when(fs.provider()).thenReturn(provider); Mockito.when(fs.getPath(Mockito.anyString())).thenReturn(p1, p2); Mockito.when(provider.readAttributes(Mockito.any(), Mockito.eq(BasicFileAttributes.class))).thenReturn(attrs); - Mockito.when(attrs.isRegularFile()).thenReturn(true); BlockingQueue queue = new ArrayBlockingQueue<>(10); FileOpenRequestHandler handler = new FileOpenRequestHandler(queue); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java index 9c1a8fe83..682cd0afb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java @@ -315,7 +315,7 @@ public class MainController implements ViewController { final Path vaultPath; if (path != null && Files.isDirectory(path)) { vaultPath = path; - } else if (path != null && Files.isRegularFile(path)) { + } else if (path != null && Files.isReadable(path)) { vaultPath = path.getParent(); } else { LOG.warn("Ignoring attempt to add vault with invalid path: {}", path);