mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-24 22:58:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

WalletAppKit: simplify blocking startup

Browse source 
* Use `startAsync()` for the blocking case, too. Since we were already
  waiting on `downloadListner.await()`
* Make sure `installShutdownHook()` is called in both cases (bug fix)
* Add more comments
This commit is contained in:
Sean Gilligan 2022-07-27 13:51:36 -07:00 • committed by Andreas Schildbach
parent ff674ea605
commit bee8427761
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
View file

@ -378,16 +378,11 @@ public class WalletAppKit extends AbstractIdleService {
}
vChain.addWallet(vWallet);
vPeerGroup.addWallet(vWallet);
// vChain, vWallet, and vPeerGroup all initialized; allow subclass (if any) a chance to adjust configuration
onSetupCompleted();
if (blockingStartup) {
vPeerGroup.start();
// Make sure we shut down cleanly.
installShutdownHook();
vPeerGroup.startBlockChainDownload(downloadListener);
downloadListener.await();
} else {
// Start the PeerGroup (asynchronously) and start downloading the blockchain (asynchronously)
vPeerGroup.startAsync().whenComplete((result, t) -> {
if (t == null) {
vPeerGroup.startBlockChainDownload(downloadListener);
@ -395,6 +390,12 @@ public class WalletAppKit extends AbstractIdleService {
throw new RuntimeException(t);
}
});
// Make sure we shut down cleanly.
installShutdownHook();
if (blockingStartup) {
downloadListener.await(); // Wait for the blockchain to download
}
}