diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
commit | 6cf7e3e541ff954f5f9065ab52e6cee93c0643d3 (patch) | |
tree | 090937fb456a6fa594a49cafffd1de01a3c35e48 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |
parent | 7619083d5c0a7a2ca0c6ed4a6f8317b31ca005f5 (diff) | |
parent | ba9b8f3a6009ca60abffccc3e3fbd160e0fa420c (diff) | |
download | open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.gz open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.bz2 open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.zip |
Merge branch 'master' into encrypted-export
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.java | 4 |
1 files changed, 3 insertions, 1 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 c8cdbd59d..c967a5abc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -83,6 +83,8 @@ public class UncachedKeyRing { final PGPKeyRing mRing; final boolean mIsSecret; + private static final int CANONICALIZE_MAX_USER_IDS = 100; + UncachedKeyRing(PGPKeyRing ring) { mRing = ring; mIsSecret = ring instanceof PGPSecretKeyRing; @@ -460,7 +462,7 @@ public class UncachedKeyRing { // strip out the first found user id with this name modified = PGPPublicKey.removeCertification(modified, rawUserId); } - if (processedUserIds.size() > 100) { + if (processedUserIds.size() > CANONICALIZE_MAX_USER_IDS) { log.add(LogType.MSG_KC_UID_TOO_MANY, indent, userId); // strip out the user id modified = PGPPublicKey.removeCertification(modified, rawUserId); |