cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work on lookup key, fix some illegal state exceptions with hack

Browse Source
This commit is contained in:
Dominik Schürmann
2014-02-04 19:53:50 +01:00
parent b78a564de3
commit d090d4d332
10 changed files with 85 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java
View File

@@ -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;