change the way merging is logged

2014-10-25 02:45:16 +02:00
parent 7c4bbc83cb
commit 30d0afa363
4 changed files with 15 additions and 3 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -787,8 +787,8 @@ public class UncachedKeyRing {
     */
    public UncachedKeyRing merge(UncachedKeyRing other, OperationLog log, int indent) {

-        log.add(isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC,
-                indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId()));
+        // log.add(isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC,
+                // indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId()));
        indent += 1;

        long masterKeyId = other.getMasterKeyId();