From c3d162d9b43bb3aef4f8f43760a594c9c2eddf59 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 21 Apr 2018 16:14:31 +0200 Subject: [PATCH] DeterministicKeyChain: Fix a conditional and. --- .../main/java/org/bitcoinj/wallet/DeterministicKeyChain.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java index 1757c375..7e8f0a15 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java @@ -912,13 +912,12 @@ public class DeterministicKeyChain implements EncryptableKeyChain { // If this is not a following chain and previous was, this must be married boolean isMarried = !isFollowingKey && !chains.isEmpty() && chains.get(chains.size() - 1).isFollowing(); // If this has a private key but no seed, then all we know is the spending key H - if (seed == null & key.hasSecretBytes()) { + if (seed == null && key.hasSecretBytes()) { DeterministicKey accountKey = new DeterministicKey(immutablePath, chainCode, pubkey, new BigInteger(1, key.getSecretBytes().toByteArray()), null); accountKey.setCreationTimeSeconds(key.getCreationTimestamp() / 1000); chain = factory.makeSpendingKeyChain(key, iter.peek(), accountKey, isMarried); isSpendingKey = true; - } - else if (seed == null) { + } else if (seed == null) { DeterministicKey accountKey = new DeterministicKey(immutablePath, chainCode, pubkey, null, null); accountKey.setCreationTimeSeconds(key.getCreationTimestamp() / 1000); chain = factory.makeWatchingKeyChain(key, iter.peek(), accountKey, isFollowingKey, isMarried);