diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-12-09 18:55:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-09 18:55:09 +0000 |
| commit | d888fa3ed39ea21a29e80864a4e132f7ef63e221 (patch) | |
| tree | c69b4e3740ae0143da822aee3e99357b15347645 | |
| parent | 37411b6c8251cb6e88e8e4e01eeaa067fd6e7045 (diff) | |
| parent | ae4b4a66e778b557d67f34f75009200e4eec34a9 (diff) | |
| download | okhttp-d888fa3ed39ea21a29e80864a4e132f7ef63e221.tar.gz | |
Merge "Refactor NetworkSecurityPolicy to be pluggable"
am: ae4b4a66e7
* commit 'ae4b4a66e778b557d67f34f75009200e4eec34a9':
Refactor NetworkSecurityPolicy to be pluggable
| -rw-r--r-- | android/main/java/com/squareup/okhttp/HttpHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/main/java/com/squareup/okhttp/HttpHandler.java b/android/main/java/com/squareup/okhttp/HttpHandler.java index 6f69650..4423efb 100644 --- a/android/main/java/com/squareup/okhttp/HttpHandler.java +++ b/android/main/java/com/squareup/okhttp/HttpHandler.java @@ -81,7 +81,7 @@ public class HttpHandler extends URLStreamHandler { // Do not permit http -> https and https -> http redirects. client.setFollowSslRedirects(false); - if (NetworkSecurityPolicy.isCleartextTrafficPermitted()) { + if (NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted()) { // Permit cleartext traffic only (this is a handler for HTTP, not for HTTPS). client.setConnectionSpecs(CLEARTEXT_ONLY); } else { |