diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-02 19:23:08 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-02 19:26:07 +0200 |
| commit | 37cb5c4c78880b5b4737cffdaa4ead76506a3843 (patch) | |
| tree | 244b981b9475cbbdb021a85a5f7eab35b120c994 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java | |
| parent | 9a296c012d8aaaf4273892ad06a4f66ea4edefac (diff) | |
| download | open-keychain-37cb5c4c78880b5b4737cffdaa4ead76506a3843.tar.gz open-keychain-37cb5c4c78880b5b4737cffdaa4ead76506a3843.tar.bz2 open-keychain-37cb5c4c78880b5b4737cffdaa4ead76506a3843.zip | |
make getSignId a secret key operation, and respect unavailable keys
This one should remedy #811, but waiting for a test
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java index bb9c7d51c..c4cacaca7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java @@ -51,12 +51,9 @@ public class UncachedPublicKey { /** The revocation signature is NOT checked here, so this may be false! */ public boolean isRevoked() { - for (PGPSignature sig : new IterableIterator<PGPSignature>( - mPublicKey.getSignaturesOfType(isMasterKey() ? PGPSignature.KEY_REVOCATION - : PGPSignature.SUBKEY_REVOCATION))) { - return true; - } - return false; + return mPublicKey.getSignaturesOfType(isMasterKey() + ? PGPSignature.KEY_REVOCATION + : PGPSignature.SUBKEY_REVOCATION).hasNext(); } public Date getCreationTime() { |