diff options
author | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 05:33:28 -0400 |
---|---|---|
committer | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 14:36:30 -0400 |
commit | d21fb7733697a8f947604dbd1d6c608f5b2a21d5 (patch) | |
tree | 1ae3348b7047b351a598dd71b8d5e4e8ffed74dd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |
parent | a0107afd3efefb152b5691b04c6343a4382fcd6a (diff) | |
download | open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.tar.gz open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.tar.bz2 open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.zip |
Moving keytocard process into PgpKeyOperation.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 0fad22e4a..e0509ac9b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -40,7 +40,6 @@ import org.sufficientlysecure.keychain.operations.CertifyOperation; import org.sufficientlysecure.keychain.operations.DeleteOperation; import org.sufficientlysecure.keychain.operations.EditKeyOperation; import org.sufficientlysecure.keychain.operations.ImportExportOperation; -import org.sufficientlysecure.keychain.operations.NfcKeyToCardOperation; import org.sufficientlysecure.keychain.operations.PromoteKeyOperation; import org.sufficientlysecure.keychain.operations.SignEncryptOperation; import org.sufficientlysecure.keychain.operations.results.CertifyResult; @@ -49,7 +48,6 @@ import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; import org.sufficientlysecure.keychain.operations.results.DeleteResult; import org.sufficientlysecure.keychain.operations.results.ExportResult; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; -import org.sufficientlysecure.keychain.operations.results.NfcKeyToCardResult; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.operations.results.PromoteKeyResult; @@ -113,8 +111,6 @@ public class KeychainIntentService extends IntentService implements Progressable public static final String ACTION_IMPORT_KEYRING = Constants.INTENT_PREFIX + "IMPORT_KEYRING"; public static final String ACTION_EXPORT_KEYRING = Constants.INTENT_PREFIX + "EXPORT_KEYRING"; - public static final String ACTION_NFC_KEYTOCARD = Constants.INTENT_PREFIX + "NFC_KEYTOCARD"; - public static final String ACTION_UPLOAD_KEYRING = Constants.INTENT_PREFIX + "UPLOAD_KEYRING"; public static final String ACTION_CERTIFY_KEYRING = Constants.INTENT_PREFIX + "SIGN_KEYRING"; @@ -180,9 +176,6 @@ public class KeychainIntentService extends IntentService implements Progressable public static final String EXPORT_ALL = "export_all"; public static final String EXPORT_KEY_RING_MASTER_KEY_ID = "export_key_ring_id"; - // NFC export key to card - public static final String NFC_KEYTOCARD_SUBKEY_ID = "nfc_keytocard_subkey_id"; - // upload key public static final String UPLOAD_KEY_SERVER = "upload_key_server"; @@ -539,19 +532,6 @@ public class KeychainIntentService extends IntentService implements Progressable break; } - case ACTION_NFC_KEYTOCARD: { - // Input - long subKeyId = data.getLong(NFC_KEYTOCARD_SUBKEY_ID); - - // Operation - NfcKeyToCardOperation exportOp = new NfcKeyToCardOperation(this, providerHelper, this); - NfcKeyToCardResult result = exportOp.execute(subKeyId); - - // Result - sendMessageToHandler(MessageStatus.OKAY, result); - - break; - } case ACTION_SIGN_ENCRYPT: { // Input |