diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 20:54:11 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 20:54:11 +0100 |
| commit | bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e (patch) | |
| tree | e325bbcb7b24a5144f821bb11e9bd9120edfedf0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java | |
| parent | e312b0e675fcd81b19b95453f04b55aee927b1f3 (diff) | |
| parent | 024ba19499f6975e2e153ca496d94cb5124f5dd8 (diff) | |
| download | open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.tar.gz open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.tar.bz2 open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.zip | |
Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java | 7 |
1 files changed, 7 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 519efcd62..54cd9b1b4 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 @@ -762,6 +762,13 @@ public abstract class OperationResult implements Parcelable { MSG_DEL_CONSOLIDATE (LogLevel.DEBUG, R.string.msg_del_consolidate), MSG_DEL_OK (LogLevel.OK, R.plurals.msg_del_ok), MSG_DEL_FAIL (LogLevel.WARN, R.plurals.msg_del_fail), + + //export log + MSG_EXPORT_LOG(LogLevel.START,R.string.msg_export_log_start), + MSG_EXPORT_LOG_EXPORT_ERROR_NO_FILE(LogLevel.ERROR,R.string.msg_export_log_error_no_file), + MSG_EXPORT_LOG_EXPORT_ERROR_FOPEN(LogLevel.ERROR,R.string.msg_export_log_error_fopen), + MSG_EXPORT_LOG_EXPORT_ERROR_WRITING(LogLevel.ERROR,R.string.msg_export_log_error_writing), + MSG_EXPORT_LOG_EXPORT_SUCCESS (LogLevel.OK, R.string.msg_export_log_success), ; public final int mMsgId; |