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/pgp/UncachedKeyRing.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/pgp/UncachedKeyRing.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 4 |
1 files changed, 2 insertions, 2 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 a3ddd5325..5924e08f3 100644 --- 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(); |