diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 02:48:54 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 02:48:54 +0200 |
| commit | dce2df41132cc11facde85bcac00c55563aead5f (patch) | |
| tree | db85663f404651189056b19ab783b407de7ca174 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
| parent | b406db24b7407485eb27c8f8e682e9c4a1736e4f (diff) | |
| download | open-keychain-dce2df41132cc11facde85bcac00c55563aead5f.tar.gz open-keychain-dce2df41132cc11facde85bcac00c55563aead5f.tar.bz2 open-keychain-dce2df41132cc11facde85bcac00c55563aead5f.zip | |
add come createKey strings
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 7 |
1 files changed, 6 insertions, 1 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 9a08290e4..797a3cc3e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -166,7 +166,7 @@ public class PgpKeyOperation { try { - log.add(LogLevel.ERROR, LogType.MSG_MF_ERROR_KEYID, indent); + log.add(LogLevel.START, LogType.MSG_CR, indent); indent += 1; updateProgress(R.string.progress_building_key, 0, 100); @@ -176,6 +176,11 @@ public class PgpKeyOperation { } SubkeyAdd add = saveParcel.addSubKeys.remove(0); + if ((add.mFlags & KeyFlags.CERTIFY_OTHER) != KeyFlags.CERTIFY_OTHER) { + log.add(LogLevel.ERROR, LogType.MSG_CR_ERROR_NO_CERTIFY, indent); + return null; + } + PGPKeyPair keyPair = createKey(add.mAlgorithm, add.mKeysize); if (add.mAlgorithm == Constants.choice.algorithm.elgamal) { |