From 7fac6da4485366f9b649b12d73b1d55e84c34204 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 4 Jun 2021 20:09:10 +0200 Subject: [PATCH] Single maven module (#1676) combined all sources into single maven module --- .crowdin.yml | 4 +- .github/workflows/build.yml | 29 +- .idea/misc.xml | 2 +- .idea/modules.xml | 8 - .idea/runConfigurations/Cryptomator_Linux.xml | 2 +- .../Cryptomator_Linux_Dev.xml | 2 +- .../runConfigurations/Cryptomator_Windows.xml | 2 +- .../Cryptomator_Windows_Dev.xml | 2 +- .idea/runConfigurations/Cryptomator_macOS.xml | 2 +- .../Cryptomator_macOS_Dev.xml | 2 +- README.md | 9 +- .../assembly-linux.xml => assembly-linux.xml | 7 + .../assembly-mac.xml => assembly-mac.xml | 7 + .../assembly-win.xml => assembly-win.xml | 7 + main/buildkit/pom.xml | 216 ------- main/commons/pom.xml | 86 --- main/launcher/pom.xml | 48 -- main/pom.xml | 445 ------------- main/suppression.xml | 14 - main/ui/pom.xml | 115 ---- pom.xml | 601 ++++++++++++++++++ .../license/THIRD-PARTY.properties | 0 {main/ui/src => src}/license/template.ftl | 0 .../org/cryptomator/common/CommonsModule.java | 0 .../org/cryptomator/common/Constants.java | 0 .../common/ConsumerThrowingException.java | 0 .../org/cryptomator/common/Environment.java | 0 .../cryptomator/common/LicenseChecker.java | 0 .../org/cryptomator/common/LicenseHolder.java | 0 .../common/RunnableThrowingException.java | 0 .../cryptomator/common/SemVerComparator.java | 0 .../org/cryptomator/common/ShutdownHook.java | 0 .../common/SupplierThrowingException.java | 0 .../common/keychain/KeychainManager.java | 0 .../common/keychain/KeychainModule.java | 0 .../NoKeychainAccessProviderException.java | 0 .../AvailableDriveLetterChooser.java | 0 .../mountpoint/CustomDriveLetterChooser.java | 0 .../mountpoint/CustomMountPointChooser.java | 0 .../InvalidMountPointException.java | 0 .../mountpoint/MacVolumeMountChooser.java | 0 .../common/mountpoint/MountPointChooser.java | 0 .../mountpoint/MountPointChooserModule.java | 0 .../common/mountpoint/MountPointHelper.java | 0 .../TemporaryMountPointChooser.java | 0 .../common/settings/KeychainBackend.java | 0 .../cryptomator/common/settings/Settings.java | 0 .../common/settings/SettingsJsonAdapter.java | 0 .../common/settings/SettingsProvider.java | 0 .../cryptomator/common/settings/UiTheme.java | 0 .../common/settings/VaultSettings.java | 0 .../settings/VaultSettingsJsonAdapter.java | 0 .../common/settings/VolumeImpl.java | 0 .../common/settings/WebDavUrlScheme.java | 0 .../common/settings/WhenUnlocked.java | 0 .../common/vaults/AbstractVolume.java | 0 .../cryptomator/common/vaults/AutoLocker.java | 0 .../common/vaults/DefaultMountFlags.java | 0 .../common/vaults/DokanyVolume.java | 0 .../cryptomator/common/vaults/FuseVolume.java | 0 .../vaults/LockNotCompletedException.java | 0 .../common/vaults/MountPointRequirement.java | 0 .../cryptomator/common/vaults/PerVault.java | 0 .../org/cryptomator/common/vaults/Vault.java | 0 .../common/vaults/VaultComponent.java | 0 .../vaults/VaultListChangeListener.java | 0 .../common/vaults/VaultListManager.java | 0 .../common/vaults/VaultListModule.java | 0 .../common/vaults/VaultModule.java | 0 .../cryptomator/common/vaults/VaultState.java | 0 .../cryptomator/common/vaults/VaultStats.java | 0 .../org/cryptomator/common/vaults/Volume.java | 0 .../common/vaults/WebDavVolume.java | 0 .../common/vaults/WindowsDriveLetters.java | 0 .../org/cryptomator/launcher/Cryptomator.java | 0 .../launcher/CryptomatorComponent.java | 0 .../launcher/CryptomatorModule.java | 0 .../launcher/FileOpenRequestHandler.java | 0 .../org/cryptomator/launcher/IpcFactory.java | 0 .../org/cryptomator/launcher/IpcProtocol.java | 0 .../cryptomator/launcher/IpcProtocolImpl.java | 0 .../org/cryptomator/logging/DebugMode.java | 0 .../LaunchAndSizeBasedTriggerinPolicy.java | 0 .../logging/LaunchBasedTriggeringPolicy.java | 0 .../logging/LoggerConfiguration.java | 0 .../org/cryptomator/logging/LoggerModule.java | 0 .../ui/addvaultwizard/AddVaultModule.java | 0 .../AddVaultSuccessController.java | 0 .../AddVaultWelcomeController.java | 0 .../AddVaultWizardComponent.java | 0 .../addvaultwizard/AddVaultWizardScoped.java | 0 .../addvaultwizard/AddVaultWizardWindow.java | 0 .../ChooseExistingVaultController.java | 0 .../CreateNewVaultLocationController.java | 0 .../CreateNewVaultNameController.java | 0 .../CreateNewVaultPasswordController.java | 0 .../CreateNewVaultRecoveryKeyController.java | 0 .../ui/addvaultwizard/LocationPresets.java | 0 .../ui/addvaultwizard/ReadmeGenerator.java | 0 .../ChangePasswordComponent.java | 0 .../ChangePasswordController.java | 0 .../changepassword/ChangePasswordModule.java | 0 .../changepassword/ChangePasswordScoped.java | 0 .../changepassword/ChangePasswordWindow.java | 0 .../org/cryptomator/ui/common/Animations.java | 0 .../ui/common/DefaultSceneFactory.java | 0 .../cryptomator/ui/common/ErrorComponent.java | 0 .../ui/common/ErrorController.java | 0 .../cryptomator/ui/common/ErrorModule.java | 0 .../org/cryptomator/ui/common/FontLoader.java | 0 .../cryptomator/ui/common/FxController.java | 0 .../ui/common/FxControllerKey.java | 0 .../org/cryptomator/ui/common/FxmlFile.java | 0 .../ui/common/FxmlLoaderFactory.java | 0 .../org/cryptomator/ui/common/FxmlScene.java | 0 .../ui/common/HostServiceRevealer.java | 0 .../ui/common/NewPasswordController.java | 0 .../ui/common/PasswordStrengthUtil.java | 0 .../cryptomator/ui/common/StageFactory.java | 0 .../java/org/cryptomator/ui/common/Tasks.java | 0 .../ui/common/UserInteractionLock.java | 0 .../cryptomator/ui/common/VaultService.java | 0 .../cryptomator/ui/common/WeakBindings.java | 0 .../ui/controls/AlphanumericTextField.java | 0 .../cryptomator/ui/controls/DataLabel.java | 0 .../ui/controls/DraggableListCell.java | 0 .../ui/controls/FontAwesome5Icon.java | 0 .../ui/controls/FontAwesome5IconView.java | 0 .../ui/controls/FormattedLabel.java | 0 .../ui/controls/FormattedString.java | 0 .../ui/controls/NiceSecurePasswordField.java | 0 .../ui/controls/NumericTextField.java | 0 .../controls/PasswordStrengthIndicator.java | 0 .../ui/controls/SecurePasswordField.java | 0 .../ui/controls/ThrougputLabel.java | 0 .../ForgetPasswordComponent.java | 0 .../ForgetPasswordController.java | 0 .../forgetPassword/ForgetPasswordModule.java | 0 .../forgetPassword/ForgetPasswordScoped.java | 0 .../forgetPassword/ForgetPasswordWindow.java | 0 .../cryptomator/ui/fxapp/FxApplication.java | 0 .../ui/fxapp/FxApplicationComponent.java | 0 .../ui/fxapp/FxApplicationModule.java | 0 .../ui/fxapp/FxApplicationScoped.java | 0 .../cryptomator/ui/fxapp/UpdateChecker.java | 0 .../ui/fxapp/UpdateCheckerModule.java | 0 .../ui/fxapp/UpdateCheckerTask.java | 0 .../cryptomator/ui/health/BatchService.java | 0 .../ui/health/CheckDetailController.java | 0 .../cryptomator/ui/health/CheckListCell.java | 0 .../ui/health/CheckListController.java | 0 .../ui/health/HealthCheckComponent.java | 0 .../ui/health/HealthCheckModule.java | 0 .../ui/health/HealthCheckScoped.java | 0 .../ui/health/HealthCheckTask.java | 0 .../ui/health/HealthCheckWindow.java | 0 .../cryptomator/ui/health/ReportWriter.java | 0 .../ui/health/ResultFixApplier.java | 0 .../ui/health/ResultListCellController.java | 0 .../ui/health/ResultListCellFactory.java | 0 .../ui/health/StartController.java | 0 .../cryptomator/ui/keyloading/KeyLoading.java | 0 .../ui/keyloading/KeyLoadingComponent.java | 0 .../ui/keyloading/KeyLoadingModule.java | 0 .../ui/keyloading/KeyLoadingScoped.java | 0 .../ui/keyloading/KeyLoadingStrategy.java | 0 .../MasterkeyFileLoadingFinisher.java | 0 .../MasterkeyFileLoadingModule.java | 0 .../MasterkeyFileLoadingStrategy.java | 0 .../PassphraseEntryController.java | 0 .../SelectMasterkeyFileController.java | 0 .../ui/launcher/AppLaunchEvent.java | 0 .../ui/launcher/AppLaunchEventHandler.java | 0 .../ui/launcher/AppLifecycleListener.java | 0 .../ui/launcher/FxApplicationStarter.java | 0 .../cryptomator/ui/launcher/UiLauncher.java | 0 .../ui/launcher/UiLauncherModule.java | 0 .../cryptomator/ui/lock/LockComponent.java | 0 .../ui/lock/LockFailedController.java | 0 .../ui/lock/LockForcedController.java | 0 .../org/cryptomator/ui/lock/LockModule.java | 0 .../org/cryptomator/ui/lock/LockScoped.java | 0 .../org/cryptomator/ui/lock/LockWindow.java | 0 .../org/cryptomator/ui/lock/LockWorkflow.java | 0 .../cryptomator/ui/mainwindow/MainWindow.java | 0 .../ui/mainwindow/MainWindowComponent.java | 0 .../ui/mainwindow/MainWindowController.java | 0 .../ui/mainwindow/MainWindowModule.java | 0 .../ui/mainwindow/MainWindowSceneFactory.java | 0 .../ui/mainwindow/MainWindowScoped.java | 0 .../mainwindow/MainWindowTitleController.java | 0 .../ui/mainwindow/ResizeController.java | 0 .../ui/mainwindow/VaultDetailController.java | 0 .../VaultDetailLockedController.java | 0 .../VaultDetailMissingVaultController.java | 0 .../VaultDetailNeedsMigrationController.java | 0 .../VaultDetailUnknownErrorController.java | 0 .../VaultDetailUnlockedController.java | 0 .../mainwindow/VaultListCellController.java | 0 .../ui/mainwindow/VaultListCellFactory.java | 0 .../VaultListContextMenuController.java | 0 .../ui/mainwindow/VaultListController.java | 0 .../ui/mainwindow/WelcomeController.java | 0 .../MigrationCapabilityErrorController.java | 0 .../ui/migration/MigrationComponent.java | 0 .../MigrationImpossibleController.java | 0 .../ui/migration/MigrationModule.java | 0 .../ui/migration/MigrationRunController.java | 0 .../ui/migration/MigrationScoped.java | 0 .../migration/MigrationStartController.java | 0 .../migration/MigrationSuccessController.java | 0 .../ui/migration/MigrationWindow.java | 0 .../ui/preferences/AboutController.java | 0 .../GeneralPreferencesController.java | 0 .../ui/preferences/PreferencesComponent.java | 0 .../ui/preferences/PreferencesController.java | 0 .../ui/preferences/PreferencesModule.java | 0 .../ui/preferences/PreferencesScoped.java | 0 .../ui/preferences/PreferencesWindow.java | 0 .../preferences/SelectedPreferencesTab.java | 0 .../SupporterCertificateController.java | 0 .../UpdatesPreferencesController.java | 0 .../VolumePreferencesController.java | 0 .../cryptomator/ui/quit/QuitComponent.java | 0 .../cryptomator/ui/quit/QuitController.java | 0 .../org/cryptomator/ui/quit/QuitModule.java | 0 .../org/cryptomator/ui/quit/QuitScoped.java | 0 .../org/cryptomator/ui/quit/QuitWindow.java | 0 .../ui/recoverykey/AutoCompleter.java | 0 .../ui/recoverykey/RecoveryKeyComponent.java | 0 .../RecoveryKeyCreationController.java | 0 .../RecoveryKeyDisplayController.java | 0 .../ui/recoverykey/RecoveryKeyFactory.java | 0 .../ui/recoverykey/RecoveryKeyModule.java | 0 .../RecoveryKeyRecoverController.java | 0 .../RecoveryKeyResetPasswordController.java | 0 .../ui/recoverykey/RecoveryKeyScoped.java | 0 .../RecoveryKeySuccessController.java | 0 .../ui/recoverykey/RecoveryKeyWindow.java | 0 .../ui/recoverykey/WordEncoder.java | 0 .../ui/removevault/RemoveVaultComponent.java | 0 .../ui/removevault/RemoveVaultController.java | 0 .../ui/removevault/RemoveVaultModule.java | 0 .../ui/removevault/RemoveVaultScoped.java | 0 .../ui/removevault/RemoveVaultWindow.java | 0 .../ui/stats/VaultStatisticsComponent.java | 0 .../ui/stats/VaultStatisticsController.java | 0 .../ui/stats/VaultStatisticsModule.java | 0 .../ui/stats/VaultStatisticsScoped.java | 0 .../ui/stats/VaultStatisticsWindow.java | 0 .../ui/traymenu/TrayIconController.java | 0 .../ui/traymenu/TrayImageFactory.java | 0 .../ui/traymenu/TrayMenuComponent.java | 0 .../ui/traymenu/TrayMenuController.java | 0 .../ui/traymenu/TrayMenuScoped.java | 0 .../ui/unlock/UnlockCancelledException.java | 0 .../ui/unlock/UnlockComponent.java | 0 .../UnlockInvalidMountPointController.java | 0 .../cryptomator/ui/unlock/UnlockModule.java | 0 .../cryptomator/ui/unlock/UnlockScoped.java | 0 .../ui/unlock/UnlockSuccessController.java | 0 .../cryptomator/ui/unlock/UnlockWindow.java | 0 .../cryptomator/ui/unlock/UnlockWorkflow.java | 0 .../AutoLockVaultOptionsController.java | 0 .../GeneralVaultOptionsController.java | 0 .../MasterkeyOptionsController.java | 0 .../vaultoptions/MountOptionsController.java | 0 .../vaultoptions/SelectedVaultOptionsTab.java | 0 .../vaultoptions/VaultOptionsComponent.java | 0 .../vaultoptions/VaultOptionsController.java | 0 .../ui/vaultoptions/VaultOptionsModule.java | 0 .../ui/vaultoptions/VaultOptionsScoped.java | 0 .../ui/vaultoptions/VaultOptionsWindow.java | 0 .../WrongFileAlertComponent.java | 0 .../WrongFileAlertController.java | 0 .../wrongfilealert/WrongFileAlertModule.java | 0 .../wrongfilealert/WrongFileAlertScoped.java | 0 .../wrongfilealert/WrongFileAlertWindow.java | 0 .../main/resources/css/dark_theme.css | 0 .../resources/css/fontawesome5-free-solid.otf | Bin .../main/resources/css/light_theme.css | 0 .../main/resources/css/opensans-bold.ttf | Bin .../main/resources/css/opensans-regular.ttf | Bin .../main/resources/css/opensans-semibold.ttf | Bin .../main/resources/css/quicksand-bold.ttf | Bin .../resources/fxml/addvault_existing.fxml | 0 .../resources/fxml/addvault_new_location.fxml | 0 .../resources/fxml/addvault_new_name.fxml | 0 .../resources/fxml/addvault_new_password.fxml | 0 .../fxml/addvault_new_recoverykey.fxml | 0 .../main/resources/fxml/addvault_success.fxml | 0 .../main/resources/fxml/addvault_welcome.fxml | 0 .../main/resources/fxml/changepassword.fxml | 0 .../main/resources/fxml/error.fxml | 0 .../main/resources/fxml/forget_password.fxml | 0 .../resources/fxml/health_check_details.fxml | 0 .../resources/fxml/health_check_list.fxml | 0 .../fxml/health_result_listcell.fxml | 0 .../main/resources/fxml/health_start.fxml | 0 .../main/resources/fxml/lock_failed.fxml | 0 .../main/resources/fxml/lock_forced.fxml | 0 .../main/resources/fxml/main_window.fxml | 0 .../resources/fxml/main_window_resize.fxml | 0 .../resources/fxml/main_window_title.fxml | 0 .../fxml/migration_capability_error.fxml | 0 .../resources/fxml/migration_impossible.fxml | 0 .../main/resources/fxml/migration_run.fxml | 0 .../main/resources/fxml/migration_start.fxml | 0 .../resources/fxml/migration_success.fxml | 0 .../main/resources/fxml/new_password.fxml | 0 .../main/resources/fxml/preferences.fxml | 0 .../resources/fxml/preferences_about.fxml | 0 .../fxml/preferences_contribute.fxml | 0 .../resources/fxml/preferences_general.fxml | 0 .../resources/fxml/preferences_updates.fxml | 0 .../resources/fxml/preferences_volume.fxml | 0 .../src => src}/main/resources/fxml/quit.fxml | 0 .../resources/fxml/recoverykey_create.fxml | 0 .../resources/fxml/recoverykey_display.fxml | 0 .../resources/fxml/recoverykey_recover.fxml | 0 .../fxml/recoverykey_reset_password.fxml | 0 .../resources/fxml/recoverykey_success.fxml | 0 .../main/resources/fxml/remove_vault.fxml | 0 .../main/resources/fxml/stats.fxml | 0 .../resources/fxml/unlock_enter_password.fxml | 0 .../fxml/unlock_invalid_mount_point.fxml | 0 .../fxml/unlock_select_masterkeyfile.fxml | 0 .../main/resources/fxml/unlock_success.fxml | 0 .../main/resources/fxml/vault_detail.fxml | 0 .../resources/fxml/vault_detail_locked.fxml | 0 .../resources/fxml/vault_detail_missing.fxml | 0 .../fxml/vault_detail_needsmigration.fxml | 0 .../fxml/vault_detail_unknownerror.fxml | 0 .../resources/fxml/vault_detail_unlocked.fxml | 0 .../resources/fxml/vault_detail_welcome.fxml | 0 .../main/resources/fxml/vault_list.fxml | 0 .../main/resources/fxml/vault_list_cell.fxml | 0 .../fxml/vault_list_contextmenu.fxml | 0 .../main/resources/fxml/vault_options.fxml | 0 .../fxml/vault_options_autolock.fxml | 0 .../resources/fxml/vault_options_general.fxml | 0 .../fxml/vault_options_masterkey.fxml | 0 .../resources/fxml/vault_options_mount.fxml | 0 .../main/resources/fxml/wrongfilealert.fxml | 0 .../main/resources/i18n/4096words_en.txt | 0 .../main/resources/i18n/strings.properties | 0 .../main/resources/i18n/strings_ar.properties | 0 .../main/resources/i18n/strings_bs.properties | 0 .../main/resources/i18n/strings_ca.properties | 0 .../main/resources/i18n/strings_cs.properties | 0 .../main/resources/i18n/strings_de.properties | 0 .../main/resources/i18n/strings_el.properties | 0 .../main/resources/i18n/strings_es.properties | 0 .../main/resources/i18n/strings_fr.properties | 0 .../main/resources/i18n/strings_hi.properties | 0 .../main/resources/i18n/strings_hr.properties | 0 .../main/resources/i18n/strings_hu.properties | 0 .../main/resources/i18n/strings_id.properties | 0 .../main/resources/i18n/strings_it.properties | 0 .../main/resources/i18n/strings_ja.properties | 0 .../main/resources/i18n/strings_ko.properties | 0 .../main/resources/i18n/strings_lv.properties | 0 .../main/resources/i18n/strings_nb.properties | 0 .../main/resources/i18n/strings_nl.properties | 0 .../main/resources/i18n/strings_nn.properties | 0 .../main/resources/i18n/strings_no.properties | 0 .../main/resources/i18n/strings_pa.properties | 0 .../main/resources/i18n/strings_pl.properties | 0 .../main/resources/i18n/strings_pt.properties | 0 .../resources/i18n/strings_pt_BR.properties | 0 .../main/resources/i18n/strings_ro.properties | 0 .../main/resources/i18n/strings_ru.properties | 0 .../main/resources/i18n/strings_sk.properties | 0 .../main/resources/i18n/strings_sr.properties | 0 .../resources/i18n/strings_sr_Latn.properties | 0 .../main/resources/i18n/strings_sv.properties | 0 .../main/resources/i18n/strings_th.properties | 0 .../main/resources/i18n/strings_tr.properties | 0 .../main/resources/i18n/strings_zh.properties | 0 .../resources/i18n/strings_zh_TW.properties | 0 .../main/resources/img/bot/arm-l.png | Bin .../main/resources/img/bot/arm-l@2x.png | Bin .../main/resources/img/bot/arm-r.png | Bin .../main/resources/img/bot/arm-r@2x.png | Bin .../main/resources/img/bot/body.png | Bin .../main/resources/img/bot/body@2x.png | Bin .../main/resources/img/bot/bot.png | Bin .../main/resources/img/bot/bot@2x.png | Bin .../main/resources/img/bot/face.png | Bin .../main/resources/img/bot/face@2x.png | Bin .../main/resources/img/bot/legs.png | Bin .../main/resources/img/bot/legs@2x.png | Bin .../resources/img/select-masterkey-mac.png | Bin .../resources/img/select-masterkey-win.png | Bin .../main/resources/img/tray_icon.png | Bin .../resources/img/tray_icon_mac_black.png | Bin .../resources/img/tray_icon_mac_black@2x.png | Bin .../resources/img/tray_icon_mac_white.png | Bin .../resources/img/tray_icon_mac_white@2x.png | Bin .../main/resources/img/vault-volume-mac.png | Bin .../main/resources/img/vault-volume-win.png | Bin .../main/resources/img/window_icon_32.png | Bin .../main/resources/img/window_icon_512.png | Bin .../main/resources/license/THIRD-PARTY.txt | 8 +- .../resources => src/package}/LICENSE.txt | 0 .../package}/launcher-linux.sh | 0 .../resources => src/package}/launcher-mac.sh | 0 .../package}/launcher-win.bat | 0 .../resources => src/package}/version.txt | 0 .../cryptomator/common/EnvironmentTest.java | 0 .../common/LicenseCheckerTest.java | 0 .../common/SemVerComparatorTest.java | 0 .../common/keychain/KeychainManagerTest.java | 0 .../common/keychain/MapKeychainAccess.java | 0 .../settings/SettingsJsonAdapterTest.java | 0 .../common/settings/SettingsTest.java | 0 .../VaultSettingsJsonAdapterTest.java | 0 .../common/settings/VaultSettingsTest.java | 0 .../common/vaults/VaultModuleTest.java | 0 .../launcher/FileOpenRequestHandlerTest.java | 0 .../cryptomator/launcher/IpcFactoryTest.java | 0 .../LaunchBasedTriggeringPolicyTest.java | 0 .../addvaultwizard/ReadMeGeneratorTest.java | 0 .../ui/common/PasswordStrengthUtilTest.java | 0 .../ui/controls/SecurePasswordFieldTest.java | 0 .../ui/recoverykey/AutoCompleterTest.java | 0 .../recoverykey/RecoveryKeyFactoryTest.java | 0 .../ui/recoverykey/WordEncoderTest.java | 0 .../org.mockito.plugins.MockMaker | 0 suppression.xml | 53 ++ 430 files changed, 709 insertions(+), 962 deletions(-) delete mode 100644 .idea/modules.xml rename main/buildkit/assembly-linux.xml => assembly-linux.xml (86%) rename main/buildkit/assembly-mac.xml => assembly-mac.xml (86%) rename main/buildkit/assembly-win.xml => assembly-win.xml (86%) delete mode 100644 main/buildkit/pom.xml delete mode 100644 main/commons/pom.xml delete mode 100644 main/launcher/pom.xml delete mode 100644 main/pom.xml delete mode 100644 main/suppression.xml delete mode 100644 main/ui/pom.xml create mode 100644 pom.xml rename {main/ui/src => src}/license/THIRD-PARTY.properties (100%) rename {main/ui/src => src}/license/template.ftl (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/CommonsModule.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/Constants.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/ConsumerThrowingException.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/Environment.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/LicenseChecker.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/LicenseHolder.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/RunnableThrowingException.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/SemVerComparator.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/ShutdownHook.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/SupplierThrowingException.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/keychain/KeychainManager.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/keychain/KeychainModule.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/MacVolumeMountChooser.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/MountPointHelper.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/KeychainBackend.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/Settings.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/SettingsProvider.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/UiTheme.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/VaultSettings.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/VolumeImpl.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/settings/WhenUnlocked.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/AbstractVolume.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/AutoLocker.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/DokanyVolume.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/FuseVolume.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/LockNotCompletedException.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/MountPointRequirement.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/PerVault.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/Vault.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/VaultComponent.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/VaultListManager.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/VaultListModule.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/VaultModule.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/VaultState.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/VaultStats.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/Volume.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/WebDavVolume.java (100%) rename {main/commons/src => src}/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/launcher/Cryptomator.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/launcher/CryptomatorComponent.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/launcher/CryptomatorModule.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/launcher/IpcFactory.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/launcher/IpcProtocol.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/launcher/IpcProtocolImpl.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/logging/DebugMode.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggerinPolicy.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/logging/LoggerConfiguration.java (100%) rename {main/launcher/src => src}/main/java/org/cryptomator/logging/LoggerModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/changepassword/ChangePasswordScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/changepassword/ChangePasswordWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/Animations.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/ErrorComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/ErrorController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/ErrorModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/FontLoader.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/FxController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/FxControllerKey.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/FxmlFile.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/FxmlScene.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/HostServiceRevealer.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/NewPasswordController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/StageFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/Tasks.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/UserInteractionLock.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/VaultService.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/common/WeakBindings.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/AlphanumericTextField.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/DataLabel.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/DraggableListCell.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/FormattedLabel.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/FormattedString.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/NumericTextField.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/SecurePasswordField.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/controls/ThrougputLabel.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/fxapp/FxApplication.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/fxapp/FxApplicationComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/fxapp/FxApplicationScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/BatchService.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/CheckDetailController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/CheckListCell.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/CheckListController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/HealthCheckComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/HealthCheckModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/HealthCheckScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/HealthCheckTask.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/HealthCheckWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/ReportWriter.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/ResultFixApplier.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/ResultListCellController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/ResultListCellFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/health/StartController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/KeyLoading.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/KeyLoadingComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/KeyLoadingModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/KeyLoadingScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingFinisher.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/launcher/AppLaunchEvent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/launcher/UiLauncher.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/lock/LockComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/lock/LockFailedController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/lock/LockForcedController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/lock/LockModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/lock/LockScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/lock/LockWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/lock/LockWorkflow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/MainWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/MainWindowComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/MainWindowSceneFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/MainWindowScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/ResizeController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultDetailNeedsMigrationController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/VaultListController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationRunController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationStartController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/migration/MigrationWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/AboutController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/PreferencesController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/PreferencesModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/PreferencesScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/PreferencesWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/SelectedPreferencesTab.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/quit/QuitComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/quit/QuitController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/quit/QuitModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/quit/QuitScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/quit/QuitWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/removevault/RemoveVaultScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/stats/VaultStatisticsScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/stats/VaultStatisticsWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/traymenu/TrayIconController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/traymenu/TrayMenuScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockCancelledException.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/AutoLockVaultOptionsController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/SelectedVaultOptionsTab.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsWindow.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertScoped.java (100%) rename {main/ui/src => src}/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertWindow.java (100%) rename {main/ui/src => src}/main/resources/css/dark_theme.css (100%) rename {main/ui/src => src}/main/resources/css/fontawesome5-free-solid.otf (100%) rename {main/ui/src => src}/main/resources/css/light_theme.css (100%) rename {main/ui/src => src}/main/resources/css/opensans-bold.ttf (100%) rename {main/ui/src => src}/main/resources/css/opensans-regular.ttf (100%) rename {main/ui/src => src}/main/resources/css/opensans-semibold.ttf (100%) rename {main/ui/src => src}/main/resources/css/quicksand-bold.ttf (100%) rename {main/ui/src => src}/main/resources/fxml/addvault_existing.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/addvault_new_location.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/addvault_new_name.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/addvault_new_password.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/addvault_new_recoverykey.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/addvault_success.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/addvault_welcome.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/changepassword.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/error.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/forget_password.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/health_check_details.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/health_check_list.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/health_result_listcell.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/health_start.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/lock_failed.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/lock_forced.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/main_window.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/main_window_resize.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/main_window_title.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/migration_capability_error.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/migration_impossible.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/migration_run.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/migration_start.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/migration_success.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/new_password.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/preferences.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/preferences_about.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/preferences_contribute.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/preferences_general.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/preferences_updates.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/preferences_volume.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/quit.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/recoverykey_create.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/recoverykey_display.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/recoverykey_recover.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/recoverykey_reset_password.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/recoverykey_success.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/remove_vault.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/stats.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/unlock_enter_password.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/unlock_invalid_mount_point.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/unlock_select_masterkeyfile.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/unlock_success.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_detail.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_detail_locked.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_detail_missing.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_detail_needsmigration.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_detail_unknownerror.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_detail_unlocked.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_detail_welcome.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_list.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_list_cell.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_list_contextmenu.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_options.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_options_autolock.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_options_general.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_options_masterkey.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/vault_options_mount.fxml (100%) rename {main/ui/src => src}/main/resources/fxml/wrongfilealert.fxml (100%) rename {main/ui/src => src}/main/resources/i18n/4096words_en.txt (100%) rename {main/ui/src => src}/main/resources/i18n/strings.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_ar.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_bs.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_ca.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_cs.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_de.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_el.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_es.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_fr.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_hi.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_hr.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_hu.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_id.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_it.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_ja.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_ko.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_lv.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_nb.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_nl.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_nn.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_no.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_pa.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_pl.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_pt.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_pt_BR.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_ro.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_ru.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_sk.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_sr.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_sr_Latn.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_sv.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_th.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_tr.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_zh.properties (100%) rename {main/ui/src => src}/main/resources/i18n/strings_zh_TW.properties (100%) rename {main/ui/src => src}/main/resources/img/bot/arm-l.png (100%) rename {main/ui/src => src}/main/resources/img/bot/arm-l@2x.png (100%) rename {main/ui/src => src}/main/resources/img/bot/arm-r.png (100%) rename {main/ui/src => src}/main/resources/img/bot/arm-r@2x.png (100%) rename {main/ui/src => src}/main/resources/img/bot/body.png (100%) rename {main/ui/src => src}/main/resources/img/bot/body@2x.png (100%) rename {main/ui/src => src}/main/resources/img/bot/bot.png (100%) rename {main/ui/src => src}/main/resources/img/bot/bot@2x.png (100%) rename {main/ui/src => src}/main/resources/img/bot/face.png (100%) rename {main/ui/src => src}/main/resources/img/bot/face@2x.png (100%) rename {main/ui/src => src}/main/resources/img/bot/legs.png (100%) rename {main/ui/src => src}/main/resources/img/bot/legs@2x.png (100%) rename {main/ui/src => src}/main/resources/img/select-masterkey-mac.png (100%) rename {main/ui/src => src}/main/resources/img/select-masterkey-win.png (100%) rename {main/ui/src => src}/main/resources/img/tray_icon.png (100%) rename {main/ui/src => src}/main/resources/img/tray_icon_mac_black.png (100%) rename {main/ui/src => src}/main/resources/img/tray_icon_mac_black@2x.png (100%) rename {main/ui/src => src}/main/resources/img/tray_icon_mac_white.png (100%) rename {main/ui/src => src}/main/resources/img/tray_icon_mac_white@2x.png (100%) rename {main/ui/src => src}/main/resources/img/vault-volume-mac.png (100%) rename {main/ui/src => src}/main/resources/img/vault-volume-win.png (100%) rename {main/ui/src => src}/main/resources/img/window_icon_32.png (100%) rename {main/ui/src => src}/main/resources/img/window_icon_512.png (100%) rename {main/ui/src => src}/main/resources/license/THIRD-PARTY.txt (92%) rename {main/buildkit/src/main/resources => src/package}/LICENSE.txt (100%) rename {main/buildkit/src/main/resources => src/package}/launcher-linux.sh (100%) rename {main/buildkit/src/main/resources => src/package}/launcher-mac.sh (100%) rename {main/buildkit/src/main/resources => src/package}/launcher-win.bat (100%) rename {main/buildkit/src/main/resources => src/package}/version.txt (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/EnvironmentTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/LicenseCheckerTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/SemVerComparatorTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/settings/SettingsTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/settings/VaultSettingsTest.java (100%) rename {main/commons/src => src}/test/java/org/cryptomator/common/vaults/VaultModuleTest.java (100%) rename {main/launcher/src => src}/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java (100%) rename {main/launcher/src => src}/test/java/org/cryptomator/launcher/IpcFactoryTest.java (100%) rename {main/launcher/src => src}/test/java/org/cryptomator/logging/LaunchBasedTriggeringPolicyTest.java (100%) rename {main/ui/src => src}/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java (100%) rename {main/ui/src => src}/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java (100%) rename {main/ui/src => src}/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java (100%) rename {main/ui/src => src}/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java (100%) rename {main/ui/src => src}/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java (100%) rename {main/ui/src => src}/test/java/org/cryptomator/ui/recoverykey/WordEncoderTest.java (100%) rename {main/ui/src => src}/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) create mode 100644 suppression.xml diff --git a/.crowdin.yml b/.crowdin.yml index 719c29826..a70a3975b 100644 --- a/.crowdin.yml +++ b/.crowdin.yml @@ -1,5 +1,5 @@ commit_message: "[ci skip]" escape_special_characters: 0 files: - - source: /main/ui/src/main/resources/i18n/strings.properties - translation: /main/ui/src/main/resources/i18n/strings_%two_letters_code%.properties + - source: /src/main/resources/i18n/strings.properties + translation: /src/main/resources/i18n/strings_%two_letters_code%.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a464f599..3cf0cb845 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,41 +20,38 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Ensure to use tagged version - run: mvn versions:set --file main/pom.xml -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags' + run: mvn versions:set -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags' if: startsWith(github.ref, 'refs/tags/') - name: Build and Test - run: mvn -B install --file main/pom.xml -Pcoverage - - name: Run Codacy Coverage Reporter - if: github.repository == 'cryptomator/cryptomator' - run: | - curl -o ~/codacy-coverage-reporter.jar https://repo.maven.apache.org/maven2/com/codacy/codacy-coverage-reporter/7.1.0/codacy-coverage-reporter-7.1.0-assembly.jar - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar final + run: mvn -B clean install jacoco:report -Pcoverage,dependency-check + - name: Upload code coverage report + id: codacyCoverageReporter + run: bash <(curl -Ls https://coverage.codacy.com/get.sh) env: CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} + continue-on-error: true +### TODO: move to matrix build: - name: Assemble buildkit-linux.zip - run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,linux + run: mvn -B clean package -DskipTests -Plinux - name: Upload buildkit-linux.zip uses: actions/upload-artifact@v1 with: name: buildkit-linux.zip - path: main/buildkit/target/buildkit-linux.zip + path: target/buildkit-linux.zip - name: Assemble buildkit-mac.zip - run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,mac + run: mvn -B clean package -DskipTests -Pmac - name: Upload buildkit-mac.zip uses: actions/upload-artifact@v1 with: name: buildkit-mac.zip - path: main/buildkit/target/buildkit-mac.zip + path: target/buildkit-mac.zip - name: Assemble buildkit-win.zip - run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,windows + run: mvn -B clean package -DskipTests -Pwindows - name: Upload buildkit-win.zip uses: actions/upload-artifact@v1 with: name: buildkit-win.zip - path: main/buildkit/target/buildkit-win.zip + path: target/buildkit-win.zip release: name: Draft a Release on GitHub Releases diff --git a/.idea/misc.xml b/.idea/misc.xml index feca1b9ff..68ef79a67 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 2e793ed5c..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Cryptomator_Linux.xml b/.idea/runConfigurations/Cryptomator_Linux.xml index 01c00da09..242dc0c56 100644 --- a/.idea/runConfigurations/Cryptomator_Linux.xml +++ b/.idea/runConfigurations/Cryptomator_Linux.xml @@ -1,7 +1,7 @@