diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 19:56:33 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 19:56:33 +0200 |
commit | 084d6f1d3d8e4fc54bbd5a77a9e22af76f28a673 (patch) | |
tree | aeff7976a350913c231bd5232c2c27fcfdd08185 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | 3bf653775b7fa668d11ea4a2369d90ad0c7f645d (diff) | |
parent | 1328309009efc584375e79e478cdbf3c3a221508 (diff) | |
download | open-keychain-084d6f1d3d8e4fc54bbd5a77a9e22af76f28a673.tar.gz open-keychain-084d6f1d3d8e4fc54bbd5a77a9e22af76f28a673.tar.bz2 open-keychain-084d6f1d3d8e4fc54bbd5a77a9e22af76f28a673.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-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 87e7ec461..96778649c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -84,6 +84,8 @@ public class UncachedKeyRing implements Serializable { final PGPKeyRing mRing; final boolean mIsSecret; + private static final int CANONICALIZE_MAX_USER_IDS = 100; + UncachedKeyRing(PGPKeyRing ring) { mRing = ring; mIsSecret = ring instanceof PGPSecretKeyRing; @@ -461,7 +463,7 @@ public class UncachedKeyRing implements Serializable { // 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); |