mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 09:36:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Next button for Invalid Vault Name

Browse Source
This commit is contained in:
Carrima Hewitt
2022-09-19 21:17:48 -04:00
parent 0021f2d37c
commit 4c96c285bf
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

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

16
src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
View File

@@ -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.
* */
}

2
src/main/resources/fxml/addvault_new_name.fxml
View File

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