From b6ecc380b8f41929b5fd64ad2359cf621f250889 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Thu, 22 Feb 2018 10:09:30 +0100
Subject: [PATCH] Utils: Remove closeUnchecked() helpers, use Guava instead.

---
 .../main/java/org/bitcoinj/core/Utils.java    | 20 -------------------
 .../java/org/bitcoinj/kits/WalletAppKit.java  |  3 ++-
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/core/Utils.java b/core/src/main/java/org/bitcoinj/core/Utils.java
index df3ce7f3..a6daab63 100644
--- a/core/src/main/java/org/bitcoinj/core/Utils.java
+++ b/core/src/main/java/org/bitcoinj/core/Utils.java
@@ -29,7 +29,6 @@ import org.spongycastle.crypto.digests.RIPEMD160Digest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
@@ -625,23 +624,4 @@ public class Utils {
         List<String> lines = Resources.readLines(url, Charsets.UTF_8);
         return Joiner.on('\n').join(lines);
     }
-
-    // Can't use Closeable here because it's Java 7 only and Android devices only got that with KitKat.
-    public static InputStream closeUnchecked(InputStream stream) {
-        try {
-            stream.close();
-            return stream;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static OutputStream closeUnchecked(OutputStream stream) {
-        try {
-            stream.close();
-            return stream;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }
diff --git a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
index 095308c8..07ba0717 100644
--- a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
+++ b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
@@ -18,6 +18,7 @@
 package org.bitcoinj.kits;
 
 import com.google.common.collect.*;
+import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.*;
 import org.bitcoinj.core.listeners.*;
 import org.bitcoinj.core.*;
@@ -149,7 +150,7 @@ public class WalletAppKit extends AbstractIdleService {
      */
     public WalletAppKit setCheckpoints(InputStream checkpoints) {
         if (this.checkpoints != null)
-            Utils.closeUnchecked(this.checkpoints);
+            Closeables.closeQuietly(checkpoints);
         this.checkpoints = checkNotNull(checkpoints);
         return this;
     }