From a66e08ee9bf44c3e0111f00f7e238b3164dfb616 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 27 Nov 2017 16:20:35 +0100
Subject: [PATCH 1/2] 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<Path> 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);

From b47ced11733d35e0abd466c46adf852482cfd6bc Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 28 Nov 2017 00:04:11 +0100
Subject: [PATCH 2/2] Preparing 1.3.3

---
 main/ant-kit/pom.xml       | 2 +-
 main/commons/pom.xml       | 2 +-
 main/jacoco-report/pom.xml | 2 +-
 main/keychain/pom.xml      | 2 +-
 main/launcher/pom.xml      | 2 +-
 main/pom.xml               | 2 +-
 main/uber-jar/pom.xml      | 2 +-
 main/ui/pom.xml            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml
index 67bfd99d4..20639eb77 100644
--- a/main/ant-kit/pom.xml
+++ b/main/ant-kit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.3.3</version>
 	</parent>
 	<artifactId>ant-kit</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index fcef4fb7e..f157e2be9 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.3.3</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml
index e9be46b10..2c5694d48 100644
--- a/main/jacoco-report/pom.xml
+++ b/main/jacoco-report/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.3.3</version>
 	</parent>
 	<artifactId>jacoco-report</artifactId>
 	<name>Cryptomator Code Coverage Report</name>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 97721fd3b..f05d9b81d 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.3.3</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index 3c97807ef..c9dfc13fb 100644
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.3.3</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
diff --git a/main/pom.xml b/main/pom.xml
index 6c939e273..b4dac7bd4 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.3.3</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml
index e0fb9e634..f0a4be89b 100644
--- a/main/uber-jar/pom.xml
+++ b/main/uber-jar/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.3.3</version>
 	</parent>
 	<artifactId>uber-jar</artifactId>
 	<name>Single über jar with all dependencies</name>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index c5a0980c9..679f2a2a6 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.3.3</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>