diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 02:45:16 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 02:45:16 +0200 |
| commit | 30d0afa3632b9dda4834ab3070e18e06db32b1b7 (patch) | |
| tree | 3d243a25fc3b0c1174a964b982f5f2e9a7c98791 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java | |
| parent | 7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e (diff) | |
| download | open-keychain-30d0afa3632b9dda4834ab3070e18e06db32b1b7.tar.gz open-keychain-30d0afa3632b9dda4834ab3070e18e06db32b1b7.tar.bz2 open-keychain-30d0afa3632b9dda4834ab3070e18e06db32b1b7.zip | |
change the way merging is logged
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 | 4 |
1 files changed, 4 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 aa360609f..21d94084a 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 @@ -306,6 +306,8 @@ public abstract class OperationResult implements Parcelable { MSG_IP_MASTER_FLAGS_XXSX (LogLevel.DEBUG, R.string.msg_ip_master_flags_xxsx), MSG_IP_MASTER_FLAGS_XXXA (LogLevel.DEBUG, R.string.msg_ip_master_flags_xxxa), MSG_IP_MASTER_FLAGS_XXXX (LogLevel.DEBUG, R.string.msg_ip_master_flags_xxxx), + MSG_IP_MERGE_PUBLIC (LogLevel.DEBUG, R.string.msg_ip_merge_public), + MSG_IP_MERGE_SECRET (LogLevel.DEBUG, R.string.msg_ip_merge_secret), MSG_IP_SUBKEY (LogLevel.DEBUG, R.string.msg_ip_subkey), MSG_IP_SUBKEY_EXPIRED (LogLevel.DEBUG, R.string.msg_ip_subkey_expired), MSG_IP_SUBKEY_EXPIRES (LogLevel.DEBUG, R.string.msg_ip_subkey_expires), @@ -347,6 +349,8 @@ public abstract class OperationResult implements Parcelable { MSG_IS_BAD_TYPE_PUBLIC (LogLevel.WARN, R.string.msg_is_bad_type_public), MSG_IS_DB_EXCEPTION (LogLevel.DEBUG, R.string.msg_is_db_exception), MSG_IS_ERROR_IO_EXC(LogLevel.DEBUG, R.string.msg_is_error_io_exc), + MSG_IS_MERGE_PUBLIC (LogLevel.DEBUG, R.string.msg_is_merge_public), + MSG_IS_MERGE_SECRET (LogLevel.DEBUG, R.string.msg_is_merge_secret), MSG_IS_IMPORTING_SUBKEYS (LogLevel.DEBUG, R.string.msg_is_importing_subkeys), MSG_IS_PUBRING_GENERATE (LogLevel.DEBUG, R.string.msg_is_pubring_generate), MSG_IS_SUBKEY_NONEXISTENT (LogLevel.DEBUG, R.string.msg_is_subkey_nonexistent), |