Fix the url encoding on request

Antonio Cueva · Antonio Cueva · commit 1331d67f58f6 · 2016-01-22T15:38:04.000+02:00
diff --git a/http/http-request.android.ts b/http/http-request.android.ts
@@ -75,7 +75,22 @@ function buildJavaOptions(options: http.HttpRequestOptions) {
 
     var javaOptions = new com.tns.Async.Http.RequestOptions();
 
-    javaOptions.url = options.url.replace("%", "%25");
+    //HACK to fix the encoding    https://github.com/NativeScript/NativeScript/pull/1228
+    var originalUrl = options.url;
+    try {
+        var decodedUrl = decodeURI(originalUrl);
+        if (decodedUrl === originalUrl) {
+            //the url is not encoded, fix the %
+            options.url.replace("%", "%25");
+        }
+    }
+    catch (e) {
+        //This means something crash with js decode encode (url malformed)
+        // if we don't catch it will be and infinite loop, revert changes
+        options.url = originalUrl;
+    }
+    javaOptions.url = options.url;
+    //End of the HACK
 
     if (types.isString(options.method)) {
         javaOptions.method = options.method;
diff --git a/http/http-request.ios.ts b/http/http-request.ios.ts
@@ -19,8 +19,25 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp
             var session = NSURLSession.sessionWithConfigurationDelegateDelegateQueue(
                 sessionConfig, null, queue);
 
+            //HACK to fix the encoding  https://github.com/NativeScript/NativeScript/pull/1228
             var urlRequest = NSMutableURLRequest.requestWithURL(
-                NSURL.URLWithString(options.url.replace("%", "%25")));
+                -                NSURL.URLWithString(options.url));
+            var originalUrl = options.url;
+            try {
+                var decodedUrl = decodeURI(originalUrl);
+                if (decodedUrl === originalUrl) {
+                    //the url is not encoded, fix the %
+                    urlRequest = NSMutableURLRequest.requestWithURL(
+                        NSURL.URLWithString(options.url.replace("%", "%25")));
+                }
+            }
+            catch (e) {
+                //This means something crash with js decode encode (url malformed)
+                // if we don't catch it will be and infinite loop, revert changes
+                urlRequest = NSMutableURLRequest.requestWithURL(
+                    -                                  NSURL.URLWithString(options.url));
+            }
+            //End of the HACK
 
             urlRequest.HTTPMethod = types.isDefined(options.method) ? options.method : GET;
 
