diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-16 11:50:23 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-16 11:50:23 +0200 |
commit | b9df34468b71f156045a4f1cdb7123e3808e3789 (patch) | |
tree | b416a3718eabd03992ca1238ef7424dd74249bc8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java | |
parent | f1b14d338c2e0ad5294d060fec2557ff6d5afeb1 (diff) | |
parent | 935f88131e47c19df5bb8bb5dd13d20d391f0794 (diff) | |
download | open-keychain-b9df34468b71f156045a4f1cdb7123e3808e3789.tar.gz open-keychain-b9df34468b71f156045a4f1cdb7123e3808e3789.tar.bz2 open-keychain-b9df34468b71f156045a4f1cdb7123e3808e3789.zip |
Merge pull request #1835 from nmikhailov/check_security_token
Check security token
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java index 46bade950..001fa9dc8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java @@ -53,7 +53,7 @@ public class ApiPendingIntentFactory { case SECURITY_TOKEN_MOVE_KEY_TO_CARD: case SECURITY_TOKEN_DECRYPT: case SECURITY_TOKEN_SIGN: { - return createNfcOperationPendingIntent(data, requiredInput, cryptoInput); + return createSecurityTokenOperationPendingIntent(data, requiredInput, cryptoInput); } case PASSPHRASE: { @@ -65,7 +65,7 @@ public class ApiPendingIntentFactory { } } - private PendingIntent createNfcOperationPendingIntent(Intent data, RequiredInputParcel requiredInput, CryptoInputParcel cryptoInput) { + private PendingIntent createSecurityTokenOperationPendingIntent(Intent data, RequiredInputParcel requiredInput, CryptoInputParcel cryptoInput) { Intent intent = new Intent(mContext, RemoteSecurityTokenOperationActivity.class); // pass params through to activity that it can be returned again later to repeat pgp operation intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput); |