diff options
| author | Ashley Hughes <spirit.returned@gmail.com> | 2014-01-30 15:50:24 +0000 |
|---|---|---|
| committer | Ashley Hughes <spirit.returned@gmail.com> | 2014-01-30 15:50:24 +0000 |
| commit | fa0bd5edb4411ff227f49038ab597e84c938a7a9 (patch) | |
| tree | 30e9ed91a29a9f692b6dd4a2d3fbd526c40efb39 | |
| parent | 715ba7604cb9ac3b83248c15e68f28e6561304f4 (diff) | |
| download | open-keychain-fa0bd5edb4411ff227f49038ab597e84c938a7a9.tar.gz open-keychain-fa0bd5edb4411ff227f49038ab597e84c938a7a9.tar.bz2 open-keychain-fa0bd5edb4411ff227f49038ab597e84c938a7a9.zip | |
builds, but intents are not called or handled correctly
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 15 |
1 files changed, 9 insertions, 6 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 5c67e289c..c7f26fe2b 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 @@ -588,18 +588,21 @@ public class KeychainIntentService extends IntentService implements ProgressDial /* Operation */ PgpKeyOperation keyOperations = new PgpKeyOperation(this, this); - PGPSecretKeyRing masterKeyRing = keyOperations.createKey(Id.choice.algorithm.rsa, - 4096, passphrase, null); + PGPSecretKey masterKey = keyOperations.createKey(Id.choice.algorithm.rsa, + 4096, passphrase, true); - PGPSecretKeyRing subKeyRing = keyOperations.createKey(Id.choice.algorithm.rsa, - 4096, passphrase, masterKeyRing.getSecretKey()); + PGPSecretKey subKey = keyOperations.createKey(Id.choice.algorithm.rsa, + 4096, passphrase, false); + + // TODO: default to one master for cert, one sub for encrypt and one sub + // for sign /* Output */ Bundle resultData = new Bundle(); resultData.putByteArray(RESULT_NEW_KEY, - PgpConversionHelper.PGPSecretKeyRingToBytes(masterKeyRing)); + PgpConversionHelper.PGPSecretKeyToBytes(masterKey)); resultData.putByteArray(RESULT_NEW_KEY2, - PgpConversionHelper.PGPSecretKeyRingToBytes(subKeyRing)); + PgpConversionHelper.PGPSecretKeyToBytes(subKey)); OtherHelper.logDebugBundle(resultData, "resultData"); |