aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-10-16 15:30:06 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-10-16 15:30:06 +0200
commit8f565296b9503b210cd8edb8cb9ea42a3055c3c6 (patch)
tree55bfb9424a16e9a3fa11c6362ca761ab16bfd3d3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent930db9061efbed0cc3fd8955a15f3aba84eb53d8 (diff)
downloadopen-keychain-8f565296b9503b210cd8edb8cb9ea42a3055c3c6.tar.gz
open-keychain-8f565296b9503b210cd8edb8cb9ea42a3055c3c6.tar.bz2
open-keychain-8f565296b9503b210cd8edb8cb9ea42a3055c3c6.zip
Integrate yubikey reset method
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
index 2c430bc29..1f99836ea 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
@@ -15,7 +15,7 @@ public class RequiredInputParcel implements Parcelable {
public enum RequiredInputType {
PASSPHRASE, PASSPHRASE_SYMMETRIC, BACKUP_CODE, NFC_SIGN, NFC_DECRYPT,
- NFC_MOVE_KEY_TO_CARD, ENABLE_ORBOT, UPLOAD_FAIL_RETRY
+ NFC_MOVE_KEY_TO_CARD, NFC_RESET_CARD, ENABLE_ORBOT, UPLOAD_FAIL_RETRY,
}
public Date mSignatureTime;
@@ -100,6 +100,11 @@ public class RequiredInputParcel implements Parcelable {
new byte[][] { encryptedSessionKey }, null, null, masterKeyId, subKeyId);
}
+ public static RequiredInputParcel createNfcReset() {
+ return new RequiredInputParcel(RequiredInputType.NFC_RESET_CARD,
+ null, null, null, null, null);
+ }
+
public static RequiredInputParcel createRequiredSignPassphrase(
long masterKeyId, long subKeyId, Date signatureTime) {
return new RequiredInputParcel(RequiredInputType.PASSPHRASE,