From aa43298684367000cadf16037cb90c366ac3c000 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 15 Jul 2021 00:04:36 +0200
Subject: ensure that response.body().close() is always called when reading
 non-null API responses

---
 .../bitmaskclient/providersetup/ProviderApiConnector.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiConnector.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiConnector.java
index c863abd4..35ad9cd2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiConnector.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiConnector.java
@@ -95,10 +95,15 @@ public class ProviderApiConnector {
         if (!response.isSuccessful()) {
             VpnStatus.logWarning("[API] API request failed: " + url);
         }
-        InputStream inputStream = response.body().byteStream();
-        Scanner scanner = new Scanner(inputStream).useDelimiter("\\A");
-        if (scanner.hasNext()) {
-            return scanner.next();
+
+        if (response.body() != null) {
+            InputStream inputStream = response.body().byteStream();
+            Scanner scanner = new Scanner(inputStream).useDelimiter("\\A");
+            if (scanner.hasNext()) {
+                String result = scanner.next();
+                response.body().close();
+                return result;
+            }
         }
         return null;
     }
-- 
cgit v1.2.3