diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 20:13:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 20:27:59 +0200 |
| commit | f8d895dea4ba1a5133107474410813f4128176ef (patch) | |
| tree | a87b781052eed006e6607fff5bb0d8b1a3b29e76 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |
| parent | 134f8471c05724c312085ce5b8eae2aec8cb8a52 (diff) | |
| download | open-keychain-f8d895dea4ba1a5133107474410813f4128176ef.tar.gz open-keychain-f8d895dea4ba1a5133107474410813f4128176ef.tar.bz2 open-keychain-f8d895dea4ba1a5133107474410813f4128176ef.zip | |
consolidate: almost sane logging
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index 0f0d7cca3..a1c6b158b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -634,7 +634,7 @@ public class UncachedKeyRing { */ public UncachedKeyRing merge(UncachedKeyRing other, OperationLog log, int indent) { - log.add(LogLevel.START, isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC, + log.add(LogLevel.DEBUG, isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC, new String[]{ PgpKeyHelper.convertKeyIdToHex(getMasterKeyId()) }, indent); indent += 1; |