Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported

1 files changed, 2 insertions, 2 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 2fcbbf6c2..b934f3d5f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -261,7 +261,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
                             hint = getString(R.string.label_pin);
                             break;
                         case DIVERT_TO_CARD:
-                            message = getString(R.string.yubikey_pin_for, userId);
+                            message = getString(R.string.security_token_pin_for, userId);
                             hint = getString(R.string.label_pin);
                             break;
                         // special case: empty passphrase just returns the empty passphrase
@@ -313,7 +313,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
             mPassphraseEditText.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE);
             mPassphraseEditText.setOnEditorActionListener(this);
 
-            if ((keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD && Preferences.getPreferences(activity).useNumKeypadForYubiKeyPin())
+            if ((keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD && Preferences.getPreferences(activity).useNumKeypadForSecurityTokenPin())
                     || keyType == CanonicalizedSecretKey.SecretKeyType.PIN) {
                 mPassphraseEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
                 mPassphraseEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());