Commit e0bc873d authored by Yusuke Iwaki's avatar Yusuke Iwaki

remove DDPClient#isConnected because it is just useless!!

parent 6597044b
...@@ -61,10 +61,6 @@ public class DDPClient { ...@@ -61,10 +61,6 @@ public class DDPClient {
return impl.getOnCloseCallback(); return impl.getOnCloseCallback();
} }
public boolean isConnected() {
return impl.isConnected();
}
public void close() { public void close() {
impl.close(1000, "closed by DDPClient#close()"); impl.close(1000, "closed by DDPClient#close()");
} }
......
...@@ -96,10 +96,6 @@ public class DDPClientImpl { ...@@ -96,10 +96,6 @@ public class DDPClientImpl {
} }
} }
public boolean isConnected() {
return websocket != null && websocket.isConnected();
}
public void ping(final TaskCompletionSource<DDPClientCallback.Ping> task, public void ping(final TaskCompletionSource<DDPClientCallback.Ping> task,
@Nullable final String id) { @Nullable final String id) {
......
...@@ -15,11 +15,9 @@ import rx.observables.ConnectableObservable; ...@@ -15,11 +15,9 @@ import rx.observables.ConnectableObservable;
public class RxWebSocket { public class RxWebSocket {
private OkHttpClient httpClient; private OkHttpClient httpClient;
private WebSocket webSocket; private WebSocket webSocket;
private boolean isConnected;
public RxWebSocket(OkHttpClient client) { public RxWebSocket(OkHttpClient client) {
httpClient = client; httpClient = client;
isConnected = false;
} }
public ConnectableObservable<RxWebSocketCallback.Base> connect(String url) { public ConnectableObservable<RxWebSocketCallback.Base> connect(String url) {
...@@ -31,7 +29,6 @@ public class RxWebSocket { ...@@ -31,7 +29,6 @@ public class RxWebSocket {
httpClient.newWebSocket(request, new WebSocketListener() { httpClient.newWebSocket(request, new WebSocketListener() {
@Override @Override
public void onOpen(WebSocket webSocket, Response response) { public void onOpen(WebSocket webSocket, Response response) {
isConnected = true;
RxWebSocket.this.webSocket = webSocket; RxWebSocket.this.webSocket = webSocket;
subscriber.onNext(new RxWebSocketCallback.Open(RxWebSocket.this.webSocket, response)); subscriber.onNext(new RxWebSocketCallback.Open(RxWebSocket.this.webSocket, response));
} }
...@@ -39,7 +36,6 @@ public class RxWebSocket { ...@@ -39,7 +36,6 @@ public class RxWebSocket {
@Override @Override
public void onFailure(WebSocket webSocket, Throwable err, Response response) { public void onFailure(WebSocket webSocket, Throwable err, Response response) {
try { try {
isConnected = false;
subscriber.onError(new RxWebSocketCallback.Failure(webSocket, err, response)); subscriber.onError(new RxWebSocketCallback.Failure(webSocket, err, response));
} catch (OnErrorNotImplementedException ex) { } catch (OnErrorNotImplementedException ex) {
RCLog.w(ex, "OnErrorNotImplementedException ignored"); RCLog.w(ex, "OnErrorNotImplementedException ignored");
...@@ -48,13 +44,11 @@ public class RxWebSocket { ...@@ -48,13 +44,11 @@ public class RxWebSocket {
@Override @Override
public void onMessage(WebSocket webSocket, String text) { public void onMessage(WebSocket webSocket, String text) {
isConnected = true;
subscriber.onNext(new RxWebSocketCallback.Message(webSocket, text)); subscriber.onNext(new RxWebSocketCallback.Message(webSocket, text));
} }
@Override @Override
public void onClosed(WebSocket webSocket, int code, String reason) { public void onClosed(WebSocket webSocket, int code, String reason) {
isConnected = false;
subscriber.onNext(new RxWebSocketCallback.Close(webSocket, code, reason)); subscriber.onNext(new RxWebSocketCallback.Close(webSocket, code, reason));
subscriber.onCompleted(); subscriber.onCompleted();
} }
...@@ -67,10 +61,6 @@ public class RxWebSocket { ...@@ -67,10 +61,6 @@ public class RxWebSocket {
return webSocket.send(message); return webSocket.send(message);
} }
public boolean isConnected() {
return isConnected;
}
public boolean close(int code, String reason) throws IOException { public boolean close(int code, String reason) throws IOException {
return webSocket.close(code, reason); return webSocket.close(code, reason);
} }
......
...@@ -42,13 +42,6 @@ public class DDPClientWrapper { ...@@ -42,13 +42,6 @@ public class DDPClientWrapper {
return ddpClient.connect(protocol + hostname + "/websocket", session); return ddpClient.connect(protocol + hostname + "/websocket", session);
} }
/**
* Returns whether DDP client is connected to WebSocket server.
*/
public boolean isConnected() {
return ddpClient.isConnected();
}
/** /**
* close connection. * close connection.
*/ */
......
...@@ -179,7 +179,7 @@ public class RocketChatWebSocketThread extends HandlerThread { ...@@ -179,7 +179,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
} }
private Single<Boolean> checkIfConnectionAlive() { private Single<Boolean> checkIfConnectionAlive() {
if (ddpClient == null || !ddpClient.isConnected()) { if (ddpClient == null) {
return Single.just(false); return Single.just(false);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment