Merge remote-tracking branch 'refs/remotes/silkimen/master' into feature-patch-method-android

src/android/com/synconset/cordovahttp/CordovaHttp.java

@@ -25,6 +25,7 @@ abstract class CordovaHttp {
     private static AtomicBoolean sslPinning = new AtomicBoolean(false);
     private static AtomicBoolean acceptAllCerts = new AtomicBoolean(false);
     private static AtomicBoolean validateDomainName = new AtomicBoolean(true);
+    private static AtomicBoolean disableRedirect = new AtomicBoolean(false);
 
     private String urlString;
     private JSONObject params;
@@ -69,6 +70,10 @@ abstract class CordovaHttp {
         validateDomainName.set(accept);
     }
 
+    public static void disableRedirect(boolean disable) {
+        disableRedirect.set(disable);
+    }
+
     protected String getUrlString() {
         return this.urlString;
     }
@@ -114,6 +119,13 @@ abstract class CordovaHttp {
         return request;
     }
 
+    protected HttpRequest setupRedirect(HttpRequest request) {
+        if (disableRedirect.get()) {
+            request.followRedirects(false);
+        }
+        return request;
+    }
+
     protected void respondWithError(int status, String msg) {
         try {
             JSONObject response = new JSONObject();

src/android/com/synconset/cordovahttp/CordovaHttpDelete.java

@@ -27,6 +27,7 @@ class CordovaHttpDelete extends CordovaHttp implements Runnable {
             HttpRequest request = HttpRequest.delete(this.getUrlString(), this.getParamsMap(), false);
 
             request.readTimeout(this.getRequestTimeout());
+            this.setupRedirect(request);
             this.setupSecurity(request);
             request.acceptCharset(CHARSET);
             request.headers(this.getHeadersMap());

src/android/com/synconset/cordovahttp/CordovaHttpDownload.java

@@ -34,6 +34,7 @@ class CordovaHttpDownload extends CordovaHttp implements Runnable {
             HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), true);
 
             request.readTimeout(this.getRequestTimeout());
+            this.setupRedirect(request);
             this.setupSecurity(request);
             request.acceptCharset(CHARSET);
             request.headers(this.getHeadersMap());

src/android/com/synconset/cordovahttp/CordovaHttpGet.java

@@ -27,6 +27,7 @@ class CordovaHttpGet extends CordovaHttp implements Runnable {
             HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), false);
 
             request.readTimeout(this.getRequestTimeout());
+            this.setupRedirect(request);
             this.setupSecurity(request);
             request.acceptCharset(CHARSET);
             request.headers(this.getHeadersMap());

src/android/com/synconset/cordovahttp/CordovaHttpHead.java

@@ -26,6 +26,7 @@ class CordovaHttpHead extends CordovaHttp implements Runnable {
             HttpRequest request = HttpRequest.head(this.getUrlString(), this.getParamsMap(), true);
 
             request.readTimeout(this.getRequestTimeout());
+            this.setupRedirect(request);
             this.setupSecurity(request);
             request.acceptCharset(CHARSET);
             request.headers(this.getHeadersMap());

src/android/com/synconset/cordovahttp/CordovaHttpPlugin.java

@@ -114,6 +114,10 @@ public class CordovaHttpPlugin extends CordovaPlugin {
             CordovaHttpDownload download = new CordovaHttpDownload(urlString, params, headers, callbackContext, filePath, timeoutInMilliseconds);
 
             cordova.getThreadPool().execute(download);
+        } else if (action.equals("disableRedirect")) {
+           boolean disable = args.getBoolean(0);
+           CordovaHttp.disableRedirect(disable);
+           callbackContext.success();
         } else {
             return false;
         }

src/android/com/synconset/cordovahttp/CordovaHttpPost.java

@@ -26,6 +26,7 @@ class CordovaHttpPost extends CordovaHttp implements Runnable {
             HttpRequest request = HttpRequest.post(this.getUrlString());
 
             request.readTimeout(this.getRequestTimeout());
+            this.setupRedirect(request);
             this.setupSecurity(request);
             request.acceptCharset(CHARSET);
             request.headers(this.getHeadersMap());

src/android/com/synconset/cordovahttp/CordovaHttpPut.java

@@ -26,6 +26,7 @@ class CordovaHttpPut extends CordovaHttp implements Runnable {
             HttpRequest request = HttpRequest.put(this.getUrlString());
 
             request.readTimeout(this.getRequestTimeout());
+            this.setupRedirect(request);
             this.setupSecurity(request);
             request.acceptCharset(CHARSET);
             request.headers(this.getHeadersMap());

src/android/com/synconset/cordovahttp/CordovaHttpUpload.java

@@ -42,6 +42,7 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
             HttpRequest request = HttpRequest.post(this.getUrlString());
 
             request.readTimeout(this.getRequestTimeout());
+            this.setupRedirect(request);
             this.setupSecurity(request);
             request.acceptCharset(CHARSET);
             request.headers(this.getHeadersMap());