From fa3a5b4827e2ff36d7b28c6482492312b09f0839 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Tue, 19 Feb 2019 13:39:42 +0100
Subject: [PATCH] WalletAppKit: Fix wallet isn't moved out of the way on
 restore, preventing the actual restore.

---
 core/src/main/java/org/bitcoinj/kits/WalletAppKit.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
index bd9f98b6..f3ad73fe 100644
--- a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
+++ b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
@@ -463,8 +463,7 @@ public class WalletAppKit extends AbstractIdleService {
     }
 
     private void maybeMoveOldWalletOutOfTheWay() {
-        if (restoreFromSeed == null) return;
-        if (restoreFromKey == null) return;
+        if (restoreFromSeed == null && restoreFromKey == null) return;
         if (!vWalletFile.exists()) return;
         int counter = 1;
         File newName;