From c572bb52d79d8441639bc265e69b739182ccb779 Mon Sep 17 00:00:00 2001
From: Matthew Leon <ml@matthewleon.com>
Date: Thu, 28 Mar 2019 22:23:58 -0400
Subject: [PATCH] KeyChainGroup: Be smarter about encryption order.

This partly reverts commit 4ed5b0e3b06c18040d83be30df32e7be5b778b51.
---
 core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
index e4e757cd..2d8afea8 100644
--- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
@@ -671,15 +671,17 @@ public class KeyChainGroup implements KeyBag {
         // This code must be exception safe.
 
         BasicKeyChain newBasic = basic.toEncrypted(keyCrypter, aesKey);
-        this.basic = newBasic;
         List<DeterministicKeyChain> newChains = new ArrayList<>();
         if (chains != null) {
             for (DeterministicKeyChain chain : chains)
                 newChains.add(chain.toEncrypted(keyCrypter, aesKey));
+        }
+        this.keyCrypter = keyCrypter;
+        this.basic = newBasic;
+        if (chains != null) {
             this.chains.clear();
             this.chains.addAll(newChains);
         }
-        this.keyCrypter = keyCrypter;
     }
 
     /**