From 41061d0289941c528cc1ccbcbe7d26fea9b722b7 Mon Sep 17 00:00:00 2001
From: wb9688 <wb9688@users.noreply.github.com>
Date: Thu, 2 Apr 2020 19:58:06 +0200
Subject: [PATCH] Use DownloaderImpl in CheckForNewAppVersionTask

---
 .../newpipe/CheckForNewAppVersionTask.java     | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 1f2808bed..7229aa0a2 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -19,6 +19,7 @@ import androidx.core.app.NotificationManagerCompat;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 
@@ -31,11 +32,8 @@ import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import java.util.concurrent.TimeUnit;
 
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
@@ -150,19 +148,9 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
         }
 
         // Make a network request to get latest NewPipe data.
-        // FIXME: Use DownloaderImp
-        if (client == null) {
-
-            client = new OkHttpClient.Builder()
-                    .readTimeout(TIMEOUT_PERIOD, TimeUnit.SECONDS).build();
-        }
-
-        Request request = new Request.Builder().url(NEWPIPE_API_URL).build();
-
         try {
-            Response response = client.newCall(request).execute();
-            return response.body().string();
-        } catch (IOException ex) {
+            return DownloaderImpl.getInstance().get(NEWPIPE_API_URL).responseBody();
+        } catch (IOException | ReCaptchaException ex) {
             // connectivity problems, do not alarm user and fail silently
             if (DEBUG) {
                 Log.w(TAG, Log.getStackTraceString(ex));