Remove deprecated HttpClient

Author: javiersantos

app/app.iml

@@ -108,6 +108,5 @@
     <orderEntry type="library" exported="" name="material-design-iconic-typeface-2.2.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
   </component>
 </module>

app/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
-    useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "com.javiersantos.whatsappbetaupdater"

app/src/main/java/com/javiersantos/whatsappbetaupdater/util/UtilsAsync.java

@@ -21,11 +21,6 @@
 import com.javiersantos.whatsappbetaupdater.activity.MainActivity;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -230,6 +225,7 @@ protected Integer doInBackground(Void... voids) {
 
             try {
                 URL url = new URL(downloadUrl);
+
                 connection = (HttpURLConnection) url.openConnection();
                 connection.connect();
                 // Getting file lenght
@@ -309,17 +305,18 @@ protected void onCancelled() {
     }
 
     public static String getLatestWhatsAppVersion() {
-        String res = "0.0.0.0";
         String source = "";
 
         try {
-            HttpClient client = new DefaultHttpClient();
-            HttpGet request = new HttpGet(Config.WHATSAPP_URL_CDN);
-            HttpResponse response = client.execute(request);
+            URL url = new URL(Config.WHATSAPP_URL_CDN);
 
-            InputStream in = response.getEntity().getContent();
-            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.connect();
+
+            InputStream in = connection.getInputStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
             StringBuilder str = new StringBuilder();
+
             String line;
             while((line = reader.readLine()) != null) {
                 if (line.contains(Config.PATTERN_LATEST_VERSION)) {
@@ -345,13 +342,15 @@ public static String getLatestAppVersion() {
         String source = "";
 
         try {
-            HttpClient client = new DefaultHttpClient();
-            HttpGet request = new HttpGet(Config.GITHUB_TAGS);
-            HttpResponse response = client.execute(request);
+            URL url = new URL(Config.GITHUB_TAGS);
 
-            InputStream in = response.getEntity().getContent();
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.connect();
+
+            InputStream in = connection.getInputStream();
             BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             StringBuilder str = new StringBuilder();
+
             String line;
             while((line = reader.readLine()) != null) {
                 str.append(line);