diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 02:50:44 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 02:50:48 +0200 |
| commit | 748049fb5bd6804c0ccc625daf07b9c8191027e4 (patch) | |
| tree | 64d0f58120493c4fc8354a7e24d46e24a87da2c6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |
| parent | c5028dc9ce996e31e35e2d806e7db0241924e957 (diff) | |
| download | open-keychain-748049fb5bd6804c0ccc625daf07b9c8191027e4.tar.gz open-keychain-748049fb5bd6804c0ccc625daf07b9c8191027e4.tar.bz2 open-keychain-748049fb5bd6804c0ccc625daf07b9c8191027e4.zip | |
slightly change wording in merge logs
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 | 1 |
1 files changed, 1 insertions, 0 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 5924e08f3..a1479b0c6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -787,6 +787,7 @@ public class UncachedKeyRing { */ public UncachedKeyRing merge(UncachedKeyRing other, OperationLog log, int indent) { + // This is logged in the calling method to provide more meta info // log.add(isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC, // indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId())); indent += 1; |