diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-15 18:15:39 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-17 14:11:32 +0100 |
| commit | 87004fd0ca3a5178fba3050599a445ba9c64662c (patch) | |
| tree | 90c8590dee741d4c5c7d4e4195d568ee48e14753 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | 95be228b474c31a47743e84cf2abc1dff1d63079 (diff) | |
| download | open-keychain-87004fd0ca3a5178fba3050599a445ba9c64662c.tar.gz open-keychain-87004fd0ca3a5178fba3050599a445ba9c64662c.tar.bz2 open-keychain-87004fd0ca3a5178fba3050599a445ba9c64662c.zip | |
certify: preserve user id certificates when saving secret keys
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 506ff2735..daaff5d54 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -543,8 +543,9 @@ public class KeychainIntentService extends IntentService ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId), oldPassPhrase, newPassPhrase); } else { - keyOperations.buildSecretKey(userIds, keys, keysUsages, keysExpiryDates, masterKeyId, - oldPassPhrase, newPassPhrase); + PGPPublicKey pubkey = ProviderHelper.getPGPPublicKeyByKeyId(this, masterKeyId); + keyOperations.buildSecretKey(userIds, keys, keysUsages, keysExpiryDates, + pubkey, oldPassPhrase, newPassPhrase); } PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassPhrase); |