aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
diff options
context:
space:
mode:
authorAshley Hughes <spirit.returned@gmail.com>2014-02-22 15:41:15 +0000
committerAshley Hughes <spirit.returned@gmail.com>2014-02-22 15:41:15 +0000
commitfab74590eb0984e055f98ccf3af4390d3e3c0c15 (patch)
tree032b1f2a0d3d3d96a9f9cb0a74e3e4f8af2fc48e /OpenPGP-Keychain/src/main/java/org
parenta39c73ca12dabba01412083afbf0b58dfb42a79e (diff)
downloadopen-keychain-fab74590eb0984e055f98ccf3af4390d3e3c0c15.tar.gz
open-keychain-fab74590eb0984e055f98ccf3af4390d3e3c0c15.tar.bz2
open-keychain-fab74590eb0984e055f98ccf3af4390d3e3c0c15.zip
remove deleted keys
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index f3b289f66..ab4408056 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -378,6 +378,10 @@ public class PgpKeyOperation {
do we need to remove and add in?
*/
+ for (PGPSecretKey dKey : deleted_keys) {
+ mKR = PGPSecretKeyRing.removeSecretKey(mKR, dKey);
+ }
+
masterKey = mKR.getSecretKey();
PGPPublicKey masterPublicKey = masterKey.getPublicKey();