Skip to content

Commit 9f9bb35

Browse files
committed
ContentEncoding in effect with using RequestParams
1 parent b6bf372 commit 9f9bb35

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,13 +469,13 @@ private HttpEntity createMultipartEntity(ResponseHandlerInterface progressHandle
469469

470470
// Add string params
471471
for (ConcurrentHashMap.Entry<String, String> entry : urlParams.entrySet()) {
472-
entity.addPart(entry.getKey(), entry.getValue());
472+
entity.addPartWithCharset(entry.getKey(), entry.getValue(), contentEncoding);
473473
}
474474

475475
// Add non-string params
476476
List<BasicNameValuePair> params = getParamsList(null, urlParamsWithObjects);
477477
for (BasicNameValuePair kv : params) {
478-
entity.addPart(kv.getName(), kv.getValue());
478+
entity.addPartWithCharset(kv.getName(), kv.getValue(), contentEncoding);
479479
}
480480

481481
// Add stream params

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.http.Header;
2929
import org.apache.http.HttpEntity;
3030
import org.apache.http.message.BasicHeader;
31+
import org.apache.http.protocol.HTTP;
3132

3233
import java.io.ByteArrayOutputStream;
3334
import java.io.File;
@@ -99,8 +100,13 @@ public void addPart(String key, String value, String contentType) {
99100
}
100101
}
101102

103+
public void addPartWithCharset(String key, String value, String charset) {
104+
if (charset == null) charset = HTTP.UTF_8;
105+
addPart(key, value, "text/plain; charset=" + charset);
106+
}
107+
102108
public void addPart(String key, String value) {
103-
addPart(key, value, "text/plain; charset=UTF-8");
109+
addPartWithCharset(key, value, null);
104110
}
105111

106112
public void addPart(String key, File file) {

0 commit comments

Comments
 (0)