diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-07 17:09:54 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-07 17:09:54 +0200 |
| commit | 1f477c80597d51cbc977fd1e38052b86bd54089d (patch) | |
| tree | 92e9ae36681946b0fcb3b08a60713fcffafdf11d /OpenKeychain | |
| parent | 94a47719aebd29fd6ba09db854f764b9bc989662 (diff) | |
| parent | 597eb268f4bdc28c3cba8c5d24986f3699453e71 (diff) | |
| download | open-keychain-1f477c80597d51cbc977fd1e38052b86bd54089d.tar.gz open-keychain-1f477c80597d51cbc977fd1e38052b86bd54089d.tar.bz2 open-keychain-1f477c80597d51cbc977fd1e38052b86bd54089d.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java index d433677a3..2c8fc29d4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java @@ -289,8 +289,8 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor // if the passphrase was wrong, reset and re-enable the dialogue if (!result) { - // TODO add a "bad passphrase" dialogue? mPassphraseEditText.setText(""); + mPassphraseEditText.setError(getString(R.string.wrong_passphrase)); mInput.setVisibility(View.VISIBLE); mProgress.setVisibility(View.GONE); positive.setEnabled(true); |