aboutsummaryrefslogtreecommitdiff
path: root/okhttp-urlconnection
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-08-27 12:57:47 +0100
committerNeil Fuller <nfuller@google.com>2015-09-17 17:13:02 +0100
commit36132b3cd2c814e057c775adc821ae0fb12aeb4c (patch)
tree54ba26e855192f6697902bad35e92d6973c6648b /okhttp-urlconnection
parent71b9f47b26fb57ac3e436a19519c6e3ec70e86eb (diff)
downloadokhttp-36132b3cd2c814e057c775adc821ae0fb12aeb4c.tar.gz
Android modifications to OkHttp
Re-introduce Android integration classes and make the modifications necessary to get OkHttp/Okio to compile against Android. The only Android-specific change made over prior versions of this code is in Platform to remove the toURILenient() method (no longer used by OkHttp). This commit also includes pending PR https://github.com/square/okhttp/pull/1858 to fix two tests on Android: com.squareup.okhttp.URLConnectionTest#connectViaHttpsWithSSLFallback com.squareup.okhttp.CallTest#recoverFromTlsHandshakeFailure_Async Bug: 22943975 Bug: 23553256 Change-Id: I4c718c96fbd5fe3f2353ce422f8de3b95d0b75ee
Diffstat (limited to 'okhttp-urlconnection')
-rw-r--r--okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpsURLConnectionImpl.java16
1 files changed, 10 insertions, 6 deletions
diff --git a/okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpsURLConnectionImpl.java b/okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpsURLConnectionImpl.java
index 2aba087..75f7158 100644
--- a/okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpsURLConnectionImpl.java
+++ b/okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpsURLConnectionImpl.java
@@ -63,15 +63,19 @@ public final class HttpsURLConnectionImpl extends DelegatingHttpsURLConnection {
return delegate.client.getSslSocketFactory();
}
- @Override public long getContentLengthLong() {
- return delegate.getContentLengthLong();
- }
+ // ANDROID-BEGIN
+ // @Override public long getContentLengthLong() {
+ // return delegate.getContentLengthLong();
+ // }
+ // ANDROID-END
@Override public void setFixedLengthStreamingMode(long contentLength) {
delegate.setFixedLengthStreamingMode(contentLength);
}
- @Override public long getHeaderFieldLong(String field, long defaultValue) {
- return delegate.getHeaderFieldLong(field, defaultValue);
- }
+ // ANDROID-BEGIN
+ // @Override public long getHeaderFieldLong(String field, long defaultValue) {
+ // return delegate.getHeaderFieldLong(field, defaultValue);
+ // }
+ // ANDROID-END
}