From 884072c9e38f492164eae160fb5ab3e8c5a19317 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Sun, 26 Mar 2023 10:20:33 -0700 Subject: [PATCH] WalletAppKit: make `Closeable` --- core/src/main/java/org/bitcoinj/kits/WalletAppKit.java | 8 +++++++- .../java/org/bitcoinj/examples/ForwardingService.java | 2 +- 2 files changed, 8 insertions(+), 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 5bbcb1cfa..32f9d9a2c 100644 --- a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java +++ b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java @@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.io.Closeable; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -84,7 +85,7 @@ import static org.bitcoinj.base.internal.Preconditions.checkState; * if anything goes wrong during startup - you should probably handle it and use {@link Exception#getCause()} to figure * out what went wrong more precisely. Same thing if you just use the {@link #startAsync()} method.

*/ -public class WalletAppKit extends AbstractIdleService { +public class WalletAppKit extends AbstractIdleService implements Closeable { protected static final Logger log = LoggerFactory.getLogger(WalletAppKit.class); protected final BitcoinNetwork network; @@ -504,6 +505,11 @@ public class WalletAppKit extends AbstractIdleService { } } + @Override + public void close() { + stopAsync(); + } + public BitcoinNetwork network() { return network; } diff --git a/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java b/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java index c34947c47..2f832420c 100644 --- a/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java +++ b/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java @@ -156,7 +156,7 @@ public class ForwardingService implements Closeable { if (kit.isRunning()) { kit.wallet().removeCoinsReceivedEventListener(listener); } - kit.stopAsync(); + kit.close(); } /**