1.0.1

2026-02-11 00:00:06 +08:00 · 2016-02-24 13:59:38 -05:00
92 changed files with 1852 additions and 17282 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,13 +1,16 @@
+
 # EditorConfig helps developers define and maintain consistent
 # coding styles between different editors and IDEs
 # editorconfig.org

 root = true

+
 [*]
+
 # Change these settings to your own preference
 indent_style = space
-indent_size = 2
+indent_size = 4

 # We recommend you to keep these unchanged
 end_of_line = lf
@@ -16,4 +19,4 @@ trim_trailing_whitespace = true
 insert_final_newline = true

 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,2 @@
-node_modules/**
-test/e2e-app-template/www/certificates/*.cer
-test/e2e-app-template/www/certificates/*.pkcs
 tags
-.zedstate
-npm-debug.log
-/temp
-/android-sdk-macosx.zip
-/android-sdk-macosx/**
+.zedstate
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +0,0 @@
-tags
-.zedstate
-/scripts
-/temp
-/test
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,59 +0,0 @@
-notifications:
-  slack:
-    secure: lXE+2AgsxZU5G5dI91LkMAIgo8MAWfdM7DB5UOtn5LpuNln+2FmJo1gOI7tkdmLOqpXTGYnpI2VyQN3H4nOF21YhuouzD1Sh8n2wtQg1iTm353kuQpqiVhSBX8ZJ7Be1e1G8OsnxoYOxbs4Zo9qI40EruwkvqLCBHWM5MRGyd4M7EFWwb9Z29VZN0y1Nt5g/c3bT76kdKmF+JCLur2OeEKxAity7sIKgZekSqeIMwEVLSxXnda6Dbjc/cg0MJ0iDArkD7iu6fz/Fcrrxgm/pUxjcgvqze7Gy5i31mjEfspnrglWV1cshMd48BTDKCJ2AMmxH8O3GPSWE2txjIvGRWUve7iViNylvmQCVz3Eyf99+4EuuVGa+5PSodQ/CqODx/65EwtcN3PE1tNz2puKOK8nrOJcFkcbG8KTHKUlQtHCkjitbykUnj/hvhLK5/oWlQYVOLWWrHwdGUh8FI8aFPVGjRjWbHbhdayjEIqxwr1ns+6mYrP1EFNXbaeZxnLNC59XpJl1ifuezqYAk7YEiU5j4rtC7YKgyQ3ueb7anOHTJoTMyDn8mpZXgwuyhoBaeEYytQVgRyMtL6Y5cP98Jn2kv0+vdne3rkk9/JEBTo32HOjvoij6rsqEvXC0LhUDJSNadOVdHht0jjoN6zBH37HIE5/3zysLlPcAcHAS83ow=
-
-cache:
-  directories:
-    - node_modules
-
-addons:
-  sauce_connect: true
-
-matrix:
-  include:
-  - name: "iOS Build & Test"
-    language: objective-c
-    sudo: false
-    os: osx
-    osx_image: xcode10.1
-
-    before_install:
-    - export LANG=en_US.UTF-8
-
-    install:
-    - npm install
-
-    script:
-    - npm run testjs &&
-      npm run updatecert &&
-      scripts/build-test-app.sh --ios --emulator &&
-      scripts/upload-artifact.sh --ios &&
-      scripts/test-app.sh --ios --emulator;
-
-  - name: "Android Build & Test"
-    language: android
-    sudo : required
-
-    android:
-      components:
-        - platform-tools
-        - build-tools-28.0.3
-        - android-27
-        - extra-android-support
-        - extra-android-m2repository
-        - extra-google-m2repository
-
-    before_install:
-    - export LANG=en_US.UTF-8 &&
-      curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - &&
-      sudo apt-get install -y nodejs
-
-    install:
-    - npm install
-
-    script:
-    - npm run testjs &&
-      npm run updatecert &&
-      scripts/build-test-app.sh --android --emulator &&
-      scripts/upload-artifact.sh --android &&
-      scripts/test-app.sh --android --emulator;
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,231 +1,5 @@
 # Changelog

-## 2.0.9
-
- Fixed #204: broken support for cordova-android  < 7.0
-
- :warning: **Deprecation**: Deprecated "disableRedirect" in favor of "setFollowRedirect"
-
-## 2.0.8
-
- Fixed #198: cookie header is always passed even if there is no cookie
- Fixed #201: browser implementation is broken due to broken dependency
- Fixed #197: iOS crashes when multiple request are done simultaneously (reverted a8e3637)
- Fixed #189: error code mappings are not precise
- Fixed #200: compatibility with Java 6 is broken due to string switch on Android
-
- :warning: **Deprecation**: Deprecated "setSSLCertMode" in favor of "setServerTrustMode"
-
-## 2.0.7
-
- Fixed #195: URLs are double-encoded on Android
-
-## 2.0.6
-
- Fixed #187: setSSLCertMode with "default" throws an error on Android
- Fixed #115: HTTP connections are not kept alive on iOS (thanks MorpheusDe97)
-
-## 2.0.5
-
- Fixed #185: need more detailed SSL error message
-
-## 2.0.4
-
- Fixed #179: sending empty string with utf8 serializer throws an exception
-
-## 2.0.3
-
- Fixed #172: plugin does not respect user installed CA certs on Android
-
-#### Important information
-We've changed a default behavior on Android. User installed CA certs are respected now.
-If you don't want this for your needs, you can switch back to old behavior by setting SSL cert mode to `legacy`.
-
-## 2.0.2
-
- Fixed #142: Plugin affected by REDoS Issue of tough-cookie
- Fixed #157: Arguments are double URL-encoded on "downloadFile" (thanks TheZopo)
- Fixed #164: Arguments are double URL-encoded on "head" (thanks ath0mas)
-
-## 2.0.1
-
- Fixed #136: Content-Type header non-overwritable on browser platform
-
-## 2.0.0
-
- Feature #103: implement HTTP SSL cert modes
-
- :warning: **Breaking Change**: Removed AngularJS (v1) integration service
- :warning: **Breaking Change**: Removed "enableSSLPinning" and "acceptAllCerts", use "setSSLCertMode" instead
- :warning: **Breaking Change**: Certificates must be placed in "www/certificates" folder
-
-## 1.11.1
-
- Fixed #92: headers not deserialized on platform "browser"
-
-## 1.11.0
-
- Feature #77: allow overriding global settings for each single request
- Feature #11: add support for "browser" platform
-
-## 1.10.2
-
- Fixed #78: overriding header "Content-Type" not working on Android
- Fixed #79: PATCH operation not working on Android API level 19 and older (thanks chax)
- Fixed #83: App crashes on error during download operation on iOS (thanks troyanskiy)
- Fixed #76: upload sequence is not respecting order of operations needed by some sites (thanks Johny101)
-
- :warning: **Deprecation**: AngularJS service is deprecated now and will be removed anytime soon
-
-## 1.10.1
-
- Fixed #71: does not encode query string in URL correctly on Android
- Fixed #72: app crashes if response encoding is not UTF-8 (thanks jkfb)
-
-## 1.10.0
-
- Feature #34: add new serializer "utf8" sending utf-8 encoded plain text (thanks robertocapuano)
-
-## 1.9.1
-
- Fixed #45: does not encode arrays correctly as HTTP GET parameter on Android
- Fixed #54: requests are not responding on iOS with non-string values in header object
- Fixed #58: white-list of allowed content-types should be removed for iOS
-
-## v1.9.0
-
- Feature #44: "getCookieString" method is exposed
- Feature #43: added support for content type "application/javascript" on iOS (thanks wh33ler)
- Feature #46: "setCookie" allows adding custom cookies
-
-## v1.8.1
-
- Fixed #27: "uploadFile" method doesn't return data object on iOS (thanks Faisalali23 and laiyinjie)
- Fixed #40: generic error codes are different on Android and iOS
-
-## v1.8.0
-
- Feature #33: response object contains response url
-
-## v1.7.1
-
- Fixed #36: setting basic authentication not working correctly (thanks jkfb)
- Fixed #35: Android headers are not normalized (not returned in lowercase)
- Fixed #26: JSON request with array data is not working on Android (JSON error)
-
-## v1.7.0
-
- Feature #24: "setHeader" allows configuring headers for specified host
-
-## v1.6.2
-
- Change #29: removed "validateDomainName" (see info notice)
- Fixed #31: request fails throwing error on erroneous cookies
- Fixed #28: added support for content type "application/hal+json" on iOS (thanks ryandegruyter)
-
-#### Important information
-We've decided to remove the `validateDomainName()` method, because people were complaining that `acceptAllCerts(true)` is not behaving as expected. And also it's not a good idea to disable domain name validation while using valid certs, because it pretends having a secure connection, but it isn't.
-
-You should either use valid certs with domain name validation enabled (safe for production use) or accept any certs without domain name validation (only for private dev environments). I strongly discourage using fake certs in public networks.
-
-Therefore we are disabling domain name validation automatically, when you set `acceptAllCerts(true)`. So if you were using `validateDomainName()` function, you need to remove this function call for v1.6.2+.
-
-## v1.6.1
-
- Fixed #23: PATCH method broken on android
-
-## v1.6.0
-
- Feature #18: implemented PATCH method (thanks akhatri for android implementation)
- Feature #21: added redirection control (thanks to notsyncing and kesozjura)
- Fixed #16: cordova tries to run build script during plugin install
-
-## v1.5.10
-
- Fixed #10: fix gzip decompression when request header accepts gzip compression (thanks to DayBr3ak)
- Fixed #13: fix angular integration for `setDataSerializer` (thanks to RangerRick)
- Added some missing documentation (thanks to RangerRick)
-
-## v1.5.9
-
- Fixed case-sensitive folder name of Android source files
-
-## v1.5.8
-
- Use the same error codes if a request timed out
-
-## v1.5.7
-
- Fixed a bug in cookie handling (cookies containing an "Expires" string)
- Added setRequestTimeout function to set the timeout in seconds for all further requests
-
-## v1.5.6
-
- All response header keys are converted to lowercase (iOS only)
-
-## v1.5.5
-
- added a function to remove all cookies for a URL
-
-## v1.5.4
-
- fixed an error if the response has no "headers" field
-
-## v1.5.3
-
- handles cookies correctly on non-success response from server
- throws error when a callback function is missing
-
-## v1.5.2
-
- fixed missing file "umd-tough-cookie.js“ (caused by missing file ".npmignore")
-
-## v1.5.1
-
- fixed case-sensitive path name of android source files ("CordovaHTTP" --> "cordovahttp")
-
-## v1.5.0
-
- added cookie handling
- cookies are persisted via web storage API
-
-## v1.4.0
-
- forked from "cordova-plugin-http" v1.2.0 (see https://github.com/wymsee/cordova-HTTP)
- added configuration for data serializer
- added HTTP methods PUT and DELETE
-
-# Previous changelog (cordova-plugin-http)
-
-## v1.2.0
-
- Added support for TLSv1.1 and TLSv1.2 for android versions 4.1-4.4 (API levels 16-19)
-
-### Potentially Breaking Changes that really shouldn't matter because you shouldn't be using SSLv3
-
- Dropped SSLv3 support for all API Levels < 20.  It will now only work on API Levels 20-22.
-
-## v1.1.0
-
- Fixed the body of errors not being returned in iOS
- Updated AFNetworking to 3.1.0
-
-### Potentially Breaking Changes
-
- Disable encoding get() URLS in android (Thanks to devgeeks)
-
-## v1.0.3
-
- Fixed version number in plugin.xml
-
-## v1.0.2
-
- Fixed bug using useBasicAuth and setHeader from angular
-
-## v1.0.1
-
- updated README
-
 ## v1.0.0

 - Added getBasicAuthHeader function
@@ -269,4 +43,4 @@ Therefore we are disabling domain name validation automatically, when you set `a
 - Reports SSL Handshake errors rather than giving a generic error (Thanks to devgeeks)
 - Exporting http as a module (Thanks to pvsaikrishna)
 - Added Limitations section to readme (Thanks to cvillerm)
- Fixed examples (Thanks to hideov)
+- Fixed examples (Thanks to hideov)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,82 +0,0 @@
-# Contributing to Advanced HTTP Plugin
-
-We'd love for you to contribute to our source code and to make Advanced HTTP even better than it is
-today! Here are the guidelines we'd like you to follow:
-
- - [Issues and Bugs](#issue)
- - [Feature Requests](#feature)
- - [Submission Guidelines](#submit)
-
-## <a name="issue"></a> Found an Issue?
-
-If you find a bug in the source code or a mistake in the documentation, you can help us by
-submitting an issue to our [GitHub Repository](https://github.com/silkimen/cordova-plugin-advanced-http/issues).
-Even better you can submit a Pull Request with a fix.
-
-## <a name="feature"></a> Want a Feature?
-
-You can request a new feature by submitting an issue to our
-[GitHub Repository](https://github.com/silkimen/cordova-plugin-advanced-http/issues).
-If you would like to implement a new feature then consider what kind of change it is:
-
-* **Major Changes** that you wish to contribute to the project should be discussed first so that we
-  can better coordinate our efforts, prevent duplication of work, and help you to craft the change
-  so that it is successfully accepted into the project. Please submit an issue to our GitHub Repository
-  for discussion.
-* **Small Changes** can be crafted and submitted to the GitHub Repository as a Pull Request.
-
-## <a name="submit"></a> Submission Guidelines
-
-### Submitting an Issue
-Before you submit your issue search the archive, maybe your question was already answered.
-
-If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize
-the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
-Providing the following information will increase the chances of your issue being dealt with
-quickly:
-
-* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
-* **Motivation for or Use Case** - explain why this is a bug for you
-* **Advanced HTTP Version(s)** - is it a regression?
-* **Operating System** - is this a problem with all supported OS or only specific ones?
-* **Related Issues** - has a similar issue been reported before?
-* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
-  causing the problem (line of code or commit)
-
-**If you get help, help others. Good karma rulez!**
-
-### Submitting a Pull Request
-Before you submit your pull request consider the following guidelines:
-
-* Search [GitHub](https://github.com/silkimen/cordova-plugin-advanced-http/pulls) for an open or
-  closed Pull Request that relates to your submission. You don't want to duplicate effort.
-* Make your changes in a new git branch:
-
-    ```shell
-    git checkout -b my-fix-branch master
-    ```
-* Create your patch
-* Commit your changes using a descriptive commit message
-* Push your branch to GitHub:
-
-    ```shell
-    git push origin my-fix-branch
-    ```
-
-In GitHub, send a pull request to `cordova-plugin-advanced-http:master`.
-If we suggest changes or the [CI build fails](#cibuild), then:
-
-* Make the required updates.
-* Commit your changes to your branch (e.g. `my-fix-branch`).
-* Push the changes to your GitHub repository (this will update your Pull Request).
-
-That's it! Thank you for your contribution!
-
-### <a name="cibuild"></a> Pull Request Feedback
-You can always check the results of the latest CI builds on
-[Travis CI](https://travis-ci.org/silkimen/cordova-plugin-advanced-http/).
-You can use this information to inspect failing tests in your PR.
-
-## Attribution
-This document is adapted from
-[AngularJS' Contribution Guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
--- a/3
+++ b/3
@@ -1,6 +1,5 @@
 The MIT License (MIT)

-Copyright (c) 2017 Mobisys GmbH
 Copyright (c) 2014 Wymsee, Inc

 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -19,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -1,19 +1,11 @@
-Cordova Advanced HTTP
-=====================
-[![npm version](https://badge.fury.io/js/cordova-plugin-advanced-http.svg)](https://badge.fury.io/js/cordova-plugin-advanced-http)
-[![downloads/month](https://img.shields.io/npm/dm/cordova-plugin-advanced-http.svg)](https://www.npmjs.com/package/cordova-plugin-advanced-http)
-[![MIT Licence](https://badges.frapsoft.com/os/mit/mit.png)](https://opensource.org/licenses/mit-license.php)
-[![Build Status](https://travis-ci.org/silkimen/cordova-plugin-advanced-http.svg?branch=master)](https://travis-ci.org/silkimen/cordova-plugin-advanced-http)
+cordovaHTTP
+==================

-
-Cordova / Phonegap plugin for communicating with HTTP servers.  Supports iOS, Android and [Browser](#browserSupport).
-
-This is a fork of [Wymsee's Cordova-HTTP plugin](https://github.com/wymsee/cordova-HTTP).
+Cordova / Phonegap plugin for communicating with HTTP servers.  Supports iOS and Android.

 ## Advantages over Javascript requests

 - Background threading - all requests are done in a background thread.
- - Handling of HTTP code 401 - read more at [Issue CB-2415](https://issues.apache.org/jira/browse/CB-2415).
 - SSL Pinning - read more at [LumberBlog](http://blog.lumberlabs.com/2012/04/why-app-developers-should-care-about.html).

 ## Updates
@@ -25,351 +17,189 @@ Please check [CHANGELOG.md](CHANGELOG.md) for details about updating to a new ve
 The plugin conforms to the Cordova plugin specification, it can be installed
 using the Cordova / Phonegap command line interface.

-```shell
-phonegap plugin add cordova-plugin-advanced-http
+    phonegap plugin add cordova-plugin-http

-cordova plugin add cordova-plugin-advanced-http
-```
+    cordova plugin add cordova-plugin-http

 ## Usage

-### Plain Cordova
+### AngularJS

-This plugin registers a global object located at `cordova.plugin.http`.
+This plugin creates a cordovaHTTP service inside of a cordovaHTTP module.  You must load the module when you create your app's module.

-### With Ionic-native wrapper
+    var app = angular.module('myApp', ['ngRoute', 'ngAnimate', 'cordovaHTTP']);
+    
+You can then inject the cordovaHTTP service into your controllers.  The functions can then be used identically to the examples shown below except that instead of accepting success and failure callback functions, each function returns a promise.  For more information on promises in AngularJS read the [AngularJS docs](http://docs.angularjs.org/api/ng/service/$q).  For more info on promises in general check out this article on [html5rocks](http://www.html5rocks.com/en/tutorials/es6/promises/).  Make sure that you load cordova.js or phonegap.js after AngularJS is loaded.

-Check the [Ionic docs](https://ionicframework.com/docs/native/http/) for how to use this plugin with Ionic-native.
+### Not AngularJS

-## Synchronous Functions
+This plugin registers a `cordovaHTTP` global on window
+
+
+## Sync Functions

 ### getBasicAuthHeader
 This returns an object representing a basic HTTP Authorization header of the form `{'Authorization': 'Basic base64encodedusernameandpassword'}`

-```js
-var header = cordova.plugin.http.getBasicAuthHeader('user', 'password');
-```
+    var header = cordovaHTTP.getBasicAuthHeader("user", "password");

 ### useBasicAuth
 This sets up all future requests to use Basic HTTP authentication with the given username and password.

-```js
-cordova.plugin.http.useBasicAuth('user', 'password');
-```
+    cordovaHTTP.useBasicAuth("user", "password");
+    
+### setHeader
+Set a header for all future requests.  Takes a header and a value.

-### setHeader<a name="setHeader"></a>
-Set a header for all future requests to a specified host. Takes a hostname, a header and a value (must be a string value).
+    cordovaHTTP.setHeader("Header", "Value");
+    

-```js
-cordova.plugin.http.setHeader('Hostname', 'Header', 'Value');
-```
-
-You can also define headers used for all hosts by using wildcard character "\*" or providing only two params.
-
-```js
-cordova.plugin.http.setHeader('*', 'Header', 'Value');
-cordova.plugin.http.setHeader('Header', 'Value');
-```
-
-The hostname also includes the port number. If you define a header for `www.example.com` it will not match following URL `http://www.example.com:8080`.
-
-```js
-// will match http://www.example.com/...
-cordova.plugin.http.setHeader('www.example.com', 'Header', 'Value');
-
-// will match http://www.example.com:8080/...
-cordova.plugin.http.setHeader('www.example.com:8080', 'Header', 'Value');
-```
-
-### setDataSerializer<a name="setDataSerializer"></a>
-Set the data serializer which will be used for all future PATCH, POST and PUT requests. Takes a string representing the name of the serializer.
-
-```js
-cordova.plugin.http.setDataSerializer('urlencoded');
-```
-
-You can choose one of these:
-* `urlencoded`: send data as url encoded content in body (content type "application/x-www-form-urlencoded")
-* `json`: send data as JSON encoded content in body (content type "application/json")
-* `utf8`: send data as plain UTF8 encoded string in body (content type "plain/text")
-
-You can also override the default content type headers by specifying your own headers (see [setHeader](#setHeader)).
-
-__Caution__: `urlencoded` does not support serializing deep structures whereas `json` does.
-
-### setRequestTimeout
-Set how long to wait for a request to respond, in seconds.
-
-```js
-cordova.plugin.http.setRequestTimeout(5.0);
-```
-
-### setFollowRedirect<a name="setFollowRedirect"></a>
-Configure if it should follow redirects automatically. This defaults to true.
-
-```js
-cordova.plugin.setFollowRedirect(true);
-```
-
-### getCookieString
-Returns saved cookies (as string) matching given URL.
-
-```js
-cordova.plugin.http.getCookieString(url);
-```
-
-### setCookie
-Add a custom cookie. Takes a URL, a cookie string and an options object. See [ToughCookie documentation](https://github.com/salesforce/tough-cookie#setcookiecookieorstring-currenturl-options-cberrcookie) for allowed options.
-
-```js
-cordova.plugin.http.setCookie(url, cookie, options);
-```
-
-### clearCookies
-Clear the cookie store.
-
-```js
-cordova.plugin.http.clearCookies();
-```
-
-## Asynchronous Functions
+## Async Functions
 These functions all take success and error callbacks as their last 2 arguments.

-### setServerTrustMode<a name="setServerTrustMode"></a>
-Set server trust mode, being one of the following values:
+### enableSSLPinning
+Enable or disable SSL pinning.  This defaults to false.

-* `default`: default SSL trustship and hostname verification handling using system's CA certs
-* `legacy`: use legacy default behavior (< 2.0.3), excluding user installed CA certs (only for Android)
-* `nocheck`: disable SSL certificate checking and hostname verification, trusting all certs (meant to be used only for testing purposes)
-* `pinned`: trust only provided certificates
+To use SSL pinning you must include at least one .cer SSL certificate in your app project.  You can pin to your server certificate or to one of the issuing CA certificates. For ios include your certificate in the root level of your bundle (just add the .cer file to your project/target at the root level).  For android include your certificate in your project's platforms/android/assets folder.  In both cases all .cer files found will be loaded automatically.  If you only have a .pem certificate see this [stackoverflow answer](http://stackoverflow.com/a/16583429/3182729).  You want to convert it to a DER encoded certificate with a .cer extension.

-To use SSL pinning you must include at least one `.cer` SSL certificate in your app project.  You can pin to your server certificate or to one of the issuing CA certificates. Include your certificate in the `www/certificates` folder. All `.cer` files found there will be loaded automatically.
+As an alternative, you can store your .cer files in the www/certificates folder.

-:warning: Your certificate must be DER encoded! If you only have a PEM encoded certificate read this [stackoverflow answer](http://stackoverflow.com/a/16583429/3182729). You want to convert it to a DER encoded certificate with a .cer extension.
+    cordovaHTTP.enableSSLPinning(true, function() {
+        console.log('success!');
+    }, function() {
+        console.log('error :(');
+    });
+    
+### acceptAllCerts
+Accept all SSL certificates.  Or disable accepting all certificates.  This defaults to false.

-```js
-// enable SSL pinning
-cordova.plugin.http.setServerTrustMode('pinned', function() {
-  console.log('success!');
-}, function() {
-  console.log('error :(');
-});
-
-// use system's default CA certs
-cordova.plugin.http.setServerTrustMode('default', function() {
-  console.log('success!');
-}, function() {
-  console.log('error :(');
-});
-
-// disable SSL cert checking, only meant for testing purposes, do NOT use in production!
-cordova.plugin.http.setServerTrustMode('nocheck', function() {
-  console.log('success!');
-}, function() {
-  console.log('error :(');
-});
-```
-
-### disableRedirect (deprecated)
-This function was deprecated in 2.0.9. Use ["setFollowRedirect"](#setFollowRedirect) instead.
-
-### setSSLCertMode (deprecated)
-This function was deprecated in 2.0.8. Use ["setServerTrustMode"](#setServerTrustMode) instead.
-
-### enableSSLPinning (obsolete)
-This function was removed in 2.0.0. Use ["setServerTrustMode"](#setServerTrustMode) to enable SSL pinning (mode "pinned").
-
-### acceptAllCerts (obsolete)
-This function was removed in 2.0.0. Use ["setServerTrustMode"](#setServerTrustMode) to disable checking certs (mode "nocheck").
-
-### validateDomainName (obsolete)
-This function was removed in v1.6.2. Domain name validation is disabled automatically when you set server trust mode to "nocheck".
-
-### removeCookies
-Remove all cookies associated with a given URL.
-
-```js
-cordova.plugin.http.removeCookies(url, callback);
-```
-
-### sendRequest
-Execute a HTTP request.  Takes a URL and an options object. This is the internally used implementation of the following shorthand functions ([post](#post), [get](#get), [put](#put), [patch](#patch), [delete](#delete), [head](#head), [uploadFile](#uploadFile) and [downloadFile](#downloadFile)). You can use this function, if you want to override global settings for each single request.
-
-The options object contains following keys:
-
-* `method`: HTTP method to be used, defaults to `get`, needs to be one of the following values:
-  * `get`, `post`, `put`, `patch`, `head`, `delete`, `upload`, `download`
-* `data`: payload to be send to the server (only applicable on `post`, `put` or `patch` methods)
-* `params`: query params to be appended to the URL (only applicable on `get`, `head`, `delete`, `upload` or `download` methods)
-* `serializer`: data serializer to be used (only applicable on `post`, `put` or `patch` methods), defaults to global serializer value, see [setDataSerializer](#setDataSerializer) for supported values
-* `timeout`: timeout value for the request in seconds, defaults to global timeout value
-* `followRedirect`: enable or disable automatically following redirects
-* `headers`: headers object (key value pair), will be merged with global values
-* `filePath`: filePath to be used during upload and download see [uploadFile](#uploadFile) and [downloadFile](#downloadFile) for detailed information
-* `name`: name to be used during upload see [uploadFile](#uploadFile) for detailed information
-
-Here's a quick example:
-
-```js
-const options = {
-  method: 'post',
-  data: { id: 12, message: 'test' },
-  headers: { Authorization: 'OAuth2: token' }
-};
-
-cordova.plugin.http.sendRequest('https://google.com/', options, function(response) {
-  // prints 200
-  console.log(response.status);
-}, function(response) {
-  // prints 403
-  console.log(response.status);
-
-  //prints Permission denied
-  console.log(response.error);
-});
-```
+    cordovaHTTP.acceptAllCerts(true, function() {
+        console.log('success!');
+    }, function() {
+        console.log('error :(');
+    });
+    
+### validateDomainName
+Whether or not to validate the domain name in the certificate.  This defaults to true.

+    cordovaHTTP.validateDomainName(false, function() {
+        console.log('success!');
+    }, function() {
+        console.log('error :(');
+    });
+    
 ### post<a name="post"></a>
-Execute a POST request.  Takes a URL, data, and headers.
+Execute a POST request.  Takes a URL, parameters, and headers.

 #### success
-The success function receives a response object with 4 properties: status, data, url, and headers.  **status** is the HTTP response code as numeric value. **data** is the response from the server as a string. **url** is the final URL obtained after any redirects as a string. **headers** is an object with the headers. The keys of the returned object are the header names and the values are the respective header values. All header names are lowercase.
-
-Here's a quick example:
-
-```js
-{
-  status: 200,
-  data: '{"id": 12, "message": "test"}',
-  url: 'http://example.net/rest'
-  headers: {
-    'content-length': '247'
-  }
-}
-```
+The success function receives a response object with 2 properties: status and data.  Status is the HTTP response code and data is the response from the server as a string. Here's a quick example:

+    {
+        status: 200,
+        data: "{'id': 12, 'message': 'test'}"
+    }
+    
 Most apis will return JSON meaning you'll want to parse the data like in the example below:

-```js
-cordova.plugin.http.post('https://google.com/', {
-  id: 12,
-  message: 'test'
-}, { Authorization: 'OAuth2: token' }, function(response) {
-  // prints 200
-  console.log(response.status);
-  try {
-    response.data = JSON.parse(response.data);
-    // prints test
-    console.log(response.data.message);
-  } catch(e) {
-    console.error('JSON parsing error');
-  }
-}, function(response) {
-  // prints 403
-  console.log(response.status);
-
-  //prints Permission denied
-  console.log(response.error);
-});
-```
-
+    cordovaHTTP.post("https://google.com/", {
+        id: 12,
+        message: "test"
+    }, { Authorization: "OAuth2: token" }, function(response) {
+        // prints 200
+        console.log(response.status);
+        try {
+            response.data = JSON.parse(response.data);
+            // prints test
+            console.log(response.data.message);
+        } catch(e) {
+            console.error("JSON parsing error");
+        }
+    }, function(response) {
+        // prints 403
+        console.log(response.status);
+        
+        //prints Permission denied 
+        console.log(response.error);
+    });
+    
+    
 #### failure
-The error function receives a response object with 4 properties: status, error, url, and headers (url and headers being optional).  **status** is the HTTP response code as numeric value. **error** is the error response from the server as a string. **url** is the final URL obtained after any redirects as a string. **headers** is an object with the headers. The keys of the returned object are the header names and the values are the respective header values. All header names are lowercase.
+The error function receives a response object with 2 properties: status and error.  Status is the HTTP response code.  Error is the error response from the server as a string.  Here's a quick example:

-Here's a quick example:
-
-```js
-{
-  status: 403,
-  error: 'Permission denied',
-  url: 'http://example.net/noperm'
-  headers: {
-    'content-length': '247'
-  }
-}
-```
-
-### get<a name="get"></a>
+    {
+        status: 403,
+        error: "Permission denied"
+    }
+    
+### get
 Execute a GET request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.

-```js
-cordova.plugin.http.get('https://google.com/', {
-  id: '12',
-  message: 'test'
-}, { Authorization: 'OAuth2: token' }, function(response) {
-  console.log(response.status);
-}, function(response) {
-  console.error(response.error);
-});
-```
-
-### put<a name="put"></a>
-Execute a PUT request.  Takes a URL, data, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
-
-### patch<a name="patch"></a>
-Execute a PATCH request.  Takes a URL, data, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
-
-### delete<a name="delete"></a>
-Execute a DELETE request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
-
-### head<a name="head"></a>
-Execute a HEAD request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
-
-### uploadFile<a name="uploadFile"></a>
+    cordovaHTTP.get("https://google.com/", {
+        id: 12,
+        message: "test"
+    }, { Authorization: "OAuth2: token" }, function(response) {
+        console.log(response.status);
+    }, function(response) {
+        console.error(response.error);
+    });
+    
+### uploadFile
 Uploads a file saved on the device.  Takes a URL, parameters, headers, filePath, and the name of the parameter to pass the file along as.  See the [post](#post) documentation for details on what is returned on success and failure.

-```js
-cordova.plugin.http.uploadFile("https://google.com/", {
-    id: '12',
-    message: 'test'
-}, { Authorization: 'OAuth2: token' }, 'file:///somepicture.jpg', 'picture', function(response) {
-    console.log(response.status);
-}, function(response) {
-    console.error(response.error);
-});
-```
-
-### downloadFile<a name="downloadFile"></a>
+    cordovaHTTP.uploadFile("https://google.com/", {
+        id: 12,
+        message: "test"
+    }, { Authorization: "OAuth2: token" }, "file:///somepicture.jpg", "picture", function(response) {
+        console.log(response.status);
+    }, function(response) {
+        console.error(response.error);
+    });
+    
+### downloadFile
 Downloads a file and saves it to the device.  Takes a URL, parameters, headers, and a filePath.  See [post](#post) documentation for details on what is returned on failure.  On success this function returns a cordova [FileEntry object](http://cordova.apache.org/docs/en/3.3.0/cordova_file_file.md.html#FileEntry).

-```js
-cordova.plugin.http.downloadFile("https://google.com/", {
-  id: '12',
-  message: 'test'
-}, { Authorization: 'OAuth2: token' }, 'file:///somepicture.jpg', function(entry) {
-  // prints the filename
-  console.log(entry.name);
+    cordovaHTTP.downloadFile("https://google.com/", {
+        id: 12,
+        message: "test"
+    }, { Authorization: "OAuth2: token" }, "file:///somepicture.jpg", function(entry) {
+        // prints the filename
+        console.log(entry.name);
+        
+        // prints the filePath
+        console.log(entry.fullPath);
+    }, function(response) {
+        console.error(response.error);
+    });

-  // prints the filePath
-  console.log(entry.fullPath);
-}, function(response) {
-  console.error(response.error);
-});
-```
-
-## Browser support<a name="browserSupport"></a>
-
-This plugin supports a very restricted set of functions on the browser platform.
-It's meant for testing purposes, not for production grade usage.
-
-Following features are *not* supported:
-
-* Manipulating Cookies
-* Uploading and Downloading files
-* Pinning SSL certificate
-* Disabling SSL certificate check
-* Disabling transparently following redirects (HTTP codes 3xx)

 ## Libraries

-This plugin utilizes some awesome open source libraries:
+This plugin utilizes some awesome open source networking libraries.  These are both MIT licensed:

- - iOS - [AFNetworking](https://github.com/AFNetworking/AFNetworking) (MIT licensed)
- - Android - [http-request](https://github.com/kevinsawicki/http-request) (MIT licensed)
- - Cookie handling - [tough-cookie](https://github.com/salesforce/tough-cookie) (BSD-3-Clause licensed)
+ - iOS - [AFNetworking](https://github.com/AFNetworking/AFNetworking)
+ - Android - [http-request](https://github.com/kevinsawicki/http-request)

-We made a few modifications to the networking libraries.
+We made a few modifications to http-request.  They can be found in a separate repo here: https://github.com/wymsee/http-request

-## Contribute & Develop
+## Current Limitations

-We've set up a separate document for our [contribution guidelines](CONTRIBUTING.md).
+This plugin isn't equivalent to using XMLHttpRequest or Ajax calls in Javascript.
+For instance, the following features are currently not supported:
+
+- cookies support (a cookie set by a request isn't sent in subsequent requests)
+- read content of error responses (only the HTTP status code and message are returned)
+- read returned HTTP headers (e.g. in case security tokens are returned as headers)
+
+Take this into account when using this plugin into your application.
+
+## License
+
+The MIT License
+
+Copyright (c) 2014 Wymsee, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,19 +1,9 @@
 {
-  "name": "cordova-plugin-advanced-http",
-  "version": "2.0.9",
+  "name": "cordova-plugin-http",
+  "version": "1.0.1",
  "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
-  "scripts": {
-    "updatecert": "node ./scripts/update-e2e-server-cert.js && node ./scripts/update-e2e-client-cert.js",
-    "buildbrowser": "./scripts/build-test-app.sh --browser",
-    "testandroid": "npm run updatecert && ./scripts/build-test-app.sh --android --emulator && ./scripts/test-app.sh --android --emulator",
-    "testios": "npm run updatecert && ./scripts/build-test-app.sh --ios --emulator && ./scripts/test-app.sh --ios --emulator",
-    "testapp": "npm run testandroid && npm run testios",
-    "testjs": "mocha ./test/js-specs.js",
-    "test": "npm run testjs && npm run testapp",
-    "release": "npm run test && ./scripts/release.sh"
-  },
  "cordova": {
-    "id": "cordova-plugin-advanced-http",
+    "id": "cordova-plugin-http",
    "platforms": [
      "ios",
      "android"
@@ -21,50 +11,25 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git"
+    "url": "git+https://github.com/wymsee/cordova-HTTP.git"
  },
  "keywords": [
    "cordova",
    "device",
    "ecosystem:cordova",
    "cordova-ios",
-    "cordova-android",
-    "ssl",
-    "tls"
+    "cordova-android"
  ],
  "engines": [
    {
      "name": "cordova",
-      "version": ">=4.0.0"
+      "version": ">=3.0.0"
    }
  ],
  "author": "Wymsee",
-  "contributors": [
-    "devgeeks",
-    "EddyVerbruggen",
-    "mbektchiev",
-    "denisbabineau",
-    "andrey-tsaplin",
-    "pvsaikrishna",
-    "cvillerm",
-    "hideov",
-    "Mobisys"
-  ],
  "license": "MIT",
  "bugs": {
-    "url": "https://github.com/silkimen/cordova-plugin-advanced-http/issues"
+    "url": "https://github.com/wymsee/cordova-HTTP/issues"
  },
-  "homepage": "https://github.com/silkimen/cordova-plugin-advanced-http#readme",
-  "devDependencies": {
-    "chai": "4.1.2",
-    "chai-as-promised": "7.1.1",
-    "colors": "1.1.2",
-    "cordova": "8.1.2",
-    "mocha": "4.0.0",
-    "mock-require": "2.0.2",
-    "mz": "2.7.0",
-    "umd-tough-cookie": "2.4.3",
-    "wd": "1.4.1",
-    "xml2js": "0.4.19"
-  }
+  "homepage": "https://github.com/wymsee/cordova-HTTP#readme"
 }
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,90 +1,82 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="2.0.9">
-  <name>Advanced HTTP plugin</name>
-  <description>
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  id="cordova-plugin-http"
+  version="0.2.0">
+
+    <name>SSL Pinning</name>
+ 
+    <description>
        Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning
-	 </description>
-  <engines>
-    <engine name="cordova" version=">=4.0.0"/>
-  </engines>
-  <dependency id="cordova-plugin-file" version=">=2.0.0"/>
-  <js-module src="www/cookie-handler.js" name="cookie-handler"/>
-  <js-module src="www/global-configs.js" name="global-configs"/>
-  <js-module src="www/helpers.js" name="helpers"/>
-  <js-module src="www/js-util.js" name="js-util"/>
-  <js-module src="www/local-storage-store.js" name="local-storage-store"/>
-  <js-module src="www/lodash.js" name="lodash"/>
-  <js-module src="www/messages.js" name="messages"/>
-  <js-module src="www/public-interface.js" name="public-interface"/>
-  <js-module src="www/umd-tough-cookie.js" name="tough-cookie"/>
-  <js-module src="www/url-util.js" name="url-util"/>
-  <js-module src="www/advanced-http.js" name="http">
-    <clobbers target="cordova.plugin.http"/>
-  </js-module>
-  <platform name="ios">
-    <config-file target="config.xml" parent="/*">
-      <feature name="CordovaHttpPlugin">
-        <param name="ios-package" value="CordovaHttpPlugin"/>
-      </feature>
-    </config-file>
-    <header-file src="src/ios/CordovaHttpPlugin.h"/>
-    <header-file src="src/ios/TextResponseSerializer.h"/>
-    <header-file src="src/ios/TextRequestSerializer.h"/>
-    <header-file src="src/ios/AFNetworking/AFHTTPSessionManager.h"/>
-    <header-file src="src/ios/AFNetworking/AFNetworking.h"/>
-    <header-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.h"/>
-    <header-file src="src/ios/AFNetworking/AFSecurityPolicy.h"/>
-    <header-file src="src/ios/AFNetworking/AFURLRequestSerialization.h"/>
-    <header-file src="src/ios/AFNetworking/AFURLResponseSerialization.h"/>
-    <header-file src="src/ios/AFNetworking/AFURLSessionManager.h"/>
-    <header-file src="src/ios/SDNetworkActivityIndicator/SDNetworkActivityIndicator.h"/>
-    <source-file src="src/ios/CordovaHttpPlugin.m"/>
-    <source-file src="src/ios/TextResponseSerializer.m"/>
-    <source-file src="src/ios/TextRequestSerializer.m"/>
-    <source-file src="src/ios/AFNetworking/AFHTTPSessionManager.m"/>
-    <source-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.m"/>
-    <source-file src="src/ios/AFNetworking/AFSecurityPolicy.m"/>
-    <source-file src="src/ios/AFNetworking/AFURLRequestSerialization.m"/>
-    <source-file src="src/ios/AFNetworking/AFURLResponseSerialization.m"/>
-    <source-file src="src/ios/AFNetworking/AFURLSessionManager.m"/>
-    <source-file src="src/ios/SDNetworkActivityIndicator/SDNetworkActivityIndicator.m"/>
-    <framework src="Security.framework"/>
-    <framework src="SystemConfiguration.framework"/>
-  </platform>
-  <platform name="android">
-    <config-file target="res/xml/config.xml" parent="/*">
-      <feature name="CordovaHttpPlugin">
-        <param name="android-package" value="com.silkimen.cordovahttp.CordovaHttpPlugin"/>
-      </feature>
-    </config-file>
-    <config-file target="AndroidManifest.xml" parent="/manifest">
-      <uses-permission android:name="android.permission.INTERNET"/>
-    </config-file>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaClientAuth.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaHttpBase.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaHttpDownload.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaHttpOperation.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaHttpResponse.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaHttpUpload.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/cordovahttp/CordovaServerTrust.java" target-dir="src/com/silkimen/cordovahttp"/>
-    <source-file src="src/android/com/silkimen/http/HttpBodyDecoder.java" target-dir="src/com/silkimen/http"/>
-    <source-file src="src/android/com/silkimen/http/HttpRequest.java" target-dir="src/com/silkimen/http"/>
-    <source-file src="src/android/com/silkimen/http/JsonUtils.java" target-dir="src/com/silkimen/http"/>
-    <source-file src="src/android/com/silkimen/http/KeyChainKeyManager.java" target-dir="src/com/silkimen/http"/>
-    <source-file src="src/android/com/silkimen/http/OkConnectionFactory.java" target-dir="src/com/silkimen/http"/>
-    <source-file src="src/android/com/silkimen/http/TLSConfiguration.java" target-dir="src/com/silkimen/http"/>
-    <source-file src="src/android/com/silkimen/http/TLSSocketFactory.java" target-dir="src/com/silkimen/http"/>
-    <framework src="com.squareup.okhttp3:okhttp-urlconnection:3.10.0"/>
-  </platform>
-  <platform name="browser">
-    <config-file target="config.xml" parent="/*">
-      <feature name="CordovaHttpPlugin">
-        <param name="browser-package" value="CordovaHttpPlugin"/>
-      </feature>
-    </config-file>
-    <js-module src="src/browser/cordova-http-plugin.js" name="http-proxy">
-      <runs/>
+	</description>
+
+    <engines>
+        <engine name="cordova" version=">=3.0.0" />
+    </engines>
+
+    <dependency id="cordova-plugin-file" version=">=2.0.0" />
+
+    <js-module src="www/cordovaHTTP.js" name="CordovaHttpPlugin">
+        <clobbers target="CordovaHttpPlugin" />
    </js-module>
-  </platform>
-</plugin>
+
+    <!-- ios -->
+    <platform name="ios">
+        <config-file target="config.xml" parent="/*">
+            <feature name="CordovaHttpPlugin">
+                <param name="ios-package" value="CordovaHttpPlugin"/>
+            </feature>
+        </config-file>
+
+        <header-file src="src/ios/CordovaHttpPlugin.h" />
+        <source-file src="src/ios/CordovaHttpPlugin.m" />
+        
+        <header-file src="src/ios/TextResponseSerializer.h" />
+        <source-file src="src/ios/TextResponseSerializer.m" />
+
+        <header-file src="src/ios/AFNetworking/AFHTTPSessionManager.h" />
+        <source-file src="src/ios/AFNetworking/AFHTTPSessionManager.m" />
+
+        <header-file src="src/ios/AFNetworking/AFNetworking.h" />
+
+        <header-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.h" />
+        <source-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.m" />
+
+        <header-file src="src/ios/AFNetworking/AFSecurityPolicy.h" />
+        <source-file src="src/ios/AFNetworking/AFSecurityPolicy.m" />
+
+        <header-file src="src/ios/AFNetworking/AFURLRequestSerialization.h" />
+        <source-file src="src/ios/AFNetworking/AFURLRequestSerialization.m" />
+
+        <header-file src="src/ios/AFNetworking/AFURLResponseSerialization.h" />
+        <source-file src="src/ios/AFNetworking/AFURLResponseSerialization.m" />
+
+        <header-file src="src/ios/AFNetworking/AFURLSessionManager.h" />
+        <source-file src="src/ios/AFNetworking/AFURLSessionManager.m" />
+
+        <framework src="Security.framework" />
+        <framework src="SystemConfiguration.framework" />
+    </platform>
+
+    <!--android -->
+    <platform name="android">
+        <config-file target="res/xml/config.xml" parent="/*">
+            <feature name="CordovaHttpPlugin">
+                <param name="android-package" value="com.synconset.CordovaHttpPlugin"/>
+            </feature>
+        </config-file>
+
+        <config-file target="AndroidManifest.xml" parent="/manifest">
+            <uses-permission android:name="android.permission.INTERNET" />
+        </config-file>
+        
+        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttp.java" target-dir="src/com/synconset" />
+        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpGet.java" target-dir="src/com/synconset" />
+        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java" target-dir="src/com/synconset" />
+        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpHead.java" target-dir="src/com/synconset" />
+        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpUpload.java" target-dir="src/com/synconset" />
+        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpDownload.java" target-dir="src/com/synconset" />
+        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java" target-dir="src/com/synconset" />
+        <source-file src="src/android/com/synconset/CordovaHTTP/HttpRequest.java" target-dir="src/com/github/kevinsawicki/http" />
+    </platform>
+</plugin>
--- a/scripts/build-test-app.sh
+++ b/scripts/build-test-app.sh
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd ..; pwd )"
-WORKINGCOPY=$ROOT/temp/workingcopy
-CDV=$ROOT/node_modules/.bin/cordova
-
-PLATFORM=ios
-TARGET=emulator
-
-while :; do
-  case $1 in
-    --android)
-      PLATFORM=android
-      ;;
-    --browser)
-      PLATFORM=browser
-      ;;
-    --ios)
-      PLATFORM=ios
-      ;;
-    --device)
-      TARGET=device
-      ;;
-    --emulator)
-      TARGET=emulator
-      ;;
-    -?*)
-      printf 'WARN: Unknown option (ignored): %s\n' "$1" >&2
-      ;;
-    *)
-      break
-   esac
-
-   shift
-done
-
-printf 'Building test app for %s\n' $PLATFORM
-rm -rf $ROOT/temp
-mkdir $ROOT/temp
-cp -r $ROOT/test/e2e-app-template/. $ROOT/temp/
-cp $ROOT/test/e2e-specs.js $ROOT/temp/www/
-rsync -ax --exclude node_modules --exclude scripts --exclude temp --exclude test $ROOT/. $WORKINGCOPY
-cd $ROOT/temp
-$CDV prepare
-$CDV plugins add $WORKINGCOPY
-$CDV build $PLATFORM --$TARGET --buildConfig build.json
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd ..; pwd )"
-
-pushd $ROOT
-VERSION=$(node -e "console.log(require('./package.json').version)")
-./scripts/update-tough-cookie.sh
-node ./scripts/update-plugin-xml.js $VERSION
-git commit -a -m "release v$VERSION"
-git tag "v$VERSION"
-npm publish
-popd
--- a/scripts/test-app.sh
+++ b/scripts/test-app.sh
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd ..; pwd )"
-
-if [ $CI == "true" ] && ([ -z $SAUCE_USERNAME ] || [ -z $SAUCE_ACCESS_KEY ]); then
-  echo "Skipping CI tests, because Saucelabs credentials are not set.";
-  exit 0;
-fi
-
-printf 'Running e2e tests\n'
-pushd $ROOT
-./node_modules/.bin/mocha ./test/e2e-tooling/test.js "$@"
-popd
--- a/scripts/update-e2e-client-cert.js
+++ b/scripts/update-e2e-client-cert.js
@@ -1,29 +0,0 @@
-const fs = require('fs');
-const https = require('https');
-const path = require('path');
-
-const SOURCE_URL = 'https://badssl.com/certs/badssl.com-client.p12';
-const TARGET_PATH = path.join(__dirname, '../test/e2e-app-template/www/certificates/badssl-client-cert.pkcs');
-
-const downloadPkcsContainer = (source, target) => new Promise((resolve, reject) => {
-  const file = fs.createWriteStream(target);
-
-  const req = https.get(source, response => {
-    response.pipe(file)
-    resolve(target);
-  });
-
-  req.on('error', error => {
-    return reject(error)
-  });
-
-  req.end();
-});
-
-console.log(`Updating client certificate from ${SOURCE_URL}`);
-
-downloadPkcsContainer(SOURCE_URL, TARGET_PATH)
-  .catch(error => {
-    console.error(`Updating client certificate failed: ${error}`);
-    process.exit(1);
-  });
--- a/scripts/update-e2e-server-cert.js
+++ b/scripts/update-e2e-server-cert.js
@@ -1,40 +0,0 @@
-const fs = require('fs');
-const https = require('https');
-const path = require('path');
-
-const SOURCE_HOST = 'httpbin.org';
-const TARGET_PATH = path.join(__dirname, '../test/e2e-app-template/www/certificates/httpbin.org.cer');
-
-const getCert = hostname => new Promise((resolve, reject) => {
-  const options = {
-    hostname,
-    agent: false,
-    rejectUnauthorized: false,
-    ciphers: 'ALL'
-  };
-
-  const req = https.get(options, response => {
-    const certificate = response.socket.getPeerCertificate();
-
-    if (certificate === null) {
-      return reject({ message: 'The website did not provide a certificate' });
-    }
-
-    resolve(certificate);
-  });
-
-  req.on('error', error => {
-    return reject(error)
-  });
-
-  req.end();
-});
-
-console.log(`Updating server certificate from ${SOURCE_HOST}`);
-
-getCert(SOURCE_HOST)
-  .then(cert => fs.writeFileSync(TARGET_PATH, cert.raw))
-  .catch(error => {
-    console.error(`Updating server certificate failed: ${error}`);
-    process.exit(1);
-  });
--- a/scripts/update-plugin-xml.js
+++ b/scripts/update-plugin-xml.js
@@ -1,31 +0,0 @@
-const args = process.argv.slice(2);
-const fs = require('mz/fs');
-const path = require('path');
-const xml2js = require('xml2js');
-const xmlPath = path.join(__dirname, '..', 'plugin.xml');
-
-const parse = xml => new Promise((resolve, reject) => {
-  const parser = new xml2js.Parser();
-
-  parser.parseString(xml, (error, result) => {
-    if (error) {
-      reject(error);
-    } else {
-      resolve(result);
-    }
-  });
-});
-
-const stringify = obj => {
-  const builder = new xml2js.Builder();
-
-  return builder.buildObject(obj);
-};
-
-fs.readFile(xmlPath, 'utf-8')
-  .then(xml => parse(xml))
-  .then(parsed => {
-    parsed.plugin.$.version = args[0];
-
-    return fs.writeFile(xmlPath, stringify(parsed));
-  });
--- a/scripts/update-tough-cookie.sh
+++ b/scripts/update-tough-cookie.sh
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd ..; pwd )"
-
-cd $ROOT
-npm i
-cp node_modules/umd-tough-cookie/lib/umd-tough-cookie.js www/umd-tough-cookie.js
--- a/scripts/upload-artifact.sh
+++ b/scripts/upload-artifact.sh
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-PLATFORM=$([[ "${@#--android}" = "$@" ]] && echo "ios" || echo "android")
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd ..; pwd )"
-TEMP=$ROOT/temp
-
-if [ -z $SAUCE_USERNAME ] || [ -z $SAUCE_ACCESS_KEY ]; then
-  echo "Skipping uploading artifact, because Saucelabs credentials are not set.";
-  exit 0;
-fi
-
-if [ $PLATFORM = "android" ]; then
-  curl -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY \
-      -X POST \
-      -H "Content-Type: application/octet-stream" \
-      https://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/HttpDemo.apk?overwrite=true \
-      --data-binary @$TEMP/platforms/android/app/build/outputs/apk/debug/app-debug.apk
-else
-  rm -rf $TEMP/HttpDemo.app.zip
-  pushd $TEMP/platforms/ios/build/emulator
-  zip -r $TEMP/HttpDemo.app.zip ./HttpDemo.app
-  popd
-
-  curl -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY \
-      -X POST \
-      -H "Content-Type: application/octet-stream" \
-      https://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/HttpDemo.app.zip?overwrite=true \
-      --data-binary @$TEMP/HttpDemo.app.zip
-fi
--- a/src/android/com/silkimen/cordovahttp/CordovaClientAuth.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaClientAuth.java
@@ -1,113 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import android.app.Activity;
-import android.content.Context;
-import android.security.KeyChain;
-import android.security.KeyChainAliasCallback;
-import android.util.Log;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.net.URI;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-
-import org.apache.cordova.CallbackContext;
-
-import com.silkimen.http.KeyChainKeyManager;
-import com.silkimen.http.TLSConfiguration;
-
-class CordovaClientAuth implements Runnable, KeyChainAliasCallback {
-  private static final String TAG = "Cordova-Plugin-HTTP";
-
-  private String mode;
-  private String aliasString;
-  private byte[] rawPkcs;
-  private String pkcsPassword;
-  private Activity activity;
-  private Context context;
-  private TLSConfiguration tlsConfiguration;
-  private CallbackContext callbackContext;
-
-  public CordovaClientAuth(final String mode, final String aliasString, final byte[] rawPkcs,
-      final String pkcsPassword, final Activity activity, final Context context, final TLSConfiguration configContainer,
-      final CallbackContext callbackContext) {
-
-    this.mode = mode;
-    this.aliasString = aliasString;
-    this.rawPkcs = rawPkcs;
-    this.pkcsPassword = pkcsPassword;
-    this.activity = activity;
-    this.tlsConfiguration = configContainer;
-    this.context = context;
-    this.callbackContext = callbackContext;
-  }
-
-  @Override
-  public void run() {
-    if ("systemstore".equals(this.mode)) {
-      this.loadFromSystemStore();
-    } else if ("buffer".equals(this.mode)) {
-      this.loadFromBuffer();
-    } else {
-      this.disableClientAuth();
-    }
-  }
-
-  private void loadFromSystemStore() {
-    if (this.aliasString == null) {
-      KeyChain.choosePrivateKeyAlias(this.activity, this, null, null, null, -1, null);
-    } else {
-      this.alias(this.aliasString);
-    }
-  }
-
-  private void loadFromBuffer() {
-    try {
-      KeyStore keyStore = KeyStore.getInstance("PKCS12");
-      String keyManagerFactoryAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
-      KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(keyManagerFactoryAlgorithm);
-      ByteArrayInputStream stream = new ByteArrayInputStream(this.rawPkcs);
-
-      keyStore.load(stream, this.pkcsPassword.toCharArray());
-      keyManagerFactory.init(keyStore, this.pkcsPassword.toCharArray());
-
-      this.tlsConfiguration.setKeyManagers(keyManagerFactory.getKeyManagers());
-      this.callbackContext.success();
-    } catch (Exception e) {
-      Log.e(TAG, "Couldn't load given PKCS12 container for authentication", e);
-      this.callbackContext.error("Couldn't load given PKCS12 container for authentication");
-    }
-  }
-
-  private void disableClientAuth() {
-    this.tlsConfiguration.setKeyManagers(null);
-    this.callbackContext.success();
-  }
-
-  @Override
-  public void alias(final String alias) {
-    try {
-      if (alias == null) {
-        throw new Exception("Couldn't get a consent for private key access");
-      }
-
-      PrivateKey key = KeyChain.getPrivateKey(this.context, alias);
-      X509Certificate[] chain = KeyChain.getCertificateChain(this.context, alias);
-      KeyManager keyManager = new KeyChainKeyManager(alias, key, chain);
-
-      this.tlsConfiguration.setKeyManagers(new KeyManager[] { keyManager });
-
-      this.callbackContext.success(alias);
-    } catch (Exception e) {
-      Log.e(TAG, "Couldn't load private key and certificate pair with given alias \"" + alias + "\" for authentication",
-          e);
-      this.callbackContext.error(
-          "Couldn't load private key and certificate pair with given alias \"" + alias + "\" for authentication");
-    }
-  }
-}
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpBase.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpBase.java
@@ -1,174 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-
-import java.nio.ByteBuffer;
-
-import javax.net.ssl.SSLException;
-
-import com.silkimen.http.HttpBodyDecoder;
-import com.silkimen.http.HttpRequest;
-import com.silkimen.http.HttpRequest.HttpRequestException;
-import com.silkimen.http.JsonUtils;
-import com.silkimen.http.OkConnectionFactory;
-import com.silkimen.http.TLSConfiguration;
-
-import org.apache.cordova.CallbackContext;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.util.Log;
-
-abstract class CordovaHttpBase implements Runnable {
-  protected static final String TAG = "Cordova-Plugin-HTTP";
-
-  protected String method;
-  protected String url;
-  protected String serializer = "none";
-  protected Object data;
-  protected JSONObject headers;
-  protected int timeout;
-  protected boolean followRedirects;
-  protected TLSConfiguration tlsConfiguration;
-  protected CallbackContext callbackContext;
-
-  public CordovaHttpBase(String method, String url, String serializer, Object data, JSONObject headers, int timeout,
-      boolean followRedirects, TLSConfiguration tlsConfiguration, CallbackContext callbackContext) {
-
-    this.method = method;
-    this.url = url;
-    this.serializer = serializer;
-    this.data = data;
-    this.headers = headers;
-    this.timeout = timeout;
-    this.followRedirects = followRedirects;
-    this.tlsConfiguration = tlsConfiguration;
-    this.callbackContext = callbackContext;
-  }
-
-  public CordovaHttpBase(String method, String url, JSONObject headers, int timeout, boolean followRedirects,
-      TLSConfiguration tlsConfiguration, CallbackContext callbackContext) {
-
-    this.method = method;
-    this.url = url;
-    this.headers = headers;
-    this.timeout = timeout;
-    this.followRedirects = followRedirects;
-    this.tlsConfiguration = tlsConfiguration;
-    this.callbackContext = callbackContext;
-  }
-
-  @Override
-  public void run() {
-    CordovaHttpResponse response = new CordovaHttpResponse();
-
-    try {
-      HttpRequest request = this.createRequest();
-      this.prepareRequest(request);
-      this.sendBody(request);
-      this.processResponse(request, response);
-    } catch (HttpRequestException e) {
-      if (e.getCause() instanceof SSLException) {
-        response.setStatus(-2);
-        response.setErrorMessage("TLS connection could not be established: " + e.getMessage());
-        Log.w(TAG, "TLS connection could not be established", e);
-      } else if (e.getCause() instanceof UnknownHostException) {
-        response.setStatus(-3);
-        response.setErrorMessage("Host could not be resolved: " + e.getMessage());
-        Log.w(TAG, "Host could not be resolved", e);
-      } else if (e.getCause() instanceof SocketTimeoutException) {
-        response.setStatus(-4);
-        response.setErrorMessage("Request timed out: " + e.getMessage());
-        Log.w(TAG, "Request timed out", e);
-      } else {
-        response.setStatus(-1);
-        response.setErrorMessage("There was an error with the request: " + e.getCause().getMessage());
-        Log.w(TAG, "Generic request error", e);
-      }
-    } catch (Exception e) {
-      response.setStatus(-1);
-      response.setErrorMessage(e.getMessage());
-      Log.e(TAG, "An unexpected error occured", e);
-    }
-
-    try {
-      if (response.hasFailed()) {
-        this.callbackContext.error(response.toJSON());
-      } else {
-        this.callbackContext.success(response.toJSON());
-      }
-    } catch (JSONException e) {
-      Log.e(TAG, "An unexpected error occured while creating HTTP response object", e);
-    }
-  }
-
-  protected HttpRequest createRequest() throws JSONException {
-    return new HttpRequest(this.url, this.method);
-  }
-
-  protected void prepareRequest(HttpRequest request) throws JSONException, IOException {
-    request.followRedirects(this.followRedirects);
-    request.readTimeout(this.timeout);
-    request.acceptCharset("UTF-8");
-    request.uncompress(true);
-    request.setConnectionFactory(new OkConnectionFactory());
-
-    if (this.tlsConfiguration.getHostnameVerifier() != null) {
-      request.setHostnameVerifier(this.tlsConfiguration.getHostnameVerifier());
-    }
-
-    request.setSSLSocketFactory(this.tlsConfiguration.getTLSSocketFactory());
-
-    // setup content type before applying headers, so user can override it
-    this.setContentType(request);
-
-    request.headers(JsonUtils.getStringMap(this.headers));
-  }
-
-  protected void setContentType(HttpRequest request) {
-    if ("json".equals(this.serializer)) {
-      request.contentType("application/json", "UTF-8");
-    } else if ("utf8".equals(this.serializer)) {
-      request.contentType("text/plain", "UTF-8");
-    } else if ("urlencoded".equals(this.serializer)) {
-      // intentionally left blank, because content type is set in HttpRequest.form()
-    }
-  }
-
-  protected void sendBody(HttpRequest request) throws Exception {
-    if (this.data == null) {
-      return;
-    }
-
-    if ("json".equals(this.serializer)) {
-      request.send(this.data.toString());
-    } else if ("utf8".equals(this.serializer)) {
-      request.send(((JSONObject) this.data).getString("text"));
-    } else if ("urlencoded".equals(this.serializer)) {
-      request.form(JsonUtils.getObjectMap((JSONObject) this.data));
-    }
-  }
-
-  protected void processResponse(HttpRequest request, CordovaHttpResponse response) throws Exception {
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    request.receive(outputStream);
-
-    ByteBuffer rawOutput = ByteBuffer.wrap(outputStream.toByteArray());
-    String decodedBody = HttpBodyDecoder.decodeBody(rawOutput, request.charset());
-
-    response.setStatus(request.code());
-    response.setUrl(request.url().toString());
-    response.setHeaders(request.headers());
-
-    if (request.code() >= 200 && request.code() < 300) {
-      response.setBody(decodedBody);
-    } else {
-      response.setErrorMessage(decodedBody);
-    }
-  }
-}
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpDownload.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpDownload.java
@@ -1,42 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import java.io.File;
-import java.net.URI;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.silkimen.http.HttpRequest;
-import com.silkimen.http.TLSConfiguration;
-
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.file.FileUtils;
-import org.json.JSONObject;
-
-class CordovaHttpDownload extends CordovaHttpBase {
-  private String filePath;
-
-  public CordovaHttpDownload(String url, JSONObject headers, String filePath, int timeout, boolean followRedirects,
-      TLSConfiguration tlsConfiguration, CallbackContext callbackContext) {
-
-    super("GET", url, headers, timeout, followRedirects, tlsConfiguration, callbackContext);
-    this.filePath = filePath;
-  }
-
-  @Override
-  protected void processResponse(HttpRequest request, CordovaHttpResponse response) throws Exception {
-    response.setStatus(request.code());
-    response.setUrl(request.url().toString());
-    response.setHeaders(request.headers());
-
-    if (request.code() >= 200 && request.code() < 300) {
-      File file = new File(new URI(this.filePath));
-      JSONObject fileEntry = FileUtils.getFilePlugin().getEntryForFile(file);
-
-      request.receive(file);
-      response.setFileEntry(fileEntry);
-    } else {
-      response.setErrorMessage("There was an error downloading the file");
-    }
-  }
-}
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpOperation.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpOperation.java
@@ -1,23 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.silkimen.http.TLSConfiguration;
-
-import org.apache.cordova.CallbackContext;
-import org.json.JSONObject;
-
-class CordovaHttpOperation extends CordovaHttpBase {
-  public CordovaHttpOperation(String method, String url, String serializer, Object data, JSONObject headers,
-      int timeout, boolean followRedirects, TLSConfiguration tlsConfiguration, CallbackContext callbackContext) {
-
-    super(method, url, serializer, data, headers, timeout, followRedirects, tlsConfiguration, callbackContext);
-  }
-
-  public CordovaHttpOperation(String method, String url, JSONObject headers, int timeout, boolean followRedirects,
-      TLSConfiguration tlsConfiguration, CallbackContext callbackContext) {
-
-    super(method, url, headers, timeout, followRedirects, tlsConfiguration, callbackContext);
-  }
-}
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java
@@ -1,164 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import java.security.KeyStore;
-
-import com.silkimen.http.TLSConfiguration;
-
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.CordovaInterface;
-import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.CordovaWebView;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.util.Log;
-import android.util.Base64;
-
-import javax.net.ssl.TrustManagerFactory;
-
-public class CordovaHttpPlugin extends CordovaPlugin {
-  private static final String TAG = "Cordova-Plugin-HTTP";
-
-  private TLSConfiguration tlsConfiguration;
-
-  @Override
-  public void initialize(CordovaInterface cordova, CordovaWebView webView) {
-    super.initialize(cordova, webView);
-
-    this.tlsConfiguration = new TLSConfiguration();
-
-    try {
-      KeyStore store = KeyStore.getInstance("AndroidCAStore");
-      String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
-      TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
-
-      store.load(null);
-      tmf.init(store);
-
-      this.tlsConfiguration.setHostnameVerifier(null);
-      this.tlsConfiguration.setTrustManagers(tmf.getTrustManagers());
-    } catch (Exception e) {
-      Log.e(TAG, "An error occured while loading system's CA certificates", e);
-    }
-  }
-
-  @Override
-  public boolean execute(String action, final JSONArray args, final CallbackContext callbackContext)
-      throws JSONException {
-
-    if (action == null) {
-      return false;
-    }
-
-    if ("get".equals(action)) {
-      return this.executeHttpRequestWithoutData(action, args, callbackContext);
-    } else if ("head".equals(action)) {
-      return this.executeHttpRequestWithoutData(action, args, callbackContext);
-    } else if ("delete".equals(action)) {
-      return this.executeHttpRequestWithoutData(action, args, callbackContext);
-    } else if ("post".equals(action)) {
-      return this.executeHttpRequestWithData(action, args, callbackContext);
-    } else if ("put".equals(action)) {
-      return this.executeHttpRequestWithData(action, args, callbackContext);
-    } else if ("patch".equals(action)) {
-      return this.executeHttpRequestWithData(action, args, callbackContext);
-    } else if ("uploadFile".equals(action)) {
-      return this.uploadFile(args, callbackContext);
-    } else if ("downloadFile".equals(action)) {
-      return this.downloadFile(args, callbackContext);
-    } else if ("setServerTrustMode".equals(action)) {
-      return this.setServerTrustMode(args, callbackContext);
-    } else if ("setClientAuthMode".equals(action)) {
-      return this.setClientAuthMode(args, callbackContext);
-    } else {
-      return false;
-    }
-  }
-
-  private boolean executeHttpRequestWithoutData(final String method, final JSONArray args,
-      final CallbackContext callbackContext) throws JSONException {
-
-    String url = args.getString(0);
-    JSONObject headers = args.getJSONObject(1);
-    int timeout = args.getInt(2) * 1000;
-    boolean followRedirect = args.getBoolean(3);
-
-    CordovaHttpOperation request = new CordovaHttpOperation(method.toUpperCase(), url, headers, timeout, followRedirect,
-        this.tlsConfiguration, callbackContext);
-
-    cordova.getThreadPool().execute(request);
-
-    return true;
-  }
-
-  private boolean executeHttpRequestWithData(final String method, final JSONArray args,
-      final CallbackContext callbackContext) throws JSONException {
-
-    String url = args.getString(0);
-    Object data = args.get(1);
-    String serializer = args.getString(2);
-    JSONObject headers = args.getJSONObject(3);
-    int timeout = args.getInt(4) * 1000;
-    boolean followRedirect = args.getBoolean(5);
-
-    CordovaHttpOperation request = new CordovaHttpOperation(method.toUpperCase(), url, serializer, data, headers,
-        timeout, followRedirect, this.tlsConfiguration, callbackContext);
-
-    cordova.getThreadPool().execute(request);
-
-    return true;
-  }
-
-  private boolean uploadFile(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
-    String url = args.getString(0);
-    JSONObject headers = args.getJSONObject(1);
-    String filePath = args.getString(2);
-    String uploadName = args.getString(3);
-    int timeout = args.getInt(4) * 1000;
-    boolean followRedirect = args.getBoolean(5);
-
-    CordovaHttpUpload upload = new CordovaHttpUpload(url, headers, filePath, uploadName, timeout, followRedirect,
-        this.tlsConfiguration, callbackContext);
-
-    cordova.getThreadPool().execute(upload);
-
-    return true;
-  }
-
-  private boolean downloadFile(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
-    String url = args.getString(0);
-    JSONObject headers = args.getJSONObject(1);
-    String filePath = args.getString(2);
-    int timeout = args.getInt(3) * 1000;
-    boolean followRedirect = args.getBoolean(4);
-
-    CordovaHttpDownload download = new CordovaHttpDownload(url, headers, filePath, timeout, followRedirect,
-        this.tlsConfiguration, callbackContext);
-
-    cordova.getThreadPool().execute(download);
-
-    return true;
-  }
-
-  private boolean setServerTrustMode(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
-    CordovaServerTrust runnable = new CordovaServerTrust(args.getString(0), this.cordova.getActivity(),
-        this.tlsConfiguration, callbackContext);
-
-    cordova.getThreadPool().execute(runnable);
-
-    return true;
-  }
-
-  private boolean setClientAuthMode(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
-    byte[] pkcs = args.isNull(2) ? null : Base64.decode(args.getString(2), Base64.DEFAULT);
-
-    CordovaClientAuth runnable = new CordovaClientAuth(args.getString(0), args.isNull(1) ? null : args.getString(1),
-        pkcs, args.getString(3), this.cordova.getActivity(), this.cordova.getActivity().getApplicationContext(),
-        this.tlsConfiguration, callbackContext);
-
-    cordova.getThreadPool().execute(runnable);
-
-    return true;
-  }
-}
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpResponse.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpResponse.java
@@ -1,90 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.text.TextUtils;
-import android.util.Log;
-
-class CordovaHttpResponse {
-  private int status;
-  private String url;
-  private Map<String, List<String>> headers;
-  private String body;
-  private JSONObject fileEntry;
-  private boolean hasFailed;
-  private boolean isFileOperation;
-  private String error;
-
-  public void setStatus(int status) {
-    this.status = status;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public void setHeaders(Map<String, List<String>> headers) {
-    this.headers = headers;
-  }
-
-  public void setBody(String body) {
-    this.body = body;
-  }
-
-  public void setFileEntry(JSONObject entry) {
-    this.isFileOperation = true;
-    this.fileEntry = entry;
-  }
-
-  public void setErrorMessage(String message) {
-    this.hasFailed = true;
-    this.error = message;
-  }
-
-  public boolean hasFailed() {
-    return this.hasFailed;
-  }
-
-  public JSONObject toJSON() throws JSONException {
-    JSONObject json = new JSONObject();
-
-    json.put("status", this.status);
-    json.put("url", this.url);
-
-    if (this.hasFailed) {
-      json.put("error", this.error);
-    } else if (this.isFileOperation) {
-      json.put("headers", new JSONObject(getFilteredHeaders()));
-      json.put("file", this.fileEntry);
-    } else {
-      json.put("headers", new JSONObject(getFilteredHeaders()));
-      json.put("data", this.body);
-    }
-
-    return json;
-  }
-
-  private Map<String, String> getFilteredHeaders() throws JSONException {
-    Map<String, String> filteredHeaders = new HashMap<String, String>();
-
-    if (this.headers == null || this.headers.isEmpty()) {
-      return filteredHeaders;
-    }
-
-    for (Map.Entry<String, List<String>> entry : this.headers.entrySet()) {
-      String key = entry.getKey();
-      List<String> value = entry.getValue();
-
-      if ((key != null) && (!value.isEmpty())) {
-        filteredHeaders.put(key.toLowerCase(), TextUtils.join(", ", value));
-      }
-    }
-
-    return filteredHeaders;
-  }
-}
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpUpload.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpUpload.java
@@ -1,43 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import android.webkit.MimeTypeMap;
-
-import com.silkimen.http.HttpRequest;
-
-import java.io.File;
-import java.net.URI;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.silkimen.http.TLSConfiguration;
-
-import org.apache.cordova.CallbackContext;
-import org.json.JSONObject;
-
-class CordovaHttpUpload extends CordovaHttpBase {
-  private String filePath;
-  private String uploadName;
-
-  public CordovaHttpUpload(String url, JSONObject headers, String filePath, String uploadName, int timeout,
-      boolean followRedirects, TLSConfiguration tlsConfiguration, CallbackContext callbackContext) {
-
-    super("POST", url, headers, timeout, followRedirects, tlsConfiguration, callbackContext);
-    this.filePath = filePath;
-    this.uploadName = uploadName;
-  }
-
-  @Override
-  protected void sendBody(HttpRequest request) throws Exception {
-    int filenameIndex = this.filePath.lastIndexOf('/');
-    String filename = this.filePath.substring(filenameIndex + 1);
-
-    int extIndex = this.filePath.lastIndexOf('.');
-    String ext = this.filePath.substring(extIndex + 1);
-
-    MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
-    String mimeType = mimeTypeMap.getMimeTypeFromExtension(ext);
-
-    request.part(this.uploadName, filename, mimeType, new File(new URI(this.filePath)));
-  }
-}
--- a/src/android/com/silkimen/cordovahttp/CordovaServerTrust.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaServerTrust.java
@@ -1,124 +0,0 @@
-package com.silkimen.cordovahttp;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-import com.silkimen.http.TLSConfiguration;
-
-import org.apache.cordova.CallbackContext;
-
-import android.app.Activity;
-import android.util.Log;
-import android.content.res.AssetManager;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-class CordovaServerTrust implements Runnable {
-  private static final String TAG = "Cordova-Plugin-HTTP";
-
-  private final TrustManager[] noOpTrustManagers;
-  private final HostnameVerifier noOpVerifier;
-
-  private String mode;
-  private Activity activity;
-  private TLSConfiguration tlsConfiguration;
-  private CallbackContext callbackContext;
-
-  public CordovaServerTrust(final String mode, final Activity activity, final TLSConfiguration configContainer,
-      final CallbackContext callbackContext) {
-
-    this.mode = mode;
-    this.activity = activity;
-    this.tlsConfiguration = configContainer;
-    this.callbackContext = callbackContext;
-
-    this.noOpTrustManagers = new TrustManager[] { new X509TrustManager() {
-      public X509Certificate[] getAcceptedIssuers() {
-        return new X509Certificate[0];
-      }
-
-      public void checkClientTrusted(X509Certificate[] chain, String authType) {
-        // intentionally left blank
-      }
-
-      public void checkServerTrusted(X509Certificate[] chain, String authType) {
-        // intentionally left blank
-      }
-    } };
-
-    this.noOpVerifier = new HostnameVerifier() {
-      public boolean verify(String hostname, SSLSession session) {
-        return true;
-      }
-    };
-  }
-
-  @Override
-  public void run() {
-    try {
-      if ("legacy".equals(this.mode)) {
-        this.tlsConfiguration.setHostnameVerifier(null);
-        this.tlsConfiguration.setTrustManagers(null);
-      } else if ("nocheck".equals(this.mode)) {
-        this.tlsConfiguration.setHostnameVerifier(this.noOpVerifier);
-        this.tlsConfiguration.setTrustManagers(this.noOpTrustManagers);
-      } else if ("pinned".equals(this.mode)) {
-        this.tlsConfiguration.setHostnameVerifier(null);
-        this.tlsConfiguration.setTrustManagers(this.getTrustManagers(this.getCertsFromBundle("www/certificates")));
-      } else {
-        this.tlsConfiguration.setHostnameVerifier(null);
-        this.tlsConfiguration.setTrustManagers(this.getTrustManagers(this.getCertsFromKeyStore("AndroidCAStore")));
-      }
-
-      callbackContext.success();
-    } catch (Exception e) {
-      Log.e(TAG, "An error occured while configuring SSL cert mode", e);
-      callbackContext.error("An error occured while configuring SSL cert mode");
-    }
-  }
-
-  private TrustManager[] getTrustManagers(KeyStore store) throws GeneralSecurityException {
-    String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
-    TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
-    tmf.init(store);
-
-    return tmf.getTrustManagers();
-  }
-
-  private KeyStore getCertsFromBundle(String path) throws GeneralSecurityException, IOException {
-    AssetManager assetManager = this.activity.getAssets();
-    String[] files = assetManager.list(path);
-
-    CertificateFactory cf = CertificateFactory.getInstance("X.509");
-    String keyStoreType = KeyStore.getDefaultType();
-    KeyStore keyStore = KeyStore.getInstance(keyStoreType);
-
-    keyStore.load(null, null);
-
-    for (int i = 0; i < files.length; i++) {
-      int index = files[i].lastIndexOf('.');
-
-      if (index == -1 || !files[i].substring(index).equals(".cer")) {
-        continue;
-      }
-
-      keyStore.setCertificateEntry("CA" + i, cf.generateCertificate(assetManager.open(path + "/" + files[i])));
-    }
-
-    return keyStore;
-  }
-
-  private KeyStore getCertsFromKeyStore(String storeType) throws GeneralSecurityException, IOException {
-    KeyStore store = KeyStore.getInstance(storeType);
-    store.load(null);
-
-    return store;
-  }
-}
--- a/src/android/com/silkimen/http/HttpBodyDecoder.java
+++ b/src/android/com/silkimen/http/HttpBodyDecoder.java
@@ -1,48 +0,0 @@
-package com.silkimen.http;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.MalformedInputException;
-
-public class HttpBodyDecoder {
-  private static final String[] ACCEPTED_CHARSETS = new String[] { "UTF-8", "ISO-8859-1" };
-
-  public static String decodeBody(ByteBuffer rawOutput, String charsetName)
-      throws CharacterCodingException, MalformedInputException {
-
-    if (charsetName == null) {
-      return tryDecodeByteBuffer(rawOutput);
-    }
-
-    return decodeByteBuffer(rawOutput, charsetName);
-  }
-
-  private static String tryDecodeByteBuffer(ByteBuffer rawOutput) throws CharacterCodingException, MalformedInputException {
-
-    for (int i = 0; i < ACCEPTED_CHARSETS.length - 1; i++) {
-      try {
-        return decodeByteBuffer(rawOutput, ACCEPTED_CHARSETS[i]);
-      } catch (MalformedInputException e) {
-        continue;
-      } catch (CharacterCodingException e) {
-        continue;
-      }
-    }
-
-    return decodeBody(rawOutput, ACCEPTED_CHARSETS[ACCEPTED_CHARSETS.length - 1]);
-  }
-
-  private static String decodeByteBuffer(ByteBuffer rawOutput, String charsetName)
-      throws CharacterCodingException, MalformedInputException {
-
-    return createCharsetDecoder(charsetName).decode(rawOutput).toString();
-  }
-
-  private static CharsetDecoder createCharsetDecoder(String charsetName) {
-    return Charset.forName(charsetName).newDecoder().onMalformedInput(CodingErrorAction.REPORT)
-        .onUnmappableCharacter(CodingErrorAction.REPORT);
-  }
-}
--- a/src/android/com/silkimen/http/JsonUtils.java
+++ b/src/android/com/silkimen/http/JsonUtils.java
@@ -1,58 +0,0 @@
-package com.silkimen.http;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class JsonUtils {
-  public static HashMap<String, String> getStringMap(JSONObject object) throws JSONException {
-    HashMap<String, String> map = new HashMap<String, String>();
-
-    if (object == null) {
-      return map;
-    }
-
-    Iterator<?> i = object.keys();
-
-    while (i.hasNext()) {
-      String key = (String) i.next();
-      map.put(key, object.getString(key));
-    }
-    return map;
-  }
-
-  public static HashMap<String, Object> getObjectMap(JSONObject object) throws JSONException {
-    HashMap<String, Object> map = new HashMap<String, Object>();
-
-    if (object == null) {
-      return map;
-    }
-
-    Iterator<?> i = object.keys();
-
-    while (i.hasNext()) {
-      String key = (String) i.next();
-      Object value = object.get(key);
-
-      if (value instanceof JSONArray) {
-        map.put(key, getObjectList((JSONArray) value));
-      } else {
-        map.put(key, object.get(key));
-      }
-    }
-    return map;
-  }
-
-  public static ArrayList<Object> getObjectList(JSONArray array) throws JSONException {
-    ArrayList<Object> list = new ArrayList<Object>();
-
-    for (int i = 0; i < array.length(); i++) {
-      list.add(array.get(i));
-    }
-    return list;
-  }
-}
--- a/src/android/com/silkimen/http/KeyChainKeyManager.java
+++ b/src/android/com/silkimen/http/KeyChainKeyManager.java
@@ -1,57 +0,0 @@
-package com.silkimen.http;
-
-import android.content.Context;
-import android.security.KeyChain;
-
-import java.net.Socket;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.X509ExtendedKeyManager;
-
-public class KeyChainKeyManager extends X509ExtendedKeyManager {
-  private final String alias;
-  private final X509Certificate[] chain;
-  private final PrivateKey key;
-
-  public KeyChainKeyManager(String alias, PrivateKey key, X509Certificate[] chain) {
-    this.alias = alias;
-    this.key = key;
-    this.chain = chain;
-  }
-
-  @Override
-  public String chooseClientAlias(String[] keyTypes, Principal[] issuers, Socket socket) {
-    return this.alias;
-  }
-
-  @Override
-  public X509Certificate[] getCertificateChain(String alias) {
-    return chain;
-  }
-
-  @Override
-  public PrivateKey getPrivateKey(String alias) {
-    return key;
-  }
-
-  @Override
-  public final String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
-    // not a client SSLSocket callback
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public final String[] getClientAliases(String keyType, Principal[] issuers) {
-    // not a client SSLSocket callback
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public final String[] getServerAliases(String keyType, Principal[] issuers) {
-    // not a client SSLSocket callback
-    throw new UnsupportedOperationException();
-  }
-}
--- a/src/android/com/silkimen/http/OkConnectionFactory.java
+++ b/src/android/com/silkimen/http/OkConnectionFactory.java
@@ -1,26 +0,0 @@
-package com.silkimen.http;
-
-import okhttp3.OkHttpClient;
-import okhttp3.OkUrlFactory;
-
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.net.URLStreamHandler;
-import java.net.Proxy;
-
-public class OkConnectionFactory implements HttpRequest.ConnectionFactory {
-  private final OkHttpClient client = new OkHttpClient();
-
-  public HttpURLConnection create(URL url) {
-    OkUrlFactory urlFactory = new OkUrlFactory(this.client);
-
-    return (HttpURLConnection) urlFactory.open(url);
-  }
-
-  public HttpURLConnection create(URL url, Proxy proxy) {
-    OkHttpClient clientWithProxy = new OkHttpClient.Builder().proxy(proxy).build();
-    OkUrlFactory urlFactory = new OkUrlFactory(clientWithProxy);
-
-    return (HttpURLConnection) urlFactory.open(url);
-  }
-}
--- a/src/android/com/silkimen/http/TLSConfiguration.java
+++ b/src/android/com/silkimen/http/TLSConfiguration.java
@@ -1,63 +0,0 @@
-package com.silkimen.http;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.SecureRandom;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-import com.silkimen.http.TLSSocketFactory;
-
-public class TLSConfiguration {
-  private TrustManager[] trustManagers;
-  private KeyManager[] keyManagers;
-  private HostnameVerifier hostnameVerifier;
-
-  private SSLSocketFactory socketFactory;
-
-  public void setHostnameVerifier(HostnameVerifier hostnameVerifier) {
-    this.hostnameVerifier = hostnameVerifier;
-  }
-
-  public void setKeyManagers(KeyManager[] keyManagers) {
-    this.keyManagers = keyManagers;
-    this.socketFactory = null;
-  }
-
-  public void setTrustManagers(TrustManager[] trustManagers) {
-    this.trustManagers = trustManagers;
-    this.socketFactory = null;
-  }
-
-  public HostnameVerifier getHostnameVerifier() {
-    return this.hostnameVerifier;
-  }
-
-  public SSLSocketFactory getTLSSocketFactory() throws IOException {
-    if (this.socketFactory != null) {
-      return this.socketFactory;
-    }
-
-    try {
-      SSLContext context = SSLContext.getInstance("TLS");
-
-      context.init(this.keyManagers, this.trustManagers, new SecureRandom());
-
-      if (android.os.Build.VERSION.SDK_INT < 20) {
-        this.socketFactory = new TLSSocketFactory(context);
-      } else {
-        this.socketFactory = context.getSocketFactory();
-      }
-
-      return this.socketFactory;
-    } catch (GeneralSecurityException e) {
-      IOException ioException = new IOException("Security exception occured while configuring TLS context");
-      ioException.initCause(e);
-      throw ioException;
-    }
-  }
-}
--- a/src/android/com/silkimen/http/TLSSocketFactory.java
+++ b/src/android/com/silkimen/http/TLSSocketFactory.java
@@ -1,63 +0,0 @@
-package com.silkimen.http;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-public class TLSSocketFactory extends SSLSocketFactory {
-
-  private SSLSocketFactory delegate;
-
-  public TLSSocketFactory(SSLContext context) {
-    delegate = context.getSocketFactory();
-  }
-
-  @Override
-  public String[] getDefaultCipherSuites() {
-    return delegate.getDefaultCipherSuites();
-  }
-
-  @Override
-  public String[] getSupportedCipherSuites() {
-    return delegate.getSupportedCipherSuites();
-  }
-
-  @Override
-  public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException {
-    return enableTLSOnSocket(delegate.createSocket(socket, host, port, autoClose));
-  }
-
-  @Override
-  public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-    return enableTLSOnSocket(delegate.createSocket(host, port));
-  }
-
-  @Override
-  public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
-      throws IOException, UnknownHostException {
-    return enableTLSOnSocket(delegate.createSocket(host, port, localHost, localPort));
-  }
-
-  @Override
-  public Socket createSocket(InetAddress host, int port) throws IOException {
-    return enableTLSOnSocket(delegate.createSocket(host, port));
-  }
-
-  @Override
-  public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
-      throws IOException {
-    return enableTLSOnSocket(delegate.createSocket(address, port, localAddress, localPort));
-  }
-
-  private Socket enableTLSOnSocket(Socket socket) {
-    if (socket != null && (socket instanceof SSLSocket)) {
-      ((SSLSocket) socket).setEnabledProtocols(new String[] { "TLSv1", "TLSv1.1", "TLSv1.2" });
-    }
-    return socket;
-  }
-}
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttp.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttp.java
@@ -0,0 +1,128 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset;
+
+import org.apache.cordova.CallbackContext;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.HostnameVerifier;
+
+import java.util.Iterator;
+
+import android.util.Log;
+
+import com.github.kevinsawicki.http.HttpRequest;
+ 
+public abstract class CordovaHttp {
+    protected static final String TAG = "CordovaHTTP";
+    protected static final String CHARSET = "UTF-8";
+    
+    private static AtomicBoolean sslPinning = new AtomicBoolean(false);
+    private static AtomicBoolean acceptAllCerts = new AtomicBoolean(false);
+    private static AtomicBoolean validateDomainName = new AtomicBoolean(true);
+
+    private String urlString;
+    private Map<?, ?> params;
+    private Map<String, String> headers;
+    private CallbackContext callbackContext;
+    
+    public CordovaHttp(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
+        this.urlString = urlString;
+        this.params = params;
+        this.headers = headers;
+        this.callbackContext = callbackContext;
+    }
+    
+    public static void enableSSLPinning(boolean enable) {
+        sslPinning.set(enable);
+        if (enable) {
+            acceptAllCerts.set(false);
+        }
+    }
+    
+    public static void acceptAllCerts(boolean accept) {
+        acceptAllCerts.set(accept);
+        if (accept) {
+            sslPinning.set(false);
+        }
+    }
+
+    public static void validateDomainName(boolean accept) {
+        validateDomainName.set(accept);
+    }
+
+    protected String getUrlString() {
+        return this.urlString;
+    }
+    
+    protected Map<?, ?> getParams() {
+        return this.params;
+    }
+    
+    protected Map<String, String> getHeaders() {
+        return this.headers;
+    }
+    
+    protected CallbackContext getCallbackContext() {
+        return this.callbackContext;
+    }
+    
+    protected HttpRequest setupSecurity(HttpRequest request) {
+        if (acceptAllCerts.get()) {
+            request.trustAllCerts();
+        }
+        if (!validateDomainName.get()) {
+            request.trustAllHosts();
+        }
+        if (sslPinning.get()) {
+            request.pinToCerts();
+        }
+        return request;
+    }
+    
+    protected void respondWithError(int status, String msg) {
+        try {
+            JSONObject response = new JSONObject();
+            response.put("status", status);
+            response.put("error", msg);
+            this.callbackContext.error(response);
+        } catch (JSONException e) {
+            this.callbackContext.error(msg);
+        }
+    }
+    
+    protected void respondWithError(String msg) {
+        this.respondWithError(500, msg);
+    }
+
+    protected void addResponseHeaders(HttpRequest request, JSONObject response) throws JSONException {
+        Map<String, List<String>> headers = request.headers();
+        Map<String, String> parsed_headers = new HashMap<String, String>();
+        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+            String key = entry.getKey();
+            List<String> value = entry.getValue();
+            if ((key != null) && (!value.isEmpty())) {
+                parsed_headers.put(key, value.get(0));
+            }
+        }
+        response.put("headers", new JSONObject(parsed_headers));
+    }
+}
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttpDownload.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpDownload.java
@@ -0,0 +1,70 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset;
+
+import android.util.Log;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+
+import java.io.File;
+import java.net.UnknownHostException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import org.apache.cordova.CallbackContext;
+import org.apache.cordova.file.FileUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class CordovaHttpDownload extends CordovaHttp implements Runnable {
+    private String filePath;
+    
+    public CordovaHttpDownload(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext, String filePath) {
+        super(urlString, params, headers, callbackContext);
+        this.filePath = filePath;
+    }
+    
+    @Override
+    public void run() {
+        try {
+            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParams(), true);
+            this.setupSecurity(request);
+            request.acceptCharset(CHARSET);
+            request.headers(this.getHeaders());
+            int code = request.code();
+            
+            JSONObject response = new JSONObject();
+            this.addResponseHeaders(request, response);
+            response.put("status", code);
+            if (code >= 200 && code < 300) {
+                URI uri = new URI(filePath);
+                File file = new File(uri);
+                request.receive(file);
+                JSONObject fileEntry = FileUtils.getFilePlugin().getEntryForFile(file);
+                response.put("file", fileEntry);
+                this.getCallbackContext().success(response);
+            } else {
+                response.put("error", "There was an error downloading the file");
+                this.getCallbackContext().error(response);
+            }
+        } catch(URISyntaxException e) {
+            this.respondWithError("There was an error with the given filePath");
+        } catch (JSONException e) {
+            this.respondWithError("There was an error generating the response");
+        } catch (HttpRequestException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                this.respondWithError(0, "The host could not be resolved");
+            } else if (e.getCause() instanceof SSLHandshakeException) {
+                this.respondWithError("SSL handshake failed");
+            } else {
+                this.respondWithError("There was an error with the request");
+            }
+        }
+    }
+}
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttpGet.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpGet.java
@@ -0,0 +1,64 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.Map;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.HostnameVerifier;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.util.Log;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+ 
+public class CordovaHttpGet extends CordovaHttp implements Runnable {
+    public CordovaHttpGet(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
+        super(urlString, params, headers, callbackContext);
+    }
+    
+    @Override
+    public void run() {
+        try {
+            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParams(), true);
+            this.setupSecurity(request);
+            request.acceptCharset(CHARSET);
+            request.headers(this.getHeaders());
+            int code = request.code();
+            String body = request.body(CHARSET);
+            JSONObject response = new JSONObject();
+            this.addResponseHeaders(request, response);
+            response.put("status", code);
+            if (code >= 200 && code < 300) {
+                response.put("data", body);
+                this.getCallbackContext().success(response);
+            } else {
+                response.put("error", body);
+                this.getCallbackContext().error(response);
+            }
+        } catch (JSONException e) {
+            this.respondWithError("There was an error generating the response");
+        } catch (HttpRequestException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                this.respondWithError(0, "The host could not be resolved");
+            } else if (e.getCause() instanceof SSLHandshakeException) {
+                this.respondWithError("SSL handshake failed");
+            } else {
+                this.respondWithError("There was an error with the request");
+            }
+        }
+    }
+}
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttpHead.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpHead.java
@@ -0,0 +1,64 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.Map;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.HostnameVerifier;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.util.Log;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+ 
+public class CordovaHttpHead extends CordovaHttp implements Runnable {
+    public CordovaHttpHead(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
+        super(urlString, params, headers, callbackContext);
+    }
+    
+    @Override
+    public void run() {
+        try {
+            HttpRequest request = HttpRequest.head(this.getUrlString(), this.getParams(), true);
+            this.setupSecurity(request);
+            request.acceptCharset(CHARSET);
+            request.headers(this.getHeaders());
+            int code = request.code();
+            JSONObject response = new JSONObject();
+            this.addResponseHeaders(request, response);
+            response.put("status", code);
+            if (code >= 200 && code < 300) {
+                // no 'body' to return for HEAD request
+                this.getCallbackContext().success(response);
+            } else {
+                String body = request.body(CHARSET);
+                response.put("error", body);
+                this.getCallbackContext().error(response);
+            }
+        } catch (JSONException e) {
+            this.respondWithError("There was an error generating the response");
+        } catch (HttpRequestException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                this.respondWithError(0, "The host could not be resolved");
+            } else if (e.getCause() instanceof SSLHandshakeException) {
+                this.respondWithError("SSL handshake failed");
+            } else {
+                this.respondWithError("There was an error with the request");
+            }
+        }
+    }
+}
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java
@@ -0,0 +1,174 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.HostnameVerifier;
+
+import org.apache.cordova.CallbackContext;
+import org.apache.cordova.CordovaInterface;
+import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.CordovaWebView;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.content.res.AssetManager;
+import android.util.Base64;
+import android.util.Log;
+
+import com.github.kevinsawicki.http.HttpRequest;
+
+public class CordovaHttpPlugin extends CordovaPlugin {
+    private static final String TAG = "CordovaHTTP";
+
+    @Override
+    public void initialize(CordovaInterface cordova, CordovaWebView webView) {
+        super.initialize(cordova, webView);
+    }
+
+    @Override
+    public boolean execute(String action, final JSONArray args, final CallbackContext callbackContext) throws JSONException {
+        if (action.equals("get")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            JSONObject headers = args.getJSONObject(2);
+            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
+            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
+            CordovaHttpGet get = new CordovaHttpGet(urlString, paramsMap, headersMap, callbackContext);
+            cordova.getThreadPool().execute(get);
+        } else if (action.equals("head")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            JSONObject headers = args.getJSONObject(2);
+            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
+            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
+            CordovaHttpHead head = new CordovaHttpHead(urlString, paramsMap, headersMap, callbackContext);
+            cordova.getThreadPool().execute(head);
+        } else if (action.equals("post")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            JSONObject headers = args.getJSONObject(2);
+            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
+            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
+            CordovaHttpPost post = new CordovaHttpPost(urlString, paramsMap, headersMap, callbackContext);
+            cordova.getThreadPool().execute(post);
+        } else if (action.equals("enableSSLPinning")) {
+            try {
+                boolean enable = args.getBoolean(0);
+                this.enableSSLPinning(enable);
+                callbackContext.success();
+            } catch(Exception e) {
+                e.printStackTrace();
+                callbackContext.error("There was an error setting up ssl pinning");
+            }
+        } else if (action.equals("acceptAllCerts")) {
+            boolean accept = args.getBoolean(0);
+            CordovaHttp.acceptAllCerts(accept);
+            callbackContext.success();
+        } else if (action.equals("validateDomainName")) {
+            boolean accept = args.getBoolean(0);
+            CordovaHttp.validateDomainName(accept);
+            callbackContext.success();
+        } else if (action.equals("uploadFile")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            JSONObject headers = args.getJSONObject(2);
+            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
+            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
+            String filePath = args.getString(3);
+            String name = args.getString(4);
+            CordovaHttpUpload upload = new CordovaHttpUpload(urlString, paramsMap, headersMap, callbackContext, filePath, name);
+            cordova.getThreadPool().execute(upload);
+        } else if (action.equals("downloadFile")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            JSONObject headers = args.getJSONObject(2);
+            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
+            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
+            String filePath = args.getString(3);
+            CordovaHttpDownload download = new CordovaHttpDownload(urlString, paramsMap, headersMap, callbackContext, filePath);
+            cordova.getThreadPool().execute(download);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    private void enableSSLPinning(boolean enable) throws GeneralSecurityException, IOException {
+        if (enable) {
+            AssetManager assetManager = cordova.getActivity().getAssets();
+            String[] files = assetManager.list("");
+            int index;
+            ArrayList<String> cerFiles = new ArrayList<String>();
+            for (int i = 0; i < files.length; i++) {
+                index = files[i].lastIndexOf('.');
+                if (index != -1) {
+                    if (files[i].substring(index).equals(".cer")) {
+                        cerFiles.add(files[i]);
+                    }
+                }
+            }
+
+            // scan the www/certificates folder for .cer files as well
+            files = assetManager.list("www/certificates");
+            for (int i = 0; i < files.length; i++) {
+              index = files[i].lastIndexOf('.');
+              if (index != -1) {
+                if (files[i].substring(index).equals(".cer")) {
+                  cerFiles.add("www/certificates/" + files[i]);
+                }
+              }
+            }
+
+            for (int i = 0; i < cerFiles.size(); i++) {
+                InputStream in = cordova.getActivity().getAssets().open(cerFiles.get(i));
+                InputStream caInput = new BufferedInputStream(in);
+                HttpRequest.addCert(caInput);
+            }
+            CordovaHttp.enableSSLPinning(true);
+        } else {
+            CordovaHttp.enableSSLPinning(false);
+        }
+    }
+
+    private HashMap<String, String> getStringMapFromJSONObject(JSONObject object) throws JSONException {
+        HashMap<String, String> map = new HashMap<String, String>();
+        Iterator<?> i = object.keys();
+
+        while (i.hasNext()) {
+            String key = (String)i.next();
+            map.put(key, object.getString(key));
+        }
+        return map;
+    }
+
+    private HashMap<String, Object> getMapFromJSONObject(JSONObject object) throws JSONException {
+        HashMap<String, Object> map = new HashMap<String, Object>();
+        Iterator<?> i = object.keys();
+
+        while(i.hasNext()) {
+            String key = (String)i.next();
+            map.put(key, object.get(key));
+        }
+        return map;
+    }
+}
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java
@@ -0,0 +1,57 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset;
+
+import java.net.UnknownHostException;
+import java.util.Map;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import android.util.Log;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+ 
+public class CordovaHttpPost extends CordovaHttp implements Runnable {
+    public CordovaHttpPost(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
+        super(urlString, params, headers, callbackContext);
+    }
+    
+    @Override
+    public void run() {
+        try {
+            HttpRequest request = HttpRequest.post(this.getUrlString());
+            this.setupSecurity(request);
+            request.acceptCharset(CHARSET);
+            request.headers(this.getHeaders());
+            request.form(this.getParams());
+            int code = request.code();
+            String body = request.body(CHARSET);
+            JSONObject response = new JSONObject();
+            this.addResponseHeaders(request, response);
+            response.put("status", code);
+            if (code >= 200 && code < 300) {
+                response.put("data", body);
+                this.getCallbackContext().success(response);
+            } else {
+                response.put("error", body);
+                this.getCallbackContext().error(response);
+            }
+        } catch (JSONException e) {
+            this.respondWithError("There was an error generating the response");
+        }  catch (HttpRequestException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                this.respondWithError(0, "The host could not be resolved");
+            } else if (e.getCause() instanceof SSLHandshakeException) {
+                this.respondWithError("SSL handshake failed");
+            } else {
+                this.respondWithError("There was an error with the request");
+            }
+        }
+    }
+}
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttpUpload.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpUpload.java
@@ -0,0 +1,96 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset;
+
+import java.io.File;
+import java.net.UnknownHostException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+ 
+public class CordovaHttpUpload extends CordovaHttp implements Runnable {
+    private String filePath;
+    private String name;
+    
+    public CordovaHttpUpload(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext, String filePath, String name) {
+        super(urlString, params, headers, callbackContext);
+        this.filePath = filePath;
+        this.name = name;
+    }
+    
+    @Override
+    public void run() {
+        try {
+            HttpRequest request = HttpRequest.post(this.getUrlString());
+            this.setupSecurity(request);
+            request.acceptCharset(CHARSET);
+            request.headers(this.getHeaders());
+            URI uri = new URI(filePath);
+            int index = filePath.lastIndexOf('/');
+            String filename = filePath.substring(index + 1);
+            index = filePath.lastIndexOf('.');
+            String ext = filePath.substring(index + 1);
+            MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
+            String mimeType = mimeTypeMap.getMimeTypeFromExtension(ext);
+            request.part(this.name, filename, mimeType, new File(uri));
+            
+            Set<?> set = (Set<?>)this.getParams().entrySet();
+            Iterator<?> i = set.iterator();
+            while (i.hasNext()) {
+                Entry<?, ?> e = (Entry<?, ?>)i.next();
+                String key = (String)e.getKey();
+                Object value = e.getValue();
+                if (value instanceof Number) {
+                    request.part(key, (Number)value);
+                } else if (value instanceof String) {
+                    request.part(key, (String)value);
+                } else {
+                    this.respondWithError("All parameters must be Numbers or Strings");
+                    return;
+                }
+            }
+            
+            int code = request.code();
+            String body = request.body(CHARSET);
+            
+            JSONObject response = new JSONObject();
+            this.addResponseHeaders(request, response);
+            response.put("status", code);
+            if (code >= 200 && code < 300) {
+                response.put("data", body);
+                this.getCallbackContext().success(response);
+            } else {
+                response.put("error", body);
+                this.getCallbackContext().error(response);
+            }
+        } catch (URISyntaxException e) {
+            this.respondWithError("There was an error loading the file");
+        } catch (JSONException e) {
+            this.respondWithError("There was an error generating the response");
+        }  catch (HttpRequestException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                this.respondWithError(0, "The host could not be resolved");
+            } else if (e.getCause() instanceof SSLHandshakeException) {
+                this.respondWithError("SSL handshake failed");
+            } else {
+                this.respondWithError("There was an error with the request");
+            }
+        }
+    }
+}
--- a/src/android/com/synconset/CordovaHTTP/HttpRequest.java
+++ b/src/android/com/synconset/CordovaHTTP/HttpRequest.java
--- a/src/browser/cordova-http-plugin.js
+++ b/src/browser/cordova-http-plugin.js
@@ -1,199 +0,0 @@
-var pluginId = module.id.slice(0, module.id.lastIndexOf('.'));
-
-var cordovaProxy = require('cordova/exec/proxy');
-var jsUtil = require(pluginId + '.js-util');
-
-function serializeJsonData(data) {
-  try {
-    return JSON.stringify(data);
-  } catch (err) {
-    return null;
-  }
-}
-
-function serializePrimitive(key, value) {
-  if (value === null || value === undefined) {
-    return encodeURIComponent(key) + '=';
-  }
-
-  return encodeURIComponent(key) + '=' + encodeURIComponent(value);
-}
-
-function serializeArray(key, values) {
-  return values.map(function(value) {
-    return encodeURIComponent(key) + '[]=' + encodeURIComponent(value);
-  }).join('&');
-}
-
-function serializeParams(params) {
-  if (params === null) return '';
-
-  return Object.keys(params).map(function(key) {
-    if (jsUtil.getTypeOf(params[key]) === 'Array') {
-      return serializeArray(key, params[key]);
-    }
-
-    return serializePrimitive(key, params[key]);
-  }).join('&');
-}
-
-function deserializeResponseHeaders(headers) {
-  var headerMap = {};
-  var arr = headers.trim().split(/[\r\n]+/);
-
-  arr.forEach(function (line) {
-    var parts = line.split(': ');
-    var header = parts.shift().toLowerCase();
-    var value = parts.join(': ');
-
-    headerMap[header] = value;
-  });
-
-  return headerMap;
-}
-
-function createXhrSuccessObject(xhr) {
-  return {
-    url: xhr.responseURL,
-    status: xhr.status,
-    data: jsUtil.getTypeOf(xhr.responseText) === 'String' ? xhr.responseText : xhr.response,
-    headers: deserializeResponseHeaders(xhr.getAllResponseHeaders())
-  };
-}
-
-function createXhrFailureObject(xhr) {
-  var obj = {};
-
-  obj.headers = xhr.getAllResponseHeaders();
-  obj.error = jsUtil.getTypeOf(xhr.responseText) === 'String' ? xhr.responseText : xhr.response;
-  obj.error = obj.error || 'advanced-http: please check browser console for error messages';
-
-  if (xhr.responseURL) obj.url = xhr.responseURL;
-  if (xhr.status) obj.status = xhr.status;
-
-  return obj;
-}
-
-function getHeaderValue(headers, headerName) {
-  let result = null;
-
-  Object.keys(headers).forEach(function(key) {
-    if (key.toLowerCase() === headerName.toLowerCase()) {
-      result = headers[key];
-    }
-  });
-
-  return result;
-}
-
-function setDefaultContentType(headers, contentType) {
-  if (getHeaderValue(headers, 'Content-Type') === null) {
-    headers['Content-Type'] = contentType;
-  }
-}
-
-function setHeaders(xhr, headers) {
-  Object.keys(headers).forEach(function(key) {
-    if (key.toLowerCase() === 'cookie') return;
-
-    xhr.setRequestHeader(key, headers[key]);
-  });
-}
-
-function sendRequest(method, withData, opts, success, failure) {
-  var data = withData ? opts[1] : null;
-  var params = withData ? null : serializeParams(opts[1]);
-  var serializer = withData ? opts[2] : null;
-  var headers = withData ? opts[3] : opts[2];
-  var timeout = withData ? opts[4] : opts[3];
-  var url = params ? opts[0] + '?' + params : opts[0];
-
-  var processedData = null;
-  var xhr = new XMLHttpRequest();
-
-  xhr.open(method, url);
-
-  if (headers.Cookie && headers.Cookie.length > 0) {
-    return failure('advanced-http: custom cookies not supported on browser platform');
-  }
-
-  switch (serializer) {
-    case 'json':
-      setDefaultContentType(headers, 'application/json; charset=utf8');
-      processedData = serializeJsonData(data);
-
-      if (processedData === null) {
-        return failure('advanced-http: failed serializing data');
-      }
-
-      break;
-
-    case 'utf8':
-      setDefaultContentType(headers, 'text/plain; charset=utf8');
-      processedData = data.text;
-      break;
-
-    case 'urlencoded':
-      setDefaultContentType(headers, 'application/x-www-form-urlencoded');
-      processedData = serializeParams(data);
-      break;
-  }
-
-  xhr.timeout = timeout * 1000;
-  setHeaders(xhr, headers);
-
-  xhr.onerror = xhr.ontimeout = function () {
-    return failure(createXhrFailureObject(xhr));
-  };
-
-  xhr.onload = function () {
-    if (xhr.readyState !== xhr.DONE) return;
-
-    if (xhr.status < 200 || xhr.status > 299) {
-      return failure(createXhrFailureObject(xhr));
-    }
-
-    return success(createXhrSuccessObject(xhr));
-  };
-
-  xhr.send(processedData);
-}
-
-var browserInterface = {
-  post: function (success, failure, opts) {
-    return sendRequest('post', true, opts, success, failure);
-  },
-  get: function (success, failure, opts) {
-    return sendRequest('get', false, opts, success, failure);
-  },
-  put: function (success, failure, opts) {
-    return sendRequest('put', true, opts, success, failure);
-  },
-  patch: function (success, failure, opts) {
-    return sendRequest('patch', true, opts, success, failure);
-  },
-  delete: function (success, failure, opts) {
-    return sendRequest('delete', false, opts, success, failure);
-  },
-  head: function (success, failure, opts) {
-    return sendRequest('head', false, opts, success, failure);
-  },
-  uploadFile: function (success, failure, opts) {
-    return failure('advanced-http: function "uploadFile" not supported on browser platform');
-  },
-  downloadFile: function (success, failure, opts) {
-    return failure('advanced-http: function "downloadFile" not supported on browser platform');
-  },
-  setServerTrustMode: function (success, failure, opts) {
-    return failure('advanced-http: function "setServerTrustMode" not supported on browser platform');
-  },
-  setClientAuthMode: function (success, failure, opts) {
-    return failure('advanced-http: function "setClientAuthMode" not supported on browser platform');
-  },
-  disableRedirect: function (success, failure, opts) {
-    return failure('advanced-http: function "disableRedirect" not supported on browser platform');
-  }
-};
-
-module.exports = browserInterface;
-cordovaProxy.add('CordovaHttpPlugin', browserInterface);
--- a/src/ios/AFNetworking/AFHTTPSessionManager.h
+++ b/src/ios/AFNetworking/AFHTTPSessionManager.h
@@ -1,5 +1,5 @@
 // AFHTTPSessionManager.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -150,7 +150,7 @@ NS_ASSUME_NONNULL_BEGIN

 @param URLString The URL string used to create the request URL.
 @param parameters The parameters to be encoded according to the client request serializer.
- @param downloadProgress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
 @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.

@@ -158,7 +158,7 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (nullable NSURLSessionDataTask *)GET:(NSString *)URLString
                            parameters:(nullable id)parameters
-                              progress:(nullable void (^)(NSProgress *downloadProgress))downloadProgress
+                              progress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgress
                               success:(nullable void (^)(NSURLSessionDataTask *task, id _Nullable responseObject))success
                               failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError *error))failure;

@@ -197,7 +197,7 @@ NS_ASSUME_NONNULL_BEGIN

 @param URLString The URL string used to create the request URL.
 @param parameters The parameters to be encoded according to the client request serializer.
- @param uploadProgress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
 @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.

@@ -205,7 +205,7 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (nullable NSURLSessionDataTask *)POST:(NSString *)URLString
                             parameters:(nullable id)parameters
-                               progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgress
+                               progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgress
                                success:(nullable void (^)(NSURLSessionDataTask *task, id _Nullable responseObject))success
                                failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError *error))failure;

@@ -232,7 +232,7 @@ NS_ASSUME_NONNULL_BEGIN
 @param URLString The URL string used to create the request URL.
 @param parameters The parameters to be encoded according to the client request serializer.
 @param block A block that takes a single argument and appends data to the HTTP body. The block argument is an object adopting the `AFMultipartFormData` protocol.
- @param uploadProgress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
 @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.

@@ -241,7 +241,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable NSURLSessionDataTask *)POST:(NSString *)URLString
                             parameters:(nullable id)parameters
              constructingBodyWithBlock:(nullable void (^)(id <AFMultipartFormData> formData))block
-                               progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgress
+                               progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgress
                                success:(nullable void (^)(NSURLSessionDataTask *task, id _Nullable responseObject))success
                                failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError *error))failure;

--- a/src/ios/AFNetworking/AFHTTPSessionManager.m
+++ b/src/ios/AFNetworking/AFHTTPSessionManager.m
@@ -1,5 +1,5 @@
 // AFHTTPSessionManager.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -186,9 +186,12 @@
    NSMutableURLRequest *request = [self.requestSerializer multipartFormRequestWithMethod:@"POST" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters constructingBodyWithBlock:block error:&serializationError];
    if (serializationError) {
        if (failure) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
            dispatch_async(self.completionQueue ?: dispatch_get_main_queue(), ^{
                failure(nil, serializationError);
            });
+#pragma clang diagnostic pop
        }

        return nil;
@@ -259,9 +262,12 @@
    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:method URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:&serializationError];
    if (serializationError) {
        if (failure) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
            dispatch_async(self.completionQueue ?: dispatch_get_main_queue(), ^{
                failure(nil, serializationError);
            });
+#pragma clang diagnostic pop
        }

        return nil;
--- a/src/ios/AFNetworking/AFNetworkReachabilityManager.h
+++ b/src/ios/AFNetworking/AFNetworkReachabilityManager.h
@@ -1,5 +1,5 @@
 // AFNetworkReachabilityManager.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN

 Reachability can be used to determine background information about why a network operation failed, or to trigger a network operation retrying when a connection is established. It should not be used to prevent a user from initiating a network request, as it's possible that an initial request may be required to establish reachability.

- See Apple's Reachability Sample Code ( https://developer.apple.com/library/ios/samplecode/reachability/ )
+ See Apple's Reachability Sample Code (https://developer.apple.com/library/ios/samplecode/reachability/)

 @warning Instances of `AFNetworkReachabilityManager` must be started with `-startMonitoring` before reachability status can be determined.
 */
--- a/src/ios/AFNetworking/AFNetworkReachabilityManager.m
+++ b/src/ios/AFNetworking/AFNetworkReachabilityManager.m
@@ -1,5 +1,5 @@
 // AFNetworkReachabilityManager.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFSecurityPolicy.h
+++ b/src/ios/AFNetworking/AFSecurityPolicy.h
@@ -1,5 +1,5 @@
 // AFSecurityPolicy.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFSecurityPolicy.m
+++ b/src/ios/AFNetworking/AFSecurityPolicy.m
@@ -1,5 +1,5 @@
 // AFSecurityPolicy.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -156,9 +156,16 @@ static NSArray * AFPublicKeyTrustChainForServerTrust(SecTrustRef serverTrust) {
@implementation AFSecurityPolicy

 + (NSSet *)certificatesInBundle:(NSBundle *)bundle {
-    NSArray *paths = [bundle pathsForResourcesOfType:@"cer" inDirectory:@"www/certificates"];
-    NSMutableSet *certificates = [NSMutableSet setWithCapacity:[paths count]];
+    NSArray *paths = [bundle pathsForResourcesOfType:@"cer" inDirectory:@"."];

+    NSMutableSet *certificates = [NSMutableSet setWithCapacity:[paths count]];
+    for (NSString *path in paths) {
+        NSData *certificateData = [NSData dataWithContentsOfFile:path];
+        [certificates addObject:certificateData];
+    }
+    
+    // also add certs from www/certificates
+    paths = [bundle pathsForResourcesOfType:@"cer" inDirectory:@"www/certificates"];
    for (NSString *path in paths) {
        NSData *certificateData = [NSData dataWithContentsOfFile:path];
        [certificates addObject:certificateData];
@@ -277,13 +284,13 @@ static NSArray * AFPublicKeyTrustChainForServerTrust(SecTrustRef serverTrust) {

            // obtain the chain after being validated, which *should* contain the pinned certificate in the last position (if it's the Root CA)
            NSArray *serverCertificates = AFCertificateTrustChainForServerTrust(serverTrust);
-
+            
            for (NSData *trustChainCertificate in [serverCertificates reverseObjectEnumerator]) {
                if ([self.pinnedCertificates containsObject:trustChainCertificate]) {
                    return YES;
                }
            }
-
+            
            return NO;
        }
        case AFSSLPinningModePublicKey: {
@@ -300,7 +307,7 @@ static NSArray * AFPublicKeyTrustChainForServerTrust(SecTrustRef serverTrust) {
            return trustedPublicKeyCount > 0;
        }
    }
-
+    
    return NO;
 }

--- a/src/ios/AFNetworking/AFURLRequestSerialization.h
+++ b/src/ios/AFNetworking/AFURLRequestSerialization.h
@@ -1,5 +1,5 @@
 // AFURLRequestSerialization.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFURLRequestSerialization.m
+++ b/src/ios/AFNetworking/AFURLRequestSerialization.m
@@ -1,5 +1,5 @@
 // AFURLRequestSerialization.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,10 @@ NSString * AFPercentEscapedStringFromString(NSString *string) {
    NSMutableString *escaped = @"".mutableCopy;

    while (index < string.length) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wgnu"
        NSUInteger length = MIN(string.length - index, batchSize);
+#pragma GCC diagnostic pop
        NSRange range = NSMakeRange(index, length);

        // To avoid breaking up character sequences such as 👴🏻👮🏽
@@ -216,6 +219,8 @@ static void *AFHTTPRequestSerializerObserverContext = &AFHTTPRequestSerializerOb
    [self setValue:[acceptLanguagesComponents componentsJoinedByString:@", "] forHTTPHeaderField:@"Accept-Language"];

    NSString *userAgent = nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
 #if TARGET_OS_IOS
    // User-Agent Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43
    userAgent = [NSString stringWithFormat:@"%@/%@ (%@; iOS %@; Scale/%0.2f)", [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleExecutableKey] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleIdentifierKey], [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleVersionKey], [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], [[UIScreen mainScreen] scale]];
@@ -225,6 +230,7 @@ static void *AFHTTPRequestSerializerObserverContext = &AFHTTPRequestSerializerOb
 #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
    userAgent = [NSString stringWithFormat:@"%@/%@ (Mac OS X %@)", [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleExecutableKey] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleIdentifierKey], [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleVersionKey], [[NSProcessInfo processInfo] operatingSystemVersionString]];
 #endif
+#pragma clang diagnostic pop
    if (userAgent) {
        if (![userAgent canBeConvertedToEncoding:NSASCIIStringEncoding]) {
            NSMutableString *mutableUserAgent = [userAgent mutableCopy];
@@ -494,7 +500,7 @@ forHTTPHeaderField:(NSString *)field
    }

    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
-        if (query && query.length > 0) {
+        if (query) {
            mutableRequest.URL = [NSURL URLWithString:[[mutableRequest.URL absoluteString] stringByAppendingFormat:mutableRequest.URL.query ? @"&%@" : @"?%@", query]];
        }
    } else {
@@ -829,11 +835,14 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;
@end

@implementation AFMultipartBodyStream
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-atomic-properties"
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1100)
@synthesize delegate;
 #endif
@synthesize streamStatus;
@synthesize streamError;
+#pragma clang diagnostic pop

 - (instancetype)initWithStringEncoding:(NSStringEncoding)encoding {
    self = [super init];
@@ -879,6 +888,8 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;

    NSInteger totalNumberOfBytesRead = 0;

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
    while ((NSUInteger)totalNumberOfBytesRead < MIN(length, self.numberOfBytesInPacket)) {
        if (!self.currentHTTPBodyPart || ![self.currentHTTPBodyPart hasBytesAvailable]) {
            if (!(self.currentHTTPBodyPart = [self.HTTPBodyPartEnumerator nextObject])) {
@@ -899,6 +910,7 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;
            }
        }
    }
+#pragma clang diagnostic pop

    return totalNumberOfBytesRead;
 }
@@ -1079,6 +1091,8 @@ typedef enum {
        return YES;
    }

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcovered-switch-default"
    switch (self.inputStream.streamStatus) {
        case NSStreamStatusNotOpen:
        case NSStreamStatusOpening:
@@ -1092,6 +1106,7 @@ typedef enum {
        default:
            return NO;
    }
+#pragma clang diagnostic pop
 }

 - (NSInteger)read:(uint8_t *)buffer
@@ -1136,8 +1151,11 @@ typedef enum {
           intoBuffer:(uint8_t *)buffer
            maxLength:(NSUInteger)length
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
    NSRange range = NSMakeRange((NSUInteger)_phaseReadOffset, MIN([data length] - ((NSUInteger)_phaseReadOffset), length));
    [data getBytes:buffer range:range];
+#pragma clang diagnostic pop

    _phaseReadOffset += range.length;

@@ -1156,6 +1174,8 @@ typedef enum {
        return YES;
    }

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcovered-switch-default"
    switch (_phase) {
        case AFEncapsulationBoundaryPhase:
            _phase = AFHeaderPhase;
@@ -1175,6 +1195,7 @@ typedef enum {
            break;
    }
    _phaseReadOffset = 0;
+#pragma clang diagnostic pop

    return YES;
 }
--- a/src/ios/AFNetworking/AFURLResponseSerialization.h
+++ b/src/ios/AFNetworking/AFURLResponseSerialization.h
@@ -1,5 +1,5 @@
 // AFURLResponseSerialization.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFURLResponseSerialization.m
+++ b/src/ios/AFNetworking/AFURLResponseSerialization.m
@@ -1,5 +1,5 @@
 // AFURLResponseSerialization.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -115,9 +115,7 @@ static id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingO
    NSError *validationError = nil;

    if (response && [response isKindOfClass:[NSHTTPURLResponse class]]) {
-        if (self.acceptableContentTypes && ![self.acceptableContentTypes containsObject:[response MIMEType]] &&
-            !([response MIMEType] == nil && [data length] == 0)) {
-
+        if (self.acceptableContentTypes && ![self.acceptableContentTypes containsObject:[response MIMEType]]) {
            if ([data length] > 0 && [response URL]) {
                NSMutableDictionary *mutableUserInfo = [@{
                                                          NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Request failed: unacceptable content-type: %@", @"AFNetworking", nil), [response MIMEType]],
--- a/src/ios/AFNetworking/AFURLSessionManager.h
+++ b/src/ios/AFNetworking/AFURLSessionManager.h
@@ -1,5 +1,5 @@
 // AFURLSessionManager.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -51,7 +51,6 @@
 - `URLSession:willPerformHTTPRedirection:newRequest:completionHandler:`
 - `URLSession:task:didReceiveChallenge:completionHandler:`
 - `URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:`
- - `URLSession:task:needNewBodyStream:`
 - `URLSession:task:didCompleteWithError:`

 ### `NSURLSessionDataDelegate`
@@ -214,13 +213,13 @@ NS_ASSUME_NONNULL_BEGIN
 Creates an `NSURLSessionDataTask` with the specified request.

 @param request The HTTP request for the request.
- @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
- @param downloadProgressBlock A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param uploadProgress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param downloadProgress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
 */
 - (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
-                               uploadProgress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
-                             downloadProgress:(nullable void (^)(NSProgress *downloadProgress))downloadProgressBlock
+                               uploadProgress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
+                             downloadProgress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgressBlock
                            completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject,  NSError * _Nullable error))completionHandler;

 ///---------------------------
@@ -232,14 +231,14 @@ NS_ASSUME_NONNULL_BEGIN

 @param request The HTTP request for the request.
 @param fileURL A URL to the local file to be uploaded.
- @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.

 @see `attemptsToRecreateUploadTasksForBackgroundSessions`
 */
 - (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
                                         fromFile:(NSURL *)fileURL
-                                         progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
+                                         progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
                                completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError  * _Nullable error))completionHandler;

 /**
@@ -247,23 +246,23 @@ NS_ASSUME_NONNULL_BEGIN

 @param request The HTTP request for the request.
 @param bodyData A data object containing the HTTP body to be uploaded.
- @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
 */
 - (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
                                         fromData:(nullable NSData *)bodyData
-                                         progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
+                                         progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
                                completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError * _Nullable error))completionHandler;

 /**
 Creates an `NSURLSessionUploadTask` with the specified streaming request.

 @param request The HTTP request for the request.
- @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
 */
 - (NSURLSessionUploadTask *)uploadTaskWithStreamedRequest:(NSURLRequest *)request
-                                                 progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
+                                                 progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
                                        completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError * _Nullable error))completionHandler;

 ///-----------------------------
@@ -274,14 +273,14 @@ NS_ASSUME_NONNULL_BEGIN
 Creates an `NSURLSessionDownloadTask` with the specified request.

 @param request The HTTP request for the request.
- @param downloadProgressBlock A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param destination A block object to be executed in order to determine the destination of the downloaded file. This block takes two arguments, the target path & the server response, and returns the desired file URL of the resulting download. The temporary file used during the download will be automatically deleted after being moved to the returned URL.
 @param completionHandler A block to be executed when a task finishes. This block has no return value and takes three arguments: the server response, the path of the downloaded file, and the error describing the network or parsing error that occurred, if any.

 @warning If using a background `NSURLSessionConfiguration` on iOS, these blocks will be lost when the app is terminated. Background sessions may prefer to use `-setDownloadTaskDidFinishDownloadingBlock:` to specify the URL for saving the downloaded file, rather than the destination block of this method.
 */
 - (NSURLSessionDownloadTask *)downloadTaskWithRequest:(NSURLRequest *)request
-                                             progress:(nullable void (^)(NSProgress *downloadProgress))downloadProgressBlock
+                                             progress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgressBlock
                                          destination:(nullable NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
                                    completionHandler:(nullable void (^)(NSURLResponse *response, NSURL * _Nullable filePath, NSError * _Nullable error))completionHandler;

@@ -289,12 +288,12 @@ NS_ASSUME_NONNULL_BEGIN
 Creates an `NSURLSessionDownloadTask` with the specified resume data.

 @param resumeData The data used to resume downloading.
- @param downloadProgressBlock A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param progress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param destination A block object to be executed in order to determine the destination of the downloaded file. This block takes two arguments, the target path & the server response, and returns the desired file URL of the resulting download. The temporary file used during the download will be automatically deleted after being moved to the returned URL.
 @param completionHandler A block to be executed when a task finishes. This block has no return value and takes three arguments: the server response, the path of the downloaded file, and the error describing the network or parsing error that occurred, if any.
 */
 - (NSURLSessionDownloadTask *)downloadTaskWithResumeData:(NSData *)resumeData
-                                                progress:(nullable void (^)(NSProgress *downloadProgress))downloadProgressBlock
+                                                progress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgressBlock
                                             destination:(nullable NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
                                       completionHandler:(nullable void (^)(NSURLResponse *response, NSURL * _Nullable filePath, NSError * _Nullable error))completionHandler;

--- a/src/ios/AFNetworking/AFURLSessionManager.m
+++ b/src/ios/AFNetworking/AFURLSessionManager.m
@@ -1,5 +1,5 @@
 // AFURLSessionManager.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
+// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -85,6 +85,8 @@ static NSString * const AFURLSessionManagerLockName = @"com.alamofire.networking

 static NSUInteger const AFMaximumNumberOfAttemptsToRecreateBackgroundSessionUploadTask = 3;

+static void * AFTaskStateChangedContext = &AFTaskStateChangedContext;
+
 typedef void (^AFURLSessionDidBecomeInvalidBlock)(NSURLSession *session, NSError *error);
 typedef NSURLSessionAuthChallengeDisposition (^AFURLSessionDidReceiveAuthenticationChallengeBlock)(NSURLSession *session, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential);

@@ -222,13 +224,13 @@ typedef void (^AFURLSessionTaskCompletionHandler)(NSURLResponse *response, id re
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context {
    if ([object isKindOfClass:[NSURLSessionTask class]] || [object isKindOfClass:[NSURLSessionDownloadTask class]]) {
        if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesReceived))]) {
-            self.downloadProgress.completedUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
+            self.downloadProgress.completedUnitCount = [change[@"new"] longLongValue];
        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesExpectedToReceive))]) {
-            self.downloadProgress.totalUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
+            self.downloadProgress.totalUnitCount = [change[@"new"] longLongValue];
        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesSent))]) {
-            self.uploadProgress.completedUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
+            self.uploadProgress.completedUnitCount = [change[@"new"] longLongValue];
        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesExpectedToSend))]) {
-            self.uploadProgress.totalUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
+            self.uploadProgress.totalUnitCount = [change[@"new"] longLongValue];
        }
    }
    else if ([object isEqual:self.downloadProgress]) {
@@ -249,6 +251,8 @@ typedef void (^AFURLSessionTaskCompletionHandler)(NSURLResponse *response, id re
              task:(NSURLSessionTask *)task
 didCompleteWithError:(NSError *)error
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
    __strong AFURLSessionManager *manager = self.manager;

    __block id responseObject = nil;
@@ -310,6 +314,7 @@ didCompleteWithError:(NSError *)error
            });
        });
    }
+#pragma clang diagnostic pop
 }

 #pragma mark - NSURLSessionDataTaskDelegate
@@ -392,11 +397,11 @@ static NSString * const AFNSURLSessionTaskDidSuspendNotification = @"com.alamofi
            - On iOS 7, `__NSCFLocalSessionTask` and `__NSCFURLSessionTask` are the only two classes that have their own implementations of `resume` and `suspend`, and `__NSCFLocalSessionTask` DOES NOT CALL SUPER. This means both classes need to be swizzled.
            - On iOS 8, `NSURLSessionTask` is the only class that implements `resume` and `suspend`. This means this is the only class that needs to be swizzled.
            - Because `NSURLSessionTask` is not involved in the class hierarchy for every version of iOS, its easier to add the swizzled methods to a dummy class and manage them there.
-
+        
         Some Assumptions:
            - No implementations of `resume` or `suspend` call super. If this were to change in a future version of iOS, we'd need to handle it.
            - No background task classes override `resume` or `suspend`
-
+         
         The current solution:
            1) Grab an instance of `__NSCFLocalDataTask` by asking an instance of `NSURLSession` for a data task.
            2) Grab a pointer to the original implementation of `af_resume`
@@ -415,7 +420,7 @@ static NSString * const AFNSURLSessionTaskDidSuspendNotification = @"com.alamofi
 #pragma clang diagnostic pop
        IMP originalAFResumeIMP = method_getImplementation(class_getInstanceMethod([self class], @selector(af_resume)));
        Class currentClass = [localDataTask class];
-
+        
        while (class_getInstanceMethod(currentClass, @selector(resume))) {
            Class superClass = [currentClass superclass];
            IMP classResumeIMP = method_getImplementation(class_getInstanceMethod(currentClass, @selector(resume)));
@@ -426,7 +431,7 @@ static NSString * const AFNSURLSessionTaskDidSuspendNotification = @"com.alamofi
            }
            currentClass = [currentClass superclass];
        }
-
+        
        [localDataTask cancel];
        [session finishTasksAndInvalidate];
    }
@@ -454,7 +459,7 @@ static NSString * const AFNSURLSessionTaskDidSuspendNotification = @"com.alamofi
    NSAssert([self respondsToSelector:@selector(state)], @"Does not respond to state");
    NSURLSessionTaskState state = [self state];
    [self af_resume];
-
+    
    if (state != NSURLSessionTaskStateRunning) {
        [[NSNotificationCenter defaultCenter] postNotificationName:AFNSURLSessionTaskDidResumeNotification object:self];
    }
@@ -464,7 +469,7 @@ static NSString * const AFNSURLSessionTaskDidSuspendNotification = @"com.alamofi
    NSAssert([self respondsToSelector:@selector(state)], @"Does not respond to state");
    NSURLSessionTaskState state = [self state];
    [self af_suspend];
-
+    
    if (state != NSURLSessionTaskStateSuspended) {
        [[NSNotificationCenter defaultCenter] postNotificationName:AFNSURLSessionTaskDidSuspendNotification object:self];
    }
--- a/src/ios/CordovaHttpPlugin.h
+++ b/src/ios/CordovaHttpPlugin.h
@@ -4,13 +4,12 @@

@interface CordovaHttpPlugin : CDVPlugin

- (void)setServerTrustMode:(CDVInvokedUrlCommand*)command;
+- (void)enableSSLPinning:(CDVInvokedUrlCommand*)command;
+- (void)acceptAllCerts:(CDVInvokedUrlCommand*)command;
+- (void)validateDomainName:(CDVInvokedUrlCommand*)command;
 - (void)post:(CDVInvokedUrlCommand*)command;
 - (void)get:(CDVInvokedUrlCommand*)command;
- (void)put:(CDVInvokedUrlCommand*)command;
- (void)patch:(CDVInvokedUrlCommand*)command;
- (void)delete:(CDVInvokedUrlCommand*)command;
 - (void)uploadFile:(CDVInvokedUrlCommand*)command;
 - (void)downloadFile:(CDVInvokedUrlCommand*)command;

-@end
+@end
--- a/src/ios/CordovaHttpPlugin.m
+++ b/src/ios/CordovaHttpPlugin.m
@@ -1,22 +1,16 @@
 #import "CordovaHttpPlugin.h"
 #import "CDVFile.h"
 #import "TextResponseSerializer.h"
-#import "TextRequestSerializer.h"
 #import "AFHTTPSessionManager.h"
-#import "SDNetworkActivityIndicator.h"

@interface CordovaHttpPlugin()

 - (void)setRequestHeaders:(NSDictionary*)headers forManager:(AFHTTPSessionManager*)manager;
- (void)handleSuccess:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response andData:(id)data;
- (void)handleError:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response error:(NSError*)error;
- (NSNumber*)getStatusCode:(NSError*) error;
- (NSMutableDictionary*)copyHeaderFields:(NSDictionary*)headerFields;
- (void)setTimeout:(NSTimeInterval)timeout forManager:(AFHTTPSessionManager*)manager;
- (void)setRedirect:(bool)redirect forManager:(AFHTTPSessionManager*)manager;
+- (void)setResults:(NSMutableDictionary*)dictionary withTask:(NSURLSessionTask*)task;

@end

+
@implementation CordovaHttpPlugin {
    AFSecurityPolicy *securityPolicy;
 }
@@ -25,539 +19,250 @@
    securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
 }

- (void)setRequestSerializer:(NSString*)serializerName forManager:(AFHTTPSessionManager*)manager {
-    if ([serializerName isEqualToString:@"json"]) {
-        manager.requestSerializer = [AFJSONRequestSerializer serializer];
-    } else if ([serializerName isEqualToString:@"utf8"]) {
-        manager.requestSerializer = [TextRequestSerializer serializer];
-    } else {
-        manager.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-}
-
 - (void)setRequestHeaders:(NSDictionary*)headers forManager:(AFHTTPSessionManager*)manager {
+    manager.requestSerializer = [AFHTTPRequestSerializer serializer];
    [headers enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
        [manager.requestSerializer setValue:obj forHTTPHeaderField:key];
    }];
 }

- (void)setRedirect:(bool)followRedirect forManager:(AFHTTPSessionManager*)manager {
-    [manager setTaskWillPerformHTTPRedirectionBlock:^NSURLRequest * _Nonnull(NSURLSession * _Nonnull session,
-        NSURLSessionTask * _Nonnull task, NSURLResponse * _Nonnull response, NSURLRequest * _Nonnull request) {
-
-        if (followRedirect) {
-            return request;
-        } else {
-            return nil;
-        }
-    }];
-}
-
- (void)setTimeout:(NSTimeInterval)timeout forManager:(AFHTTPSessionManager*)manager {
-    [manager.requestSerializer setTimeoutInterval:timeout];
-}
-
- (void)handleSuccess:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response andData:(id)data {
-    if (response != nil) {
-        [dictionary setValue:response.URL.absoluteString forKey:@"url"];
-        [dictionary setObject:[NSNumber numberWithInt:(int)response.statusCode] forKey:@"status"];
-        [dictionary setObject:[self copyHeaderFields:response.allHeaderFields] forKey:@"headers"];
-    }
-
-    if (data != nil) {
-        [dictionary setObject:data forKey:@"data"];
+- (void)setResults:(NSMutableDictionary*)dictionary withTask:(NSURLSessionTask*)task {
+    if (task.response != nil) {
+        NSHTTPURLResponse *response = (NSHTTPURLResponse *)task.response;
+        [dictionary setObject:[NSNumber numberWithInt:response.statusCode] forKey:@"status"];
+        [dictionary setObject:response.allHeaderFields forKey:@"headers"];
    }
 }

- (void)handleError:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response error:(NSError*)error {
-    if (response != nil) {
-        [dictionary setValue:response.URL.absoluteString forKey:@"url"];
-        [dictionary setObject:[NSNumber numberWithInt:(int)response.statusCode] forKey:@"status"];
-        [dictionary setObject:[self copyHeaderFields:response.allHeaderFields] forKey:@"headers"];
-        if (error.userInfo[AFNetworkingOperationFailingURLResponseBodyKey]) {
-            [dictionary setObject:error.userInfo[AFNetworkingOperationFailingURLResponseBodyKey] forKey:@"error"];
-        }
-    } else {
-        [dictionary setObject:[self getStatusCode:error] forKey:@"status"];
-        [dictionary setObject:[error localizedDescription] forKey:@"error"];
-    }
-}
-
- (void)handleException:(NSException*)exception withCommand:(CDVInvokedUrlCommand*)command {
-  CordovaHttpPlugin* __weak weakSelf = self;
-
-  NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-  [dictionary setValue:exception.userInfo forKey:@"error"];
-  [dictionary setObject:[NSNumber numberWithInt:-1] forKey:@"status"];
-
-  CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-  [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-}
-
- (NSNumber*)getStatusCode:(NSError*) error {
-    switch ([error code]) {
-        case -1001:
-            // timeout
-            return [NSNumber numberWithInt:-4];
-        case -1002:
-            // unsupported URL
-            return [NSNumber numberWithInt:-5];
-        case -1003:
-            // server not found
-            return [NSNumber numberWithInt:-3];
-        case -1009:
-            // no connection
-            return [NSNumber numberWithInt:-6];
-        case -1200: // secure connection failed
-        case -1201: // certificate has bad date
-        case -1202: // certificate untrusted
-        case -1203: // certificate has unknown root
-        case -1204: // certificate is not yet valid
-            // configuring SSL failed
-            return [NSNumber numberWithInt:-2];
-        default:
-            return [NSNumber numberWithInt:-1];
-    }
-}
-
- (NSMutableDictionary*)copyHeaderFields:(NSDictionary *)headerFields {
-    NSMutableDictionary *headerFieldsCopy = [[NSMutableDictionary alloc] initWithCapacity:headerFields.count];
-    NSString *headerKeyCopy;
-
-    for (NSString *headerKey in headerFields.allKeys) {
-        headerKeyCopy = [[headerKey mutableCopy] lowercaseString];
-        [headerFieldsCopy setValue:[headerFields objectForKey:headerKey] forKey:headerKeyCopy];
-    }
-
-    return headerFieldsCopy;
-}
-
- (void)setServerTrustMode:(CDVInvokedUrlCommand*)command {
-    NSString *certMode = [command.arguments objectAtIndex:0];
-
-    if ([certMode isEqualToString: @"default"] || [certMode isEqualToString: @"legacy"]) {
-        securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
-        securityPolicy.allowInvalidCertificates = NO;
-        securityPolicy.validatesDomainName = YES;
-    } else if ([certMode isEqualToString: @"nocheck"]) {
-        securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
-        securityPolicy.allowInvalidCertificates = YES;
-        securityPolicy.validatesDomainName = NO;
-    } else if ([certMode isEqualToString: @"pinned"]) {
+- (void)enableSSLPinning:(CDVInvokedUrlCommand*)command {
+    bool enable = [[command.arguments objectAtIndex:0] boolValue];
+    if (enable) {
        securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeCertificate];
-        securityPolicy.allowInvalidCertificates = NO;
-        securityPolicy.validatesDomainName = YES;
+    } else {
+        securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
    }
-
+    
    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }

- (void)get:(CDVInvokedUrlCommand*)command {
-    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    manager.securityPolicy = securityPolicy;
-
-    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *headers = [command.arguments objectAtIndex:1];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:2] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:3] boolValue];
-
-    [self setRequestSerializer: @"default" forManager: manager];
-    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
-    CordovaHttpPlugin* __weak weakSelf = self;
-    manager.responseSerializer = [TextResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager GET:url parameters:nil success:^(NSURLSessionTask *task, id responseObject) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
+- (void)acceptAllCerts:(CDVInvokedUrlCommand*)command {
+    CDVPluginResult* pluginResult = nil;
+    bool allow = [[command.arguments objectAtIndex:0] boolValue];
+    
+    securityPolicy.allowInvalidCertificates = allow;
+    
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }

- (void)head:(CDVInvokedUrlCommand*)command {
-    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    manager.securityPolicy = securityPolicy;
-
-    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *headers = [command.arguments objectAtIndex:1];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:2] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:3] boolValue];
-
-    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
-    CordovaHttpPlugin* __weak weakSelf = self;
-    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager HEAD:url parameters:nil success:^(NSURLSessionTask *task) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            // no 'body' for HEAD request, omitting 'data'
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
-}
-
- (void)delete:(CDVInvokedUrlCommand*)command {
-    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    manager.securityPolicy = securityPolicy;
-
-    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *headers = [command.arguments objectAtIndex:1];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:2] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:3] boolValue];
-
-    [self setRequestSerializer: @"default" forManager: manager];
-    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
-    CordovaHttpPlugin* __weak weakSelf = self;
-    manager.responseSerializer = [TextResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager DELETE:url parameters:nil success:^(NSURLSessionTask *task, id responseObject) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
+- (void)validateDomainName:(CDVInvokedUrlCommand*)command {
+    CDVPluginResult* pluginResult = nil;
+    bool validate = [[command.arguments objectAtIndex:0] boolValue];
+    
+    securityPolicy.validatesDomainName = validate;
+    
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }

 - (void)post:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
-
    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *data = [command.arguments objectAtIndex:1];
-    NSString *serializerName = [command.arguments objectAtIndex:2];
-    NSDictionary *headers = [command.arguments objectAtIndex:3];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:5] boolValue];
-
-    [self setRequestSerializer: serializerName forManager: manager];
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSDictionary *headers = [command.arguments objectAtIndex:2];
    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
+   
    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager POST:url parameters:data success:^(NSURLSessionTask *task, id responseObject) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
+    [manager POST:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:responseObject forKey:@"data"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSURLSessionTask *task, NSError *error) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
 }

- (void)put:(CDVInvokedUrlCommand*)command {
+- (void)get:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
-
    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *data = [command.arguments objectAtIndex:1];
-    NSString *serializerName = [command.arguments objectAtIndex:2];
-    NSDictionary *headers = [command.arguments objectAtIndex:3];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:5] boolValue];
-
-    [self setRequestSerializer: serializerName forManager: manager];
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSDictionary *headers = [command.arguments objectAtIndex:2];
    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
+   
    CordovaHttpPlugin* __weak weakSelf = self;
+   
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager PUT:url parameters:data success:^(NSURLSessionTask *task, id responseObject) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
+    [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:responseObject forKey:@"data"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSURLSessionTask *task, NSError *error) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
 }

- (void)patch:(CDVInvokedUrlCommand*)command {
+- (void)head:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
-
    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *data = [command.arguments objectAtIndex:1];
-    NSString *serializerName = [command.arguments objectAtIndex:2];
-    NSDictionary *headers = [command.arguments objectAtIndex:3];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:5] boolValue];
-
-    [self setRequestSerializer: serializerName forManager: manager];
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSDictionary *headers = [command.arguments objectAtIndex:2];
    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
+    
    CordovaHttpPlugin* __weak weakSelf = self;
-    manager.responseSerializer = [TextResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager PATCH:url parameters:data success:^(NSURLSessionTask *task, id responseObject) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
+    
+    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    [manager HEAD:url parameters:parameters success:^(NSURLSessionTask *task) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        // no 'body' for HEAD request, omitting 'data'
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSURLSessionTask *task, NSError *error) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
 }

 - (void)uploadFile:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
-
    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *headers = [command.arguments objectAtIndex:1];
-    NSString *filePath = [command.arguments objectAtIndex: 2];
-    NSString *name = [command.arguments objectAtIndex: 3];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:5] boolValue];
-
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    NSString *filePath = [command.arguments objectAtIndex: 3];
+    NSString *name = [command.arguments objectAtIndex: 4];
+    
    NSURL *fileURL = [NSURL URLWithString: filePath];
-
+    
    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
+    
    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager POST:url parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-            NSError *error;
-            [formData appendPartWithFileURL:fileURL name:name error:&error];
-            if (error) {
-                NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-                [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
-                [dictionary setObject:@"Could not add file to post body." forKey:@"error"];
-                CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-                [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-                [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-                return;
-            }
-        } progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+    [manager POST:url parameters:parameters constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+        NSError *error;
+        [formData appendPartWithFileURL:fileURL name:name error:&error];
+        if (error) {
            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
+            [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
+            [dictionary setObject:@"Could not add file to post body." forKey:@"error"];
            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
+            return;
+        }
+    } progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSURLSessionTask *task, NSError *error) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
 }

+
 - (void)downloadFile:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
-
    NSString *url = [command.arguments objectAtIndex:0];
-    NSDictionary *headers = [command.arguments objectAtIndex:1];
-    NSString *filePath = [command.arguments objectAtIndex: 2];
-    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:3] doubleValue];
-    bool followRedirect = [[command.arguments objectAtIndex:4] boolValue];
-
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    NSString *filePath = [command.arguments objectAtIndex: 3];
+   
    [self setRequestHeaders: headers forManager: manager];
-    [self setTimeout:timeoutInSeconds forManager:manager];
-    [self setRedirect:followRedirect forManager:manager];
-
+    
    if ([filePath hasPrefix:@"file://"]) {
        filePath = [filePath substringFromIndex:7];
    }
-
+    
    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-    @try {
-        [manager GET:url parameters:nil success:^(NSURLSessionTask *task, id responseObject) {
-            /*
-             *
-             * Licensed to the Apache Software Foundation (ASF) under one
-             * or more contributor license agreements.  See the NOTICE file
-             * distributed with this work for additional information
-             * regarding copyright ownership.  The ASF licenses this file
-             * to you under the Apache License, Version 2.0 (the
-             * "License"); you may not use this file except in compliance
-             * with the License.  You may obtain a copy of the License at
-             *
-             *   http://www.apache.org/licenses/LICENSE-2.0
-             *
-             * Unless required by applicable law or agreed to in writing,
-             * software distributed under the License is distributed on an
-             * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-             * KIND, either express or implied.  See the License for the
-             * specific language governing permissions and limitations
-             * under the License.
-             *
-             * Modified by Andrew Stephan for Sync OnSet
-             *
-             */
-            // Download response is okay; begin streaming output to file
-            NSString* parentPath = [filePath stringByDeletingLastPathComponent];
-
-            // create parent directories if needed
-            NSError *error;
-            if ([[NSFileManager defaultManager] createDirectoryAtPath:parentPath withIntermediateDirectories:YES attributes:nil error:&error] == NO) {
-                NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-                [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
-                if (error) {
-                    [dictionary setObject:[NSString stringWithFormat:@"Could not create path to save downloaded file: %@", [error localizedDescription]] forKey:@"error"];
-                } else {
-                    [dictionary setObject:@"Could not create path to save downloaded file" forKey:@"error"];
-                }
-                CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-                [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-                [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-                return;
-            }
-            NSData *data = (NSData *)responseObject;
-            if (![data writeToFile:filePath atomically:YES]) {
-                NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-                [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
-                [dictionary setObject:@"Could not write the data to the given filePath." forKey:@"error"];
-                CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-                [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-                [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-                return;
-            }
-
-            id filePlugin = [self.commandDelegate getCommandInstance:@"File"];
+    [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+        /*
+         *
+         * Licensed to the Apache Software Foundation (ASF) under one
+         * or more contributor license agreements.  See the NOTICE file
+         * distributed with this work for additional information
+         * regarding copyright ownership.  The ASF licenses this file
+         * to you under the Apache License, Version 2.0 (the
+         * "License"); you may not use this file except in compliance
+         * with the License.  You may obtain a copy of the License at
+         *
+         *   http://www.apache.org/licenses/LICENSE-2.0
+         *
+         * Unless required by applicable law or agreed to in writing,
+         * software distributed under the License is distributed on an
+         * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+         * KIND, either express or implied.  See the License for the
+         * specific language governing permissions and limitations
+         * under the License.
+         *
+         * Modified by Andrew Stephan for Sync OnSet
+         *
+        */
+        // Download response is okay; begin streaming output to file
+        NSString* parentPath = [filePath stringByDeletingLastPathComponent];
+        
+        // create parent directories if needed
+        NSError *error;
+        if ([[NSFileManager defaultManager] createDirectoryAtPath:parentPath withIntermediateDirectories:YES attributes:nil error:&error] == NO) {
            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];
-            [dictionary setObject:[filePlugin getDirectoryEntry:filePath isDirectory:NO] forKey:@"file"];
-
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        } failure:^(NSURLSessionTask *task, NSError *error) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-            [dictionary setObject:@"There was an error downloading the file" forKey:@"error"];
-
+            [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
+            if (error) {
+                [dictionary setObject:[NSString stringWithFormat:@"Could not create path to save downloaded file: %@", [error localizedDescription]] forKey:@"error"];
+            } else {
+                [dictionary setObject:@"Could not create path to save downloaded file" forKey:@"error"];
+            }
            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        }];
-    }
-    @catch (NSException *exception) {
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-        [self handleException:exception withCommand:command];
-    }
+            return;
+        }
+        NSData *data = (NSData *)responseObject;
+        if (![data writeToFile:filePath atomically:YES]) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
+            [dictionary setObject:@"Could not write the data to the given filePath." forKey:@"error"];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+            return;
+        }
+   
+        id filePlugin = [self.commandDelegate getCommandInstance:@"File"];
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:[filePlugin getDirectoryEntry:filePath isDirectory:NO] forKey:@"file"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSURLSessionTask *task, NSError *error) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
 }

@end
--- a/src/ios/SDNetworkActivityIndicator/LICENSE
+++ b/src/ios/SDNetworkActivityIndicator/LICENSE
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Olivier Poitrey <rs@dailymotion.com>
- 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
--- a/src/ios/SDNetworkActivityIndicator/README.md
+++ b/src/ios/SDNetworkActivityIndicator/README.md
@@ -1,52 +0,0 @@
-# SDNetworkActivityIndicator
-
-Handle showing / hiding of the iOS network activity indicator to allow multiple concurrent threads to show / hide the indicator such that the indicator remains visible until all the requests have completed and requested the indicator to be hidden.
-
-## Requirements
-
-* iOS 5.0 or later.
-* ARC memory management.
-
-## Installation
-
-The easiest way to install it is by copying the following files to your project:
-
-* SDNetworkActivityIndicator.h
-* SDNetworkActivityIndicator.m
-
-## Usage
-
-* When you start a network activity (will show the network activity indicator):
-
-        [[SDNetworkActivityIndicator sharedActivityIndicator] startActivity];
-
-* When you finish a network activity (will hide the network activity indicator only if the number of calls to `stopActivity` matches the number of calls to `startActivity`):
-
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopActivity];
-
-* To hide the network activity indicator regardless of whether all activities have finished (without having to call `stopActivity` for each `startActivity` called):
-
-        [[SDNetworkActivityIndicator sharedActivityIndicator] stopAllActivity];
-
-
-## License
-Copyright (c) 2010 Olivier Poitrey <rs@dailymotion.com>
- 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
--- a/src/ios/SDNetworkActivityIndicator/SDNetworkActivityIndicator.h
+++ b/src/ios/SDNetworkActivityIndicator/SDNetworkActivityIndicator.h
@@ -1,18 +0,0 @@
-/*
- * This file is part of the SDNetworkActivityIndicator package.
- * (c) Olivier Poitrey <rs@dailymotion.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface SDNetworkActivityIndicator : NSObject
-
-+ (id)sharedActivityIndicator;
- (void)startActivity;
- (void)stopActivity;
- (void)stopAllActivity;
-
-@end
--- a/src/ios/SDNetworkActivityIndicator/SDNetworkActivityIndicator.m
+++ b/src/ios/SDNetworkActivityIndicator/SDNetworkActivityIndicator.m
@@ -1,70 +0,0 @@
-/*
- * This file is part of the SDNetworkActivityIndicator package.
- * (c) Olivier Poitrey <rs@dailymotion.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-#import "SDNetworkActivityIndicator.h"
-
-@interface SDNetworkActivityIndicator()
-{
-    @private NSUInteger counter;
-}
-@end
-
-
-@implementation SDNetworkActivityIndicator
-
-+ (instancetype) sharedActivityIndicator
-{
-    static id _sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _sharedInstance = [[self alloc] init];
-    });
-    
-    return _sharedInstance;
-}
-
- (id)init
-{
-    if ((self = [super init]))
-    {
-        counter = 0;
-    }
-
-    return self;
-}
-
- (void)startActivity
-{
-    @synchronized(self)
-    {
-        counter++;
-        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-    }
-}
-
- (void)stopActivity
-{
-    @synchronized(self)
-    {
-        if (counter > 0 && --counter == 0)
-        {
-            [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-        }
-    }
-}
-
- (void)stopAllActivity
-{
-    @synchronized(self)
-    {
-        counter = 0;
-        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-    }
-}
-
-@end
--- a/src/ios/TextRequestSerializer.h
+++ b/src/ios/TextRequestSerializer.h
@@ -1,8 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "AFURLRequestSerialization.h"
-
-@interface TextRequestSerializer : AFHTTPRequestSerializer
-
-+ (instancetype)serializer;
-
-@end
--- a/src/ios/TextRequestSerializer.m
+++ b/src/ios/TextRequestSerializer.m
@@ -1,53 +0,0 @@
-#import "TextRequestSerializer.h"
-
-@implementation TextRequestSerializer
-
-+ (instancetype)serializer
-{
-    TextRequestSerializer *serializer = [[self alloc] init];
-    return serializer;
-}
-
-#pragma mark - AFURLRequestSerialization
-
- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
-                               withParameters:(id)parameters
-                                        error:(NSError *__autoreleasing *)error
-{
-    NSParameterAssert(request);
-
-    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
-        return [super requestBySerializingRequest:request withParameters:parameters error:error];
-    }
-
-    NSMutableURLRequest *mutableRequest = [request mutableCopy];
-
-    [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) {
-        if (![request valueForHTTPHeaderField:field]) {
-            [mutableRequest setValue:value forHTTPHeaderField:field];
-        }
-    }];
-
-    if (parameters) {
-        if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
-            [mutableRequest setValue:@"text/plain; charset=utf-8" forHTTPHeaderField:@"Content-Type"];
-        }
-
-        [mutableRequest setHTTPBody: [[parameters valueForKey:@"text"] dataUsingEncoding:NSUTF8StringEncoding]];
-    }
-
-    return mutableRequest;
-}
-
-#pragma mark - NSSecureCoding
-
- (instancetype)initWithCoder:(NSCoder *)decoder {
-    self = [super initWithCoder:decoder];
-    if (!self) {
-        return nil;
-    }
-
-    return self;
-}
-
-@end
--- a/src/ios/TextResponseSerializer.h
+++ b/src/ios/TextResponseSerializer.h
@@ -5,6 +5,4 @@

 + (instancetype)serializer;

-FOUNDATION_EXPORT NSString * const AFNetworkingOperationFailingURLResponseBodyKey;
-
-@end
+@end
--- a/src/ios/TextResponseSerializer.m
+++ b/src/ios/TextResponseSerializer.m
@@ -1,126 +1,31 @@
 #import "TextResponseSerializer.h"

-NSString * const AFNetworkingOperationFailingURLResponseBodyKey = @"com.alamofire.serialization.response.error.body";
-NSStringEncoding const SupportedEncodings[6] = { NSUTF8StringEncoding, NSWindowsCP1252StringEncoding, NSISOLatin1StringEncoding, NSISOLatin2StringEncoding, NSASCIIStringEncoding, NSUnicodeStringEncoding };
+static BOOL AFErrorOrUnderlyingErrorHasCode(NSError *error, NSInteger code) {
+    if (error.code == code) {
+        return YES;
+    } else if (error.userInfo[NSUnderlyingErrorKey]) {
+        return AFErrorOrUnderlyingErrorHasCode(error.userInfo[NSUnderlyingErrorKey], code);
+    }

-static NSError * AFErrorWithUnderlyingError(NSError *error, NSError *underlyingError) {
-  if (!error) {
-    return underlyingError;
-  }
-
-  if (!underlyingError || error.userInfo[NSUnderlyingErrorKey]) {
-    return error;
-  }
-
-  NSMutableDictionary *mutableUserInfo = [error.userInfo mutableCopy];
-  mutableUserInfo[NSUnderlyingErrorKey] = underlyingError;
-
-  return [[NSError alloc] initWithDomain:error.domain code:error.code userInfo:mutableUserInfo];
-}
-
-static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger code, NSString *domain) {
-  if ([error.domain isEqualToString:domain] && error.code == code) {
-    return YES;
-  } else if (error.userInfo[NSUnderlyingErrorKey]) {
-    return AFErrorOrUnderlyingErrorHasCodeInDomain(error.userInfo[NSUnderlyingErrorKey], code, domain);
-  }
-
-  return NO;
+    return NO;
 }

@implementation TextResponseSerializer

 + (instancetype)serializer {
-  TextResponseSerializer *serializer = [[self alloc] init];
-  return serializer;
+    TextResponseSerializer *serializer = [[self alloc] init];
+    return serializer;
 }

 - (instancetype)init {
-  self = [super init];
-
-  if (!self) {
-    return nil;
-  }
-
-  self.acceptableContentTypes = nil;
-
-  return self;
-}
-
- (NSString*)decodeResponseData:(NSData*)rawResponseData withEncoding:(CFStringEncoding)cfEncoding {
-  NSStringEncoding nsEncoding;
-  NSString* decoded = nil;
-
-  if (cfEncoding != kCFStringEncodingInvalidId) {
-    nsEncoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
-  }
-
-  for (int i = 0; i < sizeof(SupportedEncodings) / sizeof(NSStringEncoding) && !decoded; ++i) {
-    if (cfEncoding == kCFStringEncodingInvalidId || nsEncoding == SupportedEncodings[i]) {
-      decoded = [[NSString alloc] initWithData:rawResponseData encoding:SupportedEncodings[i]];
-    }
-  }
-
-  return decoded;
-}
-
- (CFStringEncoding) getEncoding:(NSURLResponse *)response {
-  CFStringEncoding encoding = kCFStringEncodingInvalidId;
-
-  if (response.textEncodingName) {
-    encoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)response.textEncodingName);
-  }
-
-  return encoding;
-}
-
-#pragma mark -
-
- (BOOL)validateResponse:(NSHTTPURLResponse *)response
-                    data:(NSData *)data
-                 decoded:(NSString **)decoded
-                   error:(NSError * __autoreleasing *)error
-{
-  BOOL responseIsValid = YES;
-  NSError *validationError = nil;
-
-  if (response && [response isKindOfClass:[NSHTTPURLResponse class]]) {
-    if (data) {
-      *decoded = [self decodeResponseData:data withEncoding:[self getEncoding:response]];
+    self = [super init];
+    if (!self) {
+        return nil;
    }

-    if (data && !*decoded) {
-      NSMutableDictionary *mutableUserInfo = [@{
-        NSURLErrorFailingURLErrorKey:[response URL],
-        AFNetworkingOperationFailingURLResponseErrorKey: response,
-        AFNetworkingOperationFailingURLResponseDataErrorKey: data,
-        AFNetworkingOperationFailingURLResponseBodyKey: @"Could not decode response data due to invalid or unknown charset encoding",
-      } mutableCopy];
+    self.acceptableContentTypes = [NSSet setWithObjects:@"text/plain", @"text/html", @"text/json", @"application/json", @"text/xml", @"application/xml", @"text/css", nil];

-      validationError = AFErrorWithUnderlyingError([NSError errorWithDomain:AFURLResponseSerializationErrorDomain code:NSURLErrorBadServerResponse userInfo:mutableUserInfo], validationError);
-      responseIsValid = NO;
-    } else if (self.acceptableStatusCodes && ![self.acceptableStatusCodes containsIndex:(NSUInteger)response.statusCode] && [response URL]) {
-      NSMutableDictionary *mutableUserInfo = [@{
-        NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Request failed: %@ (%ld)", @"AFNetworking", nil), [NSHTTPURLResponse localizedStringForStatusCode:response.statusCode], (long)response.statusCode],
-        NSURLErrorFailingURLErrorKey: [response URL],
-        AFNetworkingOperationFailingURLResponseErrorKey: response,
-      } mutableCopy];
-
-      if (data) {
-        mutableUserInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] = data;
-        mutableUserInfo[AFNetworkingOperationFailingURLResponseBodyKey] = *decoded;
-      }
-
-      validationError = AFErrorWithUnderlyingError([NSError errorWithDomain:AFURLResponseSerializationErrorDomain code:NSURLErrorBadServerResponse userInfo:mutableUserInfo], validationError);
-      responseIsValid = NO;
-    }
-  }
-
-  if (error && !responseIsValid) {
-    *error = validationError;
-  }
-
-  return responseIsValid;
+    return self;
 }

 #pragma mark - AFURLResponseSerialization
@@ -129,15 +34,25 @@ static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger co
                           data:(NSData *)data
                          error:(NSError *__autoreleasing *)error
 {
-  NSString* decoded = nil;
-
-  if (![self validateResponse:(NSHTTPURLResponse *)response data:data decoded:&decoded error:error]) {
-    if (!error || AFErrorOrUnderlyingErrorHasCodeInDomain(*error, NSURLErrorCannotDecodeContentData, AFURLResponseSerializationErrorDomain)) {
-      return nil;
+    if (![self validateResponse:(NSHTTPURLResponse *)response data:data error:error]) {
+        if (AFErrorOrUnderlyingErrorHasCode(*error, NSURLErrorCannotDecodeContentData)) {
+            return nil;
+        }
    }
-  }

-  return decoded;
+    // Workaround for behavior of Rails to return a single space for `head :ok` (a workaround for a bug in Safari), which is not interpreted as valid input by NSJSONSerialization.
+    // See https://github.com/rails/rails/issues/1742
+    NSStringEncoding stringEncoding = self.stringEncoding;
+    if (response.textEncodingName) {
+        CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)response.textEncodingName);
+        if (encoding != kCFStringEncodingInvalidId) {
+            stringEncoding = CFStringConvertEncodingToNSStringEncoding(encoding);
+        }
+    }
+
+    NSString *responseString = [[NSString alloc] initWithData:data encoding:stringEncoding];
+
+    return responseString;
 }

-@end
+@end
--- a/test/e2e-app-template/build.json
+++ b/test/e2e-app-template/build.json
@@ -1,14 +0,0 @@
-{
-  "ios": {
-    "debug": {
-      "buildFlag": [
-        "-UseModernBuildSystem=0"
-      ]
-    },
-    "release": {
-      "buildFlag": [
-        "-UseModernBuildSystem=0"
-      ]
-    }
-  }
-}
--- a/test/e2e-app-template/config.xml
+++ b/test/e2e-app-template/config.xml
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<widget id="com.ilkimen.http.demo" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>HttpDemo</name>
-    <description>
-        A sample Apache Cordova application that demonstrates advanced HTTP plugin.
-    </description>
-    <author email="dev@cordova.apache.org" href="http://cordova.io">
-        Sefa Ilkimen
-    </author>
-    <content src="index.html" />
-    <access origin="*" />
-    <allow-intent href="http://*/*" />
-    <allow-intent href="https://*/*" />
-    <allow-intent href="tel:*" />
-    <allow-intent href="sms:*" />
-    <allow-intent href="mailto:*" />
-    <allow-intent href="geo:*" />
-    <platform name="android">
-        <allow-intent href="market:*" />
-    </platform>
-    <platform name="ios">
-        <allow-intent href="itms:*" />
-        <allow-intent href="itms-apps:*" />
-    </platform>
-    <engine name="android" spec="7.1.0" />
-    <engine name="browser" spec="5.0.0" />
-    <engine name="ios" spec="4.4.0" />
-    <plugin name="cordova-plugin-file" spec="6.0.1" />
-    <preference name="AndroidPersistentFileLocation" value="Internal" />
-</widget>
--- a/test/e2e-app-template/package.json
+++ b/test/e2e-app-template/package.json
@@ -1,26 +0,0 @@
-{
-    "name": "com.ilkimen.http.demo",
-    "displayName": "HttpDemo",
-    "version": "1.0.0",
-    "description": "A sample Apache Cordova application that demonstrates advanced HTTP plugin.",
-    "main": "index.js",
-    "scripts": {
-        "build": "scripts/build.sh",
-        "test": "npm run build && scripts/test.sh"
-    },
-    "author": "Sefa Ilkimen",
-    "license": "Apache-2.0",
-    "dependencies": {
-        "cordova": "7.0.1",
-        "cordova-android": "7.1.0",
-        "cordova-browser": "5.0.0",
-        "cordova-ios": "4.4.0"
-    },
-    "cordova": {
-        "platforms": [
-            "android",
-            "ios"
-        ]
-    },
-    "devDependencies": {}
-}
--- a/test/e2e-app-template/www/certificates/.gitkeep
+++ b/test/e2e-app-template/www/certificates/.gitkeep
--- a/test/e2e-app-template/www/index.css
+++ b/test/e2e-app-template/www/index.css
@@ -1,34 +0,0 @@
-* {
-    -webkit-tap-highlight-color: rgba(0,0,0,0); /* make transparent link selection, adjust last value opacity 0 to 1.0 */
-}
-
-body {
-    -webkit-touch-callout: none;                /* prevent callout to copy image, etc when tap to hold */
-    -webkit-text-size-adjust: none;             /* prevent webkit from resizing text to fit */
-    -webkit-user-select: none;                  /* prevent copy paste, to allow, change 'none' to 'text' */
-    height:100%;
-    margin:0px;
-    padding:20px 0;
-    width:100%;
-    font-family: sans-serif;
-}
-
-button, input, textarea {
-  display: block;
-  box-sizing: border-box;
-  width: 100%;
-}
-
-button {
-  height: 2.5em;
-  font-size: 10pt;
-}
-
-input {
-  text-align: center;
-}
-
-h1 {
-  font-size: 12pt;
-  text-align: center;
-}
--- a/test/e2e-app-template/www/index.html
+++ b/test/e2e-app-template/www/index.html
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com https://self-signed.badssl.com http://httpbin.org http://www.columbia.edu 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;">
-        <meta name="format-detection" content="telephone=no">
-        <meta name="msapplication-tap-highlight" content="no">
-        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
-        <link rel="stylesheet" type="text/css" href="index.css">
-    </head>
-    <body>
-        <h1 id="descriptionLbl">Advanced HTTP test suite</h1>
-        <input value="idle" id="statusInput" readonly></input>
-        <textarea rows="16" cols="50" id="expectedTextarea" readonly>Click next to run first test.</textarea>
-        <textarea rows="16" cols="50" id="resultTextarea" readonly></textarea>
-        <button id="nextBtn">Run next test</button>
-
-        <script type="text/javascript" src="cordova.js"></script>
-        <script type="text/javascript" src="e2e-specs.js"></script>
-        <script type="text/javascript" src="index.js"></script>
-    </body>
-</html>
--- a/test/e2e-app-template/www/index.js
+++ b/test/e2e-app-template/www/index.js
@@ -1,141 +0,0 @@
-const app = {
-  testIndex: -1,
-
-  lastResult: null,
-
-  initialize: function () {
-    document.getElementById('nextBtn').addEventListener('click', app.onNextBtnClick);
-  },
-
-  printResult: function (prefix, content) {
-    const text = prefix + ': ' + JSON.stringify(content);
-
-    document.getElementById('resultTextarea').value += text;
-  },
-
-  reject: function (content) {
-    document.getElementById('statusInput').value = 'finished';
-    app.printResult('result - rejected', content);
-
-    app.lastResult = {
-      type: 'rejected',
-      data: content
-    };
-  },
-
-  resolve: function (content) {
-    document.getElementById('statusInput').value = 'finished';
-    app.printResult('result - resolved', content);
-
-    app.lastResult = {
-      type: 'resolved',
-      data: content
-    };
-  },
-
-  throw: function (error) {
-    document.getElementById('statusInput').value = 'finished';
-    app.printResult('result - throwed', error.message);
-
-    app.lastResult = {
-      type: 'throwed',
-      message: error.message
-    };
-  },
-
-  getResult: function (cb) {
-    cb(app.lastResult);
-  },
-
-  runTest: function (index) {
-    const testDefinition = tests[index];
-    const titleText = app.testIndex + ': ' + testDefinition.description;
-    const expectedText = 'expected - ' + testDefinition.expected;
-
-    document.getElementById('statusInput').value = 'running';
-    document.getElementById('expectedTextarea').value = expectedText;
-    document.getElementById('resultTextarea').value = '';
-    document.getElementById('descriptionLbl').innerText = titleText;
-
-    const onSuccessFactory = function (cbChain) {
-      return function () {
-        cbChain.shift()(cbChain);
-      }
-    };
-
-    const onFailFactory = function (prefix) {
-      return function (errorMessage) {
-        app.reject(prefix + ': ' + errorMessage);
-      }
-    };
-
-    const onThrowedHandler = function (prefix, error) {
-      app.throw(new Error(prefix + ': ' + error.message));
-    };
-
-    const execBeforeEachTest = function (cbChain) {
-      const prefix = 'in before each hook';
-
-      try {
-        if (!hooks || !hooks.onBeforeEachTest) {
-          return onSuccessFactory(cbChain)();
-        }
-
-        hooks.onBeforeEachTest(
-          onSuccessFactory(cbChain),
-          onFailFactory(prefix)
-        );
-      } catch (error) {
-        onThrowedHandler(prefix, error);
-      }
-    };
-
-    const execBeforeTest = function (cbChain) {
-      const prefix = 'in before hook';
-
-      try {
-        if (!testDefinition.before) {
-          return onSuccessFactory(cbChain)();
-        }
-
-        testDefinition.before(
-          onSuccessFactory(cbChain),
-          onFailFactory(prefix)
-        );
-      } catch (error) {
-        onThrowedHandler(prefix, error);
-      }
-    };
-
-    const execTest = function () {
-      try {
-        testDefinition.func(app.resolve, app.reject);
-      } catch (error) {
-        app.throw(error);
-      }
-    };
-
-    onSuccessFactory([execBeforeEachTest, execBeforeTest, execTest])();
-  },
-
-  onFinishedAllTests: function () {
-    const titleText = 'No more tests';
-    const expectedText = 'You have run all available tests.';
-
-    document.getElementById('expectedTextarea').value = expectedText;
-    document.getElementById('resultTextarea').value = '';
-    document.getElementById('descriptionLbl').innerText = titleText;
-  },
-
-  onNextBtnClick: function () {
-    app.testIndex += 1;
-
-    if (app.testIndex < tests.length) {
-      app.runTest(app.testIndex);
-    } else {
-      app.onFinishedAllTests();
-    }
-  }
-};
-
-app.initialize();
--- a/test/e2e-specs.js
+++ b/test/e2e-specs.js
@@ -1,642 +0,0 @@
-const hooks = {
-  onBeforeEachTest: function (resolve, reject) {
-    cordova.plugin.http.clearCookies();
-
-    helpers.enableFollowingRedirect(function() {
-      helpers.setDefaultServerTrustMode(function () {
-        // @TODO: not ready yet
-        // helpers.setNoneClientAuthMode(resolve, reject);
-        resolve();
-      }, reject);
-    });
-  }
-};
-
-const helpers = {
-  setDefaultServerTrustMode: function (resolve, reject) { cordova.plugin.http.setServerTrustMode('default', resolve, reject); },
-  setNoCheckServerTrustMode: function (resolve, reject) { cordova.plugin.http.setServerTrustMode('nocheck', resolve, reject); },
-  setPinnedServerTrustMode: function (resolve, reject) { cordova.plugin.http.setServerTrustMode('pinned', resolve, reject); },
-  setNoneClientAuthMode: function (resolve, reject) { cordova.plugin.http.setClientAuthMode('none', resolve, reject); },
-  setBufferClientAuthMode: function (resolve, reject) {
-    helpers.getWithXhr(function(pkcs) {
-      cordova.plugin.http.setClientAuthMode('buffer', {
-        rawPkcs: pkcs,
-        pkcsPassword: 'badssl.com'
-      }, resolve, reject);
-    }, './certificates/badssl-client-cert.pkcs', 'arraybuffer');
-  },
-  setJsonSerializer: function (resolve) { resolve(cordova.plugin.http.setDataSerializer('json')); },
-  setUtf8StringSerializer: function (resolve) { resolve(cordova.plugin.http.setDataSerializer('utf8')); },
-  setUrlEncodedSerializer: function (resolve) { resolve(cordova.plugin.http.setDataSerializer('urlencoded')); },
-  disableFollowingRedirect: function (resolve) { resolve(cordova.plugin.http.setFollowRedirect(false)); },
-  enableFollowingRedirect: function(resolve) { resolve(cordova.plugin.http.setFollowRedirect(true)); },
-  getWithXhr: function (done, url, type) {
-    var xhr = new XMLHttpRequest();
-
-    xhr.addEventListener('load', function () {
-      if (!type || type === 'text') {
-        done(this.responseText);
-      } else {
-        done(this.response);
-      }
-    });
-
-    xhr.responseType = type;
-    xhr.open('GET', url);
-    xhr.send();
-  },
-  writeToFile: function (done, fileName, content) {
-    window.resolveLocalFileSystemURL(cordova.file.cacheDirectory, function (directoryEntry) {
-      directoryEntry.getFile(fileName, { create: true, exclusive: false }, function (fileEntry) {
-        fileEntry.createWriter(function (fileWriter) {
-          var blob = new Blob([content], { type: 'text/plain' });
-
-          fileWriter.onwriteend = done;
-          fileWriter.onerror = done;
-          fileWriter.write(blob);
-        }, done);
-      }, done);
-    }, done);
-  }
-};
-
-const messageFactory = {
-  sslTrustAnchor: function () { return 'TLS connection could not be established: javax.net.ssl.SSLHandshakeException: java.security.cert.CertPathValidatorException: Trust anchor for certification path not found.' },
-  invalidCertificate: function (domain) { return 'The certificate for this server is invalid. You might be connecting to a server that is pretending to be “' + domain + '” which could put your confidential information at risk.' }
-}
-
-const tests = [
-  {
-    description: 'should reject self signed cert (GET)',
-    expected: 'rejected: {"status":-2, ...',
-    func: function (resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result, targetInfo) {
-      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.sslTrustAnchor() : messageFactory.invalidCertificate('self-signed.badssl.com') });
-    }
-  },
-  {
-    description: 'should reject self signed cert (PUT)',
-    expected: 'rejected: {"status":-2, ...',
-    func: function (resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result, targetInfo) {
-      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.sslTrustAnchor() : messageFactory.invalidCertificate('self-signed.badssl.com') });
-    }
-  },
-  {
-    description: 'should reject self signed cert (POST)',
-    expected: 'rejected: {"status":-2, ...',
-    func: function (resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result, targetInfo) {
-      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.sslTrustAnchor() : messageFactory.invalidCertificate('self-signed.badssl.com') });
-    }
-  },
-  {
-    description: 'should reject self signed cert (PATCH)',
-    expected: 'rejected: {"status":-2, ...',
-    func: function (resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result, targetInfo) {
-      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.sslTrustAnchor() : messageFactory.invalidCertificate('self-signed.badssl.com') });
-    }
-  },
-  {
-    description: 'should reject self signed cert (DELETE)',
-    expected: 'rejected: {"status":-2, ...',
-    func: function (resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result, targetInfo) {
-      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.sslTrustAnchor() : messageFactory.invalidCertificate('self-signed.badssl.com') });
-    }
-  },
-  {
-    description: 'should accept bad cert (GET)',
-    expected: 'resolved: {"status":200, ...',
-    before: helpers.setNoCheckServerTrustMode,
-    func: function (resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.should.include({ status: 200 });
-    }
-  },
-  {
-    description: 'should accept bad cert (PUT)',
-    expected: 'rejected: {"status":405, ... // will be rejected because PUT is not allowed',
-    before: helpers.setNoCheckServerTrustMode,
-    func: function (resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('rejected');
-      result.data.should.include({ status: 405 });
-    }
-  },
-  {
-    description: 'should accept bad cert (POST)',
-    expected: 'rejected: {"status":405, ... // will be rejected because POST is not allowed',
-    before: helpers.setNoCheckServerTrustMode,
-    func: function (resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('rejected');
-      result.data.should.include({ status: 405 });
-    }
-  },
-  {
-    description: 'should accept bad cert (PATCH)',
-    expected: 'rejected: {"status":405, ... // will be rejected because PATCH is not allowed',
-    before: helpers.setNoCheckServerTrustMode,
-    func: function (resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('rejected');
-      result.data.should.include({ status: 405 });
-    }
-  },
-  {
-    description: 'should accept bad cert (DELETE)',
-    expected: 'rejected: {"status":405, ... // will be rejected because DELETE is not allowed',
-    before: helpers.setNoCheckServerTrustMode,
-    func: function (resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('rejected');
-      result.data.should.include({ status: 405 });
-    }
-  },
-  {
-    description: 'should fetch data from http://httpbin.org/ (GET)',
-    expected: 'resolved: {"status":200, ...',
-    before: helpers.setNoCheckServerTrustMode,
-    func: function (resolve, reject) { cordova.plugin.http.get('http://httpbin.org/', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.should.include({ status: 200 });
-    }
-  },
-  {
-    description: 'should send JSON object correctly (POST)',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).json.should.eql({ test: 'testString' });
-    }
-  },
-  {
-    description: 'should send JSON object correctly (PUT)',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).json.should.eql({ test: 'testString' });
-    }
-  },
-  {
-    description: 'should send JSON object correctly (PATCH)',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).json.should.eql({ test: 'testString' });
-    }
-  },
-  {
-    description: 'should send JSON array correctly (POST) #26',
-    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', [1, 2, 3], {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).json.should.eql([1, 2, 3]);
-    }
-  },
-  {
-    description: 'should send JSON array correctly (PUT) #26',
-    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', [1, 2, 3], {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).json.should.eql([1, 2, 3]);
-    }
-  },
-  {
-    description: 'should send JSON array correctly (PATCH) #26',
-    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', [1, 2, 3], {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.data.should.be.a('string');
-      JSON.parse(result.data.data).json.should.eql([1, 2, 3]);
-    }
-  },
-  {
-    description: 'should send url encoded data correctly (POST) #41',
-    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
-    before: helpers.setUrlEncodedSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).form.should.eql({ test: 'testString' });
-    }
-  },
-  {
-    description: 'should send url encoded data correctly (PUT)',
-    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
-    before: helpers.setUrlEncodedSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).form.should.eql({ test: 'testString' });
-    }
-  },
-  {
-    description: 'should send url encoded data correctly (PATCH)',
-    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
-    before: helpers.setUrlEncodedSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).form.should.eql({ test: 'testString' });
-    }
-  },
-  {
-    description: 'should resolve correct URL after redirect (GET) #33',
-    expected: 'resolved: {"status": 200, url: "http://httpbin.org/anything", ...',
-    func: function (resolve, reject) { cordova.plugin.http.get('http://httpbin.org/redirect-to?url=http://httpbin.org/anything', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.url.should.be.equal('http://httpbin.org/anything');
-    }
-  },
-  {
-    description: 'should not follow 302 redirect when following redirects is disabled',
-    expected: 'rejected: {"status": 302, ...',
-    before: function(resolve, reject) { cordova.plugin.http.disableRedirect(true, resolve, reject)},
-    func: function (resolve, reject) { cordova.plugin.http.get('http://httpbin.org/redirect-to?url=http://httpbin.org/anything', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('rejected');
-      result.data.status.should.be.equal(302);
-    }
-  },
-  {
-    description: 'should download a file from given URL to given path in local filesystem',
-    expected: 'resolved: {"content": "<?xml version=\'1.0\' encoding=\'us-ascii\'?>\\n\\n<!--  A SAMPLE set of slides  -->" ...',
-    func: function (resolve, reject) {
-      var sourceUrl = 'http://httpbin.org/xml';
-      var targetPath = cordova.file.cacheDirectory + 'test.xml';
-
-      cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function (entry) {
-        helpers.getWithXhr(function (content) {
-          resolve({
-            sourceUrl: sourceUrl,
-            targetPath: targetPath,
-            fullPath: entry.fullPath,
-            name: entry.name,
-            content: content
-          });
-        }, targetPath);
-      }, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.name.should.be.equal('test.xml');
-      result.data.content.should.be.equal("<?xml version='1.0' encoding='us-ascii'?>\n\n<!--  A SAMPLE set of slides  -->\n\n<slideshow \n    title=\"Sample Slide Show\"\n    date=\"Date of publication\"\n    author=\"Yours Truly\"\n    >\n\n    <!-- TITLE SLIDE -->\n    <slide type=\"all\">\n      <title>Wake up to WonderWidgets!</title>\n    </slide>\n\n    <!-- OVERVIEW -->\n    <slide type=\"all\">\n        <title>Overview</title>\n        <item>Why <em>WonderWidgets</em> are great</item>\n        <item/>\n        <item>Who <em>buys</em> WonderWidgets</item>\n    </slide>\n\n</slideshow>");
-    }
-  },
-  {
-    description: 'should upload a file from given path in local filesystem to given URL #27',
-    expected: 'resolved: {"status": 200, "data": "files": {"test-file.txt": "I am a dummy file. I am used ...',
-    func: function (resolve, reject) {
-      var fileName = 'test-file.txt';
-      var fileContent = 'I am a dummy file. I am used for testing purposes!';
-      var sourcePath = cordova.file.cacheDirectory + fileName;
-      var targetUrl = 'http://httpbin.org/post';
-
-      helpers.writeToFile(function () {
-        cordova.plugin.http.uploadFile(targetUrl, {}, {}, sourcePath, fileName, resolve, reject);
-      }, fileName, fileContent);
-    },
-    validationFunc: function (driver, result) {
-      var fileName = 'test-file.txt';
-      var fileContent = 'I am a dummy file. I am used for testing purposes!';
-
-      result.type.should.be.equal('resolved');
-      result.data.data.should.be.a('string');
-
-      JSON
-        .parse(result.data.data)
-        .files[fileName]
-        .should.be.equal(fileContent);
-    }
-  },
-  {
-    description: 'should encode HTTP array params correctly (GET) #45',
-    expected: 'resolved: {"status": 200, "data": "{\\"url\\":\\"http://httpbin.org/get?myArray[]=val1&myArray[]=val2&myArray[]=val3\\"}\" ...',
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('http://httpbin.org/get', { myArray: ['val1', 'val2', 'val3'], myString: 'testString' }, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.data.should.be.a('string');
-
-      JSON
-        .parse(result.data.data)
-        .url
-        .should.include('httpbin.org/get?myArray[]=val1&myArray[]=val2&myArray[]=val3&myString=testString');
-    }
-  },
-  {
-    description: 'should throw on non-string values in local header object #54',
-    expected: 'throwed: {"message": "advanced-http: header values must be strings"}',
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('http://httpbin.org/get', {}, { myTestHeader: 1 }, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('throwed');
-      result.message.should.be.equal('advanced-http: header values must be strings');
-    }
-  },
-  {
-    description: 'should throw an error while setting non-string value as global header #54',
-    expected: 'throwed: "advanced-http: header values must be strings"',
-    func: function (resolve, reject) {
-      cordova.plugin.http.setHeader('myTestHeader', 2);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('throwed');
-      result.message.should.be.equal('advanced-http: header values must be strings');
-    }
-  },
-  {
-    description: 'should accept content-type "application/xml" #58',
-    expected: 'resolved: {"status": 200, ...',
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('http://httpbin.org/xml', {}, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.status.should.be.equal(200);
-    }
-  },
-  {
-    description: 'should send programmatically set cookies correctly (GET)',
-    expected: 'resolved: {"status": 200, ...',
-    func: function (resolve, reject) {
-      cordova.plugin.http.setCookie('http://httpbin.org/get', 'myCookie=myValue');
-      cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
-      cordova.plugin.http.get('http://httpbin.org/get', {}, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.data.should.be.a('string');
-
-      JSON
-        .parse(result.data.data)
-        .headers
-        .Cookie
-        .should.be.equal('myCookie=myValue; mySecondCookie=mySecondValue');
-    }
-  },
-  {
-    description: 'should not send any cookies after running "clearCookies" (GET) #59',
-    expected: 'resolved: {"status": 200, "data": "{\"headers\": {\"Cookie\": \"\"...',
-    func: function (resolve, reject) {
-      cordova.plugin.http.setCookie('http://httpbin.org/get', 'myCookie=myValue');
-      cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
-      cordova.plugin.http.clearCookies();
-      cordova.plugin.http.get('http://httpbin.org/get', {}, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.data.should.be.a('string');
-
-      JSON
-        .parse(result.data.data)
-        .headers
-        .should.not.have.property('Cookie');
-    }
-  },
-  {
-    description: 'should send programmatically set cookies correctly (DOWNLOAD) #57',
-    expected: 'resolved: {"content":{"cookies":{"myCookie":"myValue ...',
-    func: function (resolve, reject) {
-      var sourceUrl = 'http://httpbin.org/cookies';
-      var targetPath = cordova.file.cacheDirectory + 'cookies.json';
-
-      cordova.plugin.http.setCookie('http://httpbin.org/get', 'myCookie=myValue');
-      cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
-
-      cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function (entry) {
-        helpers.getWithXhr(function (content) {
-          resolve({
-            sourceUrl: sourceUrl,
-            targetPath: targetPath,
-            fullPath: entry.fullPath,
-            name: entry.name,
-            content: content
-          });
-        }, targetPath);
-      }, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.name.should.be.equal('cookies.json');
-      result.data.content.should.be.a('string');
-
-      var cookies = JSON.parse(result.data.content).cookies;
-
-      cookies.myCookie.should.be.equal('myValue');
-      cookies.mySecondCookie.should.be.equal('mySecondValue');
-    }
-  },
-  {
-    description: 'should send UTF-8 encoded raw string correctly (POST) #34',
-    expected: 'resolved: {"status": 200, "data": "{\\"data\\": \\"this is a test string\\"...',
-    before: helpers.setUtf8StringSerializer,
-    func: function (resolve, reject) {
-      cordova.plugin.http.post('http://httpbin.org/anything', 'this is a test string', {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).data.should.be.equal('this is a test string');
-    }
-  },
-  {
-    description: 'should encode spaces in query string (params object) correctly (GET) #71',
-    expected: 'resolved: {"status": 200, "data": "{\\"args\\": \\"query param\\": \\"and value with spaces\\"...',
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('http://httpbin.org/get', { 'query param': 'and value with spaces' }, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).args['query param'].should.be.equal('and value with spaces');
-    }
-  },
-  {
-    description: 'should decode latin1 (iso-8859-1) encoded body correctly (GET) #72',
-    expected: 'resolved: {"status": 200, "data": "<!DOCTYPE HTML PUBLIC \\"-//W3C//DTD HTML 4.01 Transitional//EN\\"> ...',
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('http://www.columbia.edu/kermit/latin1.html', {}, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.data.should.include('[¡]  161  10/01  241  A1  INVERTED EXCLAMATION MARK\n[¢]  162  10/02  242  A2  CENT SIGN');
-    }
-  },
-  {
-    description: 'should return empty body string correctly (GET)',
-    expected: 'resolved: {"status": 200, "data": "" ...',
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('http://httpbin.org/stream/0', {}, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.data.should.be.equal('');
-    }
-  },
-  {
-    description: 'should pin SSL cert correctly (GET)',
-    expected: 'resolved: {"status": 200 ...',
-    before: helpers.setPinnedServerTrustMode,
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('https://httpbin.org', {}, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.status.should.be.equal(200);
-    }
-  },
-  {
-    description: 'should reject when pinned cert does not match received server cert (GET)',
-    expected: 'rejected: {"status": -2 ...',
-    before: helpers.setPinnedServerTrustMode,
-    func: function (resolve, reject) {
-      cordova.plugin.http.get('https://sha512.badssl.com/', {}, {}, resolve, reject);
-    },
-    validationFunc: function (driver, result, targetInfo) {
-      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.sslTrustAnchor() : messageFactory.invalidCertificate('sha512.badssl.com') });
-    }
-  },
-  {
-    description: 'should send deeply structured JSON object correctly (POST) #65',
-    expected: 'resolved: {"status": 200, "data": "{\\"data\\": \\"{\\\\"outerObj\\\\":{\\\\"innerStr\\\\":\\\\"testString\\\\",\\\\"innerArr\\\\":[1,2,3]}}\\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { outerObj: { innerStr: 'testString', innerArr: [1, 2, 3] } }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).json.should.eql({ outerObj: { innerStr: 'testString', innerArr: [1, 2, 3] } });
-    }
-  },
-  {
-    description: 'should override header "content-type" correctly (POST) #78',
-    expected: 'resolved: {"status": 200, "headers": "{\\"Content-Type\\": \\"text/plain\\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', {}, { 'Content-Type': 'text/plain' }, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).headers['Content-Type'].should.be.equal('text/plain');
-    }
-  },
-  {
-    description: 'should handle error during file download correctly (DOWNLOAD) #83',
-    expected: 'rejected: {"status": 403, "error": "There was an error downloading the file" ...',
-    func: function (resolve, reject) { cordova.plugin.http.downloadFile('http://httpbin.org/status/403', {}, {}, cordova.file.tempDirectory + 'testfile.txt', resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('rejected');
-      result.data.status.should.be.equal(403);
-      result.data.error.should.be.equal('There was an error downloading the file');
-    }
-  },
-  {
-    description: 'should handle gzip encoded response correctly',
-    expected: 'resolved: {"status": 200, "headers": "{\\"Content-Encoding\\": \\"gzip\\" ...',
-    func: function (resolve, reject) { cordova.plugin.http.get('http://httpbin.org/gzip', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.status.should.be.equal(200);
-      JSON.parse(result.data.data).gzipped.should.be.equal(true);
-    }
-  },
-  {
-    description: 'should send empty string correctly',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"\\" ...',
-    before: helpers.setUtf8StringSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', '', {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).data.should.be.equal('');
-    }
-  },
-  {
-    description: 'shouldn\'t escape forward slashes #184',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"/\\" ...',
-    before: helpers.setJsonSerializer,
-    func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { testString: '/' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).json.testString.should.be.equal('/');
-    }
-  },
-  {
-    description: 'should not double encode spaces in url path #195',
-    expected: 'resolved: {"status": 200, "data": "{\\"url\\":\\"https://httpbin.org/anything/containing spaces in url\\" ...',
-    func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/anything/containing%20spaces%20in%20url', {}, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).url.should.be.equal('https://httpbin.org/anything/containing spaces in url');
-    }
-  },
-  {
-    description: 'should encode spaces in url query correctly',
-    expected: 'resolved: {"status": 200, "data": "{\\"url\\":\\"https://httpbin.org/anything?query key=very long query value with spaces\\" ...',
-    func: function (resolve, reject) { cordova.plugin.http.get('https://httpbin.org/anything', { 'query key': 'very long query value with spaces' }, {}, resolve, reject); },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      JSON.parse(result.data.data).url.should.be.equal('https://httpbin.org/anything?query key=very long query value with spaces');
-    }
-  },
-  {
-    description: 'should download a file from given HTTPS URL to given path in local filesystem #197',
-    expected: 'resolved: {"content": "<?xml version=\'1.0\' encoding=\'us-ascii\'?>\\n\\n<!--  A SAMPLE set of slides  -->" ...',
-    func: function (resolve, reject) {
-      var sourceUrl = 'https://httpbin.org/xml';
-      var targetPath = cordova.file.cacheDirectory + 'test.xml';
-
-      cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function (entry) {
-        helpers.getWithXhr(function (content) {
-          resolve({
-            sourceUrl: sourceUrl,
-            targetPath: targetPath,
-            fullPath: entry.fullPath,
-            name: entry.name,
-            content: content
-          });
-        }, targetPath);
-      }, reject);
-    },
-    validationFunc: function (driver, result) {
-      result.type.should.be.equal('resolved');
-      result.data.name.should.be.equal('test.xml');
-      result.data.content.should.be.equal("<?xml version='1.0' encoding='us-ascii'?>\n\n<!--  A SAMPLE set of slides  -->\n\n<slideshow \n    title=\"Sample Slide Show\"\n    date=\"Date of publication\"\n    author=\"Yours Truly\"\n    >\n\n    <!-- TITLE SLIDE -->\n    <slide type=\"all\">\n      <title>Wake up to WonderWidgets!</title>\n    </slide>\n\n    <!-- OVERVIEW -->\n    <slide type=\"all\">\n        <title>Overview</title>\n        <item>Why <em>WonderWidgets</em> are great</item>\n        <item/>\n        <item>Who <em>buys</em> WonderWidgets</item>\n    </slide>\n\n</slideshow>");
-    }
-  },
-  // @TODO: not ready yet
-  // {
-  //   description: 'should authenticate correctly when client cert auth is configured with a PKCS12 container',
-  //   expected: 'resolved: {"status": 200, ...',
-  //   before: helpers.setBufferClientAuthMode,
-  //   func: function (resolve, reject) { cordova.plugin.http.get('https://client.badssl.com/', {}, {}, resolve, reject); },
-  //   validationFunc: function (driver, result) {
-  //     result.type.should.be.equal('resolved');
-  //     result.data.data.should.include('TLS handshake');
-  //   }
-  // }
-];
-
-if (typeof module !== 'undefined' && module.exports) {
-  module.exports = { tests: tests, hooks: hooks };
-}
--- a/test/e2e-tooling/helpers/apps.js
+++ b/test/e2e-tooling/helpers/apps.js
@@ -1,10 +0,0 @@
-const path = require('path');
-
-if (process.env.SAUCE_USERNAME) {
-  exports.iosTestApp = 'sauce-storage:HttpDemo.app.zip';
-  exports.androidTestApp = 'sauce-storage:HttpDemo.apk';
-} else {
-  // these paths are relative to working directory
-  exports.iosTestApp = path.resolve('temp/platforms/ios/build/emulator/HttpDemo.app');
-  exports.androidTestApp = path.resolve('temp/platforms/android/app/build/outputs/apk/debug/app-debug.apk');
-}
--- a/test/e2e-tooling/helpers/caps.js
+++ b/test/e2e-tooling/helpers/caps.js
@@ -1,60 +0,0 @@
-const local = {
-  iosDevice: {
-    platformName: 'iOS',
-    platformVersion: '10.3',
-    deviceName: 'iPhone 6',
-    autoWebview: true,
-    app: undefined // will be set later
-  },
-  iosEmulator: {
-    platformName: 'iOS',
-    platformVersion: '11.0',
-    deviceName: 'iPhone Simulator',
-    autoWebview: true,
-    app: undefined // will be set later
-  },
-  androidEmulator: {
-    platformName: 'Android',
-    platformVersion: '5.1',
-    deviceName: 'Android Emulator',
-    autoWebview: true,
-    fullReset: true,
-    app: undefined // will be set later
-  }
-};
-
-const sauce = {
-  iosDevice: {
-    browserName: '',
-    'appium-version': '1.7.1',
-    platformName: 'iOS',
-    platformVersion: '10.3',
-    deviceName: 'iPhone 6',
-    autoWebview: true,
-    app: undefined // will be set later
-  },
-  iosEmulator: {
-    browserName: '',
-    'appium-version': '1.7.1',
-    platformName: 'iOS',
-    platformVersion: '10.3',
-    deviceName: 'iPhone Simulator',
-    autoWebview: true,
-    app: undefined // will be set later
-  },
-  androidEmulator: {
-    browserName: '',
-    'appium-version': '1.7.1',
-    platformName: 'Android',
-    platformVersion: '5.1',
-    deviceName: 'Android Emulator',
-    autoWebview: true,
-    app: undefined // will be set later
-  }
-};
-
-if (process.env.SAUCE_USERNAME) {
-  module.exports = sauce;
-} else {
-  module.exports = local;
-}
--- a/test/e2e-tooling/helpers/logging.js
+++ b/test/e2e-tooling/helpers/logging.js
@@ -1,13 +0,0 @@
-exports.configure = driver => {
-  driver.on('status', info => {
-    console.log(info.cyan);
-  });
-
-  driver.on('command', (meth, path, data) => {
-    console.log(' > ' + meth.yellow, path.grey, data || '');
-  });
-
-  driver.on('http', (meth, path, data) => {
-    console.log(' > ' + meth.magenta, path, (data || '').grey);
-  });
-};
--- a/test/e2e-tooling/helpers/server.js
+++ b/test/e2e-tooling/helpers/server.js
@@ -1,16 +0,0 @@
-const local = {
-  host: 'localhost',
-  port: 4723
-};
-
-const sauce = {
-  host: 'ondemand.saucelabs.com',
-  port: 80,
-  auth: process.env.SAUCE_USERNAME + ":" + process.env.SAUCE_ACCESS_KEY
-};
-
-if (process.env.SAUCE_USERNAME) {
-  module.exports = sauce;
-} else {
-  module.exports = local;
-}
--- a/test/e2e-tooling/helpers/setup.js
+++ b/test/e2e-tooling/helpers/setup.js
@@ -1,12 +0,0 @@
-const wd = require("wd");
-
-require('colors');
-
-const chai = require('chai');
-const chaiAsPromised = require('chai-as-promised');
-chai.use(chaiAsPromised);
-
-const should = chai.should();
-chaiAsPromised.transferPromiseness = wd.transferPromiseness;
-
-exports.should = should;
--- a/test/e2e-tooling/test.js
+++ b/test/e2e-tooling/test.js
@@ -1,94 +0,0 @@
-require('./helpers/setup');
-
-const wd = require('wd');
-const apps = require('./helpers/apps');
-const caps = Object.assign({}, require('./helpers/caps'));
-const serverConfig = require('./helpers/server');
-const testDefinitions = require('../e2e-specs');
-const pkgjson = require('../../package.json');
-
-describe('Advanced HTTP', function() {
-  const isDevice = process.argv.includes('--device');
-  const isAndroid = process.argv.includes('--android');
-  const targetInfo = { isDevice, isAndroid };
-
-  let driver = null;
-  let allPassed = true;
-
-  this.timeout(900000);
-
-  const getCaps = appName => {
-    const desiredOs = isAndroid ? 'android' : 'ios';
-    const desiredCaps = caps[desiredOs + (isDevice ? 'Device' : 'Emulator')];
-    const desiredApp = apps[desiredOs + appName];
-
-    desiredCaps.name = pkgjson.name + ` (${desiredOs})`;
-    desiredCaps.app = desiredApp;
-
-    return desiredCaps;
-  };
-
-  const validateTestIndex = number => driver
-    .elementById('descriptionLbl')
-    .text()
-    .then(text => parseInt(text.match(/(\d+):/)[1], 10))
-    .should.eventually.become(number, 'Test index is not matching!');
-
-  const validateTestTitle = testTitle => driver
-    .elementById('descriptionLbl')
-    .text()
-    .then(text => text.match(/\d+:\ (.*)/)[1])
-    .should.eventually.become(testTitle, 'Test description is not matching!');
-
-  const waitToBeFinished = timeout => new Promise((resolve, reject) => {
-    const timeoutTimestamp = Date.now() + timeout;
-    const checkIfFinished = () => driver
-      .elementById('statusInput')
-      .getValue()
-      .then(value => {
-        if (value === 'finished') {
-          resolve();
-        } else if (Date.now() > timeoutTimestamp) {
-          reject('Test function timed out!');
-        } else {
-          setTimeout(checkIfFinished, 500);
-        }
-      });
-
-    checkIfFinished();
-  });
-
-  const validateResult = testDefinition => driver
-    .safeExecute('app.lastResult')
-    .then(result => testDefinition.validationFunc(driver, result, targetInfo));
-
-  const clickNext = () => driver
-    .elementById('nextBtn')
-    .click()
-    .sleep(1000);
-
-  before(() => {
-    driver = wd.promiseChainRemote(serverConfig);
-    require('./helpers/logging').configure(driver);
-
-    return driver.init(getCaps('TestApp'));
-  });
-
-  after(() => driver
-    .quit()
-    .finally(function () {
-      if (process.env.SAUCE_USERNAME) {
-        return driver.sauceJobStatus(allPassed);
-      }
-    }));
-
-  testDefinitions.tests.forEach((definition, index) => {
-    it(index + ': ' + definition.description, function() {
-      return clickNext()
-        .then(() => validateTestIndex(index))
-        .then(() => validateTestTitle(definition.description))
-        .then(() => waitToBeFinished(definition.timeout || 10000))
-        .then(() => validateResult(definition))
-      });
-  });
-});
--- a/test/js-specs.js
+++ b/test/js-specs.js
@@ -1,376 +0,0 @@
-const chai = require('chai');
-const mock = require('mock-require');
-const should = chai.should();
-
-describe('Advanced HTTP public interface', function () {
-  const messages = require('../www/messages');
-  let http = {};
-
-  const noop = () => { /* intentionally doing nothing */ };
-
-  const getDependenciesBlueprint = () => {
-    const globalConfigs = require('../www/global-configs');
-    const jsUtil = require('../www/js-util');
-    const ToughCookie = require('../www/umd-tough-cookie');
-    const lodash = require('../www/lodash');
-    const WebStorageCookieStore = require('../www/local-storage-store')(ToughCookie, lodash);
-    const cookieHandler = require('../www/cookie-handler')(null, ToughCookie, WebStorageCookieStore);
-    const helpers = require('../www/helpers')(jsUtil, cookieHandler, messages);
-    const urlUtil = require('../www/url-util')(jsUtil);
-
-    return { exec: noop, cookieHandler, urlUtil: urlUtil, helpers, globalConfigs };
-  };
-
-  const loadHttp = (deps) => {
-    http = require('../www/public-interface')(deps.exec, deps.cookieHandler, deps.urlUtil, deps.helpers, deps.globalConfigs);
-  };
-
-  beforeEach(() => {
-    // mocked btoa function (base 64 encoding strings)
-    global.btoa = decoded => new Buffer(decoded).toString('base64');
-    loadHttp(getDependenciesBlueprint());
-  });
-
-  it('sets global headers correctly with two args (old interface)', () => {
-    http.setHeader('myKey', 'myValue');
-    http.getHeaders('*').myKey.should.equal('myValue');
-  });
-
-  it('sets global headers correctly with three args (new interface) #24', () => {
-    http.setHeader('*', 'myKey', 'myValue');
-    http.getHeaders('*').myKey.should.equal('myValue');
-  });
-
-  it('sets host headers correctly #24', () => {
-    http.setHeader('www.google.de', 'myKey', 'myValue');
-    http.getHeaders('www.google.de').myKey.should.equal('myValue');
-  });
-
-  it('resolves global headers correctly #24', () => {
-    const deps = getDependenciesBlueprint();
-
-    deps.cookieHandler.getCookieString = () => 'fakeCookieString';
-
-    deps.exec = (onSuccess, onFail, namespace, method, params) => {
-      const headers = params[1];
-      headers.should.eql({
-        Cookie: 'fakeCookieString',
-        myKey: 'myValue'
-      });
-    };
-
-    loadHttp(deps);
-
-    http.setHeader('*', 'myKey', 'myValue');
-    http.get('url', {}, {}, noop, noop);
-  });
-
-  it('resolves host headers correctly (set without port number) #37', () => {
-    const deps = getDependenciesBlueprint();
-
-    deps.cookieHandler.getCookieString = () => 'fakeCookieString';
-
-    deps.exec = (onSuccess, onFail, namespace, method, params) => {
-      const headers = params[1];
-      headers.should.eql({
-        Cookie: 'fakeCookieString',
-        myKey: 'myValue'
-      });
-    };
-
-    loadHttp(deps);
-
-    http.setHeader('www.google.de', 'myKey', 'myValue');
-    http.get('https://www.google.de/?gws_rd=ssl', {}, {}, noop, noop);
-  });
-
-  it('resolves host headers correctly (set with port number) #37', () => {
-    const deps = getDependenciesBlueprint();
-
-    deps.cookieHandler.getCookieString = () => 'fakeCookieString';
-
-    deps.exec = (onSuccess, onFail, namespace, method, params) => {
-      const headers = params[1];
-      headers.should.eql({
-        Cookie: 'fakeCookieString',
-        myKey: 'myValue'
-      });
-    };
-
-    loadHttp(deps);
-
-    http.setHeader('www.google.de:8080', 'myKey', 'myValue');
-    http.get('https://www.google.de:8080/?gws_rd=ssl', {}, {}, noop, noop);
-  });
-
-  it('resolves request headers correctly', () => {
-    const deps = getDependenciesBlueprint();
-
-    deps.cookieHandler.getCookieString = () => 'fakeCookieString';
-
-    deps.exec = (onSuccess, onFail, namespace, method, params) => {
-      const headers = params[1];
-      headers.should.eql({
-        Cookie: 'fakeCookieString',
-        myKey: 'myValue'
-      });
-    };
-
-    loadHttp(deps);
-
-    http.get('https://www.google.de/?gws_rd=ssl', {}, { myKey: 'myValue' }, noop, noop);
-  });
-
-  it('sets basic authentication header correctly #36', () => {
-    http.useBasicAuth('name', 'pass');
-    http.getHeaders('*').Authorization.should.equal('Basic bmFtZTpwYXNz');
-  });
-
-  it('throws an Error when you try to add a cookie by using "setHeader" #46', () => {
-    (function () { http.setHeader('*', 'cookie', 'value'); }).should.throw();
-  });
-
-  it('configures global timeout value correctly with given valid value', () => {
-    http.setRequestTimeout(10);
-    http.getRequestTimeout().should.equal(10);
-  });
-
-  it('throws an Error when you try to configure global timeout with a string', () => {
-    (function () { http.setRequestTimeout('myString'); }).should.throw(messages.INVALID_TIMEOUT_VALUE);
-  });
-
-  it('sets global option for following redirects correctly', () => {
-    http.setFollowRedirect(false);
-    http.getFollowRedirect().should.equal(false);
-  });
-
-  it('throws an Error when you try to configure global option for following redirects with a string', () => {
-    (function () { http.setFollowRedirect('myString'); }).should.throw(messages.INVALID_FOLLOW_REDIRECT_VALUE);
-  });
-});
-
-describe('URL util', function () {
-  const jsUtil = require('../www/js-util');
-  const util = require('../www/url-util')(jsUtil);
-
-  it('parses URL with protocol, hostname and path correctly', () => {
-    util.parseUrl('http://ilkimen.net/test').should.include({
-      protocol: 'http:',
-      host: 'ilkimen.net',
-      hostname: 'ilkimen.net',
-      pathname: '/test',
-      port: '',
-      search: '',
-      hash: ''
-    });
-  });
-
-  it('parses URL with protocol, hostname, port and path correctly', () => {
-    util.parseUrl('http://ilkimen.net:8080/test').should.include({
-      protocol: 'http:',
-      host: 'ilkimen.net:8080',
-      hostname: 'ilkimen.net',
-      pathname: '/test',
-      port: '8080',
-      search: '',
-      hash: ''
-    });
-  });
-
-  it('parses URL with protocol, hostname, port, path and query string correctly', () => {
-    util.parseUrl('http://ilkimen.net:8080/test?param=value').should.include({
-      protocol: 'http:',
-      host: 'ilkimen.net:8080',
-      hostname: 'ilkimen.net',
-      pathname: '/test',
-      port: '8080',
-      search: '?param=value',
-      hash: ''
-    });
-  });
-
-  it('parses URL with protocol, hostname, port, path, query string and hash param correctly', () => {
-    util.parseUrl('http://ilkimen.net:8080/test?param=value#myHash').should.include({
-      protocol: 'http:',
-      host: 'ilkimen.net:8080',
-      hostname: 'ilkimen.net',
-      pathname: '/test',
-      port: '8080',
-      search: '?param=value',
-      hash: '#myHash'
-    });
-  });
-
-  it('serializes query params correctly', () => {
-    util.serializeQueryParams({
-      strParam1: 'value with spaces',
-      strParam2: 'value with special character äöü%',
-      boolParam: true,
-      numberParam: 1,
-      nullParam: null,
-    }, false).should.equal('strParam1=value with spaces&strParam2=value with special character äöü%&boolParam=true&numberParam=1&nullParam=null');
-  });
-
-  it('serializes query params correctly with URL encoding enabled', () => {
-    util.serializeQueryParams({
-      'param 1': 'value with spaces',
-      'param 2': 'value with special character äöü%&'
-    }, true).should.equal('param%201=value%20with%20spaces&param%202=value%20with%20special%20character%20%C3%A4%C3%B6%C3%BC%25%26');
-  });
-
-  it('serializes array of query params correctly', () => {
-    util.serializeQueryParams({
-      myArray: ['val1', 'val2', 'val3'],
-      myString: 'testString'
-    }, false).should.equal('myArray[]=val1&myArray[]=val2&myArray[]=val3&myString=testString');
-  });
-
-  it('serializes deeply structured array of query params correctly', () => {
-    util.serializeQueryParams({
-      myArray: [['val1.1', 'val1.2', 'val1.3'], 'val2', 'val3'],
-      myString: 'testString'
-    }, false).should.equal('myArray[][]=val1.1&myArray[][]=val1.2&myArray[][]=val1.3&myArray[]=val2&myArray[]=val3&myString=testString');
-  });
-
-  it('serializes deeply structured object of query params correctly', () => {
-    util.serializeQueryParams({
-      myObject: { obj1: { 'param1.1': 'val1.1', 'param1.2': 'val1.2' }, param2: 'val2' }
-    }, false).should.equal('myObject[obj1][param1.1]=val1.1&myObject[obj1][param1.2]=val1.2&myObject[param2]=val2');
-  });
-
-  it('appends query params string correctly to given URL without query parameters', () => {
-    util.appendQueryParamsString('http://ilkimen.net/', 'param1=value1')
-      .should.equal('http://ilkimen.net/?param1=value1');
-  });
-
-  it('appends query params string correctly to given URL with existing query parameters', () => {
-    util.appendQueryParamsString('http://ilkimen.net/?myParam=myValue', 'param1=value1')
-      .should.equal('http://ilkimen.net/?myParam=myValue&param1=value1');
-  });
-
-  it('appends query params string correctly to given URL with existing query parameters and hash value', () => {
-    util.appendQueryParamsString('http://ilkimen.net/?myParam=myValue#myHash', 'param1=value1')
-      .should.equal('http://ilkimen.net/?myParam=myValue&param1=value1#myHash');
-  });
-});
-
-describe('Common helpers', function () {
-  describe('mergeHeaders(globalHeaders, localHeaders)', function () {
-    const init = require('../www/helpers');
-    init.debug = true;
-
-    const helpers = init(null, null, null);
-
-    it('merges empty header sets correctly', () => {
-      helpers.mergeHeaders({}, {}).should.eql({});
-    });
-
-    it('merges ssimple header sets without collision correctly', () => {
-      helpers.mergeHeaders({ a: 1 }, { b: 2 }).should.eql({ a: 1, b: 2 });
-    });
-
-    it('merges header sets with collision correctly', () => {
-      helpers.mergeHeaders({ a: 1 }, { a: 2 }).should.eql({ a: 2 });
-    });
-  });
-
-  describe('getCookieHeader(url)', function () {
-    it('resolves cookie header correctly when no cookie is set #198', () => {
-      const helpers = require('../www/helpers')(null, { getCookieString: () => '' }, null);
-
-      helpers.getCookieHeader('http://ilkimen.net').should.eql({});
-    });
-
-    it('resolves cookie header correctly when a cookie is set', () => {
-      const helpers = require('../www/helpers')(null, { getCookieString: () => 'cookie=value' }, null);
-
-      helpers.getCookieHeader('http://ilkimen.net').should.eql({ Cookie: 'cookie=value' });
-    });
-  });
-
-  describe('checkClientAuthOptions()', function () {
-    const jsUtil = require('../www/js-util');
-    const messages = require('../www/messages');
-    const helpers = require('../www/helpers')(jsUtil, null, messages);
-
-    it('returns options object with empty values when mode is "none" and no options are given', () => {
-      helpers.checkClientAuthOptions('none').should.eql({
-        alias: null,
-        rawPkcs: null,
-        pkcsPassword: ''
-      });
-    });
-
-    it('returns options object with empty values when mode is "none" and random options are given', () => {
-      helpers.checkClientAuthOptions('none', {
-        alias: 'myAlias',
-        pkcsPath: 'myPath'
-      }).should.eql({
-        alias: null,
-        rawPkcs: null,
-        pkcsPassword: ''
-      });
-    });
-
-    it('throws an error when mode is "systemstore" and alias is not a string or undefined', () => {
-      (() => helpers.checkClientAuthOptions('systemstore', { alias: 1 }))
-        .should.throw(messages.INVALID_CLIENT_AUTH_ALIAS);
-
-      (() => helpers.checkClientAuthOptions('systemstore', { alias: undefined }))
-        .should.not.throw();
-    });
-
-    it('returns an object with null alias when mode is "systemstore" and no options object is given', () => {
-      helpers.checkClientAuthOptions('systemstore').should.eql({
-        alias: null,
-        rawPkcs: null,
-        pkcsPassword: ''
-      });
-    });
-
-    it('throws an error when mode is "buffer" and rawPkcs is not an array buffer', () => {
-      (() => helpers.checkClientAuthOptions('buffer', {
-        rawPkcs: undefined,
-        pkcsPassword: 'password'
-      })).should.throw(messages.INVALID_CLIENT_AUTH_RAW_PKCS);
-
-      (() => helpers.checkClientAuthOptions('buffer', {
-        pkcsPath: 1,
-        pkcsPassword: 'password'
-      })).should.throw(messages.INVALID_CLIENT_AUTH_RAW_PKCS);
-    });
-
-    it('throws an error when mode is "buffer" and pkcsPassword is not a string', () => {
-      (() => helpers.checkClientAuthOptions('buffer', {
-        rawPkcs: new ArrayBuffer(),
-        pkcsPassword: undefined
-      })).should.throw(messages.INVALID_CLIENT_AUTH_PKCS_PASSWORD);
-
-      (() => helpers.checkClientAuthOptions('buffer', {
-        rawPkcs: new ArrayBuffer(),
-        pkcsPassword: 1
-      })).should.throw(messages.INVALID_CLIENT_AUTH_PKCS_PASSWORD);
-    });
-  });
-
-  describe('handleMissingOptions()', function () {
-    const jsUtil = require('../www/js-util');
-    const messages = require('../www/messages');
-    const helpers = require('../www/helpers')(jsUtil, null, messages);
-    const mockGlobals = {
-      headers: {},
-      serializer: 'urlencoded',
-      followRedirect: true,
-      timeout: 60.0,
-    }
-
-    it('adds missing "followRedirect" option correctly', () => {
-      helpers.handleMissingOptions({}, mockGlobals).should.include({ followRedirect: true });
-    });
-
-    it('throws an error when "followRedirect" option is not a boolean', () => {
-      (() => helpers.handleMissingOptions({ followRedirect: 1 }, mockGlobals))
-        .should.throw(messages.INVALID_FOLLOW_REDIRECT_VALUE);
-    });
-  });
-})
--- a/www/advanced-http.js
+++ b/www/advanced-http.js
@@ -1,19 +0,0 @@
-/*
- * A native HTTP Plugin for Cordova / PhoneGap.
- */
-
-var pluginId = module.id.slice(0, module.id.lastIndexOf('.'));
-
-var exec = require('cordova/exec');
-var messages = require(pluginId + '.messages');
-var globalConfigs = require(pluginId + '.global-configs');
-var jsUtil = require(pluginId + '.js-util');
-var ToughCookie = require(pluginId + '.tough-cookie');
-var lodash = require(pluginId + '.lodash');
-var WebStorageCookieStore = require(pluginId + '.local-storage-store')(ToughCookie, lodash);
-var cookieHandler = require(pluginId + '.cookie-handler')(window.localStorage, ToughCookie, WebStorageCookieStore);
-var helpers = require(pluginId + '.helpers')(jsUtil, cookieHandler, messages);
-var urlUtil = require(pluginId + '.url-util')(jsUtil);
-var publicInterface = require(pluginId + '.public-interface')(exec, cookieHandler, urlUtil, helpers, globalConfigs);
-
-module.exports = publicInterface;
--- a/www/cookie-handler.js
+++ b/www/cookie-handler.js
@@ -1,70 +0,0 @@
-module.exports = function init(storage, ToughCookie, WebStorageCookieStore) {
-  var storeKey = '__advancedHttpCookieStore__';
-
-  var store = new WebStorageCookieStore(storage, storeKey);
-  var cookieJar = new ToughCookie.CookieJar(store);
-
-  return {
-    setCookieFromString: setCookieFromString,
-    setCookie: setCookie,
-    getCookieString: getCookieString,
-    clearCookies: clearCookies,
-    removeCookies: removeCookies
-  };
-
-  function splitCookieString(cookieStr) {
-    var cookieParts = cookieStr.split(',');
-    var splitCookies = [];
-    var processedCookie = null;
-
-    for (var i = 0; i < cookieParts.length; ++i) {
-      if (cookieParts[i].substr(-11, 8).toLowerCase() === 'expires=') {
-        processedCookie = cookieParts[i] + ',' + cookieParts[i + 1];
-        i++;
-      } else {
-        processedCookie = cookieParts[i];
-      }
-
-      processedCookie = processedCookie.trim();
-      splitCookies.push(processedCookie);
-    }
-
-    return splitCookies;
-  }
-
-  function setCookieFromString(url, cookieStr) {
-    if (!cookieStr) return;
-
-    var cookies = splitCookieString(cookieStr);
-
-    for (var i = 0; i < cookies.length; ++i) {
-      cookieJar.setCookieSync(cookies[i], url, { ignoreError: true });
-    }
-  }
-
-  function setCookie(url, cookie, options) {
-    options = options || {};
-    options.ignoreError = false;
-    cookieJar.setCookieSync(cookie, url, options);
-  }
-
-  function getCookieString(url) {
-    return cookieJar.getCookieStringSync(url);
-  }
-
-  function clearCookies() {
-    window.localStorage.removeItem(storeKey);
-  }
-
-  function removeCookies(url, cb) {
-    cookieJar.getCookies(url, function (error, cookies) {
-      if (!cookies || cookies.length === 0) {
-        return cb(null, []);
-      }
-
-      var domain = cookies[0].domain;
-
-      cookieJar.store.removeCookies(domain, null, cb);
-    });
-  }
-};
--- a/www/cordovaHTTP.js
+++ b/www/cordovaHTTP.js
@@ -0,0 +1,171 @@
+/*global angular*/
+
+/*
+ * An HTTP Plugin for PhoneGap.
+ */
+
+var exec = require('cordova/exec');
+
+// Thanks Mozilla: https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#The_.22Unicode_Problem.22
+function b64EncodeUnicode(str) {
+    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
+        return String.fromCharCode('0x' + p1);
+    }));
+}
+
+function mergeHeaders(globalHeaders, localHeaders) {
+    var globalKeys = Object.keys(globalHeaders);
+    var key;
+    for (var i = 0; i < globalKeys.length; i++) {
+        key = globalKeys[i];
+        if (!localHeaders.hasOwnProperty(key)) {
+            localHeaders[key] = globalHeaders[key];
+        }
+    }
+    return localHeaders;
+}
+
+var http = {
+    headers: {},
+    sslPinning: false,
+    getBasicAuthHeader: function(username, password) {
+        return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
+    },
+    useBasicAuth: function(username, password) {
+        this.headers.Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
+    },
+    setHeader: function(header, value) {
+        this.headers[header] = value;
+    },
+    enableSSLPinning: function(enable, success, failure) {
+        return exec(success, failure, "CordovaHttpPlugin", "enableSSLPinning", [enable]);
+    },
+    acceptAllCerts: function(allow, success, failure) {
+        return exec(success, failure, "CordovaHttpPlugin", "acceptAllCerts", [allow]);
+    },
+    validateDomainName: function(validate, success, failure) {
+        return exec(success, failure, "CordovaHttpPlugin", "validateDomainName", [validate]);
+    },
+    post: function(url, params, headers, success, failure) {
+        headers = mergeHeaders(this.headers, headers);
+        return exec(success, failure, "CordovaHttpPlugin", "post", [url, params, headers]);
+    },
+    get: function(url, params, headers, success, failure) {
+        headers = mergeHeaders(this.headers, headers);
+        return exec(success, failure, "CordovaHttpPlugin", "get", [url, params, headers]);
+    },
+    head: function(url, params, headers, success, failure) {
+        headers = mergeHeaders(this.headers, headers);
+        return exec(success, failure, "CordovaHttpPlugin", "head", [url, params, headers]);
+    },
+    uploadFile: function(url, params, headers, filePath, name, success, failure) {
+        headers = mergeHeaders(this.headers, headers);
+        return exec(success, failure, "CordovaHttpPlugin", "uploadFile", [url, params, headers, filePath, name]);
+    },
+    downloadFile: function(url, params, headers, filePath, success, failure) {
+        /*
+         *
+         * Licensed to the Apache Software Foundation (ASF) under one
+         * or more contributor license agreements.  See the NOTICE file
+         * distributed with this work for additional information
+         * regarding copyright ownership.  The ASF licenses this file
+         * to you under the Apache License, Version 2.0 (the
+         * "License"); you may not use this file except in compliance
+         * with the License.  You may obtain a copy of the License at
+         *
+         *   http://www.apache.org/licenses/LICENSE-2.0
+         *
+         * Unless required by applicable law or agreed to in writing,
+         * software distributed under the License is distributed on an
+         * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+         * KIND, either express or implied.  See the License for the
+         * specific language governing permissions and limitations
+         * under the License.
+         *
+         * Modified by Andrew Stephan for Sync OnSet
+         *
+        */
+        headers = mergeHeaders(this.headers, headers);
+        var win = function(result) {
+            var entry = new (require('cordova-plugin-file.FileEntry'))();
+            entry.isDirectory = false;
+            entry.isFile = true;
+            entry.name = result.file.name;
+            entry.fullPath = result.file.fullPath;
+            entry.filesystem = new FileSystem(result.file.filesystemName || (result.file.filesystem == window.PERSISTENT ? 'persistent' : 'temporary'));
+            entry.nativeURL = result.file.nativeURL;
+            success(entry);
+        };
+        return exec(win, failure, "CordovaHttpPlugin", "downloadFile", [url, params, headers, filePath]);
+    }
+};
+
+module.exports = http;
+
+if (typeof angular !== "undefined") {
+    angular.module('cordovaHTTP', []).factory('cordovaHTTP', function($timeout, $q) {
+        function makePromise(fn, args, async) {
+            var deferred = $q.defer();
+            
+            var success = function(response) {
+                if (async) {
+                    $timeout(function() {
+                        deferred.resolve(response);
+                    });
+                } else {
+                    deferred.resolve(response);
+                }
+            };
+            
+            var fail = function(response) {
+                if (async) {
+                    $timeout(function() {
+                        deferred.reject(response);
+                    });
+                } else {
+                    deferred.reject(response);
+                }
+            };
+            
+            args.push(success);
+            args.push(fail);
+            
+            fn.apply(http, args);
+            
+            return deferred.promise;
+        }
+        
+        var cordovaHTTP = {
+            getBasicAuthHeader: http.getBasicAuthHeader,
+            useBasicAuth: http.useBasicAuth,
+            setHeader: http.setHeader,
+            enableSSLPinning: function(enable) {
+                return makePromise(http.enableSSLPinning, [enable]);
+            },
+            acceptAllCerts: function(allow) {
+                return makePromise(http.acceptAllCerts, [allow]);
+            },
+            validateDomainName: function(validate) {
+                return makePromise(http.validateDomainName, [validate]);
+            },
+            post: function(url, params, headers) {
+                return makePromise(http.post, [url, params, headers], true);
+            },
+            get: function(url, params, headers) {
+                return makePromise(http.get, [url, params, headers], true);
+            },
+            head: function(url, params, headers) {
+                return makePromise(http.head, [url, params, headers], true);
+            },
+            uploadFile: function(url, params, headers, filePath, name) {
+                return makePromise(http.uploadFile, [url, params, headers, filePath, name], true);
+            },
+            downloadFile: function(url, params, headers, filePath) {
+                return makePromise(http.downloadFile, [url, params, headers, filePath], true);
+            }
+        };
+        return cordovaHTTP;
+    });
+} else {
+    window.cordovaHTTP = http;
+}
--- a/www/global-configs.js
+++ b/www/global-configs.js
@@ -1,8 +0,0 @@
-var globalConfigs = {
-  headers: {},
-  serializer: 'urlencoded',
-  followRedirect: true,
-  timeout: 60.0,
-};
-
-module.exports = globalConfigs;
--- a/www/helpers.js
+++ b/www/helpers.js
@@ -1,315 +0,0 @@
-module.exports = function init(jsUtil, cookieHandler, messages) {
-  var validSerializers = ['urlencoded', 'json', 'utf8'];
-  var validCertModes = ['default', 'nocheck', 'pinned', 'legacy'];
-  var validClientAuthModes = ['none', 'systemstore', 'buffer'];
-  var validHttpMethods = ['get', 'put', 'post', 'patch', 'head', 'delete', 'upload', 'download'];
-
-  var interface = {
-    b64EncodeUnicode: b64EncodeUnicode,
-    checkSerializer: checkSerializer,
-    checkSSLCertMode: checkSSLCertMode,
-    checkClientAuthMode: checkClientAuthMode,
-    checkClientAuthOptions: checkClientAuthOptions,
-    checkForBlacklistedHeaderKey: checkForBlacklistedHeaderKey,
-    checkForInvalidHeaderValue: checkForInvalidHeaderValue,
-    checkTimeoutValue: checkTimeoutValue,
-    checkFollowRedirectValue: checkFollowRedirectValue,
-    injectCookieHandler: injectCookieHandler,
-    injectFileEntryHandler: injectFileEntryHandler,
-    getMergedHeaders: getMergedHeaders,
-    getProcessedData: getProcessedData,
-    handleMissingCallbacks: handleMissingCallbacks,
-    handleMissingOptions: handleMissingOptions
-  };
-
-  // expose all functions for testing purposes
-  if (init.debug) {
-    interface.mergeHeaders = mergeHeaders;
-    interface.checkForValidStringValue = checkForValidStringValue;
-    interface.checkKeyValuePairObject = checkKeyValuePairObject;
-    interface.checkHttpMethod = checkHttpMethod;
-    interface.checkHeadersObject = checkHeadersObject;
-    interface.checkParamsObject = checkParamsObject;
-    interface.resolveCookieString = resolveCookieString;
-    interface.createFileEntry = createFileEntry;
-    interface.getCookieHeader = getCookieHeader;
-    interface.getMatchingHostHeaders = getMatchingHostHeaders;
-    interface.getAllowedDataTypes = getAllowedDataTypes;
-  }
-
-  return interface;
-
-  // Thanks Mozilla: https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#The_.22Unicode_Problem.22
-  function b64EncodeUnicode(str) {
-    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function (match, p1) {
-      return String.fromCharCode('0x' + p1);
-    }));
-  }
-
-  function mergeHeaders(globalHeaders, localHeaders) {
-    var globalKeys = Object.keys(globalHeaders);
-    var key;
-
-    for (var i = 0; i < globalKeys.length; i++) {
-      key = globalKeys[i];
-
-      if (!localHeaders.hasOwnProperty(key)) {
-        localHeaders[key] = globalHeaders[key];
-      }
-    }
-
-    return localHeaders;
-  }
-
-  function checkForValidStringValue(list, value, onInvalidValueMessage) {
-    if (jsUtil.getTypeOf(value) !== 'String') {
-      throw new Error(onInvalidValueMessage + ' ' + list.join(', '));
-    }
-
-    value = value.trim().toLowerCase();
-
-    if (list.indexOf(value) === -1) {
-      throw new Error(onInvalidValueMessage + ' ' + list.join(', '));
-    }
-
-    return value;
-  }
-
-  function checkKeyValuePairObject(obj, allowedChildren, onInvalidValueMessage) {
-    if (jsUtil.getTypeOf(obj) !== 'Object') {
-      throw new Error(onInvalidValueMessage);
-    }
-
-    var keys = Object.keys(obj);
-
-    for (var i = 0; i < keys.length; i++) {
-      if (allowedChildren.indexOf(jsUtil.getTypeOf(obj[keys[i]])) === -1) {
-        throw new Error(onInvalidValueMessage);
-      }
-    }
-
-    return obj;
-  }
-
-  function checkHttpMethod(method) {
-    return checkForValidStringValue(validHttpMethods, method, messages.INVALID_HTTP_METHOD);
-  }
-
-  function checkSerializer(serializer) {
-    return checkForValidStringValue(validSerializers, serializer, messages.INVALID_DATA_SERIALIZER);
-  }
-
-  function checkSSLCertMode(mode) {
-    return checkForValidStringValue(validCertModes, mode, messages.INVALID_SSL_CERT_MODE);
-  }
-
-  function checkClientAuthMode(mode) {
-    return checkForValidStringValue(validClientAuthModes, mode, messages.INVALID_CLIENT_AUTH_MODE);
-  }
-
-  function checkClientAuthOptions(mode, options) {
-    options = options || {};
-
-    // none
-    if (mode === validClientAuthModes[0]) {
-      return {
-        alias: null,
-        rawPkcs: null,
-        pkcsPassword: ''
-      };
-    }
-
-    if (jsUtil.getTypeOf(options) !== 'Object') {
-      throw new Error(messages.INVALID_CLIENT_AUTH_OPTIONS);
-    }
-
-    // systemstore
-    if (mode === validClientAuthModes[1]) {
-      if (jsUtil.getTypeOf(options.alias) !== 'String'
-        && jsUtil.getTypeOf(options.alias) !== 'Undefined') {
-        throw new Error(messages.INVALID_CLIENT_AUTH_ALIAS);
-      }
-
-      return {
-        alias: jsUtil.getTypeOf(options.alias) === 'Undefined' ? null : options.alias,
-        rawPkcs: null,
-        pkcsPassword: ''
-      };
-    }
-
-    // buffer
-    if (mode === validClientAuthModes[2]) {
-      if (jsUtil.getTypeOf(options.rawPkcs) !== 'ArrayBuffer') {
-        throw new Error(messages.INVALID_CLIENT_AUTH_RAW_PKCS);
-      }
-
-      if (jsUtil.getTypeOf(options.pkcsPassword) !== 'String') {
-        throw new Error(messages.INVALID_CLIENT_AUTH_PKCS_PASSWORD);
-      }
-
-      return {
-        alias: null,
-        rawPkcs: options.rawPkcs,
-        pkcsPassword: options.pkcsPassword
-      }
-    }
-  }
-
-  function checkForBlacklistedHeaderKey(key) {
-    if (key.toLowerCase() === 'cookie') {
-      throw new Error(messages.ADDING_COOKIES_NOT_SUPPORTED);
-    }
-
-    return key;
-  }
-
-  function checkForInvalidHeaderValue(value) {
-    if (jsUtil.getTypeOf(value) !== 'String') {
-      throw new Error(messages.INVALID_HEADERS_VALUE);
-    }
-
-    return value;
-  }
-
-  function checkTimeoutValue(timeout) {
-    if (jsUtil.getTypeOf(timeout) !== 'Number' || timeout < 0) {
-      throw new Error(messages.INVALID_TIMEOUT_VALUE);
-    }
-
-    return timeout;
-  }
-
-  function checkFollowRedirectValue(follow) {
-    if (jsUtil.getTypeOf(follow) !== 'Boolean') {
-      throw new Error(messages.INVALID_FOLLOW_REDIRECT_VALUE);
-    }
-
-    return follow;
-  }
-
-  function checkHeadersObject(headers) {
-    return checkKeyValuePairObject(headers, ['String'], messages.INVALID_HEADERS_VALUE);
-  }
-
-  function checkParamsObject(params) {
-    return checkKeyValuePairObject(params, ['String', 'Array'], messages.INVALID_PARAMS_VALUE);
-  }
-
-  function resolveCookieString(headers) {
-    var keys = Object.keys(headers || {});
-
-    for (var i = 0; i < keys.length; ++i) {
-      if (keys[i].match(/^set-cookie$/i)) {
-        return headers[keys[i]];
-      }
-    }
-
-    return null;
-  }
-
-  function createFileEntry(rawEntry) {
-    var entry = new (require('cordova-plugin-file.FileEntry'))();
-
-    entry.isDirectory = rawEntry.isDirectory;
-    entry.isFile = rawEntry.isFile;
-    entry.name = rawEntry.name;
-    entry.fullPath = rawEntry.fullPath;
-    entry.filesystem = new FileSystem(rawEntry.filesystemName || (rawEntry.filesystem == window.PERSISTENT ? 'persistent' : 'temporary'));
-    entry.nativeURL = rawEntry.nativeURL;
-
-    return entry;
-  }
-
-  function injectCookieHandler(url, cb) {
-    return function (response) {
-      cookieHandler.setCookieFromString(url, resolveCookieString(response.headers));
-      cb(response);
-    }
-  }
-
-  function injectFileEntryHandler(cb) {
-    return function (response) {
-      cb(createFileEntry(response.file));
-    }
-  }
-
-  function getCookieHeader(url) {
-    var cookieString = cookieHandler.getCookieString(url);
-
-    if (cookieString.length) {
-      return { Cookie: cookieHandler.getCookieString(url) };
-    }
-
-    return {};
-  }
-
-  function getMatchingHostHeaders(url, headersList) {
-    var matches = url.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
-    var domain = matches && matches[1];
-
-    return headersList[domain] || null;
-  }
-
-  function getMergedHeaders(url, requestHeaders, predefinedHeaders) {
-    var globalHeaders = predefinedHeaders['*'] || {};
-    var hostHeaders = getMatchingHostHeaders(url, predefinedHeaders) || {};
-    var mergedHeaders = mergeHeaders(globalHeaders, hostHeaders);
-
-    mergedHeaders = mergeHeaders(mergedHeaders, requestHeaders);
-    mergedHeaders = mergeHeaders(mergedHeaders, getCookieHeader(url));
-
-    return mergedHeaders;
-  }
-
-  function getAllowedDataTypes(dataSerializer) {
-    switch (dataSerializer) {
-      case 'utf8':
-        return ['String'];
-      case 'urlencoded':
-        return ['Object'];
-      default:
-        return ['Array', 'Object'];
-    }
-  }
-
-  function getProcessedData(data, dataSerializer) {
-    var currentDataType = jsUtil.getTypeOf(data);
-    var allowedDataTypes = getAllowedDataTypes(dataSerializer);
-
-    if (allowedDataTypes.indexOf(currentDataType) === -1) {
-      throw new Error(messages.DATA_TYPE_MISMATCH + ' ' + allowedDataTypes.join(', '));
-    }
-
-    if (dataSerializer === 'utf8') {
-      data = { text: data };
-    }
-
-    return data;
-  }
-
-  function handleMissingCallbacks(successFn, failFn) {
-    if (jsUtil.getTypeOf(successFn) !== 'Function') {
-      throw new Error(messages.MANDATORY_SUCCESS);
-    }
-
-    if (jsUtil.getTypeOf(failFn) !== 'Function') {
-      throw new Error(messages.MANDATORY_FAIL);
-    }
-  }
-
-  function handleMissingOptions(options, globals) {
-    options = options || {};
-
-    return {
-      method: checkHttpMethod(options.method || validHttpMethods[0]),
-      serializer: checkSerializer(options.serializer || globals.serializer),
-      timeout: checkTimeoutValue(options.timeout || globals.timeout),
-      followRedirect: checkFollowRedirectValue(options.followRedirect || globals.followRedirect),
-      headers: checkHeadersObject(options.headers || {}),
-      params: checkParamsObject(options.params || {}),
-      data: jsUtil.getTypeOf(options.data) === 'Undefined' ? null : options.data,
-      filePath: options.filePath || '',
-      name: options.name || ''
-    };
-  }
-};
--- a/www/js-util.js
+++ b/www/js-util.js
@@ -1,28 +0,0 @@
-module.exports = {
-  // typeof is not working reliably in JS
-  getTypeOf: function (object) {
-    switch (Object.prototype.toString.call(object)) {
-      case '[object Array]':
-        return 'Array';
-      case '[object ArrayBuffer]':
-        return 'ArrayBuffer';
-      case '[object Boolean]':
-        return 'Boolean';
-      case '[object Function]':
-        return 'Function';
-      case '[object Null]':
-        return 'Null';
-      case '[object Number]':
-        return 'Number';
-      case '[object Object]':
-        return 'Object';
-      case '[object String]':
-        return 'String';
-      case '[object Undefined]':
-        return 'Undefined';
-      default:
-        return 'Unknown';
-    }
-  }
-}
-
--- a/www/local-storage-store.js
+++ b/www/local-storage-store.js
@@ -1,181 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Exponent
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Based on "tough-cookie-web-storage-store" v1.0.0
- * Thanks James Ide: https://github.com/exponentjs/tough-cookie-web-storage-store
- *
- * Modified by Sefa Ilkimen for cordova plugin integration
- *
- */
-
-'use strict';
-
-module.exports = function init(ToughCookie, _) {
-  function WebStorageCookieStore(storage, storeKey) {
-    ToughCookie.Store.call(this);
-    this._storage = storage;
-    this._storeKey = storeKey || '__cookieStore__';
-    this.synchronous = true;
-  }
-
-  WebStorageCookieStore.prototype = Object.create(ToughCookie.Store);
-
-  WebStorageCookieStore.prototype.findCookie = function (domain, path, key, callback) {
-    var store = this._readStore();
-    var cookie = _.get(store, [domain, path, key], null);
-
-    callback(null, ToughCookie.Cookie.fromJSON(cookie));
-  };
-
-  WebStorageCookieStore.prototype.findCookies = function (domain, path, callback) {
-    if (!domain) {
-      callback(null, []);
-      return;
-    }
-
-    var that = this;
-    var cookies = [];
-    var store = this._readStore();
-    var domains = ToughCookie.permuteDomain(domain) || [domain];
-
-    domains.forEach(function (domain) {
-      if (!store[domain]) {
-        return;
-      }
-
-      var matchingPaths = Object.keys(store[domain]);
-
-      if (path != null) {
-        matchingPaths = matchingPaths.filter(function (cookiePath) {
-          return that._isOnPath(cookiePath, path);
-        });
-      }
-
-      matchingPaths.forEach(function (path) {
-        Array.prototype.push.apply(cookies, _.values(store[domain][path]));
-      });
-    });
-
-    cookies = cookies.map(function (cookie) {
-      return ToughCookie.Cookie.fromJSON(cookie);
-    });
-
-    callback(null, cookies);
-  };
-
-  /**
-   * Returns whether `cookiePath` is on the given `urlPath`
-   */
-  WebStorageCookieStore.prototype._isOnPath = function (cookiePath, urlPath) {
-    if (!cookiePath) {
-      return false;
-    }
-
-    if (cookiePath === urlPath) {
-      return true;
-    }
-
-    if (urlPath.indexOf(cookiePath) !== 0) {
-      return false;
-    }
-
-    if (cookiePath[cookiePath.length - 1] !== '/' && urlPath[cookiePath.length] !== '/') {
-      return false;
-    }
-
-    return true;
-  };
-
-  WebStorageCookieStore.prototype.putCookie = function (cookie, callback) {
-    var store = this._readStore();
-
-    _.set(store, [cookie.domain, cookie.path, cookie.key], cookie);
-    this._writeStore(store);
-    callback(null);
-  };
-
-  WebStorageCookieStore.prototype.updateCookie = function (oldCookie, newCookie, callback) {
-    this.putCookie(newCookie, callback);
-  };
-
-
-  WebStorageCookieStore.prototype.removeCookie = function (domain, path, key, callback) {
-    var store = this._readStore();
-
-    _.unset(store, [domain, path, key]);
-    this._writeStore(store);
-    callback(null);
-  };
-
-  WebStorageCookieStore.prototype.removeCookies = function (domain, path, callback) {
-    var store = this._readStore();
-
-    if (path == null) {
-      _.unset(store, [domain]);
-    } else {
-      _.unset(store, [domain, path]);
-    }
-
-    this._writeStore(store);
-    callback(null);
-  };
-
-  WebStorageCookieStore.prototype.getAllCookies = function (callback) {
-    var cookies = [];
-    var store = this._readStore();
-
-    Object.keys(store).forEach(function (domain) {
-      Object.keys(store[domain]).forEach(function (path) {
-        Array.protype.push.apply(cookies, _.values(store[domain][path]));
-      });
-    });
-
-    cookies = cookies.map(function (cookie) {
-      return ToughCookie.Cookie.fromJSON(cookie);
-    });
-
-    cookies.sort(function (c1, c2) {
-      return (c1.creationIndex || 0) - (c2.creationIndex || 0);
-    });
-
-    callback(null, cookies);
-  };
-
-  WebStorageCookieStore.prototype._readStore = function () {
-    var json = this._storage.getItem(this._storeKey);
-
-    if (json !== null) {
-      try {
-        return JSON.parse(json);
-      } catch (e) { }
-    }
-
-    return {};
-  };
-
-  WebStorageCookieStore.prototype._writeStore = function (store) {
-    this._storage.setItem(this._storeKey, JSON.stringify(store));
-  };
-
-  return WebStorageCookieStore;
-};
--- a/www/lodash.js
+++ b/www/lodash.js
@@ -1,20 +0,0 @@
-/**
- * @license
- * Lodash (Custom Build) lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
- * Build: `lodash include="get,set,unset,values" exports="node"`
- */
-;(function(){function t(t,e){for(var r=-1,n=null==t?0:t.length,o=Array(n);++r<n;)o[r]=e(t[r],r,t);return o}function e(t){return function(e){return t(e)}}function r(e,r){return t(r,function(t){return e[t]})}function n(){}function o(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function u(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function i(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1]);
-}}function c(t,e){for(var r=t.length;r--;)if(m(t[r][0],e))return r;return-1}function a(t,e){e=h(e,t);for(var r=0,n=e.length;null!=t&&r<n;)t=t[j(e[r++])];return r&&r==n?t:E}function l(t){if(null==t)return t===E?"[object Undefined]":"[object Null]";t=Object(t);var e;if(nt&&nt in t){var r=Q.call(t,nt),n=t[nt];try{t[nt]=E,e=true}catch(t){}var o=Y.call(t);e&&(r?t[nt]=n:delete t[nt]),e=o}else e=Y.call(t);return e}function s(t){return w(t)&&"[object Arguments]"==l(t)}function f(t){return w(t)&&z(t.length)&&!!M[l(t)];
-}function p(e){if(typeof e=="string")return e;if(ft(e))return t(e,p)+"";if(x(e))return at?at.call(e):"";var r=e+"";return"0"==r&&1/e==-T?"-0":r}function h(t,e){var r;return ft(t)?r=t:(ft(t)?r=false:(r=typeof t,r=!("number"!=r&&"symbol"!=r&&"boolean"!=r&&null!=t&&!x(t))||(B.test(t)||!I.test(t)||null!=e&&t in Object(e))),r=r?[t]:lt(F(t))),r}function y(t,e){var r=t.__data__,n=typeof e;return("string"==n||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?r[typeof e=="string"?"string":"hash"]:r.map;
-}function b(t,e){var r=null==t?E:t[e];return(!S(r)||X&&X in r?0:(O(r)?Z:L).test(g(r)))?r:E}function _(t,e){return e=null==e?9007199254740991:e,!!e&&(typeof t=="number"||R.test(t))&&-1<t&&0==t%1&&t<e}function j(t){if(typeof t=="string"||x(t))return t;var e=t+"";return"0"==e&&1/t==-T?"-0":e}function g(t){if(null!=t){try{return K.call(t)}catch(t){}return t+""}return""}function v(t){var e=null==t?0:t.length;return e?t[e-1]:E}function d(t,e){function r(){var n=arguments,o=e?e.apply(this,n):n[0],u=r.cache;
-return u.has(o)?u.get(o):(n=t.apply(this,n),r.cache=u.set(o,n)||u,n)}if(typeof t!="function"||null!=e&&typeof e!="function")throw new TypeError("Expected a function");return r.cache=new(d.Cache||i),r}function m(t,e){return t===e||t!==t&&e!==e}function A(t){return null!=t&&z(t.length)&&!O(t)}function O(t){return!!S(t)&&(t=l(t),"[object Function]"==t||"[object GeneratorFunction]"==t||"[object AsyncFunction]"==t||"[object Proxy]"==t)}function z(t){return typeof t=="number"&&-1<t&&0==t%1&&9007199254740991>=t;
-}function S(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}function w(t){return null!=t&&typeof t=="object"}function x(t){return typeof t=="symbol"||w(t)&&"[object Symbol]"==l(t)}function F(t){return null==t?"":p(t)}function $(t){if(A(t)){var e=ft(t),r=!e&&st(t),n=!e&&!r&&pt(t),o=!e&&!r&&!n&&ht(t);if(e=e||r||n||o){for(var r=t.length,u=String,i=-1,c=Array(r);++i<r;)c[i]=u(i);r=c}else r=[];var a,u=r.length;for(a in t)!Q.call(t,a)||e&&("length"==a||n&&("offset"==a||"parent"==a)||o&&("buffer"==a||"byteLength"==a||"byteOffset"==a)||_(a,u))||r.push(a);
-t=r}else if(a=t&&t.constructor,t===(typeof a=="function"&&a.prototype||H)){a=[];for(n in Object(t))Q.call(t,n)&&"constructor"!=n&&a.push(n);t=a}else t=ut(t);return t}function k(){return false}var E,T=1/0,I=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,B=/^\w*$/,P=/^\./,U=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,C=/\\(\\)?/g,L=/^\[object .+?Constructor\]$/,R=/^(?:0|[1-9]\d*)$/,M={};M["[object Float32Array]"]=M["[object Float64Array]"]=M["[object Int8Array]"]=M["[object Int16Array]"]=M["[object Int32Array]"]=M["[object Uint8Array]"]=M["[object Uint8ClampedArray]"]=M["[object Uint16Array]"]=M["[object Uint32Array]"]=true,
-M["[object Arguments]"]=M["[object Array]"]=M["[object ArrayBuffer]"]=M["[object Boolean]"]=M["[object DataView]"]=M["[object Date]"]=M["[object Error]"]=M["[object Function]"]=M["[object Map]"]=M["[object Number]"]=M["[object Object]"]=M["[object RegExp]"]=M["[object Set]"]=M["[object String]"]=M["[object WeakMap]"]=false;var N,D=typeof global=="object"&&global&&global.Object===Object&&global,V=typeof self=="object"&&self&&self.Object===Object&&self,q=D||V||Function("return this")(),G=(V=typeof exports=="object"&&exports&&!exports.nodeType&&exports)&&typeof module=="object"&&module&&!module.nodeType&&module,W=G&&G.exports===V,D=W&&D.process;
-t:{try{N=D&&D.binding&&D.binding("util");break t}catch(t){}N=void 0}N=N&&N.isTypedArray;var D=Array.prototype,H=Object.prototype,J=q["__core-js_shared__"],K=Function.prototype.toString,Q=H.hasOwnProperty,X=function(){var t=/[^.]+$/.exec(J&&J.keys&&J.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}(),Y=H.toString,Z=RegExp("^"+K.call(Q).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),tt=W?q.Buffer:E,W=q.Symbol,et=H.propertyIsEnumerable,rt=D.splice,nt=W?W.toStringTag:E,ot=function(){
-try{var t=b(Object,"defineProperty");return t({},"",{}),t}catch(t){}}(),D=tt?tt.isBuffer:E,ut=function(t,e){return function(r){return t(e(r))}}(Object.keys,Object),it=b(q,"Map"),ct=b(Object,"create"),at=(q=W?W.prototype:E)?q.toString:E;o.prototype.clear=function(){this.__data__=ct?ct(null):{},this.size=0},o.prototype.delete=function(t){return t=this.has(t)&&delete this.__data__[t],this.size-=t?1:0,t},o.prototype.get=function(t){var e=this.__data__;return ct?(t=e[t],"__lodash_hash_undefined__"===t?E:t):Q.call(e,t)?e[t]:E;
-},o.prototype.has=function(t){var e=this.__data__;return ct?e[t]!==E:Q.call(e,t)},o.prototype.set=function(t,e){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=ct&&e===E?"__lodash_hash_undefined__":e,this},u.prototype.clear=function(){this.__data__=[],this.size=0},u.prototype.delete=function(t){var e=this.__data__;return t=c(e,t),!(0>t)&&(t==e.length-1?e.pop():rt.call(e,t,1),--this.size,true)},u.prototype.get=function(t){var e=this.__data__;return t=c(e,t),0>t?E:e[t][1]},u.prototype.has=function(t){
-return-1<c(this.__data__,t)},u.prototype.set=function(t,e){var r=this.__data__,n=c(r,t);return 0>n?(++this.size,r.push([t,e])):r[n][1]=e,this},i.prototype.clear=function(){this.size=0,this.__data__={hash:new o,map:new(it||u),string:new o}},i.prototype.delete=function(t){return t=y(this,t).delete(t),this.size-=t?1:0,t},i.prototype.get=function(t){return y(this,t).get(t)},i.prototype.has=function(t){return y(this,t).has(t)},i.prototype.set=function(t,e){var r=y(this,t),n=r.size;return r.set(t,e),this.size+=r.size==n?0:1,
-this};var lt=function(t){t=d(t,function(t){return 500===e.size&&e.clear(),t});var e=t.cache;return t}(function(t){var e=[];return P.test(t)&&e.push(""),t.replace(U,function(t,r,n,o){e.push(n?o.replace(C,"$1"):r||t)}),e});d.Cache=i;var st=s(function(){return arguments}())?s:function(t){return w(t)&&Q.call(t,"callee")&&!et.call(t,"callee")},ft=Array.isArray,pt=D||k,ht=N?e(N):f;n.keys=$,n.memoize=d,n.set=function(t,e,r){if(null!=t&&S(t)){e=h(e,t);for(var n=-1,o=e.length,u=o-1,i=t;null!=i&&++n<o;){var c=j(e[n]),a=r;
-if(n!=u){var l=i[c],a=E;a===E&&(a=S(l)?l:_(e[n+1])?[]:{})}var s=i,l=c,f=s[l];Q.call(s,l)&&m(f,a)&&(a!==E||l in s)||("__proto__"==l&&ot?ot(s,l,{configurable:true,enumerable:true,value:a,writable:true}):s[l]=a),i=i[c]}}return t},n.unset=function(t,e){var r;if(null==t)r=true;else{var n=t,o=r=h(e,n);if(!(2>o.length)){var u=0,i=-1,c=-1,l=o.length;for(0>u&&(u=-u>l?0:l+u),i=i>l?l:i,0>i&&(i+=l),l=u>i?0:i-u>>>0,u>>>=0,i=Array(l);++c<l;)i[c]=o[c+u];n=a(n,i)}r=j(v(r)),r=!(null!=n&&Q.call(n,r))||delete n[r]}return r;
-},n.values=function(t){return null==t?[]:r(t,$(t))},n.eq=m,n.get=function(t,e,r){return t=null==t?E:a(t,e),t===E?r:t},n.isArguments=st,n.isArray=ft,n.isArrayLike=A,n.isBuffer=pt,n.isFunction=O,n.isLength=z,n.isObject=S,n.isObjectLike=w,n.isSymbol=x,n.isTypedArray=ht,n.last=v,n.stubFalse=k,n.toString=F,n.VERSION="4.17.1",G&&((G.exports=n)._=n,V._=n)}).call(this);
--- a/www/messages.js
+++ b/www/messages.js
@@ -1,18 +0,0 @@
-module.exports = {
-  ADDING_COOKIES_NOT_SUPPORTED: 'advanced-http: "setHeader" does not support adding cookies, please use "setCookie" function instead',
-  DATA_TYPE_MISMATCH: 'advanced-http: "data" argument supports only following data types:',
-  MANDATORY_SUCCESS: 'advanced-http: missing mandatory "onSuccess" callback function',
-  MANDATORY_FAIL: 'advanced-http: missing mandatory "onFail" callback function',
-  INVALID_HTTP_METHOD: 'advanced-http: invalid HTTP method, supported methods are:',
-  INVALID_DATA_SERIALIZER: 'advanced-http: invalid serializer, supported serializers are:',
-  INVALID_SSL_CERT_MODE: 'advanced-http: invalid SSL cert mode, supported modes are:',
-  INVALID_CLIENT_AUTH_MODE: 'advanced-http: invalid client certificate authentication mode, supported modes are:',
-  INVALID_CLIENT_AUTH_OPTIONS: 'advanced-http: invalid client certificate authentication options, needs to be an object',
-  INVALID_CLIENT_AUTH_ALIAS: 'advanced-http: invalid client certificate alias, needs to be a string or undefined',
-  INVALID_CLIENT_AUTH_RAW_PKCS: 'advanced-http: invalid PKCS12 container, needs to be an array buffer',
-  INVALID_CLIENT_AUTH_PKCS_PASSWORD: 'advanced-http: invalid PKCS12 container password, needs to be a string',
-  INVALID_HEADERS_VALUE: 'advanced-http: header values must be strings',
-  INVALID_TIMEOUT_VALUE: 'advanced-http: invalid timeout value, needs to be a positive numeric value',
-  INVALID_FOLLOW_REDIRECT_VALUE: 'advanced-http: invalid follow redirect value, needs to be a boolean value',
-  INVALID_PARAMS_VALUE: 'advanced-http: invalid params object, needs to be an object with strings'
-};
--- a/www/public-interface.js
+++ b/www/public-interface.js
@@ -1,198 +0,0 @@
-module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConfigs) {
-  const publicInterface = {
-    getBasicAuthHeader: getBasicAuthHeader,
-    useBasicAuth: useBasicAuth,
-    getHeaders: getHeaders,
-    setHeader: setHeader,
-    getDataSerializer: getDataSerializer,
-    setDataSerializer: setDataSerializer,
-    setCookie: setCookie,
-    clearCookies: clearCookies,
-    removeCookies: removeCookies,
-    getCookieString: getCookieString,
-    getRequestTimeout: getRequestTimeout,
-    setRequestTimeout: setRequestTimeout,
-    getFollowRedirect: getFollowRedirect,
-    setFollowRedirect: setFollowRedirect,
-    // @DEPRECATED
-    disableRedirect: disableRedirect,
-    // @DEPRECATED
-    setSSLCertMode: setServerTrustMode,
-    setServerTrustMode: setServerTrustMode,
-    setClientAuthMode: setClientAuthMode,
-    sendRequest: sendRequest,
-    post: post,
-    get: get,
-    put: put,
-    patch: patch,
-    delete: del,
-    head: head,
-    uploadFile: uploadFile,
-    downloadFile: downloadFile
-  };
-
-  function getBasicAuthHeader(username, password) {
-    return { 'Authorization': 'Basic ' + helpers.b64EncodeUnicode(username + ':' + password) };
-  }
-
-  function useBasicAuth(username, password) {
-    this.setHeader('*', 'Authorization', 'Basic ' + helpers.b64EncodeUnicode(username + ':' + password));
-  }
-
-  function getHeaders(host) {
-    return globalConfigs.headers[host || '*'] || null;
-  }
-
-  function setHeader() {
-    // this one is for being backward compatible
-    var host = '*';
-    var header = arguments[0];
-    var value = arguments[1];
-
-    if (arguments.length === 3) {
-      host = arguments[0];
-      header = arguments[1];
-      value = arguments[2];
-    }
-
-    helpers.checkForBlacklistedHeaderKey(header);
-    helpers.checkForInvalidHeaderValue(value);
-
-    globalConfigs.headers[host] = globalConfigs.headers[host] || {};
-    globalConfigs.headers[host][header] = value;
-  }
-
-  function getDataSerializer() {
-    return globalConfigs.serializer;
-  }
-
-  function setDataSerializer(serializer) {
-    globalConfigs.serializer = helpers.checkSerializer(serializer);
-  }
-
-  function setCookie(url, cookie, options) {
-    cookieHandler.setCookie(url, cookie, options);
-  }
-
-  function clearCookies() {
-    cookieHandler.clearCookies();
-  }
-
-  function removeCookies(url, callback) {
-    cookieHandler.removeCookies(url, callback);
-  }
-
-  function getCookieString(url) {
-    return cookieHandler.getCookieString(url);
-  }
-
-  function getRequestTimeout() {
-    return globalConfigs.timeout;
-  }
-
-  function setRequestTimeout(timeout) {
-    globalConfigs.timeout = helpers.checkTimeoutValue(timeout);
-  }
-
-  function getFollowRedirect() {
-    return globalConfigs.followRedirect;
-  }
-
-  function setFollowRedirect(follow) {
-    globalConfigs.followRedirect = helpers.checkFollowRedirectValue(follow);
-  }
-
-  // @DEPRECATED
-  function disableRedirect(disable, success, failure) {
-    helpers.handleMissingCallbacks(success, failure);
-
-    setFollowRedirect(!disable);
-    success();
-  }
-
-  function setServerTrustMode(mode, success, failure) {
-    helpers.handleMissingCallbacks(success, failure);
-
-    return exec(success, failure, 'CordovaHttpPlugin', 'setServerTrustMode', [helpers.checkSSLCertMode(mode)]);
-  }
-
-  function setClientAuthMode() {
-    var mode = arguments[0];
-    var options = null;
-    var success = arguments[1];
-    var failure = arguments[2];
-
-    if (arguments.length === 4) {
-      options = arguments[1];
-      success = arguments[2];
-      failure = arguments[3];
-    }
-
-    mode = helpers.checkClientAuthMode(mode);
-    options = helpers.checkClientAuthOptions(mode, options);
-
-    helpers.handleMissingCallbacks(success, failure);
-
-    return exec(success, failure, 'CordovaHttpPlugin', 'setClientAuthMode', [mode, options.alias, options.rawPkcs, options.pkcsPassword]);
-  }
-
-  function sendRequest(url, options, success, failure) {
-    helpers.handleMissingCallbacks(success, failure);
-
-    options = helpers.handleMissingOptions(options, globalConfigs);
-    url = urlUtil.appendQueryParamsString(url, urlUtil.serializeQueryParams(options.params, true));
-
-    var headers = helpers.getMergedHeaders(url, options.headers, globalConfigs.headers);
-    var onSuccess = helpers.injectCookieHandler(url, success);
-    var onFail = helpers.injectCookieHandler(url, failure);
-
-    switch (options.method) {
-      case 'post':
-      case 'put':
-      case 'patch':
-        var data = helpers.getProcessedData(options.data, options.serializer);
-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', options.method, [url, data, options.serializer, headers, options.timeout, options.followRedirect]);
-      case 'upload':
-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'uploadFile', [url, headers, options.filePath, options.name, options.timeout, options.followRedirect]);
-      case 'download':
-        var onDownloadSuccess = helpers.injectCookieHandler(url, helpers.injectFileEntryHandler(success));
-        return exec(onDownloadSuccess, onFail, 'CordovaHttpPlugin', 'downloadFile', [url, headers, options.filePath, options.timeout, options.followRedirect]);
-      default:
-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', options.method, [url, headers, options.timeout, options.followRedirect]);
-    }
-  }
-
-  function post(url, data, headers, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'post', data: data, headers: headers }, success, failure);
-  };
-
-  function get(url, params, headers, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'get', params: params, headers: headers }, success, failure);
-  };
-
-  function put(url, data, headers, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'put', data: data, headers: headers }, success, failure);
-  }
-
-  function patch(url, data, headers, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'patch', data: data, headers: headers }, success, failure);
-  }
-
-  function del(url, params, headers, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'delete', params: params, headers: headers }, success, failure);
-  }
-
-  function head(url, params, headers, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'head', params: params, headers: headers }, success, failure);
-  }
-
-  function uploadFile(url, params, headers, filePath, name, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'upload', params: params, headers: headers, filePath: filePath, name: name }, success, failure);
-  }
-
-  function downloadFile(url, params, headers, filePath, success, failure) {
-    return publicInterface.sendRequest(url, { method: 'download', params: params, headers: headers, filePath: filePath }, success, failure);
-  }
-
-  return publicInterface;
-}
--- a/www/umd-tough-cookie.js
+++ b/www/umd-tough-cookie.js
--- a/www/url-util.js
+++ b/www/url-util.js
@@ -1,103 +0,0 @@
-module.exports = function init(jsUtil) {
-  return {
-    parseUrl: parseUrl,
-    appendQueryParamsString: appendQueryParamsString,
-    serializeQueryParams: serializeQueryParams
-  }
-
-  function parseUrl(url) {
-    var match = url.match(/^(https?\:)\/\/(([^:\/?#]*)(?:\:([0-9]+))?)([\/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
-
-    return match && {
-        protocol: match[1],
-        host: match[2],
-        hostname: match[3],
-        port: match[4] || '',
-        pathname: match[5],
-        search: match[6],
-        hash: match[7]
-    }
-  }
-
-  function appendQueryParamsString(url, params) {
-    if (!url.length || !params.length) {
-      return url;
-    }
-
-    var parsed = parseUrl(url);
-
-    return parsed.protocol
-      + '//'
-      + parsed.host
-      + parsed.pathname
-      + (parsed.search.length ? parsed.search + '&' + params : '?' + params)
-      + parsed.hash;
-  }
-
-  function serializeQueryParams(params, encode) {
-    return serializeObject('', params, encode);
-  }
-
-  function serializeObject(parentKey, object, encode) {
-    var parts = [];
-
-    for (var key in object) {
-      if (!object.hasOwnProperty(key)) {
-        continue;
-      }
-
-      var identifier = parentKey.length ? parentKey + '[' + key + ']' : key;
-
-      if (jsUtil.getTypeOf(object[key]) === 'Array') {
-        parts.push(serializeArray(identifier, object[key], encode));
-        continue;
-      } else if (jsUtil.getTypeOf(object[key]) === 'Object') {
-        parts.push(serializeObject(identifier, object[key], encode));
-        continue;
-      }
-
-      parts.push(serializeIdentifier(parentKey, key, encode) + '=' + serializeValue(object[key], encode));
-    }
-
-    return parts.join('&');
-  }
-
-  function serializeArray(parentKey, array, encode) {
-    var parts = [];
-
-    for (var i = 0; i < array.length; ++i) {
-      if (jsUtil.getTypeOf(array[i]) === 'Array') {
-        parts.push(serializeArray(parentKey + '[]', array[i], encode));
-        continue;
-      } else if (jsUtil.getTypeOf(array[i]) === 'Object') {
-        parts.push(serializeObject(parentKey + '[]' + array[i], encode));
-        continue;
-      }
-
-      parts.push(serializeIdentifier(parentKey, '', encode) + '=' + serializeValue(array[i], encode));
-    }
-
-    return parts.join('&');
-  }
-
-  function serializeIdentifier(parentKey, key, encode) {
-    if (!parentKey.length) {
-      return encode ? encodeURIComponent(key) : key;
-    }
-
-    if (encode) {
-      return encodeURIComponent(parentKey) + '[' + encodeURIComponent(key) + ']';
-    } else {
-      return parentKey + '[' + key + ']';
-    }
-  }
-
-  function serializeValue(value, encode) {
-    if (encode) {
-      return encodeURIComponent(value);
-    } else {
-      return value;
-    }
-  }
-};
-
--- a/zedconfig.json
+++ b/zedconfig.json
@@ -0,0 +1,33 @@
+{
+    "preferences": {
+        "tabSize": 4,
+        "wordWrap": true,
+        "useSoftTabs": true,
+        "gotoExclude": []
+    },
+    "packages": [
+        "gh:wymsee/zed-tools/mobile"
+    ],
+    "modes": {
+        "javascript": {
+             "commands": {
+                 "Tools:Check": {
+                     "options": {
+                         "globals": {
+                            "angular": true,
+                            "$": true,
+                            "device": true,
+                            "persistence": true,
+                            "moment": true,
+                            "sos": true,
+                            "LocalFileSystem": true,
+                            "Hammer": true,
+                            "AnimationFrame": true,
+                            "Bloodhound": true
+                        }
+                    }
+                }
+            }
+        }
+    }
+}