diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-27 01:18:18 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-27 01:18:18 +0100 |
commit | 6dce7c88d847f8578bf4b980fb9c4ee1ea1c280b (patch) | |
tree | 04d89a253080ed5bdef2e76b84b3972447df8792 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
parent | a70d80483df4576d8d02fccde73ac6defa55a1f9 (diff) | |
parent | 5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937 (diff) | |
download | open-keychain-6dce7c88d847f8578bf4b980fb9c4ee1ea1c280b.tar.gz open-keychain-6dce7c88d847f8578bf4b980fb9c4ee1ea1c280b.tar.bz2 open-keychain-6dce7c88d847f8578bf4b980fb9c4ee1ea1c280b.zip |
Merge keybase-proof branch
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index ec26d4bbe..f79900aab 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -586,6 +586,15 @@ public abstract class OperationResult implements Parcelable { MSG_DC_TRAIL_UNKNOWN (LogLevel.DEBUG, R.string.msg_dc_trail_unknown), MSG_DC_UNLOCKING (LogLevel.INFO, R.string.msg_dc_unlocking), + // verify signed literal data + MSG_VL (LogLevel.INFO, R.string.msg_vl), + MSG_VL_ERROR_MISSING_SIGLIST (LogLevel.ERROR, R.string.msg_vl_error_no_siglist), + MSG_VL_ERROR_MISSING_LITERAL (LogLevel.ERROR, R.string.msg_vl_error_missing_literal), + MSG_VL_ERROR_MISSING_KEY (LogLevel.ERROR, R.string.msg_vl_error_wrong_key), + MSG_VL_CLEAR_SIGNATURE_CHECK (LogLevel.DEBUG, R.string.msg_vl_clear_signature_check), + MSG_VL_ERROR_INTEGRITY_CHECK (LogLevel.ERROR, R.string.msg_vl_error_integrity_check), + MSG_VL_OK (LogLevel.OK, R.string.msg_vl_ok), + // signencrypt MSG_SE (LogLevel.START, R.string.msg_se), MSG_SE_INPUT_BYTES (LogLevel.INFO, R.string.msg_se_input_bytes), |