Skip to content
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
merged 49 commits into from
Dec 13, 2023

Conversation

mindmonk
Copy link
Contributor

@mindmonk mindmonk commented Nov 12, 2023

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'.

Preferences Preferences

The 'Mounting' tab in the 'Vault Options' has been expanded to include the 'Volume Type' and 'TCP Port' options.

Bildschirmfoto 2023-12-11 um 15 25 47
Bildschirmfoto 2023-12-11 um 15 26 23

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.

Unlock macFUSE failed

This provides the option to directly access and modify the 'Vault Options'.

To use this volume type, Cryptomator needs to be restarted

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.

# Conflicts:
#	src/main/resources/i18n/strings.properties
…ext and added tooltip to 'show vault options' button
@mindmonk mindmonk requested a review from infeo November 12, 2023 13:26
@CLAassistant

This comment was marked as resolved.

Copy link
Member

@infeo infeo left a 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.

@mindmonk mindmonk requested a review from infeo December 8, 2023 11:15
…vableValue<Boolean>' in VolumePreferencesController and MountOptionsController
…icFuseMountServices to CONFLICTING_MOUNT_SERVICES
# Conflicts:
#	src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@mindmonk mindmonk requested a review from infeo December 13, 2023 15:00
@mindmonk mindmonk merged commit 923af4b into develop Dec 13, 2023
5 checks passed
@infeo infeo added this to the 1.12.0 milestone Dec 13, 2023
@infeo infeo deleted the feature/vault-volume-type branch March 1, 2024 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants