diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-19 14:46:15 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-19 14:46:15 +0200 |
commit | 26e82afa8ead82e5e8305ae458979aeeba3837a2 (patch) | |
tree | 64bf5039601968929fd8d14bdb4f8333781ccdc3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | |
parent | c1d05d0ee92e9c9bc2a12a64aa4b73e832fbde0a (diff) | |
parent | 6a3150d8788664a5e1d501488159ff5e080cb9b4 (diff) | |
download | open-keychain-26e82afa8ead82e5e8305ae458979aeeba3837a2.tar.gz open-keychain-26e82afa8ead82e5e8305ae458979aeeba3837a2.tar.bz2 open-keychain-26e82afa8ead82e5e8305ae458979aeeba3837a2.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 85e772d52..913bfafed 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -881,10 +881,12 @@ public class PgpKeyOperation { } // add shiny new user id certificate + boolean isPrimary = currentCert.getHashedSubPackets() != null && + currentCert.getHashedSubPackets().isPrimaryUserID(); modifiedPublicKey = PGPPublicKey.removeCertification( modifiedPublicKey, userId, currentCert); PGPSignature newCert = generateUserIdSignature( - masterPrivateKey, masterPublicKey, userId, true, flags, expiry); + masterPrivateKey, masterPublicKey, userId, isPrimary, flags, expiry); modifiedPublicKey = PGPPublicKey.addCertification( modifiedPublicKey, userId, newCert); ok = true; |