Fix 2981 #2985
Merged
Fix 2981 #2985
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
Moved bindings for VaultOptionsComponent and HealthCheckComponent from MainWindowModule to FxApplicationModule
infeo
requested changes
Jul 5, 2023
There was a problem hiding this comment.
Regarding the naming in UnlockInvalidMountpointController:
I thought longer about keeping just the boolean showPreferences() function, because what we actually doin is deciding between two options and not just swichting on option off. Hence, please refactor to a proper decision model (create enum, add another function showVaultOptions() etc)
src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
Outdated
Show resolved
Hide resolved
Resolved by a3c953d. |
infeo
approved these changes
Jul 5, 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.
Closes #2981
This PR adds support for showing either the "Open Vault Options" or the "Open Preferences" button in the Invalid mountpoint dialog, depending on the actual type of invalid custom mountpoint.
This required refactoring the internal logic of how the dialog is populated and moving the dagger bindings for
VaultOptionsComponentandHealthCheckComponentfromMainWindowModuletoFxApplicationModule.The latter change can be seen below:
Changes in dagger graph introduced by e5047c2
Before:
After:
Furthermore the utility method
#showVaultOptionsWindow()was added toFxApplicationWindowsto facilitate easy access to the vault options. This method is also subject of #2988.