aboutsummaryrefslogtreecommitdiffstats
path: root/AndroidAsync/src
diff options
context:
space:
mode:
authorGlen Daniels <glen@thoughtcraft.com>2014-06-17 23:01:55 -0400
committerGlen Daniels <glen@thoughtcraft.com>2014-06-17 23:01:55 -0400
commitd730d433bf1cb5f6ac820c142b7950d416060bbc (patch)
tree19732a9e742ee636cdd823fed3e6e968b475627d /AndroidAsync/src
parent442bd36af73b45c6059e92dafbc77c10bb1c18f6 (diff)
downloadAndroidAsync-d730d433bf1cb5f6ac820c142b7950d416060bbc.tar.gz
AndroidAsync-d730d433bf1cb5f6ac820c142b7950d416060bbc.tar.bz2
AndroidAsync-d730d433bf1cb5f6ac820c142b7950d416060bbc.zip
Restore legacy constructor.
Diffstat (limited to 'AndroidAsync/src')
-rw-r--r--AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index ccfafa2..6086ea2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -1,23 +1,18 @@
package com.koushikdutta.async;
-import android.os.Build;
-
import com.koushikdutta.async.callback.CompletedCallback;
import com.koushikdutta.async.callback.DataCallback;
import com.koushikdutta.async.callback.WritableCallback;
-import com.koushikdutta.async.http.AsyncSSLEngineConfigurator;
import com.koushikdutta.async.http.AsyncSSLSocketMiddleware;
import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
import org.apache.http.conn.ssl.StrictHostnameVerifier;
-import java.lang.String;
import java.nio.ByteBuffer;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
-import java.util.Arrays;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -50,6 +45,10 @@ public class AsyncSSLSocketWrapper implements AsyncSocketWrapper, AsyncSSLSocket
TrustManager[] trustManagers;
boolean clientMode;
+ public AsyncSSLSocketWrapper(AsyncSocket socket, String host, int port, SSLContext sslContext, TrustManager[] trustManagers, HostnameVerifier verifier, boolean clientMode) {
+ this(socket, host, port, sslContext.createSSLEngine(), trustManagers, verifier, clientMode);
+ }
+
public AsyncSSLSocketWrapper(AsyncSocket socket, String host, int port, SSLEngine sslEngine, TrustManager[] trustManagers, HostnameVerifier verifier, boolean clientMode) {
mSocket = socket;
hostnameVerifier = verifier;