diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-23 01:35:49 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-23 01:36:46 +0200 |
commit | 9d9d71f3db93302483f1142851462b989270abd8 (patch) | |
tree | f577aaa0bae8adf4a6f737b48403c786e3c07627 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java | |
parent | 3759d74ac857ee434ec7b0f8c5dd0b371c621a93 (diff) | |
download | open-keychain-9d9d71f3db93302483f1142851462b989270abd8.tar.gz open-keychain-9d9d71f3db93302483f1142851462b989270abd8.tar.bz2 open-keychain-9d9d71f3db93302483f1142851462b989270abd8.zip |
reject keys with duplicate subkeys altogether
closes #870
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java index 69516eafd..beaa6f2ba 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java @@ -316,6 +316,7 @@ public abstract class OperationResult implements Parcelable { MSG_KC_ERROR_V3 (LogLevel.ERROR, R.string.msg_kc_error_v3), MSG_KC_ERROR_NO_UID (LogLevel.ERROR, R.string.msg_kc_error_no_uid), MSG_KC_ERROR_MASTER_ALGO (LogLevel.ERROR, R.string.msg_kc_error_master_algo), + MSG_KC_ERROR_DUP_KEY (LogLevel.ERROR, R.string.msg_kc_error_dup_key), MSG_KC_MASTER (LogLevel.DEBUG, R.string.msg_kc_master), MSG_KC_REVOKE_BAD_ERR (LogLevel.WARN, R.string.msg_kc_revoke_bad_err), MSG_KC_REVOKE_BAD_LOCAL (LogLevel.WARN, R.string.msg_kc_revoke_bad_local), |