diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-31 12:58:35 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-02 13:47:48 +0200 |
commit | d891f753393d26bbf3c1f766deddf71f6c9ce5ae (patch) | |
tree | f0f9ab42c7d7c75c0a933dba602d4524a04b77b5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | e27048fe73eab25561cd53e64e96960afeb37aac (diff) | |
download | open-keychain-d891f753393d26bbf3c1f766deddf71f6c9ce5ae.tar.gz open-keychain-d891f753393d26bbf3c1f766deddf71f6c9ce5ae.tar.bz2 open-keychain-d891f753393d26bbf3c1f766deddf71f6c9ce5ae.zip |
make everything work again
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 5 |
1 files changed, 3 insertions, 2 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 3e296edb9..44fc4c8c9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -197,7 +197,7 @@ public class PgpKeyOperation { } } - public UncachedKeyRing buildNewSecretKey( + public Pair<UncachedKeyRing,UncachedKeyRing> buildNewSecretKey( OldSaveKeyringParcel saveParcel) throws PgpGeneralMsgIdException, PGPException, SignatureException, IOException { @@ -336,8 +336,9 @@ public class PgpKeyOperation { } PGPSecretKeyRing secretKeyRing = keyGen.generateSecretKeyRing(); + PGPPublicKeyRing publicKeyRing = keyGen.generatePublicKeyRing(); - return new UncachedKeyRing(secretKeyRing); + return new Pair(new UncachedKeyRing(secretKeyRing), new UncachedKeyRing(publicKeyRing)); } |