update RequestParams

Author: wyouflf

library/src/com/lidroid/xutils/http/RequestParams.java

@@ -220,18 +220,32 @@ public void addBodyParameter(String key, File file, String mimeType, String char
         fileParams.put(key, new FileBody(file, mimeType, charset));
     }
 
+    public void addBodyParameter(String key, File file, String fileName, String mimeType, String charset) {
+        if (fileParams == null) {
+            fileParams = new HashMap<String, ContentBody>();
+        }
+        fileParams.put(key, new FileBody(file, fileName, mimeType, charset));
+    }
+
+    public void addBodyParameter(String key, InputStream stream, long length) {
+        if (fileParams == null) {
+            fileParams = new HashMap<String, ContentBody>();
+        }
+        fileParams.put(key, new InputStreamBody(stream, length));
+    }
+
     public void addBodyParameter(String key, InputStream stream, long length, String fileName) {
         if (fileParams == null) {
             fileParams = new HashMap<String, ContentBody>();
         }
         fileParams.put(key, new InputStreamBody(stream, length, fileName));
     }
 
-    public void addBodyParameter(String key, InputStream stream, long length, String mimeType, String fileName) {
+    public void addBodyParameter(String key, InputStream stream, long length, String fileName, String mimeType) {
         if (fileParams == null) {
             fileParams = new HashMap<String, ContentBody>();
         }
-        fileParams.put(key, new InputStreamBody(stream, length, mimeType, fileName));
+        fileParams.put(key, new InputStreamBody(stream, length, fileName, mimeType));
     }
 
     public void setBodyEntity(HttpEntity bodyEntity) {

library/src/com/lidroid/xutils/http/client/multipart/content/FileBody.java

@@ -41,10 +41,11 @@ public FileBody(final File file,
             throw new IllegalArgumentException("File may not be null");
         }
         this.file = file;
-        if (filename != null)
+        if (filename != null) {
             this.filename = filename;
-        else
+        } else {
             this.filename = file.getName();
+        }
         this.charset = charset;
     }
 
@@ -58,11 +59,11 @@ public FileBody(final File file,
     }
 
     public FileBody(final File file, final String mimeType) {
-        this(file, mimeType, null);
+        this(file, null, mimeType, null);
     }
 
     public FileBody(final File file) {
-        this(file, "application/octet-stream");
+        this(file, null, "application/octet-stream", null);
     }
 
     public InputStream getInputStream() throws IOException {

library/src/com/lidroid/xutils/http/client/multipart/content/InputStreamBody.java

@@ -32,7 +32,7 @@ public class InputStreamBody extends AbstractContentBody {
     private final String filename;
     private long length;
 
-    public InputStreamBody(final InputStream in, long length, final String mimeType, final String filename) {
+    public InputStreamBody(final InputStream in, long length, final String filename, final String mimeType) {
         super(mimeType);
         if (in == null) {
             throw new IllegalArgumentException("Input stream may not be null");
@@ -43,11 +43,11 @@ public InputStreamBody(final InputStream in, long length, final String mimeType,
     }
 
     public InputStreamBody(final InputStream in, long length, final String filename) {
-        this(in, length, "application/octet-stream", filename);
+        this(in, length, filename, "application/octet-stream");
     }
 
     public InputStreamBody(final InputStream in, long length) {
-        this(in, length, "application/octet-stream", "no_name");
+        this(in, length, "no_name", "application/octet-stream");
     }
 
     public InputStream getInputStream() {