diff options
author | Koushik Dutta <koushd@gmail.com> | 2015-02-15 22:20:34 -0800 |
---|---|---|
committer | Koushik Dutta <koushd@gmail.com> | 2015-02-15 22:20:34 -0800 |
commit | f3da7a7d5e2238648700e976e179d7e7568d7bf5 (patch) | |
tree | 3a40554e57ad73034b3167f40b00b750a999c497 /AndroidAsync | |
parent | c4b0164a66d141fe24a8797a42b50a024f44191f (diff) | |
download | AndroidAsync-f3da7a7d5e2238648700e976e179d7e7568d7bf5.tar.gz AndroidAsync-f3da7a7d5e2238648700e976e179d7e7568d7bf5.tar.bz2 AndroidAsync-f3da7a7d5e2238648700e976e179d7e7568d7bf5.zip |
fix multipart setContentType not actually doing anything.
https://github.com/koush/ion/issues/398
Diffstat (limited to 'AndroidAsync')
-rw-r--r-- | AndroidAsync/AndroidAsync-AndroidAsync.iml | 2 | ||||
-rw-r--r-- | AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml index c5d0925..d1b73c2 100644 --- a/AndroidAsync/AndroidAsync-AndroidAsync.iml +++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml @@ -80,7 +80,9 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> + <excludeFolder url="file://$MODULE_DIR$/build/libs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/poms" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java index 0a8a26d..34ea06d 100644 --- a/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java +++ b/AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java @@ -184,7 +184,7 @@ public class MultipartFormDataBody extends BoundaryEmitter implements AsyncHttpR if (getBoundary() == null) { setBoundary("----------------------------" + UUID.randomUUID().toString().replace("-", "")); } - return CONTENT_TYPE + "; boundary=" + getBoundary(); + return contentType + "; boundary=" + getBoundary(); } @Override |