updated deprecated httpcore/httpclient api usage

Author: smarek

library/src/main/java/com/loopj/android/http/utils/LogHandler.java

@@ -56,7 +56,7 @@ public void logWithThrowable(int logLevel, String tag, String msg, Throwable t)
                     Log.d(tag, msg, t);
                     break;
                 case WTF:
-                    if (Integer.valueOf(Build.VERSION.SDK) > 8) {
+                    if (Build.VERSION.SDK_INT > 8) {
                         checkedWtf(tag, msg, t);
                     } else {
                         Log.e(tag, msg, t);

library/src/main/java/com/loopj/android/http/utils/PreemptiveAuthorizationHttpRequestInterceptor.java

@@ -28,25 +28,24 @@
 import cz.msebera.android.httpclient.auth.AuthState;
 import cz.msebera.android.httpclient.auth.Credentials;
 import cz.msebera.android.httpclient.client.CredentialsProvider;
-import cz.msebera.android.httpclient.client.protocol.ClientContext;
+import cz.msebera.android.httpclient.client.protocol.HttpClientContext;
 import cz.msebera.android.httpclient.impl.auth.BasicScheme;
-import cz.msebera.android.httpclient.protocol.ExecutionContext;
 import cz.msebera.android.httpclient.protocol.HttpContext;
+import cz.msebera.android.httpclient.protocol.HttpCoreContext;
 
 public class PreemptiveAuthorizationHttpRequestInterceptor implements HttpRequestInterceptor {
 
-    public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
-        AuthState authState = (AuthState) context.getAttribute(ClientContext.TARGET_AUTH_STATE);
+    public void process(final HttpRequest request, final HttpContext context) {
+        AuthState authState = (AuthState) context.getAttribute(HttpClientContext.TARGET_AUTH_STATE);
         CredentialsProvider credsProvider = (CredentialsProvider) context.getAttribute(
-                ClientContext.CREDS_PROVIDER);
-        HttpHost targetHost = (HttpHost) context.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
+                HttpClientContext.CREDS_PROVIDER);
+        HttpHost targetHost = (HttpHost) context.getAttribute(HttpCoreContext.HTTP_TARGET_HOST);
 
         if (authState.getAuthScheme() == null) {
             AuthScope authScope = new AuthScope(targetHost.getHostName(), targetHost.getPort());
             Credentials creds = credsProvider.getCredentials(authScope);
             if (creds != null) {
-                authState.setAuthScheme(new BasicScheme());
-                authState.setCredentials(creds);
+                authState.update(new BasicScheme(), creds);
             }
         }
     }

library/src/main/java/com/loopj/android/http/utils/RetryHandler.java

@@ -36,8 +36,8 @@
 import cz.msebera.android.httpclient.NoHttpResponseException;
 import cz.msebera.android.httpclient.client.HttpRequestRetryHandler;
 import cz.msebera.android.httpclient.client.methods.HttpUriRequest;
-import cz.msebera.android.httpclient.protocol.ExecutionContext;
 import cz.msebera.android.httpclient.protocol.HttpContext;
+import cz.msebera.android.httpclient.protocol.HttpCoreContext;
 
 public final class RetryHandler implements HttpRequestRetryHandler {
     private final static HashSet<Class<?>> exceptionWhitelist = new HashSet<Class<?>>();
@@ -77,9 +77,10 @@ static void addClassToBlacklist(Class<?> cls) {
     public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {
         boolean retry = true;
 
-        Boolean b = (Boolean) context.getAttribute(ExecutionContext.HTTP_REQ_SENT);
+        Boolean b = (Boolean) context.getAttribute(HttpCoreContext.HTTP_REQ_SENT);
         boolean sent = (b != null && b);
 
+        // todo inspect logic seems flawed
         if (executionCount > maxRetries) {
             // Do not retry if over max retry count
             retry = false;
@@ -96,7 +97,7 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
 
         if (retry) {
             // resend all idempotent requests
-            HttpUriRequest currentReq = (HttpUriRequest) context.getAttribute(ExecutionContext.HTTP_REQUEST);
+            HttpUriRequest currentReq = (HttpUriRequest) context.getAttribute(HttpCoreContext.HTTP_REQUEST);
             if (currentReq == null) {
                 return false;
             }