request body for android fixed and test added

Vladimir Enchev · Vladimir Enchev · commit 82fa2b3b6e2b · 2014-05-26T15:00:23.000+03:00
diff --git a/Tests/http-tests.ts b/Tests/http-tests.ts
@@ -304,4 +304,24 @@ export var test_request_headersSentAndReceivedProperly = function () {
 
     TKUnit.waitUntilReady(isReady, 3);
     TKUnit.assert(result["Content-Type"] === "application/json", "Headers not sent/received properly!");
+}; 
+
+export var test_request_contentSentAndReceivedProperly = function () {
+    var result;
+    var completed: boolean;
+    var isReady = function () { return completed; }
+
+    http.request({
+        url: "http://httpbin.org/post", method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        content: "MyVariableOne=ValueOne&MyVariableTwo=ValueTwo"
+    }).then(function (response) {
+            completed = true;
+            result = response.content.toJSON();
+        }).fail(function (e) {
+            console.log(e);
+        });
+
+    TKUnit.waitUntilReady(isReady, 3);
+    TKUnit.assert(result["form"]["MyVariableOne"] === "ValueOne" && result["form"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
 }; 
diff --git a/declarations.android.d.ts b/declarations.android.d.ts
@@ -370,6 +370,14 @@ declare module com {
 
             export module http {
 
+                export class AsyncHttpRequest {
+                    constructor(uri: java.net.URI, method: string);
+                    addHeader(name: string, v: string);
+                    setTimeout(timeout: number);
+                    setBody(body: any);
+                    static extends(source: any);
+                }
+
                 export module libcore {
                     export class RawHeaders {
                         constructor();
@@ -395,6 +403,13 @@ declare module com {
                 export module body {
                     export class StringBody {
                         constructor(source: string);
+                        static extends(source: any);
+                    }
+                    export class UrlEncodedFormBody {
+                        constructor(source: any);
+                    }
+                    export class StreamBody {
+                        constructor(source: java.io.InputStream, length: number);
                     }
                 }
             }
diff --git a/http/http-request.android.ts b/http/http-request.android.ts
@@ -10,11 +10,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
     var d = promises.defer<http.HttpResponse>();
 
     try {
-
-        var context = require("application").android.context;
-
-        var request = com.koushikdutta.ion.Ion.getDefault(context).configure().getAsyncHttpRequestFactory()
-            .createAsyncHttpRequest(java.net.URI.create(options.url), options.method, null);
+        var request = new com.koushikdutta.async.http.AsyncHttpRequest(java.net.URI.create(options.url), options.method);
 
         if (options.headers) {
             for (var key in options.headers) {
@@ -27,7 +23,13 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
         }
 
         if (typeof options.content == "string") {
-            request.setBody(new com.koushikdutta.async.http.body.StringBody(options.content));
+            var stringBody = com.koushikdutta.async.http.body.StringBody.extends({
+                getContentType: function () {
+                    return null;
+                }
+            });
+
+            request.setBody(new stringBody(options.content));
         }
         else {
             // TODO: How to transfer everything else?
@@ -45,7 +47,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
                         var key = rawHeaders.getFieldName(i);
                         headers[key] = rawHeaders.getValue(i);
                     }
-                    
+
                     var outputStream = new java.io.ByteArrayOutputStream();
 
                     var dataCallback = new com.koushikdutta.async.callback.DataCallback({
@@ -56,7 +58,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
                     });
 
                     response.setDataCallback(dataCallback);
-                    
+
                     var endCallback = new com.koushikdutta.async.callback.CompletedCallback({
                         onCompleted: function (error) {
                             d.resolve({
