h4ckx0r/engine.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "add new Options for feeding custom OkHttpClient"

Browse Source 
This reverts commit 464b7302d4.
This commit is contained in:
Yu-Hsuan Lin
2015-05-02 00:59:34 +08:00
parent ae1c521645
commit 822aaebc35
5 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/github/nkzawa/engineio/client/Socket.java
View File

@@ -8,8 +8,6 @@ import com.github.nkzawa.engineio.parser.Packet;
import com.github.nkzawa.engineio.parser.Parser;
import com.github.nkzawa.parseqs.ParseQS;
import com.github.nkzawa.thread.EventThread;
import com.squareup.okhttp.OkHttpClient;
import org.json.JSONException;
import javax.net.ssl.SSLContext;
@@ -123,7 +121,6 @@ public class Socket extends Emitter {
private Future pingTimeoutTimer;
private Future pingIntervalTimer;
private SSLContext sslContext;
private OkHttpClient okHttpClient;
private ReadyState readyState;
private ScheduledExecutorService heartbeatScheduler;
@@ -200,7 +197,6 @@ public class Socket extends Emitter {
opts.transports : new String[]{Polling.NAME, WebSocket.NAME}));
this.policyPort = opts.policyPort != 0 ? opts.policyPort : 843;
this.rememberUpgrade = opts.rememberUpgrade;
this.okHttpClient = opts.okHttpClient;
}
/**
@@ -258,7 +254,6 @@ public class Socket extends Emitter {
opts.timestampParam = this.timestampParam;
opts.policyPort = this.policyPort;
opts.socket = this;
opts.okHttpClient = this.okHttpClient;
Transport transport;
if (WebSocket.NAME.equals(name)) {

4
src/main/java/com/github/nkzawa/engineio/client/Transport.java
View File

@@ -5,7 +5,6 @@ import com.github.nkzawa.emitter.Emitter;
import com.github.nkzawa.engineio.parser.Packet;
import com.github.nkzawa.engineio.parser.Parser;
import com.github.nkzawa.thread.EventThread;
import com.squareup.okhttp.OkHttpClient;
import javax.net.ssl.SSLContext;
import java.util.Map;
@@ -43,7 +42,6 @@ public abstract class Transport extends Emitter {
protected String timestampParam;
protected SSLContext sslContext;
protected Socket socket;
protected OkHttpClient okHttpClient;
protected ReadyState readyState;
@@ -57,7 +55,6 @@ public abstract class Transport extends Emitter {
this.timestampRequests = opts.timestampRequests;
this.sslContext = opts.sslContext;
this.socket = opts.socket;
this.okHttpClient = opts.okHttpClient;
}
protected Transport onError(String msg, Exception desc) {
@@ -147,7 +144,6 @@ public abstract class Transport extends Emitter {
public int policyPort = -1;
public Map<String, String> query;
public SSLContext sslContext;
public OkHttpClient okHttpClient;
protected Socket socket;
}
}

2
src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java
View File

@@ -48,7 +48,7 @@ public class WebSocket extends Transport {
this.emit(EVENT_REQUEST_HEADERS, headers);
final WebSocket self = this;
final OkHttpClient client = this.okHttpClient != null ? this.okHttpClient : new OkHttpClient();
final OkHttpClient client = new OkHttpClient();
if (this.sslContext != null) {
SSLSocketFactory factory = sslContext.getSocketFactory();// (SSLSocketFactory) SSLSocketFactory.getDefault();
client.setSslSocketFactory(factory);