diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 19:53:50 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 19:53:50 +0100 |
commit | d090d4d332c9b1f5174890de531e2cc6936c038b (patch) | |
tree | 0ab75b52d12bfb464c0588a1f4a09b2d595b7113 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java | |
parent | b78a564de3d8c3771d2e8ae445e0a43b026531ab (diff) | |
download | open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.tar.gz open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.tar.bz2 open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.zip |
work on lookup key, fix some illegal state exceptions with hack
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java index 1402be435..1b08b65a1 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java @@ -789,7 +789,7 @@ public class PgpOperation { return returnData; } - public Bundle verifyText(boolean lookupUnknownKey) throws IOException, PgpGeneralException, + public Bundle verifyText() throws IOException, PgpGeneralException, PGPException, SignatureException { Bundle returnData = new Bundle(); @@ -837,16 +837,6 @@ public class PgpOperation { if (signatureKeyId == 0) { signatureKeyId = signature.getKeyID(); } - // if key is not known and we want to lookup unknown ones... - if (signatureKey == null && lookupUnknownKey) { - - returnData = new Bundle(); - returnData.putLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID, signatureKeyId); - returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE_LOOKUP_KEY, true); - - // return directly now, decrypt will be done again after importing unknown key - return returnData; - } if (signatureKey == null) { signature = null; |