1.5 devel backup [RENAME !!!]

Author: smarek

library/build.gradle

@@ -1,5 +1,10 @@
 apply plugin: 'com.android.library'
 
+dependencies {
+    compile group: 'org.apache.httpcomponents', name: 'httpclient-android', version: '4.3.5'
+    compile group: 'com.intellij', name: 'annotations', version: '12.0'
+}
+
 android {
     compileSdkVersion 21
     buildToolsVersion '21.1.2'

library/src/main/java/com/loopj/android/http/AsyncHttpClient.java

@@ -20,6 +20,10 @@
 
 import android.util.Log;
 
+import com.loopj.android.http.handler.RangeFileAsyncHttpResponseHandler;
+import com.loopj.android.http.interfaces.ResponseHandlerInterface;
+import com.loopj.android.http.util.Utils;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -39,8 +43,8 @@ public class AsyncHttpRequest implements Runnable {
     private final HttpContext context;
     private final HttpUriRequest request;
     private final ResponseHandlerInterface responseHandler;
-    private int executionCount;
     private final AtomicBoolean isCancelled = new AtomicBoolean();
+    private int executionCount;
     private boolean cancelIsNotified;
     private volatile boolean isFinished;
     private boolean isRequestPreProcessed;
@@ -110,7 +114,7 @@ public void run() {
             if (!isCancelled()) {
                 responseHandler.sendFailureMessage(0, null, null, e);
             } else {
-                Log.e("AsyncHttpRequest", "makeRequestWithRetries returned error", e);
+                Logger.e("AsyncHttpRequest", "makeRequestWithRetries returned error", e);
             }
         }
 
@@ -204,7 +208,7 @@ private void makeRequestWithRetries() throws IOException {
             }
         } catch (Exception e) {
             // catch anything else to ensure failure message is propagated
-            Log.e("AsyncHttpRequest", "Unhandled exception origin cause", e);
+            Logger.e("AsyncHttpRequest", "Unhandled exception origin cause", e);
             cause = new IOException("Unhandled exception: " + e.getMessage());
         }
 

library/src/main/java/com/loopj/android/http/AsyncHttpRequest.java

@@ -20,12 +20,14 @@
 
 import android.os.Looper;
 
+import com.loopj.android.http.interfaces.RequestHandleInterface;
+
 import java.lang.ref.WeakReference;
 
 /**
  * A Handle to an AsyncRequest which can be used to cancel a running request.
  */
-public class RequestHandle {
+public class RequestHandle implements RequestHandleInterface {
     private final WeakReference<AsyncHttpRequest> request;
 
     public RequestHandle(AsyncHttpRequest request) {

library/src/main/java/com/loopj/android/http/HttpPatch.java

@@ -20,6 +20,10 @@
 
 import android.util.Log;
 
+import com.loopj.android.http.interfaces.ResponseHandlerInterface;
+import com.loopj.android.http.entities.JsonStreamerEntity;
+import com.loopj.android.http.util.SimpleMultipartEntity;
+
 import org.apache.http.HttpEntity;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.utils.URLEncodedUtils;
@@ -97,29 +101,15 @@ public class RequestParams implements Serializable {
             "application/json";
 
     protected final static String LOG_TAG = "RequestParams";
-    protected boolean isRepeatable;
-    protected boolean useJsonStreamer;
-    protected boolean autoCloseInputStreams;
     protected final ConcurrentHashMap<String, String> urlParams = new ConcurrentHashMap<String, String>();
     protected final ConcurrentHashMap<String, StreamWrapper> streamParams = new ConcurrentHashMap<String, StreamWrapper>();
     protected final ConcurrentHashMap<String, FileWrapper> fileParams = new ConcurrentHashMap<String, FileWrapper>();
     protected final ConcurrentHashMap<String, Object> urlParamsWithObjects = new ConcurrentHashMap<String, Object>();
+    protected boolean isRepeatable;
+    protected boolean useJsonStreamer;
+    protected boolean autoCloseInputStreams;
     protected String contentEncoding = HTTP.UTF_8;
 
-    /**
-     * Sets content encoding for return value of {@link #getParamString()} and {@link
-     * #createFormEntity()} <p>&nbsp;</p> Default encoding is "UTF-8"
-     *
-     * @param encoding String constant from {@link org.apache.http.protocol.HTTP}
-     */
-    public void setContentEncoding(final String encoding) {
-        if (encoding != null) {
-            this.contentEncoding = encoding;
-        } else {
-            Log.d(LOG_TAG, "setContentEncoding called with null attribute");
-        }
-    }
-
     /**
      * Constructs a new empty {@code RequestParams} instance.
      */
@@ -173,6 +163,20 @@ public RequestParams(Object... keysAndValues) {
         }
     }
 
+    /**
+     * Sets content encoding for return value of {@link #getParamString()} and {@link
+     * #createFormEntity()} <p>&nbsp;</p> Default encoding is "UTF-8"
+     *
+     * @param encoding String constant from {@link org.apache.http.protocol.HTTP}
+     */
+    public void setContentEncoding(final String encoding) {
+        if (encoding != null) {
+            this.contentEncoding = encoding;
+        } else {
+            Logger.d(LOG_TAG, "setContentEncoding called with null attribute");
+        }
+    }
+
     /**
      * Adds a key/value string pair to the request.
      *
@@ -488,7 +492,7 @@ private HttpEntity createFormEntity() {
         try {
             return new UrlEncodedFormEntity(getParamsList(), contentEncoding);
         } catch (UnsupportedEncodingException e) {
-            Log.e(LOG_TAG, "createFormEntity failed", e);
+            Logger.e(LOG_TAG, "createFormEntity failed", e);
             return null; // Can happen, if the 'contentEncoding' won't be HTTP.UTF_8
         }
     }