-
-
Notifications
You must be signed in to change notification settings - Fork 956
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature: Customizable Volume Type Options for Each Vault #3199
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he vault settings
…ault mounting options
…es and vault options
# Conflicts: # src/main/resources/i18n/strings.properties
…ext and added tooltip to 'show vault options' button
This comment was marked as resolved.
This comment was marked as resolved.
infeo
requested changes
Nov 16, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic looks good, but we can improve the code quality at some spots.
src/main/java/org/cryptomator/common/vaults/VaultListManager.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/unlock/UnlockFuseRestartRequiredController.java
Outdated
Show resolved
Hide resolved
src/test/java/org/cryptomator/common/settings/SettingsTest.java
Outdated
Show resolved
Hide resolved
795c937
to
63bf031
Compare
infeo
requested changes
Dec 5, 2023
src/main/java/org/cryptomator/common/vaults/VaultListManager.java
Outdated
Show resolved
Hide resolved
infeo
reviewed
Dec 7, 2023
infeo
requested changes
Dec 8, 2023
src/main/java/org/cryptomator/ui/unlock/UnlockFuseRestartRequiredController.java
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
Outdated
Show resolved
Hide resolved
…vableValue<Boolean>' in VolumePreferencesController and MountOptionsController
…icFuseMountServices to CONFLICTING_MOUNT_SERVICES
# Conflicts: # src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
infeo
requested changes
Dec 12, 2023
src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
Outdated
Show resolved
Hide resolved
infeo
approved these changes
Dec 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces the feature to define different 'Volume Type' options (mountService and port) for each vault.
To achieve this, new options called 'Default Volume Type' and 'Default TCP Port' has been added under 'Preferences/Virtual Drive'.
The 'Mounting' tab in the 'Vault Options' has been expanded to include the 'Volume Type' and 'TCP Port' options.
Due to the existence of incompatible volume types that cannot be loaded simultaneously or without restarting the applications, a new error message has been added.
This provides the option to directly access and modify the 'Vault Options'.
The 'Vault Options' it will display a message indicating that the selected 'Volume Type' is not usable and a restart of the application is required.
When selecting a compatible 'Volume Type,' the notification disappears, and the unlock of the vault is no longer inhibited.