DataEmitter.charset fixes:

FilteredDataEmitter.charset now calls into underlying DataEmitter.
UrlEncodedFormBody encodes as utf8.

2 files changed, 10 insertions, 2 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
index 71bcfa9..10e8504 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataEmitter.java
@@ -85,4 +85,11 @@ public class FilteredDataEmitter extends DataEmitterBase implements DataEmitter,
     public void close() {
         mEmitter.close();
     }
+
+    @Override
+    public String charset() {
+        if (mEmitter == null)
+            return null;
+        return mEmitter.charset();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
index b50b7c7..7bceceb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java
@@ -8,6 +8,7 @@ import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.Multimap;
+import com.koushikdutta.async.util.Charsets;
 
 import org.apache.http.NameValuePair;
 
@@ -42,7 +43,7 @@ public class UrlEncodedFormBody implements AsyncHttpRequestBody<Multimap> {
                 b.append('=');
                 b.append(URLEncoder.encode(pair.getValue(), "UTF-8"));
             }
-            mBodyBytes = b.toString().getBytes("ISO-8859-1");
+            mBodyBytes = b.toString().getBytes("UTF-8");
         }
         catch (UnsupportedEncodingException e) {
         }
@@ -58,7 +59,7 @@ public class UrlEncodedFormBody implements AsyncHttpRequestBody<Multimap> {
     public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
     @Override
     public String getContentType() {
-        return CONTENT_TYPE;
+        return CONTENT_TYPE + "; charset=utf8";
     }
 
     @Override