From 7aa554498baac54dcd0492c454850a533518bd7c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 23 Feb 2023 13:00:51 +0100 Subject: [PATCH] move new password files to changepassword package --- .../cryptomator/ui/addvaultwizard/AddVaultModule.java | 4 ++-- .../addvaultwizard/CreateNewVaultPasswordController.java | 2 +- .../ui/changepassword/ChangePasswordController.java | 1 - .../ui/changepassword/ChangePasswordModule.java | 2 -- .../NewPasswordController.java | 3 ++- .../{common => changepassword}/PasswordStrengthUtil.java | 2 +- .../ui/keyloading/hub/HubKeyLoadingModule.java | 9 --------- .../cryptomator/ui/recoverykey/RecoveryKeyModule.java | 4 ++-- .../recoverykey/RecoveryKeyResetPasswordController.java | 2 +- src/main/resources/fxml/new_password.fxml | 2 +- .../PasswordStrengthUtilTest.java | 4 ++-- 11 files changed, 12 insertions(+), 23 deletions(-) rename src/main/java/org/cryptomator/ui/{common => changepassword}/NewPasswordController.java (97%) rename src/main/java/org/cryptomator/ui/{common => changepassword}/PasswordStrengthUtil.java (98%) rename src/test/java/org/cryptomator/ui/{common => changepassword}/PasswordStrengthUtilTest.java (91%) 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/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/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/resources/fxml/new_password.fxml b/src/main/resources/fxml/new_password.fxml index 942fea0d0..0d8e36cd6 100644 --- a/src/main/resources/fxml/new_password.fxml +++ b/src/main/resources/fxml/new_password.fxml @@ -8,7 +8,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;