diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/BasePasswordSafeProvider.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/BasePasswordSafeProvider.java | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/BasePasswordSafeProvider.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/BasePasswordSafeProvider.java index 8c8f921f18b8..a0b001824d90 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/BasePasswordSafeProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/BasePasswordSafeProvider.java @@ -43,15 +43,13 @@ public abstract class BasePasswordSafeProvider extends PasswordSafeProvider { * @throws PasswordSafeException in case of problems with access to the password database. * @throws IllegalStateException if the method is called from the read action. */ - protected abstract byte[] key(@Nullable Project project, @NotNull Class requestor, - @Nullable ModalityState modalityState) throws PasswordSafeException; + protected abstract byte[] key(@Nullable Project project, @NotNull Class requestor) throws PasswordSafeException; @Nullable - public String getPassword(@Nullable Project project, @NotNull Class requestor, String key, - @Nullable ModalityState modalityState) throws PasswordSafeException { - byte[] k = dbKey(project, requestor, key, modalityState); + public String getPassword(@Nullable Project project, @NotNull Class requestor, String key) throws PasswordSafeException { + byte[] k = dbKey(project, requestor, key); byte[] ct = getEncryptedPassword(k); - return ct == null ? null : EncryptionUtil.decryptText(key(project, requestor, modalityState), ct); + return ct == null ? null : EncryptionUtil.decryptText(key(project, requestor), ct); } /** @@ -68,17 +66,14 @@ public abstract class BasePasswordSafeProvider extends PasswordSafeProvider { * @param project * @param requestor the requestor class * @param key the key to use - * @param modalityState * @return the key to use for map */ - private byte[] dbKey(@Nullable Project project, @NotNull Class requestor, String key, - @Nullable ModalityState modalityState) throws PasswordSafeException { - return EncryptionUtil.dbKey(key(project, requestor, modalityState), requestor, key); + private byte[] dbKey(@Nullable Project project, Class requestor, String key) throws PasswordSafeException { + return EncryptionUtil.dbKey(key(project, requestor), requestor, key); } - public void removePassword(@Nullable Project project, @NotNull Class requester, String key, - @Nullable ModalityState modalityState) throws PasswordSafeException { - byte[] k = dbKey(project, requester, key, modalityState); + public void removePassword(@Nullable Project project, @NotNull Class requester, String key) throws PasswordSafeException { + byte[] k = dbKey(project, requester, key); removeEncryptedPassword(k); } @@ -89,10 +84,9 @@ public abstract class BasePasswordSafeProvider extends PasswordSafeProvider { */ protected abstract void removeEncryptedPassword(byte[] key); - public void storePassword(@Nullable Project project, @NotNull Class requestor, String key, String value, - @Nullable ModalityState modalityState) throws PasswordSafeException { - byte[] k = dbKey(project, requestor, key, modalityState); - byte[] ct = EncryptionUtil.encryptText(key(project, requestor, modalityState), value); + public void storePassword(@Nullable Project project, @NotNull Class requestor, String key, String value) throws PasswordSafeException { + byte[] k = dbKey(project, requestor, key); + byte[] ct = EncryptionUtil.encryptText(key(project, requestor), value); storeEncryptedPassword(k, ct); } |