Merge pull request android-async-http#1 from loopj/master

合并原作者的更新

Author: liangxiaofei1100

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

@@ -634,10 +634,10 @@ public void setBasicAuth(String username, String password) {
      *
      * @param username  Basic Auth username
      * @param password  Basic Auth password
-     * @param preemtive sets authorization in preemtive manner
+     * @param preemptive sets authorization in preemptive manner
      */
-    public void setBasicAuth(String username, String password, boolean preemtive) {
-        setBasicAuth(username, password, null, preemtive);
+    public void setBasicAuth(String username, String password, boolean preemptive) {
+        setBasicAuth(username, password, null, preemptive);
     }
 
     /**
@@ -659,12 +659,12 @@ public void setBasicAuth(String username, String password, AuthScope scope) {
      * @param username  Basic Auth username
      * @param password  Basic Auth password
      * @param scope     an AuthScope object
-     * @param preemtive sets authorization in preemtive manner
+     * @param preemptive sets authorization in preemptive manner
      */
-    public void setBasicAuth(String username, String password, AuthScope scope, boolean preemtive) {
+    public void setBasicAuth(String username, String password, AuthScope scope, boolean preemptive) {
         UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(username, password);
         setCredentials(scope, credentials);
-        setAuthenticationPreemptive(preemtive);
+        setAuthenticationPreemptive(preemptive);
     }
 
     public void setCredentials(AuthScope authScope, Credentials credentials) {
@@ -676,16 +676,16 @@ public void setCredentials(AuthScope authScope, Credentials credentials) {
     }
 
     /**
-     * Sets HttpRequestInterceptor which handles authorization in preemtive way, as workaround you
+     * Sets HttpRequestInterceptor which handles authorization in preemptive way, as workaround you
      * can use call `AsyncHttpClient.addHeader("Authorization","Basic base64OfUsernameAndPassword==")`
      *
-     * @param isPreemtive whether the authorization is processed in preemtive way
+     * @param isPreemptive whether the authorization is processed in preemptive way
      */
-    public void setAuthenticationPreemptive(boolean isPreemtive) {
-        if (isPreemtive) {
-            httpClient.addRequestInterceptor(new PreemtiveAuthorizationHttpRequestInterceptor(), 0);
+    public void setAuthenticationPreemptive(boolean isPreemptive) {
+        if (isPreemptive) {
+            httpClient.addRequestInterceptor(new PreemptiveAuthorizationHttpRequestInterceptor(), 0);
         } else {
-            httpClient.removeRequestInterceptorByClass(PreemtiveAuthorizationHttpRequestInterceptor.class);
+            httpClient.removeRequestInterceptorByClass(PreemptiveAuthorizationHttpRequestInterceptor.class);
         }
     }
 

library/src/main/java/com/loopj/android/http/PreemtiveAuthorizationHttpRequestInterceptor.java renamed to library/src/main/java/com/loopj/android/http/PreemptiveAuthorizationHttpRequestInterceptor.java

@@ -33,7 +33,7 @@
 
 import java.io.IOException;
 
-public class PreemtiveAuthorizationHttpRequestInterceptor implements HttpRequestInterceptor {
+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);

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

@@ -73,6 +73,9 @@
  * String[] colors = { "blue", "yellow" }; // Ordered collection
  * params.put("colors", colors); // url params: "colors[]=blue&colors[]=yellow"
  *
+ * File[] files = { new File("pic.jpg"), new File("pic1.jpg") }; // Ordered collection
+ * params.put("files", files); // url params: "files[]=pic.jpg&files[]=pic1.jpg"
+ *
  * List<Map<String, String>> listOfMaps = new ArrayList<Map<String,
  * String>>();
  * Map<String, String> user1 = new HashMap<String, String>();
@@ -106,14 +109,15 @@ public class RequestParams implements Serializable {
     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, List<FileWrapper> >fileArrayParams = new ConcurrentHashMap<String, List<FileWrapper>>();
     protected final ConcurrentHashMap<String, Object> urlParamsWithObjects = new ConcurrentHashMap<String, Object>();
     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}
+     * @param encoding String constant from {@link HTTP}
      */
     public void setContentEncoding(final String encoding) {
         if (encoding != null) {
@@ -200,12 +204,47 @@ public void put(String key, String value) {
         }
     }
 
+    /**
+     * Adds files array to the request.
+     *
+     * @param key the key name for the new param.
+     * @param files the files array to add.
+     * @throws FileNotFoundException
+     */
+    public void put(String key, File files[]) throws FileNotFoundException {
+        put(key, files, null, null);
+    }
+
+    /**
+     *
+     * Adds files array to the request with both custom provided file content-type and files name
+     *
+     * @param key            the key name for the new param.
+     * @param files           the files array to add.
+     * @param contentType    the content type of the file, eg. application/json
+     * @param customFileName file name to use instead of real file name
+     * @throws FileNotFoundException throws if wrong File argument was passed
+     */
+    public void put(String key, File files[], String contentType, String customFileName) throws FileNotFoundException {
+
+        if(key != null){
+            List<FileWrapper> fileWrappers = new ArrayList<FileWrapper>();
+            for (int i=0;i<files.length;i++){
+                if(files[i] == null || !files[i].exists()){
+                    throw new FileNotFoundException();
+                }
+                fileWrappers.add(new FileWrapper(files[i], contentType, customFileName));
+            }
+            fileArrayParams.put(key,fileWrappers);
+        }
+    }
+
     /**
      * Adds a file to the request.
      *
      * @param key  the key name for the new param.
      * @param file the file to add.
-     * @throws java.io.FileNotFoundException throws if wrong File argument was passed
+     * @throws FileNotFoundException throws if wrong File argument was passed
      */
     public void put(String key, File file) throws FileNotFoundException {
         put(key, file, null, null);
@@ -217,7 +256,7 @@ public void put(String key, File file) throws FileNotFoundException {
      * @param key            the key name for the new param.
      * @param file           the file to add.
      * @param customFileName file name to use instead of real file name
-     * @throws java.io.FileNotFoundException throws if wrong File argument was passed
+     * @throws FileNotFoundException throws if wrong File argument was passed
      */
     public void put(String key, String customFileName, File file) throws FileNotFoundException {
         put(key, file, null, customFileName);
@@ -229,7 +268,7 @@ public void put(String key, String customFileName, File file) throws FileNotFoun
      * @param key         the key name for the new param.
      * @param file        the file to add.
      * @param contentType the content type of the file, eg. application/json
-     * @throws java.io.FileNotFoundException throws if wrong File argument was passed
+     * @throws FileNotFoundException throws if wrong File argument was passed
      */
     public void put(String key, File file, String contentType) throws FileNotFoundException {
         put(key, file, contentType, null);
@@ -242,7 +281,7 @@ public void put(String key, File file, String contentType) throws FileNotFoundEx
      * @param file           the file to add.
      * @param contentType    the content type of the file, eg. application/json
      * @param customFileName file name to use instead of real file name
-     * @throws java.io.FileNotFoundException throws if wrong File argument was passed
+     * @throws FileNotFoundException throws if wrong File argument was passed
      */
     public void put(String key, File file, String contentType, String customFileName) throws FileNotFoundException {
         if (file == null || !file.exists()) {
@@ -369,6 +408,7 @@ public void remove(String key) {
         streamParams.remove(key);
         fileParams.remove(key);
         urlParamsWithObjects.remove(key);
+        fileArrayParams.remove(key);
     }
 
     /**
@@ -381,7 +421,8 @@ public boolean has(String key) {
         return urlParams.get(key) != null ||
                 streamParams.get(key) != null ||
                 fileParams.get(key) != null ||
-                urlParamsWithObjects.get(key) != null;
+                urlParamsWithObjects.get(key) != null ||
+                fileArrayParams.get(key) != null;
     }
 
     @Override
@@ -414,6 +455,15 @@ public String toString() {
             result.append("FILE");
         }
 
+        for (ConcurrentHashMap.Entry<String, List<FileWrapper>> entry : fileArrayParams.entrySet()) {
+            if (result.length() > 0)
+                result.append("&");
+
+            result.append(entry.getKey());
+            result.append("=");
+            result.append("FILE");
+        }
+
         List<BasicNameValuePair> params = getParamsList(null, urlParamsWithObjects);
         for (BasicNameValuePair kv : params) {
             if (result.length() > 0)
@@ -469,7 +519,7 @@ public void setAutoCloseInputStreams(boolean flag) {
     public HttpEntity getEntity(ResponseHandlerInterface progressHandler) throws IOException {
         if (useJsonStreamer) {
             return createJsonStreamerEntity(progressHandler);
-        } else if (!forceMultipartEntity && streamParams.isEmpty() && fileParams.isEmpty()) {
+        } else if (!forceMultipartEntity && streamParams.isEmpty() && fileParams.isEmpty() && fileArrayParams.isEmpty()) {
             return createFormEntity();
         } else {
             return createMultipartEntity(progressHandler);
@@ -553,6 +603,14 @@ private HttpEntity createMultipartEntity(ResponseHandlerInterface progressHandle
             entity.addPart(entry.getKey(), fileWrapper.file, fileWrapper.contentType, fileWrapper.customFileName);
         }
 
+        // Add file collection
+        for (ConcurrentHashMap.Entry<String, List<FileWrapper>> entry : fileArrayParams.entrySet()) {
+            List<FileWrapper> fileWrapper = entry.getValue();
+            for (FileWrapper fw:fileWrapper){
+                entity.addPart(entry.getKey(), fw.file, fw.contentType, fw.customFileName);
+            }
+        }
+
         return entity;
     }