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

No longer using Files.isRegularFile(), fixing "add existing vault located on OneDrive's FoD"

Browse Source
This commit is contained in:
Sebastian Stenzel
2017-11-27 16:20:35 +01:00
parent ad27094d63
commit a66e08ee9b
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/launcher/src/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java
View File

@@ -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<Path> queue = new ArrayBlockingQueue<>(10);
FileOpenRequestHandler handler = new FileOpenRequestHandler(queue);

2
main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
View File

@@ -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);