Merge pull request android-async-http#24 from jvergeldedios/master

Uploading multiple files through multipart form post is broken

Author: loopj

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

@@ -187,15 +187,19 @@ HttpEntity getEntity() {
             }
 
             // Add file params
+            int currentIndex = 0;
+            int lastIndex = fileParams.entrySet().size() - 1;
             for(ConcurrentHashMap.Entry<String, FileWrapper> entry : fileParams.entrySet()) {
                 FileWrapper file = entry.getValue();
                 if(file.inputStream != null) {
+                	boolean isLast = currentIndex == lastIndex;
                     if(file.contentType != null) {
-                        multipartEntity.addPart(entry.getKey(), file.getFileName(), file.inputStream, file.contentType);
+                        multipartEntity.addPart(entry.getKey(), file.getFileName(), file.inputStream, file.contentType, isLast);
                     } else {
-                        multipartEntity.addPart(entry.getKey(), file.getFileName(), file.inputStream);
+                        multipartEntity.addPart(entry.getKey(), file.getFileName(), file.inputStream, isLast);
                     }
                 }
+                currentIndex++;
             }
 
             entity = multipartEntity;

src/com/loopj/android/http/SimpleMultipartEntity.java

@@ -93,11 +93,11 @@ public void addPart(final String key, final String value) {
         }
     }
 
-    public void addPart(final String key, final String fileName, final InputStream fin){
-        addPart(key, fileName, fin, "application/octet-stream");
+    public void addPart(final String key, final String fileName, final InputStream fin, final boolean isLast){
+        addPart(key, fileName, fin, "application/octet-stream", isLast);
     }
 
-    public void addPart(final String key, final String fileName, final InputStream fin, String type){
+    public void addPart(final String key, final String fileName, final InputStream fin, String type, final boolean isLast){
         writeFirstBoundaryIfNeeds();
         try {
             type = "Content-Type: "+type+"\r\n";
@@ -110,6 +110,8 @@ public void addPart(final String key, final String fileName, final InputStream f
             while ((l = fin.read(tmp)) != -1) {
                 out.write(tmp, 0, l);
             }
+            if(!isLast)
+            	out.write(("\r\n--" + boundary + "\r\n").getBytes());
             out.flush();
         } catch (final IOException e) {
             e.printStackTrace();
@@ -122,9 +124,9 @@ public void addPart(final String key, final String fileName, final InputStream f
         }
     }
 
-    public void addPart(final String key, final File value) {
+    public void addPart(final String key, final File value, final boolean isLast) {
         try {
-            addPart(key, value.getName(), new FileInputStream(value));
+            addPart(key, value.getName(), new FileInputStream(value), isLast);
         } catch (final FileNotFoundException e) {
             e.printStackTrace();
         }