diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-06 14:52:12 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-06 14:52:12 +0100 |
| commit | af762a65a0a225181153f95ce957fc042c6a9930 (patch) | |
| tree | 7e247ecfa48f1a17ab5af14488e110d6e32756f0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | |
| parent | e34ad18ed26166751f6897169056044c2d19ce67 (diff) | |
| parent | 0c3f9ae0a67cb98b2ac3ac59985aec03e6a15861 (diff) | |
| download | open-keychain-af762a65a0a225181153f95ce957fc042c6a9930.tar.gz open-keychain-af762a65a0a225181153f95ce957fc042c6a9930.tar.bz2 open-keychain-af762a65a0a225181153f95ce957fc042c6a9930.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index 4c65aa314..fd9324992 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -208,12 +208,12 @@ public class PassphraseDialogActivity extends FragmentActivity { case PASSPHRASE: message = getString(R.string.passphrase_for, userId); break; - case DIVERT_TO_CARD: - message = getString(R.string.yubikey_pin_for, userId); - break; case PIN: message = getString(R.string.pin_for, userId); break; + case DIVERT_TO_CARD: + message = getString(R.string.yubikey_pin_for, userId); + break; default: message = "This should not happen!"; break; |