bump engine.io-client

This commit is contained in:
nkzawa
2017-07-11 21:54:48 +09:00
parent 8f8c138a61
commit 9d6947a015
5 changed files with 48 additions and 26 deletions

View File

@@ -2,6 +2,9 @@ package io.socket.client;
import io.socket.parser.Parser;
import okhttp3.Call;
import okhttp3.OkHttpClient;
import okhttp3.WebSocket;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -23,12 +26,12 @@ public class IO {
*/
public static int protocol = Parser.protocol;
public static void setDefaultSSLContext(SSLContext sslContext) {
Manager.defaultSSLContext = sslContext;
public static void setDefaultOkHttpWebSocketFactory(WebSocket.Factory factory) {
Manager.defaultWebSocketFactory = factory;
}
public static void setDefaultHostnameVerifier(HostnameVerifier hostnameVerifier) {
Manager.defaultHostnameVerifier = hostnameVerifier;
public static void setDefaultOkHttpCallFactory(Call.Factory factory) {
Manager.defaultCallFactory = factory;
}
private IO() {}

View File

@@ -5,6 +5,8 @@ import io.socket.emitter.Emitter;
import io.socket.parser.Packet;
import io.socket.parser.Parser;
import io.socket.thread.EventThread;
import okhttp3.Call;
import okhttp3.WebSocket;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -73,8 +75,8 @@ public class Manager extends Emitter {
*/
public static final String EVENT_TRANSPORT = Engine.EVENT_TRANSPORT;
/*package*/ static SSLContext defaultSSLContext;
/*package*/ static HostnameVerifier defaultHostnameVerifier;
/*package*/ static WebSocket.Factory defaultWebSocketFactory;
/*package*/ static Call.Factory defaultCallFactory;
/*package*/ ReadyState readyState;
@@ -123,11 +125,11 @@ public class Manager extends Emitter {
if (opts.path == null) {
opts.path = "/socket.io";
}
if (opts.sslContext == null) {
opts.sslContext = defaultSSLContext;
if (opts.webSocketFactory == null) {
opts.webSocketFactory = defaultWebSocketFactory;
}
if (opts.hostnameVerifier == null) {
opts.hostnameVerifier = defaultHostnameVerifier;
if (opts.callFactory == null) {
opts.callFactory = defaultCallFactory;
}
this.opts = opts;
this.nsps = new ConcurrentHashMap<String, Socket>();