Merge pull request #128 from ashh87/master

add public keys when importing secret keys

1 files changed, 13 insertions, 0 deletions

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index c4ce3d29a..d7ab5d8fe 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -26,9 +26,12 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 
 import org.spongycastle.bcpg.ArmoredOutputStream;
+import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator;
+import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.spongycastle.openpgp.PGPException;
 import org.spongycastle.openpgp.PGPKeyRing;
 import org.spongycastle.openpgp.PGPObjectFactory;
+import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
@@ -261,6 +264,16 @@ public class PgpImportExport {
 
                 if (save) {
                     ProviderHelper.saveKeyRing(mContext, secretKeyRing);
+                    // TODO: preserve certifications (http://osdir.com/ml/encryption.bouncy-castle.devel/2007-01/msg00054.html ?)
+                    PGPPublicKeyRing newPubRing = null;
+                    for (PGPPublicKey key : new IterableIterator<PGPPublicKey>(secretKeyRing.getPublicKeys())) {
+                        if (newPubRing == null) {
+                            newPubRing = new PGPPublicKeyRing(key.getEncoded(), new JcaKeyFingerprintCalculator());
+                        }
+                        newPubRing = PGPPublicKeyRing.insertPublicKey(newPubRing, key);
+                    }
+                    if (newPubRing != null)
+                        ProviderHelper.saveKeyRing(mContext, newPubRing);
                     // TODO: remove status returns, use exceptions!
                     status = Id.return_value.ok;
                 }