aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-12-30 13:07:56 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2014-12-30 13:07:56 +0100
commit2223cdd4056341576a540b065bcb34a1e579b141 (patch)
tree77778fc631219a4761256c4c352fb94ded3c0225 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
parent22ea1defa80d7cb185e75bed20ec9ed28377df8c (diff)
downloadopen-keychain-2223cdd4056341576a540b065bcb34a1e579b141.tar.gz
open-keychain-2223cdd4056341576a540b065bcb34a1e579b141.tar.bz2
open-keychain-2223cdd4056341576a540b065bcb34a1e579b141.zip
some small notation data fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index 8d1eaa40e..5e5a28e83 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -349,14 +349,6 @@ public class UncachedKeyRing {
continue;
}
- if (cert.isLocal()) {
- // Remove revocation certs with "local" flag
- log.add(LogType.MSG_KC_REVOKE_BAD_LOCAL, indent);
- modified = PGPPublicKey.removeCertification(modified, zert);
- badCerts += 1;
- continue;
- }
-
// special case: direct key signatures!
if (cert.getSignatureType() == PGPSignature.DIRECT_KEY) {
// must be local, otherwise strip!
@@ -382,6 +374,12 @@ public class UncachedKeyRing {
redundantCerts += 1;
}
continue;
+ } else if (cert.isLocal()) {
+ // Remove revocation certs with "local" flag
+ log.add(LogType.MSG_KC_REVOKE_BAD_LOCAL, indent);
+ modified = PGPPublicKey.removeCertification(modified, zert);
+ badCerts += 1;
+ continue;
}
// first revocation? fine then.