From e0397463ea1a560ad70c98a43589db99e7433e90 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 24 Aug 2016 10:24:55 +0200 Subject: [PATCH] IDEA-160058 Password safe: provide clear explanation how the passwords will be stored after conversion --- .../masterKey/EnterPasswordComponent.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java index 68aebf6feea9..20b9d0b884af 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java @@ -17,6 +17,7 @@ package com.intellij.ide.passwordSafe.impl.providers.masterKey; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.ui.ValidationInfo; +import com.intellij.openapi.util.SystemInfo; import org.jetbrains.annotations.NotNull; import java.util.function.Function; @@ -31,7 +32,22 @@ public class EnterPasswordComponent extends PasswordComponentBase { public EnterPasswordComponent(@NotNull Function passwordConsumer) { myPasswordConsumer = passwordConsumer; - myPromptLabel.setText("Master password is required to convert saved password."); + String note; + if (SystemInfo.isMacIntel64 && SystemInfo.isMacOSLeopard) { + note = "The passwords will be stored in the system MacOS keychain."; + } + else if (SystemInfo.isLinux) { + note = "The passwords will be stored in the system keychain using Secret Service API."; + } + else if (SystemInfo.isWindows) { + note = "The passwords will be stored in the KeePass database protected by your Windows account."; + } + else { + String subNote = SystemInfo.isMacIntel64 ? "at least OS X 10.5 is required" : "your OS is not supported, please file issue"; + note = "The passwords will be stored in IDE configuration files with weak protection (" + subNote + ")."; + } + + myPromptLabel.setText("Master password is required to convert saved passwords.

" + note + ""); if (ApplicationManager.getApplication().isUnitTestMode()) { myPasswordField.setText("pass");