aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-25 21:15:12 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-25 21:15:12 +0200
commit71e3fb53809de69980baa45ca43d2e769b20e855 (patch)
tree42755ad6d88fc55f70db3e3d8bc549bd76f9e36b /OpenKeychain/src/main/java/org/sufficientlysecure
parent0abfff0b0e72011bfdee99481598882306570177 (diff)
parent26bd847c32cdc74b9526091dee96c6e8c87cd55c (diff)
downloadopen-keychain-71e3fb53809de69980baa45ca43d2e769b20e855.tar.gz
open-keychain-71e3fb53809de69980baa45ca43d2e769b20e855.tar.bz2
open-keychain-71e3fb53809de69980baa45ca43d2e769b20e855.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java4
1 files changed, 2 insertions, 2 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 21d94084a..149640bcf 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
@@ -362,8 +362,8 @@ public abstract class OperationResult implements Parcelable {
MSG_IS_SUCCESS (LogLevel.OK, R.string.msg_is_success),
// keyring canonicalization
- MSG_KC_PUBLIC (LogLevel.DEBUG, R.string.msg_kc_public),
- MSG_KC_SECRET (LogLevel.DEBUG, R.string.msg_kc_secret),
+ MSG_KC_PUBLIC (LogLevel.START, R.string.msg_kc_public),
+ MSG_KC_SECRET (LogLevel.START, R.string.msg_kc_secret),
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),