moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix comments in service

This commit is contained in:
Dominik Schürmann 2015-06-01 15:52:07 +02:00
parent 7d29901f64
commit e2988c2a68
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
View File

@ -266,18 +266,18 @@ public class KeychainService extends Service implements Progressable {
} }
case ACTION_DECRYPT_METADATA: { case ACTION_DECRYPT_METADATA: {
/* Input */ // Input
CryptoInputParcel cryptoInput = data.getParcelable(EXTRA_CRYPTO_INPUT); CryptoInputParcel cryptoInput = data.getParcelable(EXTRA_CRYPTO_INPUT);
PgpDecryptVerifyInputParcel input = data.getParcelable(DECRYPT_VERIFY_PARCEL); PgpDecryptVerifyInputParcel input = data.getParcelable(DECRYPT_VERIFY_PARCEL);
// this action is here for compatibility only // this action is here for compatibility only
input.setDecryptMetadataOnly(true); input.setDecryptMetadataOnly(true);
/* Operation */ // Operation
PgpDecryptVerify op = new PgpDecryptVerify(mKeychainService, providerHelper, mKeychainService); PgpDecryptVerify op = new PgpDecryptVerify(mKeychainService, providerHelper, mKeychainService);
DecryptVerifyResult decryptVerifyResult = op.execute(input, cryptoInput); DecryptVerifyResult decryptVerifyResult = op.execute(input, cryptoInput);
/* Result */ // Result
sendMessageToHandler(MessageStatus.OKAY, decryptVerifyResult); sendMessageToHandler(MessageStatus.OKAY, decryptVerifyResult);
break; break;
@ -378,7 +378,7 @@ public class KeychainService extends Service implements Progressable {
} }
case ACTION_DECRYPT_VERIFY: { case ACTION_DECRYPT_VERIFY: {
/* Input */ // Input
CryptoInputParcel cryptoInput = data.getParcelable(EXTRA_CRYPTO_INPUT); CryptoInputParcel cryptoInput = data.getParcelable(EXTRA_CRYPTO_INPUT);
PgpDecryptVerifyInputParcel input = data.getParcelable(DECRYPT_VERIFY_PARCEL); PgpDecryptVerifyInputParcel input = data.getParcelable(DECRYPT_VERIFY_PARCEL);
@ -386,11 +386,11 @@ public class KeychainService extends Service implements Progressable {
// TODO merge with ACTION_DECRYPT_METADATA // TODO merge with ACTION_DECRYPT_METADATA
input.setDecryptMetadataOnly(false); input.setDecryptMetadataOnly(false);
/* Operation */ // Operation
PgpDecryptVerify op = new PgpDecryptVerify(mKeychainService, providerHelper, mKeychainService); PgpDecryptVerify op = new PgpDecryptVerify(mKeychainService, providerHelper, mKeychainService);
DecryptVerifyResult decryptVerifyResult = op.execute(input, cryptoInput); DecryptVerifyResult decryptVerifyResult = op.execute(input, cryptoInput);
/* Output */ // Output
sendMessageToHandler(MessageStatus.OKAY, decryptVerifyResult); sendMessageToHandler(MessageStatus.OKAY, decryptVerifyResult);
break; break;
@ -514,11 +514,11 @@ public class KeychainService extends Service implements Progressable {
case ACTION_UPLOAD_KEYRING: { case ACTION_UPLOAD_KEYRING: {
try { try {
/* Input */ // Input
String keyServer = data.getString(UPLOAD_KEY_SERVER); String keyServer = data.getString(UPLOAD_KEY_SERVER);
// and dataUri! // and dataUri!
/* Operation */ // Operation
HkpKeyserver server = new HkpKeyserver(keyServer); HkpKeyserver server = new HkpKeyserver(keyServer);
CanonicalizedPublicKeyRing keyring = providerHelper.getCanonicalizedPublicKeyRing(dataUri); CanonicalizedPublicKeyRing keyring = providerHelper.getCanonicalizedPublicKeyRing(dataUri);