diff options
| author | Kenny Root <kroot@google.com> | 2013-05-28 15:49:54 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-05-29 10:09:10 -0700 |
| commit | 5997d62272fee36f585734c510c7ac3cbeb51537 (patch) | |
| tree | f688d7cb218e2f0ee420e2aaa4c9151af1657c3f | |
| parent | 2c1c92266ddee7b46d64033741a1201cec534f5f (diff) | |
| download | okhttp-5997d62272fee36f585734c510c7ac3cbeb51537.tar.gz | |
Add current AOSP class name for OpenSSLSocketImpl
AOSP moved OpenSSLSocketImpl to com.android.org.conscrypt.* so add that
as the first choice for unbundled apps.
Change-Id: I7bad6533dcb86ee1cac3b15f42dd386bd651eaed
| -rw-r--r-- | src/main/java/com/squareup/okhttp/internal/Platform.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/com/squareup/okhttp/internal/Platform.java b/src/main/java/com/squareup/okhttp/internal/Platform.java index 75cd66f..21761d3 100644 --- a/src/main/java/com/squareup/okhttp/internal/Platform.java +++ b/src/main/java/com/squareup/okhttp/internal/Platform.java @@ -130,7 +130,14 @@ public class Platform { Method setUseSessionTickets; Method setHostname; try { - openSslSocketClass = Class.forName("org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl"); + try { + openSslSocketClass = Class.forName("com.android.org.conscrypt.OpenSSLSocketImpl"); + } catch (ClassNotFoundException ignored) { + // Older platform before being unbundled. + openSslSocketClass = Class.forName( + "org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl"); + } + setUseSessionTickets = openSslSocketClass.getMethod("setUseSessionTickets", boolean.class); setHostname = openSslSocketClass.getMethod("setHostname", String.class); |