From 01e7d639489d8299c7f6492c80d1779b23bac472 Mon Sep 17 00:00:00 2001
From: Mike Hearn <hearn@google.com>
Date: Mon, 16 Sep 2013 11:37:05 +0200
Subject: [PATCH] WalletAppKit: Finish the non-blocking startup code, oops.

---
 .../com/google/bitcoin/kits/WalletAppKit.java | 51 ++++++++++++++-----
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java b/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
index c972aa85..d29a4205 100644
--- a/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
+++ b/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
@@ -22,6 +22,8 @@ import com.google.bitcoin.store.BlockStoreException;
 import com.google.bitcoin.store.SPVBlockStore;
 import com.google.bitcoin.store.WalletProtobufSerializer;
 import com.google.common.util.concurrent.AbstractIdleService;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -198,18 +200,29 @@ public class WalletAppKit extends AbstractIdleService {
             vChain.addWallet(vWallet);
             vPeerGroup.addWallet(vWallet);
             onSetupCompleted();
-            vPeerGroup.startAndWait();
-            // Make sure we shut down cleanly.
-            if (autoStop) Runtime.getRuntime().addShutdownHook(new Thread() {
-                @Override public void run() {
-                    try {
-                        WalletAppKit.this.stopAndWait();
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            });
-            vPeerGroup.startBlockChainDownload(downloadListener == null ? new DownloadListener() : downloadListener);
+
+			if (blockingStartup) {
+	            vPeerGroup.startAndWait();
+    	        // Make sure we shut down cleanly.
+				installShutdownHook();
+				// TODO: Be able to use the provided download listener when doing a blocking startup.
+				final DownloadListener listener = new DownloadListener();
+				vPeerGroup.startBlockChainDownload(listener);
+				listener.await();
+			} else {
+				Futures.addCallback(vPeerGroup.start(), new FutureCallback<State>() {
+					@Override
+					public void onSuccess(State result) {
+						final PeerEventListener l = downloadListener == null ? new DownloadListener() : downloadListener;
+						vPeerGroup.startBlockChainDownload(l);
+					}
+
+					@Override
+					public void onFailure(Throwable t) {
+						throw new RuntimeException(t);
+					}
+				});
+			}
         } catch (BlockStoreException e) {
             throw new IOException(e);
         } finally {
@@ -217,7 +230,19 @@ public class WalletAppKit extends AbstractIdleService {
         }
     }
 
-    @Override
+	private void installShutdownHook() {
+		if (autoStop) Runtime.getRuntime().addShutdownHook(new Thread() {
+			@Override public void run() {
+				try {
+					WalletAppKit.this.stopAndWait();
+				} catch (Exception e) {
+					throw new RuntimeException(e);
+				}
+			}
+		});
+	}
+
+	@Override
     protected void shutDown() throws Exception {
         // Runs in a separate thread.
         try {