diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 21:40:12 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 21:40:12 +0200 |
commit | 2069f20f50b808fad8fea3639e82eadd0d9bd9e7 (patch) | |
tree | 1f4071ef8682ef8d2d0c41ec9781cbb5a5fd3def /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java | |
parent | 12b8282d9b6b1723d8c4086911970d2f1188f53a (diff) | |
download | open-keychain-2069f20f50b808fad8fea3639e82eadd0d9bd9e7.tar.gz open-keychain-2069f20f50b808fad8fea3639e82eadd0d9bd9e7.tar.bz2 open-keychain-2069f20f50b808fad8fea3639e82eadd0d9bd9e7.zip |
Clarify use of methods in PgpKeyHelper
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java index 418433427..16b060c10 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java @@ -289,7 +289,7 @@ public class PgpSignEncrypt { throw new NoSigningKeyException(); // throw new PgpGeneralException(mContext.getString(R.string.error_signature_failed)); } - signingKey = PgpKeyHelper.getSigningKey(signingKeyRing); + signingKey = PgpKeyHelper.getFirstSigningSubkey(signingKeyRing); if (signingKey == null) { throw new NoSigningKeyException(); // throw new PgpGeneralException(mContext.getString(R.string.error_signature_failed)); @@ -337,7 +337,7 @@ public class PgpSignEncrypt { for (long id : mEncryptionMasterKeyIds) { try { PGPPublicKeyRing keyRing = mProviderHelper.getPGPPublicKeyRing(id); - PGPPublicKey key = PgpKeyHelper.getEncryptPublicKey(keyRing); + PGPPublicKey key = PgpKeyHelper.getFirstEncryptSubkey(keyRing); if (key != null) { JcePublicKeyKeyEncryptionMethodGenerator pubKeyEncryptionGenerator = new JcePublicKeyKeyEncryptionMethodGenerator(key); |