From 4c96c285bfb3ce619fe7e2df58c6449bfd71fff5 Mon Sep 17 00:00:00 2001
From: Carrima Hewitt <chewitt1@ufl.edu>
Date: Mon, 19 Sep 2022 21:17:48 -0400
Subject: [PATCH 1/5] Fixed Next button for Invalid Vault Name

---
 .idea/misc.xml                                   |  2 +-
 .../CreateNewVaultNameController.java            | 16 ++++++++++------
 src/main/resources/fxml/addvault_new_name.fxml   |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4731638fd..82dbec8ad 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
index 3068874ec..3776c14af 100644
--- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
+++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
@@ -40,7 +40,7 @@ public class CreateNewVaultNameController implements FxController {
 		this.chooseLocationScene = chooseLocationScene;
 		this.vaultPath = vaultPath;
 		this.vaultName = vaultName;
-		this.validVaultName = Bindings.createBooleanBinding(this::isValidVaultNameInternal, vaultName);
+		this.validVaultName = Bindings.createBooleanBinding(this::isValidVaultName, vaultName);
 	}
 
 	@FXML
@@ -49,10 +49,6 @@ public class CreateNewVaultNameController implements FxController {
 		vaultName.addListener(this::vaultNameChanged);
 	}
 
-	private boolean isValidVaultNameInternal() {
-		return vaultName.get() != null && VALID_NAME_PATTERN.matcher(vaultName.get().trim()).matches();
-	}
-
 	private void vaultNameChanged(@SuppressWarnings("unused") Observable observable) {
 		if (isValidVaultName()) {
 			if (vaultPath.get() != null) {
@@ -79,7 +75,15 @@ public class CreateNewVaultNameController implements FxController {
 	}
 
 	public boolean isValidVaultName() {
-		return validVaultName.get();
+		return vaultName.get() != null && VALID_NAME_PATTERN.matcher(vaultName.get().trim()).matches();
+		//return validVaultName.get();
 	}
+	/*
+	* Issue with next button:
+	* In the "addvault_new_location.fxml" class's method "buttonMinWidth," the next button was referring to an inValidVaultPath function which does not exist...
+	* I changed it to "!controller.validVaultName" and that worked
+	*
+	* Other "issue" I noticed is that closing the application window does not stop the program. Unsure if this is a major issue.
+	* */
 
 }
diff --git a/src/main/resources/fxml/addvault_new_name.fxml b/src/main/resources/fxml/addvault_new_name.fxml
index e7494e116..185f80ed4 100644
--- a/src/main/resources/fxml/addvault_new_name.fxml
+++ b/src/main/resources/fxml/addvault_new_name.fxml
@@ -71,7 +71,7 @@
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+X">
 			<buttons>
 				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
-				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" onAction="#next" defaultButton="true" disable="${controller.invalidVaultName}"/>
+				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" onAction="#next" defaultButton="true" disable="${!controller.validVaultName}"/>
 			</buttons>
 		</ButtonBar>
 	</children>

From 97a61ef717e0ce38f6760608bb01bd5f77a31373 Mon Sep 17 00:00:00 2001
From: Carrima Hewitt <chewitt1@ufl.edu>
Date: Tue, 20 Sep 2022 08:37:38 -0400
Subject: [PATCH 2/5] Removed Comments

---
 .../ui/addvaultwizard/CreateNewVaultNameController.java   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
index 3776c14af..5c5f3e876 100644
--- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
+++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
@@ -76,14 +76,6 @@ public class CreateNewVaultNameController implements FxController {
 
 	public boolean isValidVaultName() {
 		return vaultName.get() != null && VALID_NAME_PATTERN.matcher(vaultName.get().trim()).matches();
-		//return validVaultName.get();
 	}
-	/*
-	* Issue with next button:
-	* In the "addvault_new_location.fxml" class's method "buttonMinWidth," the next button was referring to an inValidVaultPath function which does not exist...
-	* I changed it to "!controller.validVaultName" and that worked
-	*
-	* Other "issue" I noticed is that closing the application window does not stop the program. Unsure if this is a major issue.
-	* */
 
 }

From 382f6b7851cb86d7261d1a028eaf6c097f451279 Mon Sep 17 00:00:00 2001
From: Carrima Hewitt <chewitt1@ufl.edu>
Date: Tue, 20 Sep 2022 10:19:38 -0400
Subject: [PATCH 3/5] Reverted Misc

---
 .idea/misc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 82dbec8ad..4731638fd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file

From 2def9216ecaebe5fdc461908198297c7d6e0c300 Mon Sep 17 00:00:00 2001
From: Carrima Hewitt <chewitt1@ufl.edu>
Date: Tue, 20 Sep 2022 10:33:26 -0400
Subject: [PATCH 4/5] Trimmed Vault Name StringProperty

---
 .../ui/addvaultwizard/CreateNewVaultNameController.java          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
index 5c5f3e876..90493a01f 100644
--- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
+++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
@@ -66,6 +66,7 @@ public class CreateNewVaultNameController implements FxController {
 	@FXML
 	public void next() {
 		window.setScene(chooseLocationScene.get());
+		vaultName.get().trim();
 	}
 
 	/* Getter/Setter */

From f02a8e14ff62236de61d4310a8516976c237e457 Mon Sep 17 00:00:00 2001
From: Carrima Hewitt <chewitt1@ufl.edu>
Date: Wed, 21 Sep 2022 11:11:00 -0400
Subject: [PATCH 5/5] Fixed Trim and Bidirectional Bind

---
 .../ui/addvaultwizard/CreateNewVaultNameController.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
index 90493a01f..2ca73e172 100644
--- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
+++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
@@ -45,7 +45,7 @@ public class CreateNewVaultNameController implements FxController {
 
 	@FXML
 	public void initialize() {
-		vaultName.bind(textField.textProperty());
+		vaultName.bindBidirectional(textField.textProperty());
 		vaultName.addListener(this::vaultNameChanged);
 	}
 
@@ -66,7 +66,7 @@ public class CreateNewVaultNameController implements FxController {
 	@FXML
 	public void next() {
 		window.setScene(chooseLocationScene.get());
-		vaultName.get().trim();
+		vaultName.set(vaultName.get().trim());
 	}
 
 	/* Getter/Setter */