diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java index 8058956ce..abc6f629f 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java @@ -37,30 +37,30 @@ public class SettingsJsonAdapter extends TypeAdapter { @Override public void write(JsonWriter out, Settings value) throws IOException { out.beginObject(); - out.name("lastWrittenByVersion").value(env.getAppVersion()+env.getBuildNumber().map("-"::concat).orElse("")); + out.name("writtenByVersion").value(env.getAppVersion() + env.getBuildNumber().map("-"::concat).orElse("")); out.name("directories"); writeVaultSettingsArray(out, value.getDirectories()); out.name("askedForUpdateCheck").value(value.askedForUpdateCheck().get()); - out.name("checkForUpdatesEnabled").value(value.checkForUpdates().get()); - out.name("startHidden").value(value.startHidden().get()); out.name("autoCloseVaults").value(value.autoCloseVaults().get()); - out.name("port").value(value.port().get()); - out.name("numTrayNotifications").value(value.numTrayNotifications().get()); + out.name("checkForUpdatesEnabled").value(value.checkForUpdates().get()); out.name("debugMode").value(value.debugMode().get()); - out.name("theme").value(value.theme().get().name()); - out.name("uiOrientation").value(value.userInterfaceOrientation().get().name()); + out.name("displayConfiguration").value((value.displayConfigurationProperty().get())); out.name("keychainProvider").value(value.keychainProvider().get()); - out.name("useKeychain").value(value.useKeychain().get()); + out.name("language").value((value.languageProperty().get())); out.name("licenseKey").value(value.licenseKey().get()); + out.name("mountService").value(value.mountService().get()); + out.name("numTrayNotifications").value(value.numTrayNotifications().get()); + out.name("port").value(value.port().get()); out.name("showMinimizeButton").value(value.showMinimizeButton().get()); out.name("showTrayIcon").value(value.showTrayIcon().get()); + out.name("startHidden").value(value.startHidden().get()); + out.name("theme").value(value.theme().get().name()); + out.name("uiOrientation").value(value.userInterfaceOrientation().get().name()); + out.name("useKeychain").value(value.useKeychain().get()); + out.name("windowHeight").value((value.windowHeightProperty().get())); + out.name("windowWidth").value((value.windowWidthProperty().get())); out.name("windowXPosition").value((value.windowXPositionProperty().get())); out.name("windowYPosition").value((value.windowYPositionProperty().get())); - out.name("windowWidth").value((value.windowWidthProperty().get())); - out.name("windowHeight").value((value.windowHeightProperty().get())); - out.name("displayConfiguration").value((value.displayConfigurationProperty().get())); - out.name("language").value((value.languageProperty().get())); - out.name("mountService").value(value.mountService().get()); out.endObject(); } @@ -82,33 +82,34 @@ public class SettingsJsonAdapter extends TypeAdapter { while (in.hasNext()) { String name = in.nextName(); switch (name) { + case "writtenByVersion" -> in.skipValue(); //noop case "directories" -> settings.getDirectories().addAll(readVaultSettingsArray(in)); case "askedForUpdateCheck" -> settings.askedForUpdateCheck().set(in.nextBoolean()); - case "checkForUpdatesEnabled" -> settings.checkForUpdates().set(in.nextBoolean()); - case "startHidden" -> settings.startHidden().set(in.nextBoolean()); case "autoCloseVaults" -> settings.autoCloseVaults().set(in.nextBoolean()); - case "port" -> settings.port().set(in.nextInt()); - case "numTrayNotifications" -> settings.numTrayNotifications().set(in.nextInt()); + case "checkForUpdatesEnabled" -> settings.checkForUpdates().set(in.nextBoolean()); case "debugMode" -> settings.debugMode().set(in.nextBoolean()); - case "theme" -> settings.theme().set(parseUiTheme(in.nextString())); - case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString())); - case "keychainProvider" -> settings.keychainProvider().set(in.nextString()); - case "useKeychain" -> settings.useKeychain().set(in.nextBoolean()); - case "licenseKey" -> settings.licenseKey().set(in.nextString()); - case "showMinimizeButton" -> settings.showMinimizeButton().set(in.nextBoolean()); - case "showTrayIcon" -> settings.showTrayIcon().set(in.nextBoolean()); - case "windowXPosition" -> settings.windowXPositionProperty().set(in.nextInt()); - case "windowYPosition" -> settings.windowYPositionProperty().set(in.nextInt()); - case "windowWidth" -> settings.windowWidthProperty().set(in.nextInt()); - case "windowHeight" -> settings.windowHeightProperty().set(in.nextInt()); case "displayConfiguration" -> settings.displayConfigurationProperty().set(in.nextString()); + case "keychainProvider" -> settings.keychainProvider().set(in.nextString()); case "language" -> settings.languageProperty().set(in.nextString()); + case "licenseKey" -> settings.licenseKey().set(in.nextString()); case "mountService" -> { var token = in.peek(); if (JsonToken.STRING == token) { settings.mountService().set(in.nextString()); } } + case "numTrayNotifications" -> settings.numTrayNotifications().set(in.nextInt()); + case "port" -> settings.port().set(in.nextInt()); + case "showMinimizeButton" -> settings.showMinimizeButton().set(in.nextBoolean()); + case "showTrayIcon" -> settings.showTrayIcon().set(in.nextBoolean()); + case "startHidden" -> settings.startHidden().set(in.nextBoolean()); + case "theme" -> settings.theme().set(parseUiTheme(in.nextString())); + case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString())); + case "useKeychain" -> settings.useKeychain().set(in.nextBoolean()); + case "windowHeight" -> settings.windowHeightProperty().set(in.nextInt()); + case "windowWidth" -> settings.windowWidthProperty().set(in.nextInt()); + case "windowXPosition" -> settings.windowXPositionProperty().set(in.nextInt()); + case "windowYPosition" -> settings.windowYPositionProperty().set(in.nextInt()); //1.6.x legacy case "preferredVolumeImpl" -> volumeImpl = in.nextString(); //legacy end @@ -134,7 +135,7 @@ public class SettingsJsonAdapter extends TypeAdapter { if (volumeImpl.equals("Dokany")) { return "org.cryptomator.frontend.dokany.mount.DokanyMountProvider"; } else if (volumeImpl.equals("FUSE")) { - if(SystemUtils.IS_OS_WINDOWS) { + if (SystemUtils.IS_OS_WINDOWS) { return "org.cryptomator.frontend.fuse.mount.WinFspNetworkMountProvider"; } else if (SystemUtils.IS_OS_MAC) { return "org.cryptomator.frontend.fuse.mount.MacFuseMountProvider"; @@ -142,7 +143,7 @@ public class SettingsJsonAdapter extends TypeAdapter { return "org.cryptomator.frontend.fuse.mount.LinuxFuseMountProvider"; } } else { - if(SystemUtils.IS_OS_WINDOWS) { + if (SystemUtils.IS_OS_WINDOWS) { return "org.cryptomator.frontend.webdav.mount.WindowsMounter"; } else if (SystemUtils.IS_OS_MAC) { return "org.cryptomator.frontend.webdav.mount.MacAppleScriptMounter"; diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java index c6acbadf6..02327aaf4 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java @@ -11,8 +11,8 @@ import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.NewPasswordController; -import org.cryptomator.ui.common.PasswordStrengthUtil; +import org.cryptomator.ui.changepassword.NewPasswordController; +import org.cryptomator.ui.changepassword.PasswordStrengthUtil; import org.cryptomator.ui.common.StageFactory; import org.cryptomator.ui.fxapp.PrimaryStage; import org.cryptomator.ui.recoverykey.RecoveryKeyDisplayController; diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index 0148686f3..0cd1814d4 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -13,7 +13,7 @@ import org.cryptomator.cryptolib.common.MasterkeyFileAccess; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.NewPasswordController; +import org.cryptomator.ui.changepassword.NewPasswordController; import org.cryptomator.ui.common.Tasks; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.cryptomator.ui.keyloading.masterkeyfile.MasterkeyFileLoadingStrategy; diff --git a/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java index 200a70328..4d9666785 100644 --- a/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java +++ b/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java @@ -9,7 +9,6 @@ import org.cryptomator.cryptolib.common.MasterkeyFileAccess; import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.ui.common.Animations; import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.common.NewPasswordController; import org.cryptomator.ui.controls.NiceSecurePasswordField; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.slf4j.Logger; diff --git a/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java b/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java index d95b19410..947f87aeb 100644 --- a/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java +++ b/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java @@ -10,8 +10,6 @@ import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.NewPasswordController; -import org.cryptomator.ui.common.PasswordStrengthUtil; import org.cryptomator.ui.common.StageFactory; import javax.inject.Named; diff --git a/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/src/main/java/org/cryptomator/ui/changepassword/NewPasswordController.java similarity index 97% rename from src/main/java/org/cryptomator/ui/common/NewPasswordController.java rename to src/main/java/org/cryptomator/ui/changepassword/NewPasswordController.java index 6f029efe1..36b469f49 100644 --- a/src/main/java/org/cryptomator/ui/common/NewPasswordController.java +++ b/src/main/java/org/cryptomator/ui/changepassword/NewPasswordController.java @@ -1,5 +1,6 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.changepassword; +import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.controls.FontAwesome5IconView; import org.cryptomator.ui.controls.NiceSecurePasswordField; diff --git a/src/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java b/src/main/java/org/cryptomator/ui/changepassword/PasswordStrengthUtil.java similarity index 98% rename from src/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java rename to src/main/java/org/cryptomator/ui/changepassword/PasswordStrengthUtil.java index 0224118cd..202e2f9cb 100644 --- a/src/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java +++ b/src/main/java/org/cryptomator/ui/changepassword/PasswordStrengthUtil.java @@ -6,7 +6,7 @@ * Contributors: * Jean-Noël Charon - initial API and implementation *******************************************************************************/ -package org.cryptomator.ui.common; +package org.cryptomator.ui.changepassword; import com.nulabinc.zxcvbn.Zxcvbn; import org.cryptomator.common.Environment; diff --git a/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/src/main/java/org/cryptomator/ui/error/ErrorComponent.java similarity index 83% rename from src/main/java/org/cryptomator/ui/common/ErrorComponent.java rename to src/main/java/org/cryptomator/ui/error/ErrorComponent.java index 8cb430584..554aa65f1 100644 --- a/src/main/java/org/cryptomator/ui/common/ErrorComponent.java +++ b/src/main/java/org/cryptomator/ui/error/ErrorComponent.java @@ -1,8 +1,10 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.error; import dagger.BindsInstance; import dagger.Subcomponent; import org.cryptomator.common.Nullable; +import org.cryptomator.ui.common.FxmlFile; +import org.cryptomator.ui.common.FxmlScene; import javafx.scene.Scene; import javafx.stage.Stage; diff --git a/src/main/java/org/cryptomator/ui/common/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java similarity index 98% rename from src/main/java/org/cryptomator/ui/common/ErrorController.java rename to src/main/java/org/cryptomator/ui/error/ErrorController.java index 15d2ee41f..422a44157 100644 --- a/src/main/java/org/cryptomator/ui/common/ErrorController.java +++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java @@ -1,8 +1,9 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.error; import org.cryptomator.common.Environment; import org.cryptomator.common.ErrorCode; import org.cryptomator.common.Nullable; +import org.cryptomator.ui.common.FxController; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/main/java/org/cryptomator/ui/common/ErrorModule.java b/src/main/java/org/cryptomator/ui/error/ErrorModule.java similarity index 81% rename from src/main/java/org/cryptomator/ui/common/ErrorModule.java rename to src/main/java/org/cryptomator/ui/error/ErrorModule.java index 01b8790c1..d9ac6eab9 100644 --- a/src/main/java/org/cryptomator/ui/common/ErrorModule.java +++ b/src/main/java/org/cryptomator/ui/error/ErrorModule.java @@ -1,10 +1,16 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.error; import dagger.Binds; import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.ErrorCode; +import org.cryptomator.ui.common.DefaultSceneFactory; +import org.cryptomator.ui.common.FxController; +import org.cryptomator.ui.common.FxControllerKey; +import org.cryptomator.ui.common.FxmlFile; +import org.cryptomator.ui.common.FxmlLoaderFactory; +import org.cryptomator.ui.common.FxmlScene; import javax.inject.Named; import javax.inject.Provider; diff --git a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordComponent.java similarity index 96% rename from src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java rename to src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordComponent.java index e7300bb79..347065b85 100644 --- a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java +++ b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordComponent.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.forgetPassword; +package org.cryptomator.ui.forgetpassword; import dagger.BindsInstance; import dagger.Lazy; diff --git a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordController.java similarity index 97% rename from src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java rename to src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordController.java index 8cd43ae22..f8a4fc4dd 100644 --- a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java +++ b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordController.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.forgetPassword; +package org.cryptomator.ui.forgetpassword; import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; diff --git a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordModule.java similarity index 98% rename from src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java rename to src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordModule.java index b0c34e9f5..1a06678cb 100644 --- a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java +++ b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordModule.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.forgetPassword; +package org.cryptomator.ui.forgetpassword; import dagger.Binds; import dagger.Module; diff --git a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordScoped.java b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordScoped.java similarity index 85% rename from src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordScoped.java rename to src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordScoped.java index 5be483753..bc0bd738e 100644 --- a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordScoped.java +++ b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordScoped.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.forgetPassword; +package org.cryptomator.ui.forgetpassword; import javax.inject.Scope; import java.lang.annotation.Documented; diff --git a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordWindow.java b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordWindow.java similarity index 85% rename from src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordWindow.java rename to src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordWindow.java index 285119e0a..e9162f45d 100644 --- a/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordWindow.java +++ b/src/main/java/org/cryptomator/ui/forgetpassword/ForgetPasswordWindow.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.forgetPassword; +package org.cryptomator.ui.forgetpassword; import javax.inject.Qualifier; import java.lang.annotation.Documented; diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index cdeb764be..877675b9c 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -7,9 +7,7 @@ package org.cryptomator.ui.fxapp; import dagger.Module; import dagger.Provides; -import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.ui.common.ErrorComponent; -import org.cryptomator.ui.common.StageFactory; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; import org.cryptomator.ui.preferences.PreferencesComponent; @@ -18,13 +16,9 @@ import org.cryptomator.ui.quit.QuitComponent; import org.cryptomator.ui.traymenu.TrayMenuComponent; import org.cryptomator.ui.unlock.UnlockComponent; -import javax.inject.Named; import javafx.scene.image.Image; import java.io.IOException; import java.io.InputStream; -import java.io.UncheckedIOException; -import java.util.Collections; -import java.util.List; @Module(includes = {UpdateCheckerModule.class}, subcomponents = {TrayMenuComponent.class, MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, LockComponent.class, QuitComponent.class, ErrorComponent.class}) abstract class FxApplicationModule { diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java index 5d38a9017..2b4f8e7bc 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java @@ -5,7 +5,7 @@ import dagger.Lazy; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.integrations.tray.TrayIntegrationProvider; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; import org.cryptomator.ui.preferences.PreferencesComponent; diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java index 6f63ee98e..7b8aae875 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java @@ -15,8 +15,6 @@ import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.NewPasswordController; -import org.cryptomator.ui.common.PasswordStrengthUtil; import org.cryptomator.ui.keyloading.KeyLoading; import org.cryptomator.ui.keyloading.KeyLoadingScoped; import org.cryptomator.ui.keyloading.KeyLoadingStrategy; @@ -153,13 +151,6 @@ public abstract class HubKeyLoadingModule { @FxControllerKey(AuthFlowController.class) abstract FxController bindAuthFlowController(AuthFlowController controller); - @Provides - @IntoMap - @FxControllerKey(NewPasswordController.class) - static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater) { - return new NewPasswordController(resourceBundle, strengthRater); - } - @Binds @IntoMap @FxControllerKey(InvalidLicenseController.class) diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java index 9375b0cff..5e4d148cb 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java @@ -8,7 +8,7 @@ import dagger.multibindings.StringKey; import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; import org.cryptomator.integrations.keychain.KeychainAccessException; -import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent; +import org.cryptomator.ui.forgetpassword.ForgetPasswordComponent; import org.cryptomator.ui.keyloading.KeyLoading; import org.cryptomator.ui.keyloading.KeyLoadingScoped; import org.cryptomator.ui.keyloading.KeyLoadingStrategy; diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java index baadb9a12..6d52362b3 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java @@ -7,7 +7,7 @@ import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.WeakBindings; import org.cryptomator.ui.controls.NiceSecurePasswordField; -import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent; +import org.cryptomator.ui.forgetpassword.ForgetPasswordComponent; import org.cryptomator.ui.keyloading.KeyLoading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java index 94acba3cc..6fbb8e16e 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java index a5a0b7ec8..397a80f54 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java @@ -13,8 +13,8 @@ import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.NewPasswordController; -import org.cryptomator.ui.common.PasswordStrengthUtil; +import org.cryptomator.ui.changepassword.NewPasswordController; +import org.cryptomator.ui.changepassword.PasswordStrengthUtil; import org.cryptomator.ui.common.StageFactory; import javax.inject.Named; diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java index 69e1373e1..147893426 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java @@ -5,7 +5,7 @@ import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.NewPasswordController; +import org.cryptomator.ui.changepassword.NewPasswordController; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java index 4978335c7..85566ed1f 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java @@ -4,7 +4,7 @@ import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.changepassword.ChangePasswordComponent; import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent; +import org.cryptomator.ui.forgetpassword.ForgetPasswordComponent; import org.cryptomator.ui.recoverykey.RecoveryKeyComponent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java b/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java index 50df38e71..3888963b2 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java @@ -13,7 +13,7 @@ import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxmlScene; import org.cryptomator.ui.common.StageFactory; -import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent; +import org.cryptomator.ui.forgetpassword.ForgetPasswordComponent; import org.cryptomator.ui.fxapp.PrimaryStage; import org.cryptomator.ui.recoverykey.RecoveryKeyComponent; diff --git a/src/main/resources/fxml/error.fxml b/src/main/resources/fxml/error.fxml index 1bb8a5ae2..ca0966a0a 100644 --- a/src/main/resources/fxml/error.fxml +++ b/src/main/resources/fxml/error.fxml @@ -15,7 +15,7 @@ diff --git a/src/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java b/src/test/java/org/cryptomator/ui/changepassword/PasswordStrengthUtilTest.java similarity index 91% rename from src/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java rename to src/test/java/org/cryptomator/ui/changepassword/PasswordStrengthUtilTest.java index fe3ba8846..3996bfab2 100644 --- a/src/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java +++ b/src/test/java/org/cryptomator/ui/changepassword/PasswordStrengthUtilTest.java @@ -1,9 +1,9 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.changepassword; import com.google.common.base.Strings; import org.cryptomator.common.Environment; +import org.cryptomator.ui.changepassword.PasswordStrengthUtil; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.Mockito;