From ef0043c41ff7a271c13860bcce37dcec3246b0a2 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 3 Mar 2016 15:02:34 +0100 Subject: [PATCH] DeterministicKeyChain: Print birth date of watching key in toString(). --- .../wallet/DeterministicKeyChain.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java index 2a5d3a445..25a003b8b 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java @@ -1315,22 +1315,25 @@ public class DeterministicKeyChain implements EncryptableKeyChain { } public String toString(boolean includePrivateKeys, NetworkParameters params) { - final StringBuilder builder2 = new StringBuilder(); + final DeterministicKey watchingKey = getWatchingKey(); + final StringBuilder builder = new StringBuilder(); if (seed != null) { if (seed.isEncrypted()) { - builder2.append("Seed is encrypted\n"); + builder.append("Seed is encrypted\n"); } else if (includePrivateKeys) { final List words = seed.getMnemonicCode(); - builder2.append("Seed as words: ").append(Utils.join(words)).append('\n'); - builder2.append("Seed as hex: ").append(seed.toHexString()).append('\n'); + builder.append("Seed as words: ").append(Utils.join(words)).append('\n'); + builder.append("Seed as hex: ").append(seed.toHexString()).append('\n'); } - builder2.append("Seed birthday: ").append(seed.getCreationTimeSeconds()).append(" [") + builder.append("Seed birthday: ").append(seed.getCreationTimeSeconds()).append(" [") .append(Utils.dateTimeFormat(seed.getCreationTimeSeconds() * 1000)).append("]\n"); + } else { + builder.append("Key birthday: ").append(watchingKey.getCreationTimeSeconds()).append(" [") + .append(Utils.dateTimeFormat(watchingKey.getCreationTimeSeconds() * 1000)).append("]\n"); } - final DeterministicKey watchingKey = getWatchingKey(); - builder2.append("Key to watch: ").append(watchingKey.serializePubB58(params)).append('\n'); - formatAddresses(includePrivateKeys, params, builder2); - return builder2.toString(); + builder.append("Key to watch: ").append(watchingKey.serializePubB58(params)).append('\n'); + formatAddresses(includePrivateKeys, params, builder); + return builder.toString(); } protected void formatAddresses(boolean includePrivateKeys, NetworkParameters params, StringBuilder builder2) {