~exprez135/cryptomator-libre

230436be8af6cfb6cda993085a7c0bccb2521499 — Sebastian Stenzel 2 years ago 8d00b92 + 7fefeee
Merge branch 'feature/new-ui' into develop
fixes #931, fixes #930, fixes #927, fixes #926, fixes #925, fixes #458, fixes #621, fixes #957, fixes #225, fixes #341, fixes #329, fixes #577, fixes #283 and last but not least: fixes #891
251 files changed, 14545 insertions(+), 7034 deletions(-)

M .idea/runConfigurations/Cryptomator_macOS.xml
M main/buildkit/assembly-linux.xml
M main/buildkit/assembly-mac.xml
M main/buildkit/assembly-win.xml
M main/buildkit/pom.xml
A main/buildkit/src/main/resources/ffi-version.txt
M main/commons/pom.xml
M main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
M main/commons/src/main/java/org/cryptomator/common/Environment.java
A main/commons/src/main/java/org/cryptomator/common/JniModule.java
M main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
M main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
M main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
A main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java
M main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
A main/commons/src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java
R main/{ui/src/main/java/org/cryptomator/ui/model/DefaultMountFlags.java => commons/src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java}
R main/{ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java => commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java}
R main/{ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java => commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java}
R main/{ui/src/main/java/org/cryptomator/ui/model/PerVault.java => commons/src/main/java/org/cryptomator/common/vaults/PerVault.java}
R main/{ui/src/main/java/org/cryptomator/ui/model/Vault.java => commons/src/main/java/org/cryptomator/common/vaults/Vault.java}
R main/{ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java => commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java}
A main/commons/src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java
A main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
R main/{ui/src/main/java/org/cryptomator/ui/model/VaultModule.java => commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java}
A main/commons/src/main/java/org/cryptomator/common/vaults/VaultState.java
A main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
R main/{ui/src/main/java/org/cryptomator/ui/model/Volume.java => commons/src/main/java/org/cryptomator/common/vaults/Volume.java}
R main/{ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java => commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java}
R main/{ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java => commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java}
M main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
M main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java
A main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
M main/keychain/pom.xml
M main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
M main/launcher/src/main/java/org/cryptomator/launcher/CleanShutdownPerformer.java
M main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java
M main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java
M main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java
M main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java
D main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationModule.java
M main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocol.java
M main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java
M main/launcher/src/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java
M main/pom.xml
M main/ui/pom.xml
D main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java
D main/ui/src/main/java/org/cryptomator/ui/UiModule.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizard.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardScoped.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java
A main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java
A main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java
A main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
A main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java
A main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordScoped.java
A main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordWindow.java
A main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java
A main/ui/src/main/java/org/cryptomator/ui/common/FontLoader.java
A main/ui/src/main/java/org/cryptomator/ui/common/FxController.java
R main/ui/src/main/java/org/cryptomator/ui/{controllers/ViewControllerKey.java => common/FxControllerKey.java}
A main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
A main/ui/src/main/java/org/cryptomator/ui/common/FxmlScene.java
R main/ui/src/main/java/org/cryptomator/ui/{util/PasswordStrengthUtil.java => common/PasswordStrengthUtil.java}
R main/ui/src/main/java/org/cryptomator/ui/{util/Tasks.java => common/Tasks.java}
D main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/NotFoundController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/ViewController.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerModule.java
D main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java
A main/ui/src/main/java/org/cryptomator/ui/controls/AlphanumericTextField.java
D main/ui/src/main/java/org/cryptomator/ui/controls/DirectoryListCell.java
M main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java
A main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
A main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java
A main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java
A main/ui/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
A main/ui/src/main/java/org/cryptomator/ui/controls/NumericTextField.java
A main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java
R main/ui/src/main/java/org/cryptomator/ui/controls/{SecPasswordField.java => SecurePasswordField.java}
A main/ui/src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java
A main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPassword.java
A main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java
A main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
A main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java
A main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordScoped.java
A main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
R main/{launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java => ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationComponent.java}
A main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
R main/{commons/src/main/java/org/cryptomator/common/FxApplicationScoped.java => ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationScoped.java}
A main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java
A main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
A main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
A main/ui/src/main/java/org/cryptomator/ui/keyrecovery/WordEncoder.java
M main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java
R main/ui/src/main/java/org/cryptomator/ui/{model/AppLaunchEvent.java => launcher/AppLaunchEvent.java}
A main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java
A main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java
A main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
A main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindow.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowComponent.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowScoped.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailNeedsMigrationController.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java
A main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
A main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java
A main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java
A main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
A main/ui/src/main/java/org/cryptomator/ui/migration/MigrationScoped.java
A main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
A main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java
A main/ui/src/main/java/org/cryptomator/ui/migration/MigrationWindow.java
D main/ui/src/main/java/org/cryptomator/ui/model/AutoUnlocker.java
D main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java
D main/ui/src/main/java/org/cryptomator/ui/model/VaultList.java
D main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java
D main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategy.java
D main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java
D main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java
D main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java
D main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesScoped.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesWindow.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
A main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
A main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
A main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
A main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
A main/ui/src/main/java/org/cryptomator/ui/quit/QuitScoped.java
A main/ui/src/main/java/org/cryptomator/ui/quit/QuitWindow.java
A main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVault.java
A main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java
A main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
A main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java
A main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultScoped.java
A main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
A main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
A main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java
A main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
A main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuScoped.java
A main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java
A main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
A main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
A main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockScoped.java
A main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
A main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWindow.java
D main/ui/src/main/java/org/cryptomator/ui/util/DialogBuilderUtil.java
A main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
A main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
A main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
A main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java
A main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
A main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsScoped.java
A main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsWindow.java
A main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlert.java
A main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java
A main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
A main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
A main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertScoped.java
A main/ui/src/main/resources/choose_existing_vault.png
A main/ui/src/main/resources/css/dark_theme.css
A main/ui/src/main/resources/css/dosis-bold.ttf
D main/ui/src/main/resources/css/fontawesome-webfont.ttf
A main/ui/src/main/resources/css/fontawesome5-pro-solid.otf
D main/ui/src/main/resources/css/ionicons.ttf
A main/ui/src/main/resources/css/light_theme.css
D main/ui/src/main/resources/css/linux_theme.css
D main/ui/src/main/resources/css/mac_theme.css
A main/ui/src/main/resources/css/opensans-bold.ttf
A main/ui/src/main/resources/css/opensans-regular.ttf
A main/ui/src/main/resources/css/opensans-semibold.ttf
D main/ui/src/main/resources/css/win_theme.css
A main/ui/src/main/resources/fxml/addvault_existing.fxml
A main/ui/src/main/resources/fxml/addvault_new_location.fxml
A main/ui/src/main/resources/fxml/addvault_new_name.fxml
A main/ui/src/main/resources/fxml/addvault_new_password.fxml
A main/ui/src/main/resources/fxml/addvault_success.fxml
A main/ui/src/main/resources/fxml/addvault_welcome.fxml
D main/ui/src/main/resources/fxml/change_password.fxml
A main/ui/src/main/resources/fxml/changepassword.fxml
A main/ui/src/main/resources/fxml/forget_password.fxml
D main/ui/src/main/resources/fxml/initialize.fxml
D main/ui/src/main/resources/fxml/main.fxml
A main/ui/src/main/resources/fxml/main_window.fxml
A main/ui/src/main/resources/fxml/migration_run.fxml
A main/ui/src/main/resources/fxml/migration_start.fxml
A main/ui/src/main/resources/fxml/migration_success.fxml
D main/ui/src/main/resources/fxml/notfound.fxml
A main/ui/src/main/resources/fxml/preferences.fxml
A main/ui/src/main/resources/fxml/preferences_general.fxml
A main/ui/src/main/resources/fxml/preferences_updates.fxml
A main/ui/src/main/resources/fxml/preferences_volume.fxml
A main/ui/src/main/resources/fxml/quit.fxml
A main/ui/src/main/resources/fxml/remove_vault.fxml
D main/ui/src/main/resources/fxml/settings.fxml
D main/ui/src/main/resources/fxml/unlock.fxml
A main/ui/src/main/resources/fxml/unlock2.fxml
A main/ui/src/main/resources/fxml/unlock_success.fxml
D main/ui/src/main/resources/fxml/unlocked.fxml
D main/ui/src/main/resources/fxml/upgrade.fxml
A main/ui/src/main/resources/fxml/vault_detail.fxml
A main/ui/src/main/resources/fxml/vault_detail_locked.fxml
A main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml
A main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
A main/ui/src/main/resources/fxml/vault_list.fxml
A main/ui/src/main/resources/fxml/vault_list_cell.fxml
A main/ui/src/main/resources/fxml/vault_options.fxml
A main/ui/src/main/resources/fxml/vault_options_general.fxml
A main/ui/src/main/resources/fxml/vault_options_mount.fxml
D main/ui/src/main/resources/fxml/welcome.fxml
A main/ui/src/main/resources/fxml/wrongfilealert.fxml
A main/ui/src/main/resources/i18n/4096words_en.txt
A main/ui/src/main/resources/i18n/strings.properties
A main/ui/src/main/resources/i18n/strings_de.properties
D main/ui/src/main/resources/img/dialog-appicon.png
D main/ui/src/main/resources/img/dialog-appicon@2x.png
D main/ui/src/main/resources/img/dialog-confirm.png
D main/ui/src/main/resources/img/dialog-error.png
D main/ui/src/main/resources/img/dialog-information.png
D main/ui/src/main/resources/img/dialog-warning.png
A main/ui/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java
R main/ui/src/test/java/org/cryptomator/ui/{util/PasswordStrengthUtilTest.java => common/PasswordStrengthUtilTest.java}
R main/ui/src/test/java/org/cryptomator/ui/controls/{SecPasswordFieldTest.java => SecurePasswordFieldTest.java}
A main/ui/src/test/java/org/cryptomator/ui/keyrecovery/WordEncoderTest.java
D main/ui/src/test/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4Test.java
This diff is too large to display. Try viewing the raw diff instead.