moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-19 20:31:52 -05:00
Code Issues Releases Wiki Activity

allow master key updates by removing old primary ID cert

Browse Source
This commit is contained in:
Ashley Hughes 2014-03-25 23:01:17 +00:00
parent 259a8a63a2
commit b77e0504aa
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
View File

@ -376,6 +376,9 @@ public class PgpKeyOperation {
else else
remove changed IDs and add in with new certs remove changed IDs and add in with new certs
if the master key changed, we need to remove the primary ID certification, so we can add
the new one when it is generated, and they don't conflict
Keys Keys
remove deleted keys remove deleted keys
if a key is modified, re-sign it if a key is modified, re-sign it
@ -495,6 +498,11 @@ public class PgpKeyOperation {
} }
} }
if (saveParcel.moddedKeys[0]) {
masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, saveParcel.originalIDs.get(0));
anyIDChanged = true;
}
//update the keyring with the new ID information //update the keyring with the new ID information
if (anyIDChanged) { if (anyIDChanged) {
pKR = PGPPublicKeyRing.insertPublicKey(pKR, masterPublicKey); pKR = PGPPublicKeyRing.insertPublicKey(pKR, masterPublicKey);