From 47eeafff4bf78b4c50e3b7a56f9fb366592b855d Mon Sep 17 00:00:00 2001 From: dosiecki Date: Tue, 6 Oct 2015 16:31:05 -0700 Subject: [PATCH] Remove deprecated HTTP libs in favour of Java core libs so builds against APIv23 will succeed. --- .../NewsBlur/src/com/newsblur/network/APIManager.java | 5 ++--- .../NewsBlur/src/com/newsblur/network/APIResponse.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java index a6a3143e1..a15480b92 100644 --- a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java +++ b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java @@ -2,6 +2,7 @@ package com.newsblur.network; import java.io.IOException; import java.net.URLEncoder; +import java.net.HttpURLConnection; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -57,8 +58,6 @@ import com.squareup.okhttp.Request; import com.squareup.okhttp.RequestBody; import com.squareup.okhttp.Response; -import org.apache.http.HttpStatus; - public class APIManager { private Context context; @@ -551,7 +550,7 @@ public class APIManager { int tryCount = 0; do { backoffSleep(tryCount++); - response = get_single(urlString, HttpStatus.SC_OK); + response = get_single(urlString, HttpURLConnection.HTTP_OK); } while ((response.isError()) && (tryCount < AppConstants.MAX_API_TRIES)); return response; } diff --git a/clients/android/NewsBlur/src/com/newsblur/network/APIResponse.java b/clients/android/NewsBlur/src/com/newsblur/network/APIResponse.java index c9fb402e5..2b0298971 100644 --- a/clients/android/NewsBlur/src/com/newsblur/network/APIResponse.java +++ b/clients/android/NewsBlur/src/com/newsblur/network/APIResponse.java @@ -1,13 +1,13 @@ package com.newsblur.network; import java.io.IOException; +import java.net.HttpURLConnection; import android.content.Context; import android.text.TextUtils; import android.util.Log; import com.google.gson.Gson; -import org.apache.http.HttpStatus; import com.newsblur.R; import com.newsblur.network.domain.LoginResponse; @@ -37,7 +37,7 @@ public class APIResponse { * info we might need. */ public APIResponse(Context context, OkHttpClient httpClient, Request request) { - this(context, httpClient, request, HttpStatus.SC_OK); + this(context, httpClient, request, HttpURLConnection.HTTP_OK); } /**