diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48e7ae2..3e238d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 3.0.0
+
+- :warning: **Breaking Change**: Dropped support for Android < 5.1
+- :warning: **Breaking Change**: Removed "disableRedirect", use "setFollowRedirect" instead
+- :warning: **Breaking Change**: Removed "setSSLCertMode", use "setServerTrustMode" instead
+
## 2.5.1
- Fixed #334: empty JSON response triggers error even though request is successful (thanks antikalk)
diff --git a/README.md b/README.md
index e1a031e..071161a 100644
--- a/README.md
+++ b/README.md
@@ -210,12 +210,6 @@ Configure X.509 client certificate authentication. Takes mode and options. `mode
cordova.plugin.http.setClientAuthMode('none', {}, success, fail);
```
-### 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.
-
### removeCookies
Remove all cookies associated with a given URL.
diff --git a/package.json b/package.json
index 9197884..e9c04b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-advanced-http",
- "version": "2.5.1",
+ "version": "3.0.0",
"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",
@@ -69,4 +69,4 @@
"wd": "1.4.1",
"xml2js": "0.4.19"
}
-}
+}
\ No newline at end of file
diff --git a/plugin.xml b/plugin.xml
index 530cd8b..d21a363 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -79,11 +79,8 @@
-
-
-
diff --git a/src/android/com/silkimen/cordovahttp/CordovaHttpBase.java b/src/android/com/silkimen/cordovahttp/CordovaHttpBase.java
index 277f8e7..03c7bc3 100644
--- a/src/android/com/silkimen/cordovahttp/CordovaHttpBase.java
+++ b/src/android/com/silkimen/cordovahttp/CordovaHttpBase.java
@@ -16,7 +16,6 @@ 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;
@@ -124,7 +123,6 @@ abstract class CordovaHttpBase implements Runnable {
request.readTimeout(this.timeout);
request.acceptCharset("UTF-8");
request.uncompress(true);
- HttpRequest.setConnectionFactory(new OkConnectionFactory());
if (this.tlsConfiguration.getHostnameVerifier() != null) {
request.setHostnameVerifier(this.tlsConfiguration.getHostnameVerifier());
diff --git a/src/android/com/silkimen/http/OkConnectionFactory.java b/src/android/com/silkimen/http/OkConnectionFactory.java
deleted file mode 100644
index c1a3ef1..0000000
--- a/src/android/com/silkimen/http/OkConnectionFactory.java
+++ /dev/null
@@ -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);
- }
-}
diff --git a/www/public-interface.js b/www/public-interface.js
index 8e73d36..eb0c86b 100644
--- a/www/public-interface.js
+++ b/www/public-interface.js
@@ -14,10 +14,6 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf
setRequestTimeout: setRequestTimeout,
getFollowRedirect: getFollowRedirect,
setFollowRedirect: setFollowRedirect,
- // @DEPRECATED
- disableRedirect: disableRedirect,
- // @DEPRECATED
- setSSLCertMode: setServerTrustMode,
setServerTrustMode: setServerTrustMode,
setClientAuthMode: setClientAuthMode,
sendRequest: sendRequest,
@@ -105,14 +101,6 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf
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);
@@ -154,7 +142,7 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf
case 'post':
case 'put':
case 'patch':
- return helpers.processData(options.data, options.serializer, function(data) {
+ return helpers.processData(options.data, options.serializer, function (data) {
exec(onSuccess, onFail, 'CordovaHttpPlugin', options.method, [url, data, options.serializer, headers, options.timeout, options.followRedirect, options.responseType]);
});
case 'upload':